fix

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;
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx

@@ -118,128 +118,52 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>989, 10</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="clbInboundTag.ColumnWidth" type="System.Int32, mscorlib">
-    <value>80</value>
-  </data>
-  <data name="clbInboundTag.Items" xml:space="preserve">
-    <value>socks</value>
-  </data>
-  <data name="clbInboundTag.Items1" xml:space="preserve">
-    <value>http</value>
-  </data>
   <data name="clbInboundTag.Location" type="System.Drawing.Point, System.Drawing">
-    <value>372, 15</value>
+    <value>372, 16</value>
   </data>
   <data name="clbInboundTag.Size" type="System.Drawing.Size, System.Drawing">
-    <value>272, 24</value>
+    <value>272, 20</value>
   </data>
-  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>True</value>
+    <value>279, 20</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>87, 15</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>inboundTag</value>
   </data>
   <data name="clbProtocol.Location" type="System.Drawing.Point, System.Drawing">
-    <value>372, 47</value>
+    <value>372, 46</value>
   </data>
   <data name="clbProtocol.Size" type="System.Drawing.Size, System.Drawing">
-    <value>272, 24</value>
+    <value>272, 20</value>
   </data>
   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>279, 46</value>
+    <value>279, 50</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 15</value>
   </data>
   <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
     <value>120, 46</value>
   </data>
-  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 25</value>
-  </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 46</value>
+    <value>19, 50</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>39, 15</value>
   </data>
   <data name="labRoutingTips.Text" xml:space="preserve">
     <value>*设置的路由规则,用逗号(,)分隔;正则中的逗号用&lt;COMMA&gt;替代</value>
   </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 15</value>
-  </data>
   <data name="label4.Text" xml:space="preserve">
     <value>OutboundTag</value>
   </data>
   <data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
     <value>120, 16</value>
   </data>
-  <data name="cmbOutboundTag.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 23</value>
-  </data>
-  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>989, 111</value>
-  </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>确定(&amp;O)</value>
   </data>
-  <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <value>0, 660</value>
-  </data>
-  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>989, 60</value>
-  </data>
-  <data name="txtIP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 21</value>
-  </data>
   <data name="txtIP.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
     <value>Vertical</value>
   </data>
-  <data name="txtIP.Size" type="System.Drawing.Size, System.Drawing">
-    <value>591, 515</value>
-  </data>
-  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>597, 539</value>
-  </data>
-  <data name="txtDomain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 21</value>
-  </data>
   <data name="txtDomain.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
     <value>Vertical</value>
   </data>
-  <data name="txtDomain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>386, 515</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>392, 539</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>989, 539</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 15</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>989, 720</value>
-  </data>
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>5, 5, 5, 5</value>
-  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>路由规则详情设置</value>
   </data>

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));