diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 1ba50537..25b78410 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -359,22 +359,17 @@ namespace v2rayN.Forms
case Keys.A:
menuSelectAll_Click(null, null);
break;
- }
- if (config.enableHotkey)
- {
- if (e.KeyCode == Keys.T)
- {
+ case Keys.T:
// Speed test selected servers
GetLvSelectedIndex();
ServerSpeedTest();
- }
- else if (e.KeyCode == Keys.P)
- {
+ break;
+ case Keys.P:
// Ping selected servers
GetLvSelectedIndex();
ClearTestResult();
bgwPing.RunWorkerAsync();
- }
+ break;
}
}
switch (e.KeyCode)
diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index d2f676fc..20ba91e0 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -225,13 +225,13 @@
447, 22
- Test server delay (multiple choice)
+ Test server delay (multiple choice)(Ctrl+P)
447, 22
- Test server speed (multiple choice)
+ Test server speed (multiple choice)(Ctrl+T)
444, 6
@@ -273,7 +273,7 @@
ImageAboveText
- 448, 468
+ 448, 490
cmsLv
diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
index 8395e525..e25e9c82 100644
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -215,13 +215,13 @@
252, 22
- 测试服务器延迟(多选)
+ 测试服务器延迟(多选)(Ctrl+P)
252, 22
- 测试服务器速度(多选)
+ 测试服务器速度(多选)(Ctrl+T)
249, 6
@@ -380,13 +380,13 @@
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd
- QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X
- jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY
- 6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3
- NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY
- B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAATdJREFUWEftloENAiEMRW8ER3AEN9ANdARHcAPdwBF0A91AN9INtC+5JvUCJwWM
+ mvCTFw3QUiiU65qa/lUTYT6Ato9rJZyERwT6GFNdU+EihCYNwVhsqmgm3AR1fheOAitd9PCfNvp0HDbY
+ FolV2MmZZCzX9J0FG0TRTlwFdbahIVE7Qe1IR5bYVnXCyr2yO5F1MNUBec25YtjomcCXSxhr9DmrV2Gr
+ flyL4GSrYcm9tmnEZ7JsAC7DgWr5ydbXA8hOAcVjG8FTD6ocQgvXKrW8MqFWUfc1DAXgmRwVFaJQAHsh
+ VbYUU87diqWA934sl/TZ7wV2Lesx0gBwsO5/1Sl5PQhLQb+G+E+bfTm9KXsRAVgHrMK+jO9gbNEzzMSh
+ 6DlM9nANoa+kdCeLXLNLFtc9b2r6EXXdE4e4mdByNuG1AAAAAElFTkSuQmCC
@@ -442,9 +442,9 @@
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/
- GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA
+ 8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
index 59060468..8c5eb9b9 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -82,7 +82,6 @@
this.txtKcpmtu = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.tabPage7 = new System.Windows.Forms.TabPage();
- this.chkEnableHotkey = new System.Windows.Forms.CheckBox();
this.chkAllowLANConn = new System.Windows.Forms.CheckBox();
this.txturlGFWList = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
@@ -474,7 +473,6 @@
//
// tabPage7
//
- this.tabPage7.Controls.Add(this.chkEnableHotkey);
this.tabPage7.Controls.Add(this.chkAllowLANConn);
this.tabPage7.Controls.Add(this.txturlGFWList);
this.tabPage7.Controls.Add(this.label13);
@@ -483,12 +481,6 @@
this.tabPage7.Name = "tabPage7";
this.tabPage7.UseVisualStyleBackColor = true;
//
- // chkEnableHotkey
- //
- resources.ApplyResources(this.chkEnableHotkey, "chkEnableHotkey");
- this.chkEnableHotkey.Name = "chkEnableHotkey";
- this.chkEnableHotkey.UseVisualStyleBackColor = true;
- //
// chkAllowLANConn
//
resources.ApplyResources(this.chkAllowLANConn, "chkAllowLANConn");
@@ -627,6 +619,5 @@
private System.Windows.Forms.CheckBox chksniffingEnabled;
private System.Windows.Forms.CheckBox chksniffingEnabled2;
private System.Windows.Forms.Button btnSetDefRountingRule;
- private System.Windows.Forms.CheckBox chkEnableHotkey;
}
}
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
index db858bbd..e45af2b6 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -293,9 +293,6 @@ namespace v2rayN.Forms
config.allowLANConn = chkAllowLANConn.Checked;
- //快捷键
- config.enableHotkey = chkEnableHotkey.Checked;
-
return 0;
}
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
index 5d6fe55e..d9d5d01a 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
@@ -143,6 +143,523 @@
0
+
+ True
+
+
+
+ NoControl
+
+
+ 468, 60
+
+
+ 120, 16
+
+
+ 32
+
+
+ Turn on Sniffing
+
+
+ False
+
+
+ chksniffingEnabled2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 0
+
+
+ True
+
+
+ NoControl
+
+
+ 468, 27
+
+
+ 120, 16
+
+
+ 31
+
+
+ Turn on Sniffing
+
+
+ chksniffingEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 1
+
+
+ 33, 192
+
+
+ 402, 21
+
+
+ 30
+
+
+ txtremoteDNS
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 2
+
+
+ True
+
+
+ 33, 168
+
+
+ 281, 12
+
+
+ 29
+
+
+ Custom DNS (multiple, separated by commas (,))
+
+
+ label14
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 3
+
+
+ True
+
+
+ 15, 93
+
+
+ 174, 16
+
+
+ 20
+
+
+ Turn on Mux Multiplexing
+
+
+ chkmuxEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 4
+
+
+ True
+
+
+ 15, 63
+
+
+ 120, 16
+
+
+ 19
+
+
+ listening port 2
+
+
+ False
+
+
+ chkAllowIn2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 5
+
+
+ True
+
+
+ 369, 62
+
+
+ 84, 16
+
+
+ 18
+
+
+ Enable UDP
+
+
+ False
+
+
+ chkudpEnabled2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 6
+
+
+ socks
+
+
+ http
+
+
+ 257, 60
+
+
+ 97, 20
+
+
+ 17
+
+
+ False
+
+
+ cmbprotocol2
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 7
+
+
+ True
+
+
+ 206, 64
+
+
+ 53, 12
+
+
+ 16
+
+
+ protocol
+
+
+ False
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 8
+
+
+ 124, 60
+
+
+ 78, 21
+
+
+ 14
+
+
+ False
+
+
+ txtlocalPort2
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 9
+
+
+ False
+
+
+ socks
+
+
+ http
+
+
+ 257, 25
+
+
+ 97, 20
+
+
+ 12
+
+
+ cmbprotocol
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 10
+
+
+ True
+
+
+ 206, 29
+
+
+ 53, 12
+
+
+ 11
+
+
+ protocol
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 11
+
+
+ True
+
+
+ 369, 27
+
+
+ 84, 16
+
+
+ 10
+
+
+ Enable UDP
+
+
+ chkudpEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 12
+
+
+ True
+
+
+ 15, 124
+
+
+ 126, 16
+
+
+ 9
+
+
+ Record local logs
+
+
+ chklogEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 13
+
+
+ debug
+
+
+ info
+
+
+ warning
+
+
+ error
+
+
+ none
+
+
+ 257, 122
+
+
+ 97, 20
+
+
+ 6
+
+
+ cmbloglevel
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 14
+
+
+ True
+
+
+ 193, 126
+
+
+ 59, 12
+
+
+ 8
+
+
+ Log level
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 15
+
+
+ 124, 25
+
+
+ 78, 21
+
+
+ 3
+
+
+ txtlocalPort
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 16
+
+
+ True
+
+
+ 33, 29
+
+
+ 89, 12
+
+
+ 2
+
+
+ Listening port
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 17
+
+
+ Fill
+
+
+ 3, 3
+
+
+ 624, 573
+
+
+ 6
+
groupBox1
@@ -158,7 +675,6 @@
4, 22
-
3, 3, 3, 3
@@ -183,6 +699,408 @@
0
+
+ Fill
+
+
+ 3, 3
+
+
+ True
+
+
+ Vertical
+
+
+ 604, 414
+
+
+ 0
+
+
+ txtUseragent
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage3
+
+
+ 0
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 610, 420
+
+
+ 0
+
+
+ Proxy's Domain or IP
+
+
+ tabPage3
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl2
+
+
+ 0
+
+
+ Fill
+
+
+ 3, 3
+
+
+ True
+
+
+ Vertical
+
+
+ 604, 414
+
+
+ 1
+
+
+ txtUserdirect
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage4
+
+
+ 0
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 610, 420
+
+
+ 1
+
+
+ Directly connected Domain or IP
+
+
+ tabPage4
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl2
+
+
+ 1
+
+
+ Fill
+
+
+ 3, 3
+
+
+ True
+
+
+ Vertical
+
+
+ 604, 414
+
+
+ 1
+
+
+ txtUserblock
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage5
+
+
+ 0
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 610, 420
+
+
+ 2
+
+
+ Blocked Domain or IP
+
+
+ tabPage5
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl2
+
+
+ 2
+
+
+ Fill
+
+
+ 3, 124
+
+
+ 618, 446
+
+
+ 12
+
+
+ tabControl2
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 0
+
+
+ 356, 43
+
+
+ 229, 23
+
+
+ 18
+
+
+ Set default custom routing rules
+
+
+ btnSetDefRountingRule
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 0
+
+
+ AsIs
+
+
+ IPIfNonMatch
+
+
+ IPOnDemand
+
+
+ 123, 13
+
+
+ 209, 20
+
+
+ 16
+
+
+ cmbdomainStrategy
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 1
+
+
+ 5, 83
+
+
+ 598, 16
+
+
+ 13
+
+
+ *Set the rules, separated by commas (,); support Domain (pure string / regular / subdomain) and IP
+
+
+ labRoutingTips
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 2
+
+
+ True
+
+
+ NoControl
+
+
+ 13, 17
+
+
+ 95, 12
+
+
+ 17
+
+
+ Domain strategy
+
+
+ label15
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 3
+
+
+ True
+
+
+ NoControl
+
+
+ 13, 50
+
+
+ 77, 12
+
+
+ 15
+
+
+ Routing mode
+
+
+ label12
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 4
+
+
+ Global
+
+
+ Bypassing the LAN address
+
+
+ Bypass mainland address
+
+
+ Bypassing LAN and mainland address
+
+
+ 123, 46
+
+
+ 209, 20
+
+
+ 14
+
+
+ cmbroutingMode
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 5
+
+
+ Top
+
+
+ 3, 17
+
+
+ 618, 107
+
+
+ 19
+
+
+ panel3
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 1
+
+
+ Fill
+
+
+ 3, 3
+
+
+ 624, 573
+
+
+ 12
+
groupBox2
@@ -222,6 +1140,21 @@
1
+
+ True
+
+
+ 20, 143
+
+
+ 84, 16
+
+
+ 20
+
+
+ congestion
+
chkKcpcongestion
@@ -234,6 +1167,15 @@
0
+
+ 345, 100
+
+
+ 94, 21
+
+
+ 15
+
txtKcpwriteBufferSize
@@ -246,6 +1188,21 @@
1
+
+ True
+
+
+ 236, 104
+
+
+ 95, 12
+
+
+ 14
+
+
+ writeBufferSize
+
label10
@@ -258,6 +1215,15 @@
2
+
+ 111, 100
+
+
+ 94, 21
+
+
+ 13
+
txtKcpreadBufferSize
@@ -270,6 +1236,21 @@
3
+
+ True
+
+
+ 18, 104
+
+
+ 89, 12
+
+
+ 12
+
+
+ readBufferSize
+
label11
@@ -282,6 +1263,15 @@
4
+
+ 345, 62
+
+
+ 94, 21
+
+
+ 11
+
txtKcpdownlinkCapacity
@@ -294,6 +1284,21 @@
5
+
+ True
+
+
+ 236, 66
+
+
+ 101, 12
+
+
+ 10
+
+
+ downlinkCapacity
+
label8
@@ -306,6 +1311,15 @@
6
+
+ 111, 62
+
+
+ 94, 21
+
+
+ 9
+
txtKcpuplinkCapacity
@@ -318,6 +1332,21 @@
7
+
+ True
+
+
+ 18, 66
+
+
+ 89, 12
+
+
+ 8
+
+
+ uplinkCapacity
+
label9
@@ -330,6 +1359,15 @@
8
+
+ 345, 24
+
+
+ 94, 21
+
+
+ 7
+
txtKcptti
@@ -342,6 +1380,21 @@
9
+
+ True
+
+
+ 236, 28
+
+
+ 23, 12
+
+
+ 6
+
+
+ tti
+
label7
@@ -354,6 +1407,15 @@
10
+
+ 111, 24
+
+
+ 94, 21
+
+
+ 5
+
txtKcpmtu
@@ -366,6 +1428,21 @@
11
+
+ True
+
+
+ 18, 28
+
+
+ 23, 12
+
+
+ 4
+
+
+ mtu
+
label6
@@ -405,36 +1482,6 @@
2
-
- True
-
-
- NoControl
-
-
- 15, 60
-
-
- 102, 16
-
-
- 29
-
-
- Enable hotkey(Ctrl+P ping servers / Ctrl+T speed test)
-
-
- chkEnableHotkey
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 0
-
True
@@ -460,7 +1507,7 @@
tabPage7
- 1
+ 0
30, 132
@@ -481,7 +1528,7 @@
tabPage7
- 2
+ 1
True
@@ -508,7 +1555,7 @@
tabPage7
- 3
+ 2
True
@@ -535,7 +1582,7 @@
tabPage7
- 4
+ 3
4, 22
@@ -588,1082 +1635,17 @@
0
-
- chksniffingEnabled2
+
+ 267, 16
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 75, 23
-
- groupBox1
-
-
- 0
-
-
- chksniffingEnabled
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 1
-
-
- txtremoteDNS
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 2
-
-
- label14
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 3
-
-
- chkmuxEnabled
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 4
-
-
- chkAllowIn2
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 5
-
-
- chkudpEnabled2
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 6
-
-
- cmbprotocol2
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 7
-
-
- label3
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
+
8
-
- txtlocalPort2
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 9
-
-
- cmbprotocol
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 10
-
-
- label1
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 11
-
-
- chkudpEnabled
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 12
-
-
- chklogEnabled
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 13
-
-
- cmbloglevel
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 14
-
-
- label5
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 15
-
-
- txtlocalPort
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 16
-
-
- label2
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 17
-
-
- Fill
-
-
- 3, 3
-
-
- 624, 573
-
-
- 6
-
-
- True
-
-
- NoControl
-
-
- 468, 60
-
-
- 120, 16
-
-
- 32
-
-
- Turn on Sniffing
-
-
- False
-
-
- True
-
-
- NoControl
-
-
- 468, 27
-
-
- 120, 16
-
-
- 31
-
-
- Turn on Sniffing
-
-
- 33, 192
-
-
- 402, 21
-
-
- 30
-
-
- True
-
-
- 33, 168
-
-
- 281, 12
-
-
- 29
-
-
- Custom DNS (multiple, separated by commas (,))
-
-
- True
-
-
- 15, 93
-
-
- 174, 16
-
-
- 20
-
-
- Turn on Mux Multiplexing
-
-
- True
-
-
- 15, 63
-
-
- 120, 16
-
-
- 19
-
-
- listening port 2
-
-
- False
-
-
- True
-
-
- 369, 62
-
-
- 84, 16
-
-
- 18
-
-
- Enable UDP
-
-
- False
-
-
- socks
-
-
- http
-
-
- 257, 60
-
-
- 97, 20
-
-
- 17
-
-
- False
-
-
- True
-
-
- 206, 64
-
-
- 53, 12
-
-
- 16
-
-
- protocol
-
-
- False
-
-
- 124, 60
-
-
- 78, 21
-
-
- 14
-
-
- False
-
-
- False
-
-
- socks
-
-
- http
-
-
- 257, 25
-
-
- 97, 20
-
-
- 12
-
-
- True
-
-
- 206, 29
-
-
- 53, 12
-
-
- 11
-
-
- protocol
-
-
- True
-
-
- 369, 27
-
-
- 84, 16
-
-
- 10
-
-
- Enable UDP
-
-
- True
-
-
- 15, 124
-
-
- 126, 16
-
-
- 9
-
-
- Record local logs
-
-
- debug
-
-
- info
-
-
- warning
-
-
- error
-
-
- none
-
-
- 257, 122
-
-
- 97, 20
-
-
- 6
-
-
- True
-
-
- 193, 126
-
-
- 59, 12
-
-
- 8
-
-
- Log level
-
-
- 124, 25
-
-
- 78, 21
-
-
- 3
-
-
- True
-
-
- 33, 29
-
-
- 89, 12
-
-
- 2
-
-
- Listening port
-
-
- tabControl2
-
-
- System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 0
-
-
- panel3
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 1
-
-
- Fill
-
-
- 3, 3
-
-
- 624, 573
-
-
- 12
-
-
- tabPage3
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl2
-
-
- 0
-
-
- tabPage4
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl2
-
-
- 1
-
-
- tabPage5
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl2
-
-
- 2
-
-
- Fill
-
-
- 3, 124
-
-
- 618, 446
-
-
- 12
-
-
- txtUseragent
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage3
-
-
- 0
-
-
- 4, 22
-
-
- 3, 3, 3, 3
-
-
- 610, 420
-
-
- 0
-
-
- Proxy's Domain or IP
-
-
- Fill
-
-
- 3, 3
-
-
- True
-
-
- Vertical
-
-
- 604, 414
-
-
- 0
-
-
- txtUserdirect
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage4
-
-
- 0
-
-
- 4, 22
-
-
- 3, 3, 3, 3
-
-
- 610, 420
-
-
- 1
-
-
- Directly connected Domain or IP
-
-
- Fill
-
-
- 3, 3
-
-
- True
-
-
- Vertical
-
-
- 604, 414
-
-
- 1
-
-
- txtUserblock
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage5
-
-
- 0
-
-
- 4, 22
-
-
- 3, 3, 3, 3
-
-
- 610, 420
-
-
- 2
-
-
- Blocked Domain or IP
-
-
- Fill
-
-
- 3, 3
-
-
- True
-
-
- Vertical
-
-
- 604, 414
-
-
- 1
-
-
- btnSetDefRountingRule
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel3
-
-
- 0
-
-
- cmbdomainStrategy
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel3
-
-
- 1
-
-
- labRoutingTips
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel3
-
-
- 2
-
-
- label15
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel3
-
-
- 3
-
-
- label12
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel3
-
-
- 4
-
-
- cmbroutingMode
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel3
-
-
- 5
-
-
- Top
-
-
- 3, 17
-
-
- 618, 107
-
-
- 19
-
-
- 356, 43
-
-
- 229, 23
-
-
- 18
-
-
- Set default custom routing rules
-
-
- AsIs
-
-
- IPIfNonMatch
-
-
- IPOnDemand
-
-
- 123, 13
-
-
- 209, 20
-
-
- 16
-
-
- 5, 83
-
-
- 598, 16
-
-
- 13
-
-
- *Set the rules, separated by commas (,); support Domain (pure string / regular / subdomain) and IP
-
-
- True
-
-
- NoControl
-
-
- 13, 17
-
-
- 95, 12
-
-
- 17
-
-
- Domain strategy
-
-
- True
-
-
- NoControl
-
-
- 13, 50
-
-
- 77, 12
-
-
- 15
-
-
- Routing mode
-
-
- Global
-
-
- Bypassing the LAN address
-
-
- Bypass mainland address
-
-
- Bypassing LAN and mainland address
-
-
- 123, 46
-
-
- 209, 20
-
-
- 14
-
-
- True
-
-
- 20, 143
-
-
- 84, 16
-
-
- 20
-
-
- congestion
-
-
- 345, 100
-
-
- 94, 21
-
-
- 15
-
-
- True
-
-
- 236, 104
-
-
- 95, 12
-
-
- 14
-
-
- writeBufferSize
-
-
- 111, 100
-
-
- 94, 21
-
-
- 13
-
-
- True
-
-
- 18, 104
-
-
- 89, 12
-
-
- 12
-
-
- readBufferSize
-
-
- 345, 62
-
-
- 94, 21
-
-
- 11
-
-
- True
-
-
- 236, 66
-
-
- 101, 12
-
-
- 10
-
-
- downlinkCapacity
-
-
- 111, 62
-
-
- 94, 21
-
-
- 9
-
-
- True
-
-
- 18, 66
-
-
- 89, 12
-
-
- 8
-
-
- uplinkCapacity
-
-
- 345, 24
-
-
- 94, 21
-
-
- 7
-
-
- True
-
-
- 236, 28
-
-
- 23, 12
-
-
- 6
-
-
- tti
-
-
- 111, 24
-
-
- 94, 21
-
-
- 5
-
-
- True
-
-
- 18, 28
-
-
- 23, 12
-
-
- 4
-
-
- mtu
+
+ &OK
btnOK
@@ -1701,18 +1683,6 @@
1
-
- 267, 16
-
-
- 75, 23
-
-
- 8
-
-
- &OK
-
Top
@@ -1737,9 +1707,9 @@
2
-
+
True
-
+
6, 12
diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs
index 86b86d14..929efece 100644
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -91,11 +91,6 @@ namespace v2rayN.Mode
///
public bool allowLANConn { get; set; }
- ///
- /// 启用快捷键
- ///
- public bool enableHotkey{ get; set; }
-
///
/// 自定义远程DNS
///