diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs index 5733b856..0b4e891b 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs @@ -31,6 +31,7 @@ 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.linkRuleobjectDoc = new System.Windows.Forms.LinkLabel(); this.chkEnabled = new System.Windows.Forms.CheckBox(); this.clbInboundTag = new System.Windows.Forms.CheckedListBox(); this.label2 = new System.Windows.Forms.Label(); @@ -50,7 +51,6 @@ this.txtIP = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.txtDomain = new System.Windows.Forms.TextBox(); - this.linkRuleobjectDoc = new System.Windows.Forms.LinkLabel(); this.panel3.SuspendLayout(); this.panel4.SuspendLayout(); this.panel2.SuspendLayout(); @@ -65,6 +65,7 @@ // // panel3 // + resources.ApplyResources(this.panel3, "panel3"); this.panel3.Controls.Add(this.linkRuleobjectDoc); this.panel3.Controls.Add(this.chkEnabled); this.panel3.Controls.Add(this.clbInboundTag); @@ -76,9 +77,15 @@ 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"; // + // linkRuleobjectDoc + // + resources.ApplyResources(this.linkRuleobjectDoc, "linkRuleobjectDoc"); + this.linkRuleobjectDoc.Name = "linkRuleobjectDoc"; + this.linkRuleobjectDoc.TabStop = true; + this.linkRuleobjectDoc.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkRuleobjectDoc_LinkClicked); + // // chkEnabled // resources.ApplyResources(this.chkEnabled, "chkEnabled"); @@ -87,8 +94,8 @@ // // clbInboundTag // - this.clbInboundTag.CheckOnClick = true; resources.ApplyResources(this.clbInboundTag, "clbInboundTag"); + this.clbInboundTag.CheckOnClick = true; this.clbInboundTag.FormattingEnabled = true; this.clbInboundTag.Items.AddRange(new object[] { resources.GetString("clbInboundTag.Items"), @@ -105,8 +112,8 @@ // // clbProtocol // - this.clbProtocol.CheckOnClick = true; resources.ApplyResources(this.clbProtocol, "clbProtocol"); + this.clbProtocol.CheckOnClick = true; this.clbProtocol.FormattingEnabled = true; this.clbProtocol.Items.AddRange(new object[] { resources.GetString("clbProtocol.Items"), @@ -132,8 +139,8 @@ // // labRoutingTips // - this.labRoutingTips.ForeColor = System.Drawing.Color.Brown; resources.ApplyResources(this.labRoutingTips, "labRoutingTips"); + this.labRoutingTips.ForeColor = System.Drawing.Color.Brown; this.labRoutingTips.Name = "labRoutingTips"; // // label4 @@ -143,21 +150,21 @@ // // 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.chkAutoSort); this.panel4.Controls.Add(this.btnClose); this.panel4.Controls.Add(this.btnOK); - resources.ApplyResources(this.panel4, "panel4"); this.panel4.Name = "panel4"; // // chkAutoSort @@ -168,8 +175,8 @@ // // btnClose // - this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; resources.ApplyResources(this.btnClose, "btnClose"); + this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnClose.Name = "btnClose"; this.btnClose.UseVisualStyleBackColor = true; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); @@ -183,15 +190,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 // - this.groupBox2.Controls.Add(this.txtIP); resources.ApplyResources(this.groupBox2, "groupBox2"); + this.groupBox2.Controls.Add(this.txtIP); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // @@ -202,8 +209,8 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.txtDomain); resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.txtDomain); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // @@ -212,13 +219,6 @@ resources.ApplyResources(this.txtDomain, "txtDomain"); this.txtDomain.Name = "txtDomain"; // - // linkRuleobjectDoc - // - resources.ApplyResources(this.linkRuleobjectDoc, "linkRuleobjectDoc"); - this.linkRuleobjectDoc.Name = "linkRuleobjectDoc"; - this.linkRuleobjectDoc.TabStop = true; - this.linkRuleobjectDoc.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkRuleobjectDoc_LinkClicked); - // // RoutingRuleSettingDetailsForm // resources.ApplyResources(this, "$this"); diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx index 1ffc0db3..e568dc8e 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx @@ -118,729 +118,645 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top - - - - 0, 0 - - - 742, 10 - - - - 7 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - True - - + NoControl - - 19, 86 - - - 0, 0, 0, 0 - - - 89, 12 - - - 43 - - - Ruleobject Doc - - - linkRuleobjectDoc - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - 0 - - True - - - NoControl - - - 632, 45 - - - 60, 16 - - - 42 - - - Enable - - - chkEnabled - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 1 - - - 80 - - - socks - - - http - - - socks2 - - - http2 - - - 347, 16 - - - 345, 20 - - - 41 - - - clbInboundTag - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel3 + + + 32 - - 2 - - - 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 - - - 3 - - - 80 - - - http - - - tls - - - bittorrent - - - 347, 43 + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 245, 20 - - 39 - - - clbProtocol - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 4 - - - 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 - - - 5 - - - 107, 43 - - - 119, 21 - - - 35 - - - txtPort - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 6 - - - 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 - - - 7 - - - NoControl - - - 144, 86 - - - 575, 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 - - - 8 - - - 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 - - - 9 + + 31 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 - - - 10 - - - Top - - - 0, 10 - - - 742, 111 - - - 8 - - - panel3 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - chkAutoSort - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 0 - - - btnClose - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 1 - - - btnOK - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 2 - - - Bottom - - - 0, 516 - - - 742, 60 - - - 10 - - - panel4 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - True - - - NoControl - - - 41, 18 - - - 270, 16 - - - 41 - - - Domain and ip are auto sorted when saving - - - chkAutoSort - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 0 - - - NoControl - - - 504, 15 - - - 75, 23 - - - 4 - - - &Cancel - - - btnClose - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 1 - - - 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 - - - 2 - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 1 + + 4, 4, 4, 4 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 - - - txtIP - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - Fill - - - 392, 0 - - - 350, 395 - - - 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 - - - 344, 375 - - - 25 - - - txtIP - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - txtDomain - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - Left - - - 0, 0 - - - 392, 395 + + panel1 3 - - Domain + + clbProtocol - - groupBox1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 - - panel2 + + NoControl - - 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill - - - 3, 17 - - + True - - 386, 375 + + 4 - - 24 + + Left - - txtDomain + + 80 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - groupBox1 - - + 0 - + + 29, 12 + + + 2 + + + http + + True - - - 6, 12 - - 742, 576 + + panel2 - - 4, 4, 4, 4 + + tls RoutingSettingDetailsForm + + NoControl + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 7 + + + Fill + + + 411, 15 + + + 119, 20 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 36 + + + Bottom + + + 89, 12 + + + 1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 344, 375 + + + $this + + + 0 + + + 575, 16 + + + groupBox1 + + + NoControl + + + 6 + + + label1 + + + 742, 395 + + + Protocol + + + 10 + + + True + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + True + + + 3 + + + panel4 + + + 3 + + + bittorrent + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 270, 16 + + + 144, 86 + + + 25 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 347, 16 + + + 3, 17 + + + panel3 + + + 41 + + + 80 + + + 0, 0 + + + 19, 20 + + + labRoutingTips + + + 19, 47 + + + 39 + + + Fill + + + True + + + 2 + RoutingRuleSettingDetailsForm + + panel2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 107, 43 + + + groupBox2 + + + Ruleobject Doc + + + 9 + + + 1 + + + 386, 375 + + + panel3 + + + http2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + Fill + + + panel4 + + + NoControl + + + socks2 + + + $this + + + 42 + + + groupBox2 + + + chkEnabled + + + panel3 + + + 5 + + + panel3 + + + System.Windows.Forms.Panel, 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 + + + txtPort + + + 3, 17 + + + 1 + + + 742, 10 + + + 0, 0 + + + groupBox1 + + + 24 + + + Port + + + Enable + + + label4 + + + &OK + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 34 + + + 274, 47 + + + 40 + + + block + + + 33 + + + 347, 43 + + + panel3 + + + 0 + + + panel3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + btnOK + + + 0, 0, 0, 0 + + + 2 + + + 119, 21 + + + Top + + + 4 + + + 7 + + + 0 + + + 11 + + + 0 + + + 43 + + + panel3 + + + 8 + v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + label3 + + + inboundTag + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 742, 60 + + + 0, 121 + + + chkAutoSort + + + $this + + + *Set the rules, separated by commas (,); The comma in the regular is replaced by <COMMA> + + + 345, 20 + + + linkRuleobjectDoc + + + socks + + + 65, 12 + + + btnClose + + + 392, 0 + + + 742, 111 + + + True + + + 6, 12 + + + 1 + + + 632, 45 + + + 0, 10 + + + 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 + + + 274, 20 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtIP + + + direct + + + label2 + + + 60, 16 + + + cmbOutboundTag + + + Domain and ip are auto sorted when saving + + + True + + + 19, 86 + + + NoControl + + + 742, 576 + + + 10 + + + $this + + + 392, 395 + + + 41, 18 + + + 75, 23 + + + clbInboundTag + + + 5 + + + Top + + + &Cancel + + + NoControl + + + NoControl + + + True + + + 4 + + + txtDomain + + + 41 + + + IP + + + panel3 + + + 75, 23 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 516 + + + 71, 12 + + + 350, 395 + + + panel4 + + + panel3 + + + Domain + + + 504, 15 + + + panel3 + + + 107, 16 + + + outboundTag + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 35 + + + True + \ 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 3776d004..4c82eaf8 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx @@ -118,14 +118,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 101, 12 + + + 规则详细说明文档 + - 670, 18 + 670, 48 372, 16 - 272, 20 + 347, 20 279, 20 @@ -154,6 +160,12 @@ 120, 16 + + 168, 16 + + + 保存时Domain和IP自动排序 + 取消(&C) @@ -170,10 +182,4 @@ 路由规则详情设置 - - 保存时Domain和IP自动排序 - - - 规则详细说明文档 - \ No newline at end of file