diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs
index 81a54d06..504b60ea 100644
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs
@@ -62,7 +62,6 @@
//
// panel3
//
- resources.ApplyResources(this.panel3, "panel3");
this.panel3.Controls.Add(this.clbInboundTag);
this.panel3.Controls.Add(this.label2);
this.panel3.Controls.Add(this.clbProtocol);
@@ -72,12 +71,13 @@
this.panel3.Controls.Add(this.labRoutingTips);
this.panel3.Controls.Add(this.label4);
this.panel3.Controls.Add(this.cmbOutboundTag);
+ resources.ApplyResources(this.panel3, "panel3");
this.panel3.Name = "panel3";
//
// clbInboundTag
//
- resources.ApplyResources(this.clbInboundTag, "clbInboundTag");
this.clbInboundTag.CheckOnClick = true;
+ resources.ApplyResources(this.clbInboundTag, "clbInboundTag");
this.clbInboundTag.FormattingEnabled = true;
this.clbInboundTag.Items.AddRange(new object[] {
resources.GetString("clbInboundTag.Items"),
@@ -92,8 +92,8 @@
//
// clbProtocol
//
- resources.ApplyResources(this.clbProtocol, "clbProtocol");
this.clbProtocol.CheckOnClick = true;
+ resources.ApplyResources(this.clbProtocol, "clbProtocol");
this.clbProtocol.FormattingEnabled = true;
this.clbProtocol.Items.AddRange(new object[] {
resources.GetString("clbProtocol.Items"),
@@ -119,8 +119,8 @@
//
// labRoutingTips
//
- resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+ resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
this.labRoutingTips.Name = "labRoutingTips";
//
// label4
@@ -130,26 +130,26 @@
//
// cmbOutboundTag
//
- resources.ApplyResources(this.cmbOutboundTag, "cmbOutboundTag");
this.cmbOutboundTag.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbOutboundTag.FormattingEnabled = true;
this.cmbOutboundTag.Items.AddRange(new object[] {
resources.GetString("cmbOutboundTag.Items"),
resources.GetString("cmbOutboundTag.Items1"),
resources.GetString("cmbOutboundTag.Items2")});
+ resources.ApplyResources(this.cmbOutboundTag, "cmbOutboundTag");
this.cmbOutboundTag.Name = "cmbOutboundTag";
//
// panel4
//
- resources.ApplyResources(this.panel4, "panel4");
this.panel4.Controls.Add(this.btnClose);
this.panel4.Controls.Add(this.btnOK);
+ resources.ApplyResources(this.panel4, "panel4");
this.panel4.Name = "panel4";
//
// btnClose
//
- resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
@@ -163,15 +163,15 @@
//
// panel2
//
- resources.ApplyResources(this.panel2, "panel2");
this.panel2.Controls.Add(this.groupBox2);
this.panel2.Controls.Add(this.groupBox1);
+ resources.ApplyResources(this.panel2, "panel2");
this.panel2.Name = "panel2";
//
// groupBox2
//
- resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Controls.Add(this.txtIP);
+ resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
@@ -182,8 +182,8 @@
//
// groupBox1
//
- resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.txtDomain);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
@@ -234,7 +234,7 @@
private System.Windows.Forms.TextBox txtPort;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.CheckedListBox clbProtocol;
- private System.Windows.Forms.Label label2;
private System.Windows.Forms.CheckedListBox clbInboundTag;
+ private System.Windows.Forms.Label label2;
}
}
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx
index 79486491..23589990 100644
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx
@@ -117,586 +117,547 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Top
+
-
- 53, 12
+
+ 0, 0
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 742, 10
-
- 32
+
+ 7
-
- 245, 20
-
-
- direct
-
-
- 31
-
-
- proxy
-
-
- 107, 16
-
-
-
- Fill
-
-
- 3
-
-
- clbProtocol
-
-
- 0
-
-
- 6
-
-
- NoControl
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- socks
-
-
- Left
-
-
- panel3
-
-
- NoControl
-
-
- 0
-
-
- 29, 12
-
-
- 0
-
-
- tls
-
-
- panel2
-
-
- tls
-
-
- RoutingSettingDetailsForm
-
-
- NoControl
-
-
- System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 5
-
-
- Fill
-
-
- 411, 15
-
-
- 119, 20
+
+ panel1
System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 36
-
-
- Bottom
-
-
- 0
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 344, 375
-
-
+
$this
-
- groupBox1
+
+ 3
-
- groupBox1
+
+ 80
-
+
+ socks
+
+
+ http
+
+
+ 347, 16
+
+
+ 245, 20
+
+
+ 41
+
+
+ clbInboundTag
+
+
+ System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 0
+
+
+ True
+
+
NoControl
+
+ 274, 20
+
+
+ 65, 12
+
+
+ 40
+
+
+ inboundTag
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
1
-
- 0, 121
+
+ 80
-
- label1
+
+ http
-
- 742, 395
+
+ tls
+
+
+ bittorrent
+
+
+ 347, 43
+
+
+ 245, 20
+
+
+ 39
+
+
+ clbProtocol
+
+
+ System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 2
+
+
+ True
+
+
+ NoControl
+
+
+ 274, 47
+
+
+ 53, 12
+
+
+ 36
Protocol
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 3
+
+
+ 107, 43
+
+
+ 119, 21
+
+
+ 35
+
+
+ txtPort
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 4
+
+
+ True
+
+
+ NoControl
+
+
+ 19, 47
+
+
+ 29, 12
+
+
+ 34
+
+
+ Port
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 5
+
+
+ NoControl
+
+
+ 19, 82
+
+
+ 598, 16
+
+
+ 33
+
+
+ *Set the rules, separated by commas (,); The comma in the regular is replaced by <COMMA>
+
+
+ labRoutingTips
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 6
+
+
+ True
+
+
+ NoControl
+
+
+ 19, 20
+
+
+ 71, 12
+
+
+ 32
+
+
+ outboundTag
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
+
+ 7
+
+
+ proxy
+
+
+ direct
+
+
+ block
+
+
+ 107, 16
+
+
+ 119, 20
+
+
+ 31
+
+
+ cmbOutboundTag
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel3
+
8
+
+ Top
+
+
+ 0, 10
+
+
+ 742, 111
+
+
+ 8
+
panel3
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- 3
-
-
- 40
-
-
- panel4
-
-
- 5
-
-
- bittorrent
-
-
- http
-
-
- True
-
-
- 19, 82
-
-
- 25
-
-
- 372, 20
-
-
- 3, 17
-
-
- panel3
-
-
- 0, 0
-
-
- 19, 20
-
-
- labRoutingTips
-
-
- 19, 47
-
-
- 39
-
-
- Fill
-
-
- direct
-
-
- 1
-
-
- RoutingRuleSettingDetailsForm
-
-
- panel2
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel3
-
-
- proxy
-
-
- groupBox2
-
-
- 7
-
-
- 1
-
-
- 386, 375
-
-
- panel3
-
-
- 392, 0
-
-
- panel3
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel2
-
-
- Fill
-
-
- panel4
-
-
- NoControl
-
-
- bittorrent
-
-
- 598, 16
-
-
- $this
-
-
- groupBox2
-
-
- panel3
-
-
- panel3
-
-
- 1
-
-
+
System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- panel3
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 2
-
-
- http
-
-
- txtPort
-
-
- 3, 17
-
-
- 1
-
-
- 742, 10
-
-
- 0, 0
-
-
- 24
-
-
- 11
-
-
- label4
-
-
- &OK
-
-
- block
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel4
-
-
- 34
-
-
- 71, 12
-
-
- 274, 47
-
-
- 41
-
-
- block
-
-
- 367, 16
-
-
- 347, 43
-
-
- 0
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- btnOK
+
+ $this
2
-
- 119, 21
-
-
- 4
-
-
- 7
-
-
- 1
-
-
- 0
-
-
- panel3
-
-
- 8
-
-
- v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- label3
-
-
- 80
-
-
- comboBox1
+
+ NoControl
504, 15
-
- 742, 60
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- null
-
-
- $this
-
-
- label2
-
-
- btnClose
-
-
- *Set the rules, separated by commas (,); The comma in the regular is replaced by <COMMA>
-
-
- 742, 111
-
-
- True
-
-
- 6, 12
-
-
- Port
-
-
- 0, 10
-
-
- 40
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- http
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- txtIP
-
-
- 4
-
-
- 107, 43
-
-
- cmbOutboundTag
-
-
- panel1
-
-
- 279, 20
-
-
- NoControl
-
-
- 742, 576
-
-
- 10
-
-
- $this
-
-
- 392, 395
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
75, 23
-
- clbInboundTag
-
-
- 3
-
-
- Top
-
-
- &Cancel
-
-
- True
-
4
-
- 75, 23
+
+ &Cancel
-
- txtDomain
-
-
- 42
-
-
- IP
-
-
- panel3
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ btnClose
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ panel4
+
+
+ 0
+
+
+ NoControl
+
+
+ 411, 15
+
+
+ 75, 23
+
+
+ 5
+
+
+ &OK
+
+
+ btnOK
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel4
+
+
+ 1
+
+
+ Bottom
+
0, 516
-
- 33
+
+ 742, 60
-
- cmbInboundTag
+
+ 10
+
+
+ panel4
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
+
+ Fill
+
+
+ 3, 17
+
+
+ True
+
+
+ 344, 375
+
+
+ 25
+
+
+ txtIP
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 0
+
+
+ Fill
+
+
+ 392, 0
350, 395
-
- panel3
+
+ 4
+
+
+ IP
+
+
+ groupBox2
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 0
+
+
+ Fill
+
+
+ 3, 17
+
+
+ True
+
+
+ 386, 375
+
+
+ 24
+
+
+ txtDomain
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 0
+
+
+ Left
+
+
+ 0, 0
+
+
+ 392, 395
+
+
+ 3
Domain
-
- 367, 16
+
+ groupBox1
-
- True
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- outboundTag
+
+ panel2
-
- Top
+
+ 1
-
- 35
+
+ Fill
+
+
+ 0, 121
+
+
+ 742, 395
+
+
+ 11
+
+
+ panel2
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 0
True
-
- zh-Hans
-
+
+ 6, 12
+
+
+ 742, 576
+
+
+ 4, 4, 4, 4
+
+
+ RoutingSettingDetailsForm
+
+
+ RoutingRuleSettingDetailsForm
+
+
+ v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx
index a1eb9933..15246bd3 100644
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx
@@ -118,128 +118,52 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 989, 10
-
-
-
- 80
-
-
- socks
-
-
- http
-
- 372, 15
+ 372, 16
- 272, 24
+ 272, 20
-
- True
-
-
-
- NoControl
-
-
- 87, 15
-
-
- inboundTag
+
+ 279, 20
- 372, 47
+ 372, 46
- 272, 24
+ 272, 20
- 279, 46
-
-
- 71, 15
+ 279, 50
120, 46
-
- 119, 25
-
- 19, 46
-
-
- 39, 15
+ 19, 50
*设置的路由规则,用逗号(,)分隔;正则中的逗号用<COMMA>替代
-
- 95, 15
-
OutboundTag
120, 16
-
- 119, 23
-
-
- 989, 111
-
取消(&C)
确定(&O)
-
- 0, 660
-
-
- 989, 60
-
-
- 3, 21
-
+
Vertical
-
- 591, 515
-
-
- 597, 539
-
-
- 3, 21
-
Vertical
-
- 386, 515
-
-
- 392, 539
-
-
- 989, 539
-
-
- 8, 15
-
-
- 989, 720
-
-
- 5, 5, 5, 5
-
路由规则详情设置
diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
index ca703f77..6376feb8 100644
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
@@ -55,10 +55,10 @@ namespace v2rayN.Forms
lvRoutings.HeaderStyle = ColumnHeaderStyle.Clickable;
lvRoutings.Columns.Add("", 30);
- lvRoutings.Columns.Add("inboundTag", 100);
lvRoutings.Columns.Add("outboundTag", 100);
lvRoutings.Columns.Add("port", 80);
lvRoutings.Columns.Add("protocol", 100);
+ lvRoutings.Columns.Add("inboundTag", 100);
lvRoutings.Columns.Add("domain", 160);
lvRoutings.Columns.Add("ip", 160);
@@ -75,10 +75,10 @@ namespace v2rayN.Forms
var item = routingItem.rules[k];
ListViewItem lvItem = new ListViewItem("");
- Utils.AddSubItem(lvItem, "inboundTag", Utils.List2String(item.inboundTag));
Utils.AddSubItem(lvItem, "outboundTag", item.outboundTag);
Utils.AddSubItem(lvItem, "port", item.port);
Utils.AddSubItem(lvItem, "protocol", Utils.List2String(item.protocol));
+ Utils.AddSubItem(lvItem, "inboundTag", Utils.List2String(item.inboundTag));
Utils.AddSubItem(lvItem, "domain", Utils.List2String(item.domain));
Utils.AddSubItem(lvItem, "ip", Utils.List2String(item.ip));