diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs index 9f70e165..81a54d06 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs @@ -31,6 +31,8 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoutingRuleSettingDetailsForm)); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); + this.clbInboundTag = new System.Windows.Forms.CheckedListBox(); + this.label2 = new System.Windows.Forms.Label(); this.clbProtocol = new System.Windows.Forms.CheckedListBox(); this.label3 = new System.Windows.Forms.Label(); this.txtPort = new System.Windows.Forms.TextBox(); @@ -61,6 +63,8 @@ // panel3 // resources.ApplyResources(this.panel3, "panel3"); + this.panel3.Controls.Add(this.clbInboundTag); + this.panel3.Controls.Add(this.label2); this.panel3.Controls.Add(this.clbProtocol); this.panel3.Controls.Add(this.label3); this.panel3.Controls.Add(this.txtPort); @@ -70,6 +74,22 @@ this.panel3.Controls.Add(this.cmbOutboundTag); this.panel3.Name = "panel3"; // + // clbInboundTag + // + resources.ApplyResources(this.clbInboundTag, "clbInboundTag"); + this.clbInboundTag.CheckOnClick = true; + this.clbInboundTag.FormattingEnabled = true; + this.clbInboundTag.Items.AddRange(new object[] { + resources.GetString("clbInboundTag.Items"), + resources.GetString("clbInboundTag.Items1")}); + this.clbInboundTag.MultiColumn = true; + this.clbInboundTag.Name = "clbInboundTag"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // // clbProtocol // resources.ApplyResources(this.clbProtocol, "clbProtocol"); @@ -214,5 +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; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs index a11e589d..8b861f08 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs @@ -36,6 +36,16 @@ namespace v2rayN.Forms if (rulesItem != null) { rulesItem.port = txtPort.Text.TrimEx(); + + var inboundTag = new List<String>(); + for (int i = 0; i < clbInboundTag.Items.Count; i++) + { + if (clbInboundTag.GetItemChecked(i)) + { + inboundTag.Add(clbInboundTag.Items[i].ToString()); + } + } + rulesItem.inboundTag = inboundTag; rulesItem.outboundTag = cmbOutboundTag.Text; rulesItem.domain = Utils.String2List(txtDomain.Text); rulesItem.ip = Utils.String2List(txtIP.Text); @@ -60,6 +70,17 @@ namespace v2rayN.Forms txtDomain.Text = Utils.List2String(rulesItem.domain, true); txtIP.Text = Utils.List2String(rulesItem.ip, true); + if (rulesItem.inboundTag != null) + { + for (int i = 0; i < clbInboundTag.Items.Count; i++) + { + if (rulesItem.inboundTag.Contains(clbInboundTag.Items[i].ToString())) + { + clbInboundTag.SetItemChecked(i, true); + } + } + } + if (rulesItem.protocol != null) { for (int i = 0; i < clbProtocol.Items.Count; i++) diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx index 9070a6d9..b64b2d4f 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx @@ -124,6 +124,9 @@ <data name=">>groupBox1.Type" xml:space="preserve"> <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name=">>clbInboundTag.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="label4.TabIndex" type="System.Int32, mscorlib"> <value>32</value> @@ -147,8 +150,8 @@ <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> - <data name=">>panel1.Name" xml:space="preserve"> - <value>panel1</value> + <data name=">>cmbinboundTag.Type" xml:space="preserve"> + <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> <data name="groupBox1.TabIndex" type="System.Int32, mscorlib"> <value>3</value> @@ -156,20 +159,20 @@ <data name=">>clbProtocol.Name" xml:space="preserve"> <value>clbProtocol</value> </data> - <data name=">>label1.Type" xml:space="preserve"> - <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name=">>panel2.ZOrder" xml:space="preserve"> + <value>0</value> </data> <data name=">>labRoutingTips.ZOrder" xml:space="preserve"> - <value>4</value> + <value>6</value> </data> <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> - <data name="txtDomain.Location" type="System.Drawing.Point, System.Drawing"> - <value>3, 17</value> + <data name=">>label2.Type" xml:space="preserve"> + <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>clbProtocol.ZOrder" xml:space="preserve"> - <value>0</value> + <data name="cmbInboundTag.Items1" xml:space="preserve"> + <value>socks</value> </data> <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Left</value> @@ -186,8 +189,11 @@ <data name="label1.Size" type="System.Drawing.Size, System.Drawing"> <value>29, 12</value> </data> - <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> - <value>742, 576</value> + <data name=">>clbInboundTag.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name="clbInboundTag.Items1" xml:space="preserve"> + <value>tls</value> </data> <data name=">>groupBox2.Parent" xml:space="preserve"> <value>panel2</value> @@ -198,14 +204,20 @@ <data name="$this.Text" xml:space="preserve"> <value>RoutingSettingDetailsForm</value> </data> + <data name="cmbinboundTag.Items1" xml:space="preserve"> + <value>socks</value> + </data> <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> - <data name="txtIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> + <data name=">>clbProtocol.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name="cmbinboundTag.TabIndex" type="System.Int32, mscorlib"> + <value>40</value> </data> <data name=">>label1.ZOrder" xml:space="preserve"> - <value>3</value> + <value>5</value> </data> <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> @@ -222,6 +234,9 @@ <data name="label3.TabIndex" type="System.Int32, mscorlib"> <value>36</value> </data> + <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Bottom</value> + </data> <data name=">>btnClose.ZOrder" xml:space="preserve"> <value>0</value> </data> @@ -234,8 +249,8 @@ <data name=">>panel3.Parent" xml:space="preserve"> <value>$this</value> </data> - <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing"> - <value>598, 16</value> + <data name=">>groupBox1.Name" xml:space="preserve"> + <value>groupBox1</value> </data> <data name=">>txtDomain.Parent" xml:space="preserve"> <value>groupBox1</value> @@ -243,6 +258,9 @@ <data name="labRoutingTips.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> + <data name=">>label2.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="panel2.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 121</value> </data> @@ -256,17 +274,23 @@ <value>Protocol</value> </data> <data name=">>cmbOutboundTag.ZOrder" xml:space="preserve"> - <value>6</value> + <value>8</value> </data> <data name=">>panel3.Name" xml:space="preserve"> <value>panel3</value> </data> + <data name=">>cmbInboundTag.Type" xml:space="preserve"> + <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <data name="label3.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name=">>panel1.ZOrder" xml:space="preserve"> <value>3</value> </data> + <data name="cmbInboundTag.TabIndex" type="System.Int32, mscorlib"> + <value>40</value> + </data> <data name=">>btnOK.Parent" xml:space="preserve"> <value>panel4</value> </data> @@ -276,15 +300,30 @@ <data name="clbProtocol.Items2" xml:space="preserve"> <value>bittorrent</value> </data> + <data name="clbInboundTag.Items" xml:space="preserve"> + <value>http</value> + </data> + <data name="txtDomain.Multiline" type="System.Boolean, mscorlib"> + <value>True</value> + </data> <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing"> <value>19, 82</value> </data> <data name="txtIP.TabIndex" type="System.Int32, mscorlib"> <value>25</value> </data> + <data name="clbInboundTag.Location" type="System.Drawing.Point, System.Drawing"> + <value>372, 20</value> + </data> + <data name="txtDomain.Location" type="System.Drawing.Point, System.Drawing"> + <value>3, 17</value> + </data> <data name=">>labRoutingTips.Parent" xml:space="preserve"> <value>panel3</value> </data> + <data name=">>cmbinboundTag.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="panel1.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 0</value> </data> @@ -303,6 +342,9 @@ <data name="txtDomain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> + <data name="comboBox1.Items1" xml:space="preserve"> + <value>direct</value> + </data> <data name=">>btnOK.ZOrder" xml:space="preserve"> <value>1</value> </data> @@ -318,17 +360,17 @@ <data name=">>txtPort.Parent" xml:space="preserve"> <value>panel3</value> </data> - <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing"> - <value>107, 43</value> + <data name="comboBox1.Items" xml:space="preserve"> + <value>proxy</value> </data> <data name=">>groupBox2.Name" xml:space="preserve"> <value>groupBox2</value> </data> <data name=">>label4.ZOrder" xml:space="preserve"> - <value>5</value> + <value>7</value> </data> - <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Bottom</value> + <data name=">>groupBox1.ZOrder" xml:space="preserve"> + <value>1</value> </data> <data name="txtDomain.Size" type="System.Drawing.Size, System.Drawing"> <value>386, 375</value> @@ -339,8 +381,11 @@ <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing"> <value>392, 0</value> </data> - <data name="panel3.TabIndex" type="System.Int32, mscorlib"> - <value>8</value> + <data name=">>clbProtocol.Parent" xml:space="preserve"> + <value>panel3</value> + </data> + <data name="cmbinboundTag.Items2" xml:space="preserve"> + <value>http</value> </data> <data name=">>cmbOutboundTag.Type" xml:space="preserve"> <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> @@ -348,17 +393,20 @@ <data name=">>groupBox1.Parent" xml:space="preserve"> <value>panel2</value> </data> + <data name="txtIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Fill</value> + </data> <data name=">>panel4.Name" xml:space="preserve"> <value>panel4</value> </data> - <data name=">>clbProtocol.Type" xml:space="preserve"> - <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> - <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Top</value> + <data name="clbInboundTag.Items2" xml:space="preserve"> + <value>bittorrent</value> + </data> + <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing"> + <value>598, 16</value> </data> <data name=">>panel1.Parent" xml:space="preserve"> <value>$this</value> @@ -366,12 +414,27 @@ <data name=">>txtIP.Parent" xml:space="preserve"> <value>groupBox2</value> </data> + <data name=">>comboBox1.Parent" xml:space="preserve"> + <value>panel3</value> + </data> + <data name=">>label2.Parent" xml:space="preserve"> + <value>panel3</value> + </data> + <data name=">>cmbInboundTag.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name=">>panel4.Type" xml:space="preserve"> <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name=">>cmbInboundTag.Parent" xml:space="preserve"> + <value>panel3</value> + </data> <data name=">>txtIP.Type" xml:space="preserve"> <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name=">>clbProtocol.ZOrder" xml:space="preserve"> + <value>2</value> + </data> <data name="clbProtocol.Items" xml:space="preserve"> <value>http</value> </data> @@ -390,26 +453,26 @@ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 0</value> </data> - <data name=">>groupBox1.Name" xml:space="preserve"> - <value>groupBox1</value> - </data> <data name="txtDomain.TabIndex" type="System.Int32, mscorlib"> <value>24</value> </data> + <data name=">>cmbinboundTag.Name" xml:space="preserve"> + <value>cmbinboundTag</value> + </data> <data name="panel2.TabIndex" type="System.Int32, mscorlib"> <value>11</value> </data> <data name=">>label4.Name" xml:space="preserve"> <value>label4</value> </data> + <data name=">>cmbinboundTag.Parent" xml:space="preserve"> + <value>panel3</value> + </data> <data name="btnOK.Text" xml:space="preserve"> <value>&OK</value> </data> - <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing"> - <value>75, 23</value> - </data> - <data name=">>btnClose.Name" xml:space="preserve"> - <value>btnClose</value> + <data name="comboBox1.Items2" xml:space="preserve"> + <value>block</value> </data> <data name=">>labRoutingTips.Type" xml:space="preserve"> <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> @@ -420,17 +483,23 @@ <data name="label1.TabIndex" type="System.Int32, mscorlib"> <value>34</value> </data> + <data name="label4.Size" type="System.Drawing.Size, System.Drawing"> + <value>71, 12</value> + </data> <data name="label3.Location" type="System.Drawing.Point, System.Drawing"> <value>274, 47</value> </data> + <data name="label2.TabIndex" type="System.Int32, mscorlib"> + <value>41</value> + </data> <data name="cmbOutboundTag.Items2" xml:space="preserve"> <value>block</value> </data> - <data name="labRoutingTips.TabIndex" type="System.Int32, mscorlib"> - <value>33</value> + <data name="cmbinboundTag.Items" xml:space="preserve"> + <value>null</value> </data> - <data name=">>groupBox1.ZOrder" xml:space="preserve"> - <value>1</value> + <data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing"> + <value>367, 16</value> </data> <data name="clbProtocol.Location" type="System.Drawing.Point, System.Drawing"> <value>347, 43</value> @@ -456,11 +525,8 @@ <data name="panel1.TabIndex" type="System.Int32, mscorlib"> <value>7</value> </data> - <data name=">>panel2.ZOrder" xml:space="preserve"> - <value>0</value> - </data> - <data name=">>label3.Name" xml:space="preserve"> - <value>label3</value> + <data name=">>comboBox1.ZOrder" xml:space="preserve"> + <value>1</value> </data> <data name=">>txtIP.ZOrder" xml:space="preserve"> <value>0</value> @@ -468,29 +534,41 @@ <data name=">>label1.Parent" xml:space="preserve"> <value>panel3</value> </data> - <data name=">>clbProtocol.Parent" xml:space="preserve"> - <value>panel3</value> + <data name="panel3.TabIndex" type="System.Int32, mscorlib"> + <value>8</value> </data> <data name=">>$this.Type" xml:space="preserve"> <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value> </data> - <data name="panel3.Location" type="System.Drawing.Point, System.Drawing"> - <value>0, 10</value> + <data name=">>label3.Name" xml:space="preserve"> + <value>label3</value> </data> <data name="clbProtocol.ColumnWidth" type="System.Int32, mscorlib"> <value>80</value> </data> + <data name=">>comboBox1.Name" xml:space="preserve"> + <value>comboBox1</value> + </data> + <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing"> + <value>504, 15</value> + </data> <data name="panel4.Size" type="System.Drawing.Size, System.Drawing"> <value>742, 60</value> </data> <data name=">>btnOK.Type" xml:space="preserve"> <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name="cmbInboundTag.Items" xml:space="preserve"> + <value>null</value> + </data> <data name=">>panel4.Parent" xml:space="preserve"> <value>$this</value> </data> - <data name="btnClose.Text" xml:space="preserve"> - <value>&Cancel</value> + <data name=">>label2.Name" xml:space="preserve"> + <value>label2</value> + </data> + <data name=">>btnClose.Name" xml:space="preserve"> + <value>btnClose</value> </data> <data name="labRoutingTips.Text" xml:space="preserve"> <value>*Set the rules, separated by commas (,); The comma in the regular is replaced by <COMMA></value> @@ -507,12 +585,24 @@ <data name="label1.Text" xml:space="preserve"> <value>Port</value> </data> + <data name="panel3.Location" type="System.Drawing.Point, System.Drawing"> + <value>0, 10</value> + </data> + <data name="comboBox1.TabIndex" type="System.Int32, mscorlib"> + <value>40</value> + </data> <data name=">>txtPort.Type" xml:space="preserve"> <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> <data name=">>txtDomain.Type" xml:space="preserve"> <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name="cmbInboundTag.Items2" xml:space="preserve"> + <value>http</value> + </data> + <data name=">>comboBox1.Type" xml:space="preserve"> + <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <data name=">>label3.Type" xml:space="preserve"> <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> @@ -520,34 +610,55 @@ <value>txtIP</value> </data> <data name=">>txtPort.ZOrder" xml:space="preserve"> - <value>2</value> + <value>4</value> + </data> + <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing"> + <value>107, 43</value> </data> <data name=">>cmbOutboundTag.Name" xml:space="preserve"> <value>cmbOutboundTag</value> </data> - <data name="txtDomain.Multiline" type="System.Boolean, mscorlib"> - <value>True</value> + <data name=">>panel1.Name" xml:space="preserve"> + <value>panel1</value> + </data> + <data name="label2.Location" type="System.Drawing.Point, System.Drawing"> + <value>279, 20</value> </data> <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> - <data name="groupBox1.Text" xml:space="preserve"> - <value>Domain</value> + <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> + <value>742, 576</value> </data> <data name="panel4.TabIndex" type="System.Int32, mscorlib"> <value>10</value> </data> + <data name="cmbinboundTag.Location" type="System.Drawing.Point, System.Drawing"> + <value>367, 16</value> + </data> <data name=">>panel2.Parent" xml:space="preserve"> <value>$this</value> </data> <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing"> <value>392, 395</value> </data> + <data name=">>label1.Type" xml:space="preserve"> + <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing"> <value>75, 23</value> </data> + <data name=">>clbInboundTag.Name" xml:space="preserve"> + <value>clbInboundTag</value> + </data> <data name=">>label3.ZOrder" xml:space="preserve"> - <value>1</value> + <value>3</value> + </data> + <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Top</value> + </data> + <data name="btnClose.Text" xml:space="preserve"> + <value>&Cancel</value> </data> <data name="label1.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> @@ -555,12 +666,21 @@ <data name="btnClose.TabIndex" type="System.Int32, mscorlib"> <value>4</value> </data> + <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing"> + <value>75, 23</value> + </data> <data name=">>txtDomain.Name" xml:space="preserve"> <value>txtDomain</value> </data> + <data name="clbInboundTag.TabIndex" type="System.Int32, mscorlib"> + <value>42</value> + </data> <data name="groupBox2.Text" xml:space="preserve"> <value>IP</value> </data> + <data name=">>clbInboundTag.Parent" xml:space="preserve"> + <value>panel3</value> + </data> <data name=">>panel3.Type" xml:space="preserve"> <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> @@ -570,8 +690,11 @@ <data name="panel4.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 516</value> </data> - <data name="label4.Size" type="System.Drawing.Size, System.Drawing"> - <value>71, 12</value> + <data name="labRoutingTips.TabIndex" type="System.Int32, mscorlib"> + <value>33</value> + </data> + <data name=">>cmbInboundTag.Name" xml:space="preserve"> + <value>cmbInboundTag</value> </data> <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing"> <value>350, 395</value> @@ -579,8 +702,11 @@ <data name=">>label4.Parent" xml:space="preserve"> <value>panel3</value> </data> - <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing"> - <value>504, 15</value> + <data name="groupBox1.Text" xml:space="preserve"> + <value>Domain</value> + </data> + <data name="cmbInboundTag.Location" type="System.Drawing.Point, System.Drawing"> + <value>367, 16</value> </data> <data name="label4.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx index 80928b68..a1eb9933 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx @@ -117,25 +117,129 @@ <resheader name="writer"> <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> + </data> + <data name="clbInboundTag.Size" type="System.Drawing.Size, System.Drawing"> + <value>272, 24</value> + </data> + <data name="label2.AutoSize" type="System.Boolean, mscorlib"> + <value>True</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> + </data> + <data name="clbProtocol.Size" type="System.Drawing.Size, System.Drawing"> + <value>272, 24</value> + </data> + <data name="label3.Location" type="System.Drawing.Point, System.Drawing"> + <value>279, 46</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> + </data> + <data name="label1.Size" type="System.Drawing.Size, System.Drawing"> + <value>39, 15</value> + </data> <data name="labRoutingTips.Text" xml:space="preserve"> <value>*设置的路由规则,用逗号(,)分隔;正则中的逗号用<COMMA>替代</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>取消(&C)</value> </data> <data name="btnOK.Text" xml:space="preserve"> <value>确定(&O)</value> </data> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="panel4.Location" type="System.Drawing.Point, System.Drawing"> + <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> diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs index b4384682..ca703f77 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs @@ -55,7 +55,8 @@ namespace v2rayN.Forms lvRoutings.HeaderStyle = ColumnHeaderStyle.Clickable; lvRoutings.Columns.Add("", 30); - lvRoutings.Columns.Add("outboundTag", 80); + lvRoutings.Columns.Add("inboundTag", 100); + lvRoutings.Columns.Add("outboundTag", 100); lvRoutings.Columns.Add("port", 80); lvRoutings.Columns.Add("protocol", 100); lvRoutings.Columns.Add("domain", 160); @@ -74,6 +75,7 @@ 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));