From cdaff661260f3ae96778f237afbe2c90e8ed4bbb Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Fri, 24 Jun 2022 09:54:52 +0800 Subject: [PATCH] add rule object doc --- .../RoutingRuleSettingDetailsForm.Designer.cs | 14 +- .../Forms/RoutingRuleSettingDetailsForm.cs | 6 + .../Forms/RoutingRuleSettingDetailsForm.resx | 241 +++++++++++++----- ...RoutingRuleSettingDetailsForm.zh-Hans.resx | 3 + 4 files changed, 204 insertions(+), 60 deletions(-) diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs index ee32e22e..5733b856 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs @@ -50,6 +50,7 @@ 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(); @@ -64,6 +65,7 @@ // // panel3 // + this.panel3.Controls.Add(this.linkRuleobjectDoc); this.panel3.Controls.Add(this.chkEnabled); this.panel3.Controls.Add(this.clbInboundTag); this.panel3.Controls.Add(this.label2); @@ -90,7 +92,9 @@ this.clbInboundTag.FormattingEnabled = true; this.clbInboundTag.Items.AddRange(new object[] { resources.GetString("clbInboundTag.Items"), - resources.GetString("clbInboundTag.Items1")}); + resources.GetString("clbInboundTag.Items1"), + resources.GetString("clbInboundTag.Items2"), + resources.GetString("clbInboundTag.Items3")}); this.clbInboundTag.MultiColumn = true; this.clbInboundTag.Name = "clbInboundTag"; // @@ -208,6 +212,13 @@ 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"); @@ -255,5 +266,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.CheckBox chkEnabled; private System.Windows.Forms.CheckBox chkAutoSort; + private System.Windows.Forms.LinkLabel linkRuleobjectDoc; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs index 219408b8..fa600925 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows.Forms; using v2rayN.Base; using v2rayN.Handler; @@ -138,5 +139,10 @@ namespace v2rayN.Forms { DialogResult = DialogResult.Cancel; } + + private void linkRuleobjectDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Process.Start("https://www.v2fly.org/config/routing.html#ruleobject"); + } } } diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx index bbd5dbf2..1ffc0db3 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx @@ -144,6 +144,39 @@ 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 @@ -151,7 +184,7 @@ NoControl - 617, 19 + 632, 45 60, 16 @@ -172,7 +205,7 @@ panel3 - 0 + 1 80 @@ -183,11 +216,17 @@ http + + socks2 + + + http2 + 347, 16 - 245, 20 + 345, 20 41 @@ -202,7 +241,7 @@ panel3 - 1 + 2 True @@ -232,7 +271,7 @@ panel3 - 2 + 3 80 @@ -265,7 +304,7 @@ panel3 - 3 + 4 True @@ -295,7 +334,7 @@ panel3 - 4 + 5 107, 43 @@ -316,7 +355,7 @@ panel3 - 5 + 6 True @@ -346,16 +385,16 @@ panel3 - 6 + 7 NoControl - 19, 82 + 144, 86 - 598, 16 + 575, 16 33 @@ -373,7 +412,7 @@ panel3 - 7 + 8 True @@ -403,7 +442,7 @@ panel3 - 8 + 9 proxy @@ -433,7 +472,7 @@ panel3 - 9 + 10 Top @@ -459,6 +498,66 @@ 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 @@ -543,44 +642,53 @@ 2 - - Bottom + + groupBox2 - - 0, 516 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 742, 60 + + panel2 - - 10 + + 0 - - panel4 + + groupBox1 - - System.Windows.Forms.Panel, 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 - - $this + + panel2 - + 1 - + Fill - - 3, 17 + + 0, 121 - - True + + 742, 395 - - 344, 375 + + 11 - - 25 + + panel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 txtIP @@ -621,20 +729,32 @@ 0 - + Fill - + 3, 17 - + True - - 386, 375 + + 344, 375 - - 24 + + 25 + + + txtIP + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 txtDomain @@ -675,28 +795,31 @@ 1 - + Fill - - 0, 121 + + 3, 17 - - 742, 395 + + True - - 11 + + 386, 375 - - panel2 + + 24 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtDomain - - $this + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox1 + + 0 diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx index 0059a7ff..3776d004 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx @@ -173,4 +173,7 @@ 保存时Domain和IP自动排序 + + 规则详细说明文档 + \ No newline at end of file