From c837ba5482235de8fb1f8aa723bcfd271d325d17 Mon Sep 17 00:00:00 2001 From: YFdyh000 <yfdyh000@gmail.com> Date: Fri, 17 Apr 2020 12:54:56 +0800 Subject: [PATCH] Showing routingMode on status bar --- v2rayN/v2rayN/Forms/MainForm.Designer.cs | 35 +- v2rayN/v2rayN/Forms/MainForm.cs | 31 +- v2rayN/v2rayN/Forms/MainForm.resx | 2226 +++++++++-------- v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx | 12 + .../Forms/OptionSettingForm.Designer.cs | 166 +- v2rayN/v2rayN/Forms/OptionSettingForm.cs | 21 +- v2rayN/v2rayN/Forms/OptionSettingForm.resx | 1598 +++++++++++- .../Forms/OptionSettingForm.zh-Hans.resx | 24 +- v2rayN/v2rayN/Handler/ConfigHandler.cs | 4 - v2rayN/v2rayN/Handler/SpeedtestHandler.cs | 2 +- v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 8 +- v2rayN/v2rayN/Mode/Config.cs | 2 +- v2rayN/v2rayN/Resx/ResUI.Designer.cs | 54 + v2rayN/v2rayN/Resx/ResUI.resx | 18 + v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx | 18 + 15 files changed, 2935 insertions(+), 1284 deletions(-) diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index 0511b147..7e1faaf3 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -61,8 +61,8 @@ this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem(); this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem(); this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem(); - this.qrCodeControl = new v2rayN.Forms.QRCodeControl(); this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton(); + this.qrCodeControl = new v2rayN.Forms.QRCodeControl(); this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components); this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components); this.menuSysAgentMode = new System.Windows.Forms.ToolStripMenuItem(); @@ -94,6 +94,7 @@ this.toolSslPacPortLab = new System.Windows.Forms.ToolStripStatusLabel(); this.toolSslPacPort = new System.Windows.Forms.ToolStripStatusLabel(); this.toolSslBlank3 = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolSslRouting = new System.Windows.Forms.ToolStripStatusLabel(); this.toolSslServerLatency = new System.Windows.Forms.ToolStripStatusLabel(); this.toolSslServerSpeed = new System.Windows.Forms.ToolStripStatusLabel(); this.toolSslBlank4 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -371,11 +372,6 @@ resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent"); this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click); // - // qrCodeControl - // - resources.ApplyResources(this.qrCodeControl, "qrCodeControl"); - this.qrCodeControl.Name = "qrCodeControl"; - // // tsbServer // this.tsbServer.DropDown = this.cmsLv; @@ -383,6 +379,11 @@ resources.ApplyResources(this.tsbServer, "tsbServer"); this.tsbServer.Name = "tsbServer"; // + // qrCodeControl + // + resources.ApplyResources(this.qrCodeControl, "qrCodeControl"); + this.qrCodeControl.Name = "qrCodeControl"; + // // notifyMain // this.notifyMain.ContextMenuStrip = this.cmsMain; @@ -544,6 +545,7 @@ this.toolSslPacPortLab, this.toolSslPacPort, this.toolSslBlank3, + this.toolSslRouting, this.toolSslServerLatency, this.toolSslServerSpeed, this.toolSslBlank4}); @@ -563,6 +565,7 @@ // // toolSslBlank1 // + this.toolSslBlank1.AutoToolTip = true; resources.ApplyResources(this.toolSslBlank1, "toolSslBlank1"); this.toolSslBlank1.Name = "toolSslBlank1"; this.toolSslBlank1.Spring = true; @@ -579,6 +582,7 @@ // // toolSslBlank2 // + this.toolSslBlank2.AutoToolTip = true; resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2"); this.toolSslBlank2.Name = "toolSslBlank2"; this.toolSslBlank2.Spring = true; @@ -595,21 +599,37 @@ // // toolSslBlank3 // + this.toolSslBlank3.AutoToolTip = true; resources.ApplyResources(this.toolSslBlank3, "toolSslBlank3"); this.toolSslBlank3.Name = "toolSslBlank3"; this.toolSslBlank3.Spring = true; // + // toolSslRouting + // + resources.ApplyResources(this.toolSslRouting, "toolSslRouting"); + this.toolSslRouting.AutoToolTip = true; + this.toolSslRouting.IsLink = true; + this.toolSslRouting.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.toolSslRouting.LinkColor = System.Drawing.SystemColors.ControlText; + this.toolSslRouting.Margin = new System.Windows.Forms.Padding(0, 3, 8, 2); + this.toolSslRouting.Name = "toolSslRouting"; + this.toolSslRouting.Spring = true; + this.toolSslRouting.Click += new System.EventHandler(this.toolSslRouting_Click); + // // toolSslServerLatency // resources.ApplyResources(this.toolSslServerLatency, "toolSslServerLatency"); + this.toolSslServerLatency.IsLink = true; + this.toolSslServerLatency.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.toolSslServerLatency.LinkColor = System.Drawing.SystemColors.ControlText; this.toolSslServerLatency.Name = "toolSslServerLatency"; this.toolSslServerLatency.Spring = true; this.toolSslServerLatency.Click += new System.EventHandler(this.toolSslServerLatency_Click); // // toolSslServerSpeed // - resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed"); this.toolSslServerSpeed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed"); this.toolSslServerSpeed.Name = "toolSslServerSpeed"; this.toolSslServerSpeed.Click += new System.EventHandler(this.toolSslServerSpeed_Click); // @@ -946,6 +966,7 @@ private System.Windows.Forms.ToolStripButton tsbReload; private System.Windows.Forms.ToolStripButton tsbQRCodeSwitch; private System.Windows.Forms.ToolStripStatusLabel toolSslServerLatency; + private System.Windows.Forms.ToolStripStatusLabel toolSslRouting; } } diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 15ca5b08..dec787c1 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -368,6 +368,24 @@ namespace v2rayN.Forms } } + string routingStatus = ""; + switch (config.routingMode) + { + case 0: + routingStatus = UIRes.I18N("RoutingModeGlobal"); + break; + case 1: + routingStatus = UIRes.I18N("RoutingModeBypassLAN"); + break; + case 2: + routingStatus = UIRes.I18N("RoutingModeBypassCN"); + break; + case 3: + routingStatus = UIRes.I18N("RoutingModeBypassLANCN"); + break; + } + toolSslRouting.Text = routingStatus; + notifyMain.Icon = MainFormHandler.Instance.GetNotifyIcon(config, this.Icon); } private void ssMain_ItemClicked(object sender, ToolStripItemClickedEventArgs e) @@ -762,7 +780,9 @@ namespace v2rayN.Forms private void tsbOptionSetting_Click(object sender, EventArgs e) { - OptionSettingForm fm = new OptionSettingForm(); + string tab = ""; + if (sender == toolSslRouting) tab = "tabPreDefinedRules"; + OptionSettingForm fm = new OptionSettingForm(tab); if (fm.ShowDialog() == DialogResult.OK) { //刷新 @@ -1588,13 +1608,13 @@ namespace v2rayN.Forms private async void toolSslServerLatencyRefresh() { - toolSslServerLatencySet("Measuring..."); + toolSslServerLatencySet(UIRes.I18N("ServerLatencyChecking")); string result = await httpProxyTest() + "ms"; toolSslServerLatencySet(result); } private void toolSslServerLatencySet(string text = "") { - toolSslServerLatency.Text = "Latency: " + text; + toolSslServerLatency.Text = string.Format(UIRes.I18N("toolSslServerLatency"), text); } private void toolSslServerLatency_Click(object sender, EventArgs e) { @@ -1605,5 +1625,10 @@ namespace v2rayN.Forms { //toolSslServerLatencyRefresh(); } + + private void toolSslRouting_Click(object sender, EventArgs e) + { + tsbOptionSetting_Click(toolSslRouting, null); + } } } diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 62f3cdd2..86cd8eef 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -118,131 +118,193 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="scMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Fill</value> + </data> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="scMain.Location" type="System.Drawing.Point, System.Drawing"> + <value>3, 17</value> + </data> <metadata name="cmsLv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>327, 17</value> </metadata> - <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <metadata name="notifyMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>17, 17</value> - </metadata> - <metadata name="cmsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>137, 17</value> - </metadata> - <metadata name="bgwScan.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>498, 17</value> - </metadata> - <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>228, 18</value> - </metadata> - <metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>409, 17</value> - </metadata> - <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>108</value> - </metadata> - <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> - <value>6, 12</value> + <data name="menuAddVmessServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> </data> - <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> - <value>952, 593</value> + <data name="menuAddVmessServer.Text" xml:space="preserve"> + <value>Add [VMess] server</value> </data> - <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>4, 4, 4, 4</value> + <data name="menuAddShadowsocksServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> </data> - <data name=">>$this.Name" xml:space="preserve"> - <value>MainForm</value> + <data name="menuAddShadowsocksServer.Text" xml:space="preserve"> + <value>Add [Shadowsocks] server</value> </data> - <data name="$this.Text" xml:space="preserve"> - <value>v2rayN</value> + <data name="menuAddSocksServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</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 name="menuAddSocksServer.Text" xml:space="preserve"> + <value>Add [Socks] server</value> </data> - <data name=">>bgwScan.Name" xml:space="preserve"> - <value>bgwScan</value> + <data name="menuAddCustomServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> </data> - <data name=">>bgwScan.Type" xml:space="preserve"> - <value>System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="menuAddCustomServer.Text" xml:space="preserve"> + <value>Add a custom configuration server</value> </data> - <data name=">>cmsLv.Name" xml:space="preserve"> - <value>cmsLv</value> + <data name="menuAddServers.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuAddServers.Text" xml:space="preserve"> + <value>Import bulk URL from clipboard (Ctrl+V)</value> + </data> + <data name="menuScanScreen.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuScanScreen.Text" xml:space="preserve"> + <value>Scan QR code on the screen (Ctrl+S)</value> + </data> + <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing"> + <value>352, 6</value> + </data> + <data name="menuRemoveServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuRemoveServer.Text" xml:space="preserve"> + <value>Remove selected servers (Delete)</value> + </data> + <data name="menuRemoveDuplicateServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuRemoveDuplicateServer.Text" xml:space="preserve"> + <value>Remove duplicate servers</value> + </data> + <data name="menuCopyServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuCopyServer.Text" xml:space="preserve"> + <value>Clone selected server</value> + </data> + <data name="menuSetDefaultServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuSetDefaultServer.Text" xml:space="preserve"> + <value>Set as active server (Enter)</value> + </data> + <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing"> + <value>352, 6</value> + </data> + <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuMoveTop.Text" xml:space="preserve"> + <value>Move to top (T)</value> + </data> + <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuMoveUp.Text" xml:space="preserve"> + <value>Up (U)</value> + </data> + <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuMoveDown.Text" xml:space="preserve"> + <value>Down (D)</value> + </data> + <data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuMoveBottom.Text" xml:space="preserve"> + <value>Move to bottom (B)</value> + </data> + <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuSelectAll.Text" xml:space="preserve"> + <value>Select All (Ctrl+A)</value> + </data> + <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing"> + <value>352, 6</value> + </data> + <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuPingServer.Text" xml:space="preserve"> + <value>Test servers ping (Ctrl+P)</value> + </data> + <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuTcpingServer.Text" xml:space="preserve"> + <value>Test servers with tcping (Ctrl+O)</value> + </data> + <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuRealPingServer.Text" xml:space="preserve"> + <value>Test servers real delay (Ctrl+R)</value> + </data> + <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuSpeedServer.Text" xml:space="preserve"> + <value>Test servers download speed (Ctrl+T)</value> + </data> + <data name="menuTestMe.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuTestMe.Text" xml:space="preserve"> + <value>Test current service status</value> + </data> + <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing"> + <value>352, 6</value> + </data> + <data name="menuExport2ClientConfig.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuExport2ClientConfig.Text" xml:space="preserve"> + <value>Export selected server for client configuration</value> + </data> + <data name="menuExport2ServerConfig.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuExport2ServerConfig.Text" xml:space="preserve"> + <value>Export selected server for server configuration</value> + </data> + <data name="menuExport2ShareUrl.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuExport2ShareUrl.Text" xml:space="preserve"> + <value>Export share URLs to clipboard (Ctrl+C)</value> + </data> + <data name="menuExport2SubContent.Size" type="System.Drawing.Size, System.Drawing"> + <value>355, 22</value> + </data> + <data name="menuExport2SubContent.Text" xml:space="preserve"> + <value>Export subscription (base64) share to clipboard</value> + </data> + <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> + <value>Magenta</value> + </data> + <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing"> + <value>64, 53</value> + </data> + <data name="tsbServer.Text" xml:space="preserve"> + <value>Servers</value> + </data> + <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> + <value>ImageAboveText</value> </data> <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing"> <value>356, 556</value> </data> + <data name=">>cmsLv.Name" xml:space="preserve"> + <value>cmsLv</value> + </data> <data name=">>cmsLv.Type" xml:space="preserve"> <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="cmsMain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> - <value>NoControl</value> - </data> - <data name=">>cmsMain.Name" xml:space="preserve"> - <value>cmsMain</value> - </data> - <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing"> - <value>265, 164</value> - </data> - <data name=">>cmsMain.Type" xml:space="preserve"> - <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> - </data> - <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing"> - <value>0, 66</value> - </data> - <data name=">>groupBox1.Name" xml:space="preserve"> - <value>groupBox1</value> - </data> - <data name=">>groupBox1.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing"> - <value>952, 351</value> - </data> - <data name="groupBox1.TabIndex" type="System.Int32, mscorlib"> - <value>0</value> - </data> - <data name="groupBox1.Text" xml:space="preserve"> - <value>Servers list</value> - </data> - <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=">>groupBox1.ZOrder" xml:space="preserve"> - <value>2</value> - </data> - <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Bottom</value> - </data> - <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing"> - <value>0, 417</value> - </data> - <data name=">>groupBox2.Name" xml:space="preserve"> - <value>groupBox2</value> - </data> - <data name=">>groupBox2.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing"> - <value>952, 176</value> - </data> - <data name="groupBox2.TabIndex" type="System.Int32, mscorlib"> - <value>3</value> - </data> - <data name="groupBox2.Text" xml:space="preserve"> - <value>Informations</value> - </data> - <data name=">>groupBox2.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=">>groupBox2.ZOrder" xml:space="preserve"> - <value>3</value> - </data> <data name="lvServers.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> @@ -266,515 +328,36 @@ <data name="lvServers.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 0</value> </data> - <data name=">>lvServers.Name" xml:space="preserve"> - <value>lvServers</value> - </data> - <data name=">>lvServers.Parent" xml:space="preserve"> - <value>scMain.Panel1</value> - </data> <data name="lvServers.Size" type="System.Drawing.Size, System.Drawing"> <value>686, 331</value> </data> + <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="lvServers.TabIndex" type="System.Int32, mscorlib"> <value>0</value> </data> + <data name=">>lvServers.Name" xml:space="preserve"> + <value>lvServers</value> + </data> <data name=">>lvServers.Type" xml:space="preserve"> <value>v2rayN.Base.ListViewFlickerFree, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value> </data> + <data name=">>lvServers.Parent" xml:space="preserve"> + <value>scMain.Panel1</value> + </data> <data name=">>lvServers.ZOrder" xml:space="preserve"> <value>0</value> </data> - <data name=">>menuAddCustomServer.Name" xml:space="preserve"> - <value>menuAddCustomServer</value> + <data name=">>scMain.Panel1.Name" xml:space="preserve"> + <value>scMain.Panel1</value> </data> - <data name="menuAddCustomServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> + <data name=">>scMain.Panel1.Type" xml:space="preserve"> + <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="menuAddCustomServer.Text" xml:space="preserve"> - <value>Add a custom configuration server</value> + <data name=">>scMain.Panel1.Parent" xml:space="preserve"> + <value>scMain</value> </data> - <data name=">>menuAddCustomServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuAddServers.Name" xml:space="preserve"> - <value>menuAddServers</value> - </data> - <data name="menuAddServers.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuAddServers.Text" xml:space="preserve"> - <value>Import bulk URL from clipboard (Ctrl+V)</value> - </data> - <data name=">>menuAddServers.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuAddServers2.Name" xml:space="preserve"> - <value>menuAddServers2</value> - </data> - <data name="menuAddServers2.Size" type="System.Drawing.Size, System.Drawing"> - <value>264, 22</value> - </data> - <data name="menuAddServers2.Text" xml:space="preserve"> - <value>Import bulk URL from clipboard</value> - </data> - <data name=">>menuAddServers2.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuAddShadowsocksServer.Name" xml:space="preserve"> - <value>menuAddShadowsocksServer</value> - </data> - <data name="menuAddShadowsocksServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuAddShadowsocksServer.Text" xml:space="preserve"> - <value>Add [Shadowsocks] server</value> - </data> - <data name=">>menuAddShadowsocksServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuAddSocksServer.Name" xml:space="preserve"> - <value>menuAddSocksServer</value> - </data> - <data name="menuAddSocksServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuAddSocksServer.Text" xml:space="preserve"> - <value>Add [Socks] server</value> - </data> - <data name=">>menuAddSocksServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuAddVmessServer.Name" xml:space="preserve"> - <value>menuAddVmessServer</value> - </data> - <data name="menuAddVmessServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuAddVmessServer.Text" xml:space="preserve"> - <value>Add [VMess] server</value> - </data> - <data name=">>menuAddVmessServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuCopyPACUrl.Name" xml:space="preserve"> - <value>menuCopyPACUrl</value> - </data> - <data name="menuCopyPACUrl.Size" type="System.Drawing.Size, System.Drawing"> - <value>264, 22</value> - </data> - <data name="menuCopyPACUrl.Text" xml:space="preserve"> - <value>Copy local PAC URL</value> - </data> - <data name=">>menuCopyPACUrl.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuCopyServer.Name" xml:space="preserve"> - <value>menuCopyServer</value> - </data> - <data name="menuCopyServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuCopyServer.Text" xml:space="preserve"> - <value>Clone selected server</value> - </data> - <data name=">>menuCopyServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuExit.Name" xml:space="preserve"> - <value>menuExit</value> - </data> - <data name="menuExit.Size" type="System.Drawing.Size, System.Drawing"> - <value>264, 22</value> - </data> - <data name="menuExit.Text" xml:space="preserve"> - <value>Exit</value> - </data> - <data name=">>menuExit.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuExport2ClientConfig.Name" xml:space="preserve"> - <value>menuExport2ClientConfig</value> - </data> - <data name="menuExport2ClientConfig.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuExport2ClientConfig.Text" xml:space="preserve"> - <value>Export selected server for client configuration</value> - </data> - <data name=">>menuExport2ClientConfig.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuExport2ServerConfig.Name" xml:space="preserve"> - <value>menuExport2ServerConfig</value> - </data> - <data name="menuExport2ServerConfig.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuExport2ServerConfig.Text" xml:space="preserve"> - <value>Export selected server for server configuration</value> - </data> - <data name=">>menuExport2ServerConfig.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuExport2ShareUrl.Name" xml:space="preserve"> - <value>menuExport2ShareUrl</value> - </data> - <data name="menuExport2ShareUrl.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuExport2ShareUrl.Text" xml:space="preserve"> - <value>Export share URLs to clipboard (Ctrl+C)</value> - </data> - <data name=">>menuExport2ShareUrl.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuExport2SubContent.Name" xml:space="preserve"> - <value>menuExport2SubContent</value> - </data> - <data name="menuExport2SubContent.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuExport2SubContent.Text" xml:space="preserve"> - <value>Export subscription (base64) share to clipboard</value> - </data> - <data name=">>menuExport2SubContent.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuGlobal.Name" xml:space="preserve"> - <value>menuGlobal</value> - </data> - <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing"> - <value>411, 22</value> - </data> - <data name="menuGlobal.Text" xml:space="preserve"> - <value>Open Http proxy and set the system proxy (global mode)</value> - </data> - <data name=">>menuGlobal.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuGlobalPAC.Name" xml:space="preserve"> - <value>menuGlobalPAC</value> - </data> - <data name="menuGlobalPAC.Size" type="System.Drawing.Size, System.Drawing"> - <value>411, 22</value> - </data> - <data name="menuGlobalPAC.Text" xml:space="preserve"> - <value>Open PAC and set the system proxy (PAC mode)</value> - </data> - <data name=">>menuGlobalPAC.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuKeep.Name" xml:space="preserve"> - <value>menuKeep</value> - </data> - <data name="menuKeep.Size" type="System.Drawing.Size, System.Drawing"> - <value>411, 22</value> - </data> - <data name="menuKeep.Text" xml:space="preserve"> - <value>Only open Http proxy and clear the proxy settings</value> - </data> - <data name=">>menuKeep.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuKeepNothing.Name" xml:space="preserve"> - <value>menuKeepNothing</value> - </data> - <data name="menuKeepNothing.Size" type="System.Drawing.Size, System.Drawing"> - <value>411, 22</value> - </data> - <data name="menuKeepNothing.Text" xml:space="preserve"> - <value>Only open Http proxy and do nothing</value> - </data> - <data name=">>menuKeepNothing.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuKeepPAC.Name" xml:space="preserve"> - <value>menuKeepPAC</value> - </data> - <data name="menuKeepPAC.Size" type="System.Drawing.Size, System.Drawing"> - <value>411, 22</value> - </data> - <data name="menuKeepPAC.Text" xml:space="preserve"> - <value>Only open PAC and clear the proxy settings</value> - </data> - <data name=">>menuKeepPAC.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuKeepPACNothing.Name" xml:space="preserve"> - <value>menuKeepPACNothing</value> - </data> - <data name="menuKeepPACNothing.Size" type="System.Drawing.Size, System.Drawing"> - <value>411, 22</value> - </data> - <data name="menuKeepPACNothing.Text" xml:space="preserve"> - <value>Only open PAC and do nothing</value> - </data> - <data name=">>menuKeepPACNothing.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuMoveBottom.Name" xml:space="preserve"> - <value>menuMoveBottom</value> - </data> - <data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuMoveBottom.Text" xml:space="preserve"> - <value>Move to bottom (B)</value> - </data> - <data name=">>menuMoveBottom.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuMoveDown.Name" xml:space="preserve"> - <value>menuMoveDown</value> - </data> - <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuMoveDown.Text" xml:space="preserve"> - <value>Down (D)</value> - </data> - <data name=">>menuMoveDown.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuMoveTop.Name" xml:space="preserve"> - <value>menuMoveTop</value> - </data> - <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuMoveTop.Text" xml:space="preserve"> - <value>Move to top (T)</value> - </data> - <data name=">>menuMoveTop.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuMoveUp.Name" xml:space="preserve"> - <value>menuMoveUp</value> - </data> - <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuMoveUp.Text" xml:space="preserve"> - <value>Up (U)</value> - </data> - <data name=">>menuMoveUp.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuNotEnabledHttp.Name" xml:space="preserve"> - <value>menuNotEnabledHttp</value> - </data> - <data name="menuNotEnabledHttp.Size" type="System.Drawing.Size, System.Drawing"> - <value>411, 22</value> - </data> - <data name="menuNotEnabledHttp.Text" xml:space="preserve"> - <value>Not Enabled Http Proxy</value> - </data> - <data name=">>menuNotEnabledHttp.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuPingServer.Name" xml:space="preserve"> - <value>menuPingServer</value> - </data> - <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuPingServer.Text" xml:space="preserve"> - <value>Test servers ping (Ctrl+P)</value> - </data> - <data name=">>menuPingServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuRealPingServer.Name" xml:space="preserve"> - <value>menuRealPingServer</value> - </data> - <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuRealPingServer.Text" xml:space="preserve"> - <value>Test servers real delay (Ctrl+R)</value> - </data> - <data name=">>menuRealPingServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuRemoveDuplicateServer.Name" xml:space="preserve"> - <value>menuRemoveDuplicateServer</value> - </data> - <data name="menuRemoveDuplicateServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuRemoveDuplicateServer.Text" xml:space="preserve"> - <value>Remove duplicate servers</value> - </data> - <data name=">>menuRemoveDuplicateServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuRemoveServer.Name" xml:space="preserve"> - <value>menuRemoveServer</value> - </data> - <data name="menuRemoveServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuRemoveServer.Text" xml:space="preserve"> - <value>Remove selected servers (Delete)</value> - </data> - <data name=">>menuRemoveServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuScanScreen.Name" xml:space="preserve"> - <value>menuScanScreen</value> - </data> - <data name="menuScanScreen.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuScanScreen.Text" xml:space="preserve"> - <value>Scan QR code on the screen (Ctrl+S)</value> - </data> - <data name=">>menuScanScreen.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuScanScreen2.Name" xml:space="preserve"> - <value>menuScanScreen2</value> - </data> - <data name="menuScanScreen2.Size" type="System.Drawing.Size, System.Drawing"> - <value>264, 22</value> - </data> - <data name="menuScanScreen2.Text" xml:space="preserve"> - <value>Scan QR code on the screen</value> - </data> - <data name=">>menuScanScreen2.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuSelectAll.Name" xml:space="preserve"> - <value>menuSelectAll</value> - </data> - <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuSelectAll.Text" xml:space="preserve"> - <value>Select All (Ctrl+A)</value> - </data> - <data name=">>menuSelectAll.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuServers.Name" xml:space="preserve"> - <value>menuServers</value> - </data> - <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing"> - <value>264, 22</value> - </data> - <data name="menuServers.Text" xml:space="preserve"> - <value>Server</value> - </data> - <data name=">>menuServers.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuSetDefaultServer.Name" xml:space="preserve"> - <value>menuSetDefaultServer</value> - </data> - <data name="menuSetDefaultServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuSetDefaultServer.Text" xml:space="preserve"> - <value>Set as active server (Enter)</value> - </data> - <data name=">>menuSetDefaultServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuSpeedServer.Name" xml:space="preserve"> - <value>menuSpeedServer</value> - </data> - <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuSpeedServer.Text" xml:space="preserve"> - <value>Test servers download speed (Ctrl+T)</value> - </data> - <data name=">>menuSpeedServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuSysAgentMode.Name" xml:space="preserve"> - <value>menuSysAgentMode</value> - </data> - <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing"> - <value>264, 22</value> - </data> - <data name="menuSysAgentMode.Text" xml:space="preserve"> - <value>Http proxy</value> - </data> - <data name=">>menuSysAgentMode.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuTcpingServer.Name" xml:space="preserve"> - <value>menuTcpingServer</value> - </data> - <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuTcpingServer.Text" xml:space="preserve"> - <value>Test servers with tcping (Ctrl+O)</value> - </data> - <data name=">>menuTcpingServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuTestMe.Name" xml:space="preserve"> - <value>menuTestMe</value> - </data> - <data name="menuTestMe.Size" type="System.Drawing.Size, System.Drawing"> - <value>355, 22</value> - </data> - <data name="menuTestMe.Text" xml:space="preserve"> - <value>Test current service status</value> - </data> - <data name=">>menuTestMe.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>menuUpdateSubscriptions.Name" xml:space="preserve"> - <value>menuUpdateSubscriptions</value> - </data> - <data name="menuUpdateSubscriptions.Size" type="System.Drawing.Size, System.Drawing"> - <value>264, 22</value> - </data> - <data name="menuUpdateSubscriptions.Text" xml:space="preserve"> - <value>Update subscriptions</value> - </data> - <data name=">>menuUpdateSubscriptions.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>notifyMain.Name" xml:space="preserve"> - <value>notifyMain</value> - </data> - <data name="notifyMain.Text" xml:space="preserve"> - <value>v2rayN</value> - </data> - <data name=">>notifyMain.Type" xml:space="preserve"> - <value>System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="notifyMain.Visible" type="System.Boolean, mscorlib"> - <value>True</value> - </data> - <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Top</value> - </data> - <data name="panel1.Location" type="System.Drawing.Point, System.Drawing"> - <value>0, 56</value> - </data> - <data name=">>panel1.Name" xml:space="preserve"> - <value>panel1</value> - </data> - <data name=">>panel1.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name="panel1.Size" type="System.Drawing.Size, System.Drawing"> - <value>952, 10</value> - </data> - <data name="panel1.TabIndex" type="System.Int32, mscorlib"> - <value>2</value> - </data> - <data name=">>panel1.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=">>panel1.ZOrder" xml:space="preserve"> - <value>4</value> + <data name=">>scMain.Panel1.ZOrder" xml:space="preserve"> + <value>0</value> </data> <data name="qrCodeControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> @@ -782,63 +365,39 @@ <data name="qrCodeControl.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 0</value> </data> - <data name=">>qrCodeControl.Name" xml:space="preserve"> - <value>qrCodeControl</value> - </data> - <data name=">>qrCodeControl.Parent" xml:space="preserve"> - <value>scMain.Panel2</value> - </data> <data name="qrCodeControl.Size" type="System.Drawing.Size, System.Drawing"> <value>256, 331</value> </data> <data name="qrCodeControl.TabIndex" type="System.Int32, mscorlib"> <value>2</value> </data> + <data name=">>qrCodeControl.Name" xml:space="preserve"> + <value>qrCodeControl</value> + </data> <data name=">>qrCodeControl.Type" xml:space="preserve"> <value>v2rayN.Forms.QRCodeControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value> </data> + <data name=">>qrCodeControl.Parent" xml:space="preserve"> + <value>scMain.Panel2</value> + </data> <data name=">>qrCodeControl.ZOrder" xml:space="preserve"> <value>0</value> </data> - <data name="scMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> - </data> - <data name="scMain.Location" type="System.Drawing.Point, System.Drawing"> - <value>3, 17</value> - </data> - <data name=">>scMain.Name" xml:space="preserve"> - <value>scMain</value> - </data> - <data name=">>scMain.Panel1.Name" xml:space="preserve"> - <value>scMain.Panel1</value> - </data> - <data name=">>scMain.Panel1.Parent" xml:space="preserve"> - <value>scMain</value> - </data> - <data name=">>scMain.Panel1.Type" xml:space="preserve"> - <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>scMain.Panel1.ZOrder" xml:space="preserve"> - <value>0</value> - </data> <data name=">>scMain.Panel2.Name" xml:space="preserve"> <value>scMain.Panel2</value> </data> - <data name=">>scMain.Panel2.Parent" xml:space="preserve"> - <value>scMain</value> - </data> <data name=">>scMain.Panel2.Type" xml:space="preserve"> <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name=">>scMain.Panel2.Parent" xml:space="preserve"> + <value>scMain</value> + </data> <data name=">>scMain.Panel2.ZOrder" xml:space="preserve"> <value>1</value> </data> <data name="scMain.Panel2MinSize" type="System.Int32, mscorlib"> <value>100</value> </data> - <data name=">>scMain.Parent" xml:space="preserve"> - <value>groupBox1</value> - </data> <data name="scMain.Size" type="System.Drawing.Size, System.Drawing"> <value>946, 331</value> </data> @@ -848,137 +407,263 @@ <data name="scMain.TabIndex" type="System.Int32, mscorlib"> <value>0</value> </data> + <data name=">>scMain.Name" xml:space="preserve"> + <value>scMain</value> + </data> <data name=">>scMain.Type" xml:space="preserve"> <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name=">>scMain.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name=">>scMain.ZOrder" xml:space="preserve"> <value>0</value> </data> - <data name="ssMain.Location" type="System.Drawing.Point, System.Drawing"> - <value>3, 151</value> + <metadata name="notifyMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> + <metadata name="cmsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>137, 17</value> + </metadata> + <data name="cmsMain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> + <value>NoControl</value> </data> - <data name=">>ssMain.Name" xml:space="preserve"> - <value>ssMain</value> + <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing"> + <value>265, 164</value> </data> - <data name=">>ssMain.Parent" xml:space="preserve"> - <value>groupBox2</value> + <data name=">>cmsMain.Name" xml:space="preserve"> + <value>cmsMain</value> </data> - <data name="ssMain.Size" type="System.Drawing.Size, System.Drawing"> - <value>946, 22</value> + <data name=">>cmsMain.Type" xml:space="preserve"> + <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="ssMain.TabIndex" type="System.Int32, mscorlib"> + <data name="notifyMain.Text" xml:space="preserve"> + <value>v2rayN</value> + </data> + <data name="notifyMain.Visible" type="System.Boolean, mscorlib"> + <value>True</value> + </data> + <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing"> + <value>264, 22</value> + </data> + <data name="menuSysAgentMode.Text" xml:space="preserve"> + <value>Http proxy</value> + </data> + <data name="menuNotEnabledHttp.Size" type="System.Drawing.Size, System.Drawing"> + <value>411, 22</value> + </data> + <data name="menuNotEnabledHttp.Text" xml:space="preserve"> + <value>Not Enabled Http Proxy</value> + </data> + <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing"> + <value>411, 22</value> + </data> + <data name="menuGlobal.Text" xml:space="preserve"> + <value>Open Http proxy and set the system proxy (global mode)</value> + </data> + <data name="menuGlobalPAC.Size" type="System.Drawing.Size, System.Drawing"> + <value>411, 22</value> + </data> + <data name="menuGlobalPAC.Text" xml:space="preserve"> + <value>Open PAC and set the system proxy (PAC mode)</value> + </data> + <data name="menuKeep.Size" type="System.Drawing.Size, System.Drawing"> + <value>411, 22</value> + </data> + <data name="menuKeep.Text" xml:space="preserve"> + <value>Only open Http proxy and clear the proxy settings</value> + </data> + <data name="menuKeepPAC.Size" type="System.Drawing.Size, System.Drawing"> + <value>411, 22</value> + </data> + <data name="menuKeepPAC.Text" xml:space="preserve"> + <value>Only open PAC and clear the proxy settings</value> + </data> + <data name="menuKeepNothing.Size" type="System.Drawing.Size, System.Drawing"> + <value>411, 22</value> + </data> + <data name="menuKeepNothing.Text" xml:space="preserve"> + <value>Only open Http proxy and do nothing</value> + </data> + <data name="menuKeepPACNothing.Size" type="System.Drawing.Size, System.Drawing"> + <value>411, 22</value> + </data> + <data name="menuKeepPACNothing.Text" xml:space="preserve"> + <value>Only open PAC and do nothing</value> + </data> + <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing"> + <value>264, 22</value> + </data> + <data name="menuServers.Text" xml:space="preserve"> + <value>Server</value> + </data> + <data name="menuAddServers2.Size" type="System.Drawing.Size, System.Drawing"> + <value>264, 22</value> + </data> + <data name="menuAddServers2.Text" xml:space="preserve"> + <value>Import bulk URL from clipboard</value> + </data> + <data name="menuScanScreen2.Size" type="System.Drawing.Size, System.Drawing"> + <value>264, 22</value> + </data> + <data name="menuScanScreen2.Text" xml:space="preserve"> + <value>Scan QR code on the screen</value> + </data> + <data name="menuCopyPACUrl.Size" type="System.Drawing.Size, System.Drawing"> + <value>264, 22</value> + </data> + <data name="menuCopyPACUrl.Text" xml:space="preserve"> + <value>Copy local PAC URL</value> + </data> + <data name="menuUpdateSubscriptions.Size" type="System.Drawing.Size, System.Drawing"> + <value>264, 22</value> + </data> + <data name="menuUpdateSubscriptions.Text" xml:space="preserve"> + <value>Update subscriptions</value> + </data> + <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing"> + <value>261, 6</value> + </data> + <data name="menuExit.Size" type="System.Drawing.Size, System.Drawing"> + <value>264, 22</value> + </data> + <data name="menuExit.Text" xml:space="preserve"> + <value>Exit</value> + </data> + <metadata name="bgwScan.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>498, 17</value> + </metadata> + <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Fill</value> + </data> + <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing"> + <value>0, 66</value> + </data> + <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing"> + <value>952, 351</value> + </data> + <data name="groupBox1.TabIndex" type="System.Int32, mscorlib"> <value>0</value> </data> - <data name="ssMain.Text" xml:space="preserve"> - <value>statusStrip1</value> + <data name="groupBox1.Text" xml:space="preserve"> + <value>Servers list</value> </data> - <data name=">>ssMain.Type" xml:space="preserve"> - <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name=">>groupBox1.Name" xml:space="preserve"> + <value>groupBox1</value> </data> - <data name=">>ssMain.ZOrder" xml:space="preserve"> - <value>1</value> + <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=">>groupBox1.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>groupBox1.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name="txtMsgBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Fill</value> + </data> + <data name="txtMsgBox.Location" type="System.Drawing.Point, System.Drawing"> + <value>3, 17</value> + </data> + <data name="txtMsgBox.MaxLength" type="System.Int32, mscorlib"> + <value>0</value> + </data> + <data name="txtMsgBox.Multiline" type="System.Boolean, mscorlib"> + <value>True</value> + </data> + <data name="txtMsgBox.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms"> + <value>Vertical</value> + </data> + <data name="txtMsgBox.Size" type="System.Drawing.Size, System.Drawing"> + <value>946, 134</value> + </data> + <data name="txtMsgBox.TabIndex" type="System.Int32, mscorlib"> + <value>3</value> + </data> + <data name=">>txtMsgBox.Name" xml:space="preserve"> + <value>txtMsgBox</value> + </data> + <data name=">>txtMsgBox.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=">>txtMsgBox.Parent" xml:space="preserve"> + <value>groupBox2</value> + </data> + <data name=">>txtMsgBox.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>228, 18</value> + </metadata> + <data name="toolSslSocksPortLab.Font" type="System.Drawing.Font, System.Drawing"> + <value>微软雅黑, 8pt</value> + </data> + <data name="toolSslSocksPortLab.Size" type="System.Drawing.Size, System.Drawing"> + <value>52, 17</value> + </data> + <data name="toolSslSocksPortLab.Text" xml:space="preserve"> + <value>SOCKS5:</value> + </data> + <data name="toolSslSocksPort.Size" type="System.Drawing.Size, System.Drawing"> + <value>0, 17</value> </data> <data name="toolSslBlank1.Font" type="System.Drawing.Font, System.Drawing"> <value>微软雅黑, 8pt</value> </data> - <data name=">>toolSslBlank1.Name" xml:space="preserve"> - <value>toolSslBlank1</value> - </data> <data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing"> - <value>152, 17</value> - </data> - <data name=">>toolSslBlank1.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="toolSslBlank2.Font" type="System.Drawing.Font, System.Drawing"> - <value>微软雅黑, 8pt</value> - </data> - <data name=">>toolSslBlank2.Name" xml:space="preserve"> - <value>toolSslBlank2</value> - </data> - <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing"> - <value>152, 17</value> - </data> - <data name=">>toolSslBlank2.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="toolSslBlank3.Font" type="System.Drawing.Font, System.Drawing"> - <value>微软雅黑, 8pt</value> - </data> - <data name=">>toolSslBlank3.Name" xml:space="preserve"> - <value>toolSslBlank3</value> - </data> - <data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing"> - <value>152, 17</value> - </data> - <data name=">>toolSslBlank3.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolSslBlank4.Name" xml:space="preserve"> - <value>toolSslBlank4</value> - </data> - <data name="toolSslBlank4.Size" type="System.Drawing.Size, System.Drawing"> - <value>0, 17</value> - </data> - <data name=">>toolSslBlank4.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolSslHttpPort.Name" xml:space="preserve"> - <value>toolSslHttpPort</value> - </data> - <data name="toolSslHttpPort.Size" type="System.Drawing.Size, System.Drawing"> - <value>0, 17</value> - </data> - <data name=">>toolSslHttpPort.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <value>137, 17</value> </data> <data name="toolSslHttpPortLab.Font" type="System.Drawing.Font, System.Drawing"> <value>微软雅黑, 8pt</value> </data> - <data name=">>toolSslHttpPortLab.Name" xml:space="preserve"> - <value>toolSslHttpPortLab</value> - </data> <data name="toolSslHttpPortLab.Size" type="System.Drawing.Size, System.Drawing"> <value>39, 17</value> </data> <data name="toolSslHttpPortLab.Text" xml:space="preserve"> <value>HTTP:</value> </data> - <data name=">>toolSslHttpPortLab.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolSslPacPort.Name" xml:space="preserve"> - <value>toolSslPacPort</value> - </data> - <data name="toolSslPacPort.Size" type="System.Drawing.Size, System.Drawing"> + <data name="toolSslHttpPort.Size" type="System.Drawing.Size, System.Drawing"> <value>0, 17</value> </data> - <data name=">>toolSslPacPort.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="toolSslBlank2.Font" type="System.Drawing.Font, System.Drawing"> + <value>微软雅黑, 8pt</value> + </data> + <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing"> + <value>137, 17</value> </data> <data name="toolSslPacPortLab.Font" type="System.Drawing.Font, System.Drawing"> <value>微软雅黑, 8pt</value> </data> - <data name=">>toolSslPacPortLab.Name" xml:space="preserve"> - <value>toolSslPacPortLab</value> - </data> <data name="toolSslPacPortLab.Size" type="System.Drawing.Size, System.Drawing"> <value>33, 17</value> </data> <data name="toolSslPacPortLab.Text" xml:space="preserve"> <value>PAC:</value> </data> - <data name=">>toolSslPacPortLab.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="toolSslPacPort.Size" type="System.Drawing.Size, System.Drawing"> + <value>0, 17</value> + </data> + <data name="toolSslBlank3.Font" type="System.Drawing.Font, System.Drawing"> + <value>微软雅黑, 8pt</value> + </data> + <data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing"> + <value>137, 17</value> + </data> + <data name="toolSslRouting.AutoSize" type="System.Boolean, mscorlib"> + <value>False</value> + </data> + <data name="toolSslRouting.Size" type="System.Drawing.Size, System.Drawing"> + <value>129, 17</value> + </data> + <data name="toolSslRouting.Text" xml:space="preserve"> + <value>Routing Mode</value> </data> <data name="toolSslServerLatency.AutoSize" type="System.Boolean, mscorlib"> <value>False</value> </data> - <data name=">>toolSslServerLatency.Name" xml:space="preserve"> - <value>toolSslServerLatency</value> - </data> <data name="toolSslServerLatency.Size" type="System.Drawing.Size, System.Drawing"> - <value>144, 17</value> + <value>137, 17</value> </data> <data name="toolSslServerLatency.Text" xml:space="preserve"> <value>Latency:</value> @@ -989,23 +674,14 @@ <data name="toolSslServerLatency.ToolTipText" xml:space="preserve"> <value>The http proxy's latency time.</value> </data> - <data name=">>toolSslServerLatency.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="toolSslServerSpeed.AutoSize" type="System.Boolean, mscorlib"> - <value>False</value> - </data> <data name="toolSslServerSpeed.Font" type="System.Drawing.Font, System.Drawing"> <value>微软雅黑, 8pt</value> </data> - <data name=">>toolSslServerSpeed.Name" xml:space="preserve"> - <value>toolSslServerSpeed</value> - </data> <data name="toolSslServerSpeed.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms"> <value>No</value> </data> <data name="toolSslServerSpeed.Size" type="System.Drawing.Size, System.Drawing"> - <value>200, 17</value> + <value>89, 17</value> </data> <data name="toolSslServerSpeed.Text" xml:space="preserve"> <value>SPEED Disabled</value> @@ -1013,337 +689,138 @@ <data name="toolSslServerSpeed.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <value>MiddleRight</value> </data> - <data name=">>toolSslServerSpeed.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolSslSocksPort.Name" xml:space="preserve"> - <value>toolSslSocksPort</value> - </data> - <data name="toolSslSocksPort.Size" type="System.Drawing.Size, System.Drawing"> + <data name="toolSslBlank4.Size" type="System.Drawing.Size, System.Drawing"> <value>0, 17</value> </data> - <data name=">>toolSslSocksPort.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="ssMain.Location" type="System.Drawing.Point, System.Drawing"> + <value>3, 151</value> </data> - <data name="toolSslSocksPortLab.Font" type="System.Drawing.Font, System.Drawing"> - <value>微软雅黑, 8pt</value> + <data name="ssMain.Size" type="System.Drawing.Size, System.Drawing"> + <value>946, 22</value> </data> - <data name=">>toolSslSocksPortLab.Name" xml:space="preserve"> - <value>toolSslSocksPortLab</value> + <data name="ssMain.TabIndex" type="System.Int32, mscorlib"> + <value>0</value> </data> - <data name="toolSslSocksPortLab.Size" type="System.Drawing.Size, System.Drawing"> - <value>52, 17</value> + <data name="ssMain.Text" xml:space="preserve"> + <value>statusStrip1</value> </data> - <data name="toolSslSocksPortLab.Text" xml:space="preserve"> - <value>SOCKS5:</value> + <data name=">>ssMain.Name" xml:space="preserve"> + <value>ssMain</value> </data> - <data name=">>toolSslSocksPortLab.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name=">>ssMain.Type" xml:space="preserve"> + <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>toolStripSeparator1.Name" xml:space="preserve"> - <value>toolStripSeparator1</value> + <data name=">>ssMain.Parent" xml:space="preserve"> + <value>groupBox2</value> </data> - <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing"> - <value>352, 6</value> + <data name=">>ssMain.ZOrder" xml:space="preserve"> + <value>1</value> </data> - <data name=">>toolStripSeparator1.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Bottom</value> </data> - <data name=">>toolStripSeparator10.Name" xml:space="preserve"> - <value>toolStripSeparator10</value> + <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing"> + <value>0, 417</value> </data> - <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing"> - <value>6, 56</value> + <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing"> + <value>952, 176</value> </data> - <data name=">>toolStripSeparator10.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="groupBox2.TabIndex" type="System.Int32, mscorlib"> + <value>3</value> </data> - <data name=">>toolStripSeparator11.Name" xml:space="preserve"> - <value>toolStripSeparator11</value> + <data name="groupBox2.Text" xml:space="preserve"> + <value>Informations</value> </data> - <data name="toolStripSeparator11.Size" type="System.Drawing.Size, System.Drawing"> - <value>6, 56</value> + <data name=">>groupBox2.Name" xml:space="preserve"> + <value>groupBox2</value> </data> - <data name=">>toolStripSeparator11.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name=">>groupBox2.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=">>toolStripSeparator12.Name" xml:space="preserve"> - <value>toolStripSeparator12</value> + <data name=">>groupBox2.Parent" xml:space="preserve"> + <value>$this</value> </data> - <data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing"> - <value>184, 6</value> + <data name=">>groupBox2.ZOrder" xml:space="preserve"> + <value>3</value> </data> - <data name=">>toolStripSeparator12.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Top</value> </data> - <data name=">>toolStripSeparator13.Name" xml:space="preserve"> - <value>toolStripSeparator13</value> + <data name="panel1.Location" type="System.Drawing.Point, System.Drawing"> + <value>0, 56</value> </data> - <data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing"> - <value>390, 6</value> + <data name="panel1.Size" type="System.Drawing.Size, System.Drawing"> + <value>952, 10</value> </data> - <data name=">>toolStripSeparator13.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="panel1.TabIndex" type="System.Int32, mscorlib"> + <value>2</value> </data> - <data name=">>toolStripSeparator2.Name" xml:space="preserve"> - <value>toolStripSeparator2</value> + <data name=">>panel1.Name" xml:space="preserve"> + <value>panel1</value> </data> - <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing"> - <value>261, 6</value> + <data name=">>panel1.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=">>toolStripSeparator2.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name=">>panel1.Parent" xml:space="preserve"> + <value>$this</value> </data> - <data name=">>toolStripSeparator3.Name" xml:space="preserve"> - <value>toolStripSeparator3</value> + <data name=">>panel1.ZOrder" xml:space="preserve"> + <value>4</value> </data> - <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing"> - <value>352, 6</value> + <metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>409, 17</value> + </metadata> + <data name="tsMain.Location" type="System.Drawing.Point, System.Drawing"> + <value>0, 0</value> </data> - <data name=">>toolStripSeparator3.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="tsMain.Size" type="System.Drawing.Size, System.Drawing"> + <value>952, 56</value> </data> - <data name=">>toolStripSeparator4.Name" xml:space="preserve"> - <value>toolStripSeparator4</value> + <data name="tsMain.TabIndex" type="System.Int32, mscorlib"> + <value>1</value> + </data> + <data name=">>tsMain.Name" xml:space="preserve"> + <value>tsMain</value> + </data> + <data name=">>tsMain.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsMain.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>tsMain.ZOrder" xml:space="preserve"> + <value>5</value> </data> <data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing"> <value>6, 56</value> </data> - <data name=">>toolStripSeparator4.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolStripSeparator5.Name" xml:space="preserve"> - <value>toolStripSeparator5</value> - </data> - <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing"> - <value>6, 56</value> - </data> - <data name=">>toolStripSeparator5.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolStripSeparator6.Name" xml:space="preserve"> - <value>toolStripSeparator6</value> - </data> - <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing"> - <value>352, 6</value> - </data> - <data name=">>toolStripSeparator6.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolStripSeparator7.Name" xml:space="preserve"> - <value>toolStripSeparator7</value> - </data> - <data name="toolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing"> - <value>6, 56</value> - </data> - <data name=">>toolStripSeparator7.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolStripSeparator8.Name" xml:space="preserve"> - <value>toolStripSeparator8</value> - </data> - <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing"> - <value>6, 56</value> - </data> - <data name=">>toolStripSeparator8.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>toolStripSeparator9.Name" xml:space="preserve"> - <value>toolStripSeparator9</value> - </data> - <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing"> - <value>352, 6</value> - </data> - <data name=">>toolStripSeparator9.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbAbout.Name" xml:space="preserve"> - <value>tsbAbout</value> - </data> - <data name="tsbAbout.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="tsbAbout.Text" xml:space="preserve"> - <value>v2rayN Project</value> - </data> - <data name=">>tsbAbout.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbCheckClearPACList.Name" xml:space="preserve"> - <value>tsbCheckClearPACList</value> - </data> - <data name="tsbCheckClearPACList.Size" type="System.Drawing.Size, System.Drawing"> - <value>393, 22</value> - </data> - <data name="tsbCheckClearPACList.Text" xml:space="preserve"> - <value>Simplify PAC (need to set Core route)</value> - </data> - <data name=">>tsbCheckClearPACList.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="tsbCheckUpdate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> + <data name="tsbSub.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> </data> - <data name=">>tsbCheckUpdate.Name" xml:space="preserve"> - <value>tsbCheckUpdate</value> + <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing"> + <value>99, 53</value> </data> - <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing"> - <value>128, 53</value> + <data name="tsbSub.Text" xml:space="preserve"> + <value>Subscriptions</value> </data> - <data name="tsbCheckUpdate.Text" xml:space="preserve"> - <value>Check for updates</value> - </data> - <data name="tsbCheckUpdate.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> + <data name="tsbSub.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> <value>ImageAboveText</value> </data> - <data name=">>tsbCheckUpdate.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing"> + <value>125, 22</value> </data> - <data name=">>tsbCheckUpdateCore.Name" xml:space="preserve"> - <value>tsbCheckUpdateCore</value> - </data> - <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing"> - <value>393, 22</value> - </data> - <data name="tsbCheckUpdateCore.Text" xml:space="preserve"> - <value>Update v2rayCore</value> - </data> - <data name=">>tsbCheckUpdateCore.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbCheckUpdateN.Name" xml:space="preserve"> - <value>tsbCheckUpdateN</value> - </data> - <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing"> - <value>393, 22</value> - </data> - <data name="tsbCheckUpdateN.Text" xml:space="preserve"> - <value>v2rayN (this software)</value> - </data> - <data name=">>tsbCheckUpdateN.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbCheckUpdatePACList.Name" xml:space="preserve"> - <value>tsbCheckUpdatePACList</value> - </data> - <data name="tsbCheckUpdatePACList.Size" type="System.Drawing.Size, System.Drawing"> - <value>393, 22</value> - </data> - <data name="tsbCheckUpdatePACList.Text" xml:space="preserve"> - <value>Check for updated PAC (need the HTTP proxy are ON)</value> - </data> - <data name=">>tsbCheckUpdatePACList.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="tsbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/ - GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg== -</value> - </data> - <data name="tsbClose.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> - <value>Magenta</value> - </data> - <data name=">>tsbClose.Name" xml:space="preserve"> - <value>tsbClose</value> - </data> - <data name="tsbClose.Size" type="System.Drawing.Size, System.Drawing"> - <value>52, 53</value> - </data> - <data name="tsbClose.Text" xml:space="preserve"> - <value> Close </value> - </data> - <data name="tsbClose.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> - <value>ImageAboveText</value> - </data> - <data name=">>tsbClose.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="tsbHelp.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> - <value>Magenta</value> - </data> - <data name=">>tsbHelp.Name" xml:space="preserve"> - <value>tsbHelp</value> - </data> - <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing"> - <value>48, 53</value> - </data> - <data name="tsbHelp.Text" xml:space="preserve"> - <value>Help</value> - </data> - <data name="tsbHelp.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> - <value>ImageAboveText</value> - </data> - <data name=">>tsbHelp.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbLanguageDef.Name" xml:space="preserve"> - <value>tsbLanguageDef</value> - </data> - <data name="tsbLanguageDef.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="tsbLanguageDef.Text" xml:space="preserve"> - <value>Language-[English]</value> - </data> - <data name=">>tsbLanguageDef.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbLanguageZhHans.Name" xml:space="preserve"> - <value>tsbLanguageZhHans</value> - </data> - <data name="tsbLanguageZhHans.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="tsbLanguageZhHans.Text" xml:space="preserve"> - <value>语言-[中文简体]</value> - </data> - <data name=">>tsbLanguageZhHans.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="tsbOptionSetting.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> - <value>Magenta</value> - </data> - <data name=">>tsbOptionSetting.Name" xml:space="preserve"> - <value>tsbOptionSetting</value> - </data> - <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing"> - <value>58, 53</value> - </data> - <data name="tsbOptionSetting.Text" xml:space="preserve"> + <data name="tsbSubSetting.Text" xml:space="preserve"> <value>Settings</value> </data> - <data name="tsbOptionSetting.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> - <value>ImageAboveText</value> + <data name="tsbSubUpdate.Size" type="System.Drawing.Size, System.Drawing"> + <value>125, 22</value> </data> - <data name=">>tsbOptionSetting.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="tsbPromotion.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> - <value>Magenta</value> - </data> - <data name=">>tsbPromotion.Name" xml:space="preserve"> - <value>tsbPromotion</value> - </data> - <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing"> - <value>89, 53</value> - </data> - <data name="tsbPromotion.Text" xml:space="preserve"> - <value> Promotion </value> - </data> - <data name="tsbPromotion.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> - <value>ImageAboveText</value> - </data> - <data name=">>tsbPromotion.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="tsbSubUpdate.Text" xml:space="preserve"> + <value>Updates</value> </data> <data name="tsbQRCodeSwitch.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> </data> - <data name=">>tsbQRCodeSwitch.Name" xml:space="preserve"> - <value>tsbQRCodeSwitch</value> - </data> <data name="tsbQRCodeSwitch.Size" type="System.Drawing.Size, System.Drawing"> <value>45, 53</value> </data> @@ -1356,8 +833,23 @@ <data name="tsbQRCodeSwitch.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> <value>ImageAboveText</value> </data> - <data name=">>tsbQRCodeSwitch.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing"> + <value>6, 56</value> + </data> + <data name="tsbOptionSetting.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> + <value>Magenta</value> + </data> + <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing"> + <value>58, 53</value> + </data> + <data name="tsbOptionSetting.Text" xml:space="preserve"> + <value>Settings</value> + </data> + <data name="tsbOptionSetting.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> + <value>ImageAboveText</value> + </data> + <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing"> + <value>6, 56</value> </data> <data name="tsbReload.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -1376,9 +868,6 @@ <data name="tsbReload.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> </data> - <data name=">>tsbReload.Name" xml:space="preserve"> - <value>tsbReload</value> - </data> <data name="tsbReload.Size" type="System.Drawing.Size, System.Drawing"> <value>97, 53</value> </data> @@ -1388,71 +877,68 @@ <data name="tsbReload.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> <value>ImageAboveText</value> </data> - <data name=">>tsbReload.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="toolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing"> + <value>6, 56</value> </data> - <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> + <data name="tsbCheckUpdate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> </data> - <data name=">>tsbServer.Name" xml:space="preserve"> - <value>tsbServer</value> + <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing"> + <value>128, 53</value> </data> - <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing"> - <value>64, 53</value> + <data name="tsbCheckUpdate.Text" xml:space="preserve"> + <value>Check for updates</value> </data> - <data name="tsbServer.Text" xml:space="preserve"> - <value>Servers</value> - </data> - <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> + <data name="tsbCheckUpdate.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> <value>ImageAboveText</value> </data> - <data name=">>tsbServer.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing"> + <value>393, 22</value> </data> - <data name="tsbSub.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> + <data name="tsbCheckUpdateN.Text" xml:space="preserve"> + <value>v2rayN (this software)</value> + </data> + <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing"> + <value>393, 22</value> + </data> + <data name="tsbCheckUpdateCore.Text" xml:space="preserve"> + <value>Update v2rayCore</value> + </data> + <data name="tsbCheckUpdatePACList.Size" type="System.Drawing.Size, System.Drawing"> + <value>393, 22</value> + </data> + <data name="tsbCheckUpdatePACList.Text" xml:space="preserve"> + <value>Check for updated PAC (need the HTTP proxy are ON)</value> + </data> + <data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing"> + <value>390, 6</value> + </data> + <data name="tsbCheckClearPACList.Size" type="System.Drawing.Size, System.Drawing"> + <value>393, 22</value> + </data> + <data name="tsbCheckClearPACList.Text" xml:space="preserve"> + <value>Simplify PAC (need to set Core route)</value> + </data> + <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing"> + <value>6, 56</value> + </data> + <data name="tsbHelp.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> </data> - <data name=">>tsbSub.Name" xml:space="preserve"> - <value>tsbSub</value> + <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing"> + <value>48, 53</value> </data> - <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing"> - <value>99, 53</value> + <data name="tsbHelp.Text" xml:space="preserve"> + <value>Help</value> </data> - <data name="tsbSub.Text" xml:space="preserve"> - <value>Subscriptions</value> - </data> - <data name="tsbSub.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> + <data name="tsbHelp.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> <value>ImageAboveText</value> </data> - <data name=">>tsbSub.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="tsbAbout.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> </data> - <data name=">>tsbSubSetting.Name" xml:space="preserve"> - <value>tsbSubSetting</value> - </data> - <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing"> - <value>125, 22</value> - </data> - <data name="tsbSubSetting.Text" xml:space="preserve"> - <value>Settings</value> - </data> - <data name=">>tsbSubSetting.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbSubUpdate.Name" xml:space="preserve"> - <value>tsbSubUpdate</value> - </data> - <data name="tsbSubUpdate.Size" type="System.Drawing.Size, System.Drawing"> - <value>125, 22</value> - </data> - <data name="tsbSubUpdate.Text" xml:space="preserve"> - <value>Updates</value> - </data> - <data name=">>tsbSubUpdate.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>tsbV2rayWebsite.Name" xml:space="preserve"> - <value>tsbV2rayWebsite</value> + <data name="tsbAbout.Text" xml:space="preserve"> + <value>v2rayN Project</value> </data> <data name="tsbV2rayWebsite.Size" type="System.Drawing.Size, System.Drawing"> <value>187, 22</value> @@ -1460,61 +946,587 @@ <data name="tsbV2rayWebsite.Text" xml:space="preserve"> <value>V2Ray Website</value> </data> + <data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing"> + <value>184, 6</value> + </data> + <data name="tsbLanguageDef.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="tsbLanguageDef.Text" xml:space="preserve"> + <value>Language-[English]</value> + </data> + <data name="tsbLanguageZhHans.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="tsbLanguageZhHans.Text" xml:space="preserve"> + <value>语言-[中文简体]</value> + </data> + <data name="tsbPromotion.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> + <value>Magenta</value> + </data> + <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing"> + <value>89, 53</value> + </data> + <data name="tsbPromotion.Text" xml:space="preserve"> + <value> Promotion </value> + </data> + <data name="tsbPromotion.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> + <value>ImageAboveText</value> + </data> + <data name="toolStripSeparator11.Size" type="System.Drawing.Size, System.Drawing"> + <value>6, 56</value> + </data> + <data name="tsbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/ + GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg== +</value> + </data> + <data name="tsbClose.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> + <value>Magenta</value> + </data> + <data name="tsbClose.Size" type="System.Drawing.Size, System.Drawing"> + <value>52, 53</value> + </data> + <data name="tsbClose.Text" xml:space="preserve"> + <value> Close </value> + </data> + <data name="tsbClose.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms"> + <value>ImageAboveText</value> + </data> + <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>108</value> + </metadata> + <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> + <value>6, 12</value> + </data> + <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> + <value>952, 593</value> + </data> + <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <value>4, 4, 4, 4</value> + </data> + <data name="$this.Text" xml:space="preserve"> + <value>v2rayN</value> + </data> + <data name=">>menuAddVmessServer.Name" xml:space="preserve"> + <value>menuAddVmessServer</value> + </data> + <data name=">>menuAddVmessServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuAddShadowsocksServer.Name" xml:space="preserve"> + <value>menuAddShadowsocksServer</value> + </data> + <data name=">>menuAddShadowsocksServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuAddSocksServer.Name" xml:space="preserve"> + <value>menuAddSocksServer</value> + </data> + <data name=">>menuAddSocksServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuAddCustomServer.Name" xml:space="preserve"> + <value>menuAddCustomServer</value> + </data> + <data name=">>menuAddCustomServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuAddServers.Name" xml:space="preserve"> + <value>menuAddServers</value> + </data> + <data name=">>menuAddServers.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuScanScreen.Name" xml:space="preserve"> + <value>menuScanScreen</value> + </data> + <data name=">>menuScanScreen.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator1.Name" xml:space="preserve"> + <value>toolStripSeparator1</value> + </data> + <data name=">>toolStripSeparator1.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuRemoveServer.Name" xml:space="preserve"> + <value>menuRemoveServer</value> + </data> + <data name=">>menuRemoveServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuRemoveDuplicateServer.Name" xml:space="preserve"> + <value>menuRemoveDuplicateServer</value> + </data> + <data name=">>menuRemoveDuplicateServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuCopyServer.Name" xml:space="preserve"> + <value>menuCopyServer</value> + </data> + <data name=">>menuCopyServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuSetDefaultServer.Name" xml:space="preserve"> + <value>menuSetDefaultServer</value> + </data> + <data name=">>menuSetDefaultServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator3.Name" xml:space="preserve"> + <value>toolStripSeparator3</value> + </data> + <data name=">>toolStripSeparator3.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuMoveTop.Name" xml:space="preserve"> + <value>menuMoveTop</value> + </data> + <data name=">>menuMoveTop.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuMoveUp.Name" xml:space="preserve"> + <value>menuMoveUp</value> + </data> + <data name=">>menuMoveUp.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuMoveDown.Name" xml:space="preserve"> + <value>menuMoveDown</value> + </data> + <data name=">>menuMoveDown.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuMoveBottom.Name" xml:space="preserve"> + <value>menuMoveBottom</value> + </data> + <data name=">>menuMoveBottom.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuSelectAll.Name" xml:space="preserve"> + <value>menuSelectAll</value> + </data> + <data name=">>menuSelectAll.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator9.Name" xml:space="preserve"> + <value>toolStripSeparator9</value> + </data> + <data name=">>toolStripSeparator9.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuPingServer.Name" xml:space="preserve"> + <value>menuPingServer</value> + </data> + <data name=">>menuPingServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuTcpingServer.Name" xml:space="preserve"> + <value>menuTcpingServer</value> + </data> + <data name=">>menuTcpingServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuRealPingServer.Name" xml:space="preserve"> + <value>menuRealPingServer</value> + </data> + <data name=">>menuRealPingServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuSpeedServer.Name" xml:space="preserve"> + <value>menuSpeedServer</value> + </data> + <data name=">>menuSpeedServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuTestMe.Name" xml:space="preserve"> + <value>menuTestMe</value> + </data> + <data name=">>menuTestMe.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator6.Name" xml:space="preserve"> + <value>toolStripSeparator6</value> + </data> + <data name=">>toolStripSeparator6.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuExport2ClientConfig.Name" xml:space="preserve"> + <value>menuExport2ClientConfig</value> + </data> + <data name=">>menuExport2ClientConfig.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuExport2ServerConfig.Name" xml:space="preserve"> + <value>menuExport2ServerConfig</value> + </data> + <data name=">>menuExport2ServerConfig.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuExport2ShareUrl.Name" xml:space="preserve"> + <value>menuExport2ShareUrl</value> + </data> + <data name=">>menuExport2ShareUrl.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuExport2SubContent.Name" xml:space="preserve"> + <value>menuExport2SubContent</value> + </data> + <data name=">>menuExport2SubContent.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbServer.Name" xml:space="preserve"> + <value>tsbServer</value> + </data> + <data name=">>tsbServer.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>notifyMain.Name" xml:space="preserve"> + <value>notifyMain</value> + </data> + <data name=">>notifyMain.Type" xml:space="preserve"> + <value>System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuSysAgentMode.Name" xml:space="preserve"> + <value>menuSysAgentMode</value> + </data> + <data name=">>menuSysAgentMode.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuNotEnabledHttp.Name" xml:space="preserve"> + <value>menuNotEnabledHttp</value> + </data> + <data name=">>menuNotEnabledHttp.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuGlobal.Name" xml:space="preserve"> + <value>menuGlobal</value> + </data> + <data name=">>menuGlobal.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuGlobalPAC.Name" xml:space="preserve"> + <value>menuGlobalPAC</value> + </data> + <data name=">>menuGlobalPAC.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuKeep.Name" xml:space="preserve"> + <value>menuKeep</value> + </data> + <data name=">>menuKeep.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuKeepPAC.Name" xml:space="preserve"> + <value>menuKeepPAC</value> + </data> + <data name=">>menuKeepPAC.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuKeepNothing.Name" xml:space="preserve"> + <value>menuKeepNothing</value> + </data> + <data name=">>menuKeepNothing.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuKeepPACNothing.Name" xml:space="preserve"> + <value>menuKeepPACNothing</value> + </data> + <data name=">>menuKeepPACNothing.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuServers.Name" xml:space="preserve"> + <value>menuServers</value> + </data> + <data name=">>menuServers.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuAddServers2.Name" xml:space="preserve"> + <value>menuAddServers2</value> + </data> + <data name=">>menuAddServers2.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuScanScreen2.Name" xml:space="preserve"> + <value>menuScanScreen2</value> + </data> + <data name=">>menuScanScreen2.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuCopyPACUrl.Name" xml:space="preserve"> + <value>menuCopyPACUrl</value> + </data> + <data name=">>menuCopyPACUrl.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuUpdateSubscriptions.Name" xml:space="preserve"> + <value>menuUpdateSubscriptions</value> + </data> + <data name=">>menuUpdateSubscriptions.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator2.Name" xml:space="preserve"> + <value>toolStripSeparator2</value> + </data> + <data name=">>toolStripSeparator2.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>menuExit.Name" xml:space="preserve"> + <value>menuExit</value> + </data> + <data name=">>menuExit.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>bgwScan.Name" xml:space="preserve"> + <value>bgwScan</value> + </data> + <data name=">>bgwScan.Type" xml:space="preserve"> + <value>System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslSocksPortLab.Name" xml:space="preserve"> + <value>toolSslSocksPortLab</value> + </data> + <data name=">>toolSslSocksPortLab.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslSocksPort.Name" xml:space="preserve"> + <value>toolSslSocksPort</value> + </data> + <data name=">>toolSslSocksPort.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslBlank1.Name" xml:space="preserve"> + <value>toolSslBlank1</value> + </data> + <data name=">>toolSslBlank1.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslHttpPortLab.Name" xml:space="preserve"> + <value>toolSslHttpPortLab</value> + </data> + <data name=">>toolSslHttpPortLab.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslHttpPort.Name" xml:space="preserve"> + <value>toolSslHttpPort</value> + </data> + <data name=">>toolSslHttpPort.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslBlank2.Name" xml:space="preserve"> + <value>toolSslBlank2</value> + </data> + <data name=">>toolSslBlank2.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslPacPortLab.Name" xml:space="preserve"> + <value>toolSslPacPortLab</value> + </data> + <data name=">>toolSslPacPortLab.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslPacPort.Name" xml:space="preserve"> + <value>toolSslPacPort</value> + </data> + <data name=">>toolSslPacPort.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslBlank3.Name" xml:space="preserve"> + <value>toolSslBlank3</value> + </data> + <data name=">>toolSslBlank3.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslRouting.Name" xml:space="preserve"> + <value>toolSslRouting</value> + </data> + <data name=">>toolSslRouting.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslServerLatency.Name" xml:space="preserve"> + <value>toolSslServerLatency</value> + </data> + <data name=">>toolSslServerLatency.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslServerSpeed.Name" xml:space="preserve"> + <value>toolSslServerSpeed</value> + </data> + <data name=">>toolSslServerSpeed.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolSslBlank4.Name" xml:space="preserve"> + <value>toolSslBlank4</value> + </data> + <data name=">>toolSslBlank4.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator4.Name" xml:space="preserve"> + <value>toolStripSeparator4</value> + </data> + <data name=">>toolStripSeparator4.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbSub.Name" xml:space="preserve"> + <value>tsbSub</value> + </data> + <data name=">>tsbSub.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbSubSetting.Name" xml:space="preserve"> + <value>tsbSubSetting</value> + </data> + <data name=">>tsbSubSetting.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbSubUpdate.Name" xml:space="preserve"> + <value>tsbSubUpdate</value> + </data> + <data name=">>tsbSubUpdate.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbQRCodeSwitch.Name" xml:space="preserve"> + <value>tsbQRCodeSwitch</value> + </data> + <data name=">>tsbQRCodeSwitch.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator8.Name" xml:space="preserve"> + <value>toolStripSeparator8</value> + </data> + <data name=">>toolStripSeparator8.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbOptionSetting.Name" xml:space="preserve"> + <value>tsbOptionSetting</value> + </data> + <data name=">>tsbOptionSetting.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator5.Name" xml:space="preserve"> + <value>toolStripSeparator5</value> + </data> + <data name=">>toolStripSeparator5.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbReload.Name" xml:space="preserve"> + <value>tsbReload</value> + </data> + <data name=">>tsbReload.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator7.Name" xml:space="preserve"> + <value>toolStripSeparator7</value> + </data> + <data name=">>toolStripSeparator7.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbCheckUpdate.Name" xml:space="preserve"> + <value>tsbCheckUpdate</value> + </data> + <data name=">>tsbCheckUpdate.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbCheckUpdateN.Name" xml:space="preserve"> + <value>tsbCheckUpdateN</value> + </data> + <data name=">>tsbCheckUpdateN.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbCheckUpdateCore.Name" xml:space="preserve"> + <value>tsbCheckUpdateCore</value> + </data> + <data name=">>tsbCheckUpdateCore.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbCheckUpdatePACList.Name" xml:space="preserve"> + <value>tsbCheckUpdatePACList</value> + </data> + <data name=">>tsbCheckUpdatePACList.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator13.Name" xml:space="preserve"> + <value>toolStripSeparator13</value> + </data> + <data name=">>toolStripSeparator13.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbCheckClearPACList.Name" xml:space="preserve"> + <value>tsbCheckClearPACList</value> + </data> + <data name=">>tsbCheckClearPACList.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>toolStripSeparator10.Name" xml:space="preserve"> + <value>toolStripSeparator10</value> + </data> + <data name=">>toolStripSeparator10.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbHelp.Name" xml:space="preserve"> + <value>tsbHelp</value> + </data> + <data name=">>tsbHelp.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbAbout.Name" xml:space="preserve"> + <value>tsbAbout</value> + </data> + <data name=">>tsbAbout.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tsbV2rayWebsite.Name" xml:space="preserve"> + <value>tsbV2rayWebsite</value> + </data> <data name=">>tsbV2rayWebsite.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="tsMain.Location" type="System.Drawing.Point, System.Drawing"> - <value>0, 0</value> + <data name=">>toolStripSeparator12.Name" xml:space="preserve"> + <value>toolStripSeparator12</value> </data> - <data name=">>tsMain.Name" xml:space="preserve"> - <value>tsMain</value> + <data name=">>toolStripSeparator12.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>tsMain.Parent" xml:space="preserve"> - <value>$this</value> + <data name=">>tsbLanguageDef.Name" xml:space="preserve"> + <value>tsbLanguageDef</value> </data> - <data name="tsMain.Size" type="System.Drawing.Size, System.Drawing"> - <value>952, 56</value> + <data name=">>tsbLanguageDef.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="tsMain.TabIndex" type="System.Int32, mscorlib"> - <value>1</value> + <data name=">>tsbLanguageZhHans.Name" xml:space="preserve"> + <value>tsbLanguageZhHans</value> </data> - <data name=">>tsMain.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name=">>tsbLanguageZhHans.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>tsMain.ZOrder" xml:space="preserve"> - <value>5</value> + <data name=">>tsbPromotion.Name" xml:space="preserve"> + <value>tsbPromotion</value> </data> - <data name="txtMsgBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> + <data name=">>tsbPromotion.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="txtMsgBox.Location" type="System.Drawing.Point, System.Drawing"> - <value>3, 17</value> + <data name=">>toolStripSeparator11.Name" xml:space="preserve"> + <value>toolStripSeparator11</value> </data> - <data name="txtMsgBox.MaxLength" type="System.Int32, mscorlib"> - <value>0</value> + <data name=">>toolStripSeparator11.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="txtMsgBox.Multiline" type="System.Boolean, mscorlib"> - <value>True</value> + <data name=">>tsbClose.Name" xml:space="preserve"> + <value>tsbClose</value> </data> - <data name=">>txtMsgBox.Name" xml:space="preserve"> - <value>txtMsgBox</value> + <data name=">>tsbClose.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>txtMsgBox.Parent" xml:space="preserve"> - <value>groupBox2</value> + <data name=">>$this.Name" xml:space="preserve"> + <value>MainForm</value> </data> - <data name="txtMsgBox.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms"> - <value>Vertical</value> - </data> - <data name="txtMsgBox.Size" type="System.Drawing.Size, System.Drawing"> - <value>946, 134</value> - </data> - <data name="txtMsgBox.TabIndex" type="System.Int32, mscorlib"> - <value>3</value> - </data> - <data name=">>txtMsgBox.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=">>txtMsgBox.ZOrder" xml:space="preserve"> - <value>0</value> + <data name=">>$this.Type" xml:space="preserve"> + <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value> </data> </root> \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx index 3268c19e..71c3ad06 100644 --- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx @@ -363,12 +363,24 @@ <data name="menuTcpingServer.Text" xml:space="preserve"> <value>测试服务器延迟Tcping(多选) (Ctrl+O)</value> </data> + <data name="menuTestMe.Text" xml:space="preserve"> + <value>测试当前服务节点状态</value> + </data> <data name="menuUpdateSubscriptions.Size" type="System.Drawing.Size, System.Drawing"> <value>195, 22</value> </data> <data name="menuUpdateSubscriptions.Text" xml:space="preserve"> <value>更新订阅</value> </data> + <data name="toolSslRouting.Text" xml:space="preserve"> + <value>路由模式</value> + </data> + <data name="toolSslServerLatency.Text" xml:space="preserve"> + <value>延迟:</value> + </data> + <data name="toolSslServerLatency.ToolTipText" xml:space="preserve"> + <value>当前 HTTP 代理的访问延迟。</value> + </data> <data name="toolSslServerSpeed.Text" xml:space="preserve"> <value>网速显示未启用</value> </data> diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs index 7c009fc6..6f80e585 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs @@ -31,7 +31,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionSettingForm)); this.btnClose = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabBasic = new System.Windows.Forms.TabPage(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.label16 = new System.Windows.Forms.Label(); this.cmblistenerType = new System.Windows.Forms.ComboBox(); @@ -53,7 +53,7 @@ this.label5 = new System.Windows.Forms.Label(); this.txtlocalPort = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); - this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tabRouting = new System.Windows.Forms.TabPage(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.tabControl2 = new System.Windows.Forms.TabControl(); this.tabPage3 = new System.Windows.Forms.TabPage(); @@ -62,14 +62,14 @@ this.txtUserdirect = new System.Windows.Forms.TextBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); this.txtUserblock = new System.Windows.Forms.TextBox(); - this.tabPage8 = new System.Windows.Forms.TabPage(); + this.tabPreDefinedRules = new System.Windows.Forms.TabPage(); this.cmbroutingMode = new System.Windows.Forms.ComboBox(); this.panel3 = new System.Windows.Forms.Panel(); this.linkLabelRoutingDoc = new System.Windows.Forms.LinkLabel(); this.btnSetDefRountingRule = new System.Windows.Forms.Button(); this.labRoutingTips = new System.Windows.Forms.Label(); this.cmbdomainStrategy = new System.Windows.Forms.ComboBox(); - this.tabPage6 = new System.Windows.Forms.TabPage(); + this.tabKCP = new System.Windows.Forms.TabPage(); this.chkKcpcongestion = new System.Windows.Forms.CheckBox(); this.txtKcpwriteBufferSize = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); @@ -83,7 +83,7 @@ this.label7 = new System.Windows.Forms.Label(); this.txtKcpmtu = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); - this.tabPage7 = new System.Windows.Forms.TabPage(); + this.tabGUI = new System.Windows.Forms.TabPage(); this.chkKeepOlderDedupl = new System.Windows.Forms.CheckBox(); this.cbFreshrate = new System.Windows.Forms.ComboBox(); this.lbFreshrate = new System.Windows.Forms.Label(); @@ -92,7 +92,7 @@ this.txturlGFWList = new System.Windows.Forms.TextBox(); this.label13 = new System.Windows.Forms.Label(); this.chkAutoRun = new System.Windows.Forms.CheckBox(); - this.tabPage9 = new System.Windows.Forms.TabPage(); + this.tabUserPAC = new System.Windows.Forms.TabPage(); this.txtuserPacRule = new System.Windows.Forms.TextBox(); this.panel4 = new System.Windows.Forms.Panel(); this.label4 = new System.Windows.Forms.Label(); @@ -100,19 +100,19 @@ this.btnOK = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); + this.tabBasic.SuspendLayout(); this.groupBox1.SuspendLayout(); - this.tabPage2.SuspendLayout(); + this.tabRouting.SuspendLayout(); this.groupBox2.SuspendLayout(); this.tabControl2.SuspendLayout(); this.tabPage3.SuspendLayout(); this.tabPage4.SuspendLayout(); this.tabPage5.SuspendLayout(); - this.tabPage8.SuspendLayout(); + this.tabPreDefinedRules.SuspendLayout(); this.panel3.SuspendLayout(); - this.tabPage6.SuspendLayout(); - this.tabPage7.SuspendLayout(); - this.tabPage9.SuspendLayout(); + this.tabKCP.SuspendLayout(); + this.tabGUI.SuspendLayout(); + this.tabUserPAC.SuspendLayout(); this.panel4.SuspendLayout(); this.panel2.SuspendLayout(); this.SuspendLayout(); @@ -127,21 +127,21 @@ // // tabControl1 // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage6); - this.tabControl1.Controls.Add(this.tabPage7); - this.tabControl1.Controls.Add(this.tabPage9); + this.tabControl1.Controls.Add(this.tabBasic); + this.tabControl1.Controls.Add(this.tabRouting); + this.tabControl1.Controls.Add(this.tabKCP); + this.tabControl1.Controls.Add(this.tabGUI); + this.tabControl1.Controls.Add(this.tabUserPAC); resources.ApplyResources(this.tabControl1, "tabControl1"); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; // - // tabPage1 + // tabBasic // - this.tabPage1.Controls.Add(this.groupBox1); - resources.ApplyResources(this.tabPage1, "tabPage1"); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.UseVisualStyleBackColor = true; + this.tabBasic.Controls.Add(this.groupBox1); + resources.ApplyResources(this.tabBasic, "tabBasic"); + this.tabBasic.Name = "tabBasic"; + this.tabBasic.UseVisualStyleBackColor = true; // // groupBox1 // @@ -305,12 +305,12 @@ resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; // - // tabPage2 + // tabRouting // - this.tabPage2.Controls.Add(this.groupBox2); - resources.ApplyResources(this.tabPage2, "tabPage2"); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.UseVisualStyleBackColor = true; + this.tabRouting.Controls.Add(this.groupBox2); + resources.ApplyResources(this.tabRouting, "tabRouting"); + this.tabRouting.Name = "tabRouting"; + this.tabRouting.UseVisualStyleBackColor = true; // // groupBox2 // @@ -325,7 +325,7 @@ this.tabControl2.Controls.Add(this.tabPage3); this.tabControl2.Controls.Add(this.tabPage4); this.tabControl2.Controls.Add(this.tabPage5); - this.tabControl2.Controls.Add(this.tabPage8); + this.tabControl2.Controls.Add(this.tabPreDefinedRules); resources.ApplyResources(this.tabControl2, "tabControl2"); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; @@ -366,12 +366,12 @@ resources.ApplyResources(this.txtUserblock, "txtUserblock"); this.txtUserblock.Name = "txtUserblock"; // - // tabPage8 + // tabPreDefinedRules // - this.tabPage8.Controls.Add(this.cmbroutingMode); - resources.ApplyResources(this.tabPage8, "tabPage8"); - this.tabPage8.Name = "tabPage8"; - this.tabPage8.UseVisualStyleBackColor = true; + this.tabPreDefinedRules.Controls.Add(this.cmbroutingMode); + resources.ApplyResources(this.tabPreDefinedRules, "tabPreDefinedRules"); + this.tabPreDefinedRules.Name = "tabPreDefinedRules"; + this.tabPreDefinedRules.UseVisualStyleBackColor = true; // // cmbroutingMode // @@ -425,24 +425,24 @@ resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy"); this.cmbdomainStrategy.Name = "cmbdomainStrategy"; // - // tabPage6 + // tabKCP // - this.tabPage6.Controls.Add(this.chkKcpcongestion); - this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize); - this.tabPage6.Controls.Add(this.label10); - this.tabPage6.Controls.Add(this.txtKcpreadBufferSize); - this.tabPage6.Controls.Add(this.label11); - this.tabPage6.Controls.Add(this.txtKcpdownlinkCapacity); - this.tabPage6.Controls.Add(this.label8); - this.tabPage6.Controls.Add(this.txtKcpuplinkCapacity); - this.tabPage6.Controls.Add(this.label9); - this.tabPage6.Controls.Add(this.txtKcptti); - this.tabPage6.Controls.Add(this.label7); - this.tabPage6.Controls.Add(this.txtKcpmtu); - this.tabPage6.Controls.Add(this.label6); - resources.ApplyResources(this.tabPage6, "tabPage6"); - this.tabPage6.Name = "tabPage6"; - this.tabPage6.UseVisualStyleBackColor = true; + this.tabKCP.Controls.Add(this.chkKcpcongestion); + this.tabKCP.Controls.Add(this.txtKcpwriteBufferSize); + this.tabKCP.Controls.Add(this.label10); + this.tabKCP.Controls.Add(this.txtKcpreadBufferSize); + this.tabKCP.Controls.Add(this.label11); + this.tabKCP.Controls.Add(this.txtKcpdownlinkCapacity); + this.tabKCP.Controls.Add(this.label8); + this.tabKCP.Controls.Add(this.txtKcpuplinkCapacity); + this.tabKCP.Controls.Add(this.label9); + this.tabKCP.Controls.Add(this.txtKcptti); + this.tabKCP.Controls.Add(this.label7); + this.tabKCP.Controls.Add(this.txtKcpmtu); + this.tabKCP.Controls.Add(this.label6); + resources.ApplyResources(this.tabKCP, "tabKCP"); + this.tabKCP.Name = "tabKCP"; + this.tabKCP.UseVisualStyleBackColor = true; // // chkKcpcongestion // @@ -510,19 +510,19 @@ resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; // - // tabPage7 + // tabGUI // - this.tabPage7.Controls.Add(this.chkKeepOlderDedupl); - this.tabPage7.Controls.Add(this.cbFreshrate); - this.tabPage7.Controls.Add(this.lbFreshrate); - this.tabPage7.Controls.Add(this.chkEnableStatistics); - this.tabPage7.Controls.Add(this.chkAllowLANConn); - this.tabPage7.Controls.Add(this.txturlGFWList); - this.tabPage7.Controls.Add(this.label13); - this.tabPage7.Controls.Add(this.chkAutoRun); - resources.ApplyResources(this.tabPage7, "tabPage7"); - this.tabPage7.Name = "tabPage7"; - this.tabPage7.UseVisualStyleBackColor = true; + this.tabGUI.Controls.Add(this.chkKeepOlderDedupl); + this.tabGUI.Controls.Add(this.cbFreshrate); + this.tabGUI.Controls.Add(this.lbFreshrate); + this.tabGUI.Controls.Add(this.chkEnableStatistics); + this.tabGUI.Controls.Add(this.chkAllowLANConn); + this.tabGUI.Controls.Add(this.txturlGFWList); + this.tabGUI.Controls.Add(this.label13); + this.tabGUI.Controls.Add(this.chkAutoRun); + resources.ApplyResources(this.tabGUI, "tabGUI"); + this.tabGUI.Name = "tabGUI"; + this.tabGUI.UseVisualStyleBackColor = true; // // chkKeepOlderDedupl // @@ -570,13 +570,13 @@ this.chkAutoRun.Name = "chkAutoRun"; this.chkAutoRun.UseVisualStyleBackColor = true; // - // tabPage9 + // tabUserPAC // - this.tabPage9.Controls.Add(this.txtuserPacRule); - this.tabPage9.Controls.Add(this.panel4); - resources.ApplyResources(this.tabPage9, "tabPage9"); - this.tabPage9.Name = "tabPage9"; - this.tabPage9.UseVisualStyleBackColor = true; + this.tabUserPAC.Controls.Add(this.txtuserPacRule); + this.tabUserPAC.Controls.Add(this.panel4); + resources.ApplyResources(this.tabUserPAC, "tabUserPAC"); + this.tabUserPAC.Name = "tabUserPAC"; + this.tabUserPAC.UseVisualStyleBackColor = true; // // txtuserPacRule // @@ -626,10 +626,10 @@ this.Name = "OptionSettingForm"; this.Load += new System.EventHandler(this.OptionSettingForm_Load); this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); + this.tabBasic.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); - this.tabPage2.ResumeLayout(false); + this.tabRouting.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.tabControl2.ResumeLayout(false); this.tabPage3.ResumeLayout(false); @@ -638,15 +638,15 @@ this.tabPage4.PerformLayout(); this.tabPage5.ResumeLayout(false); this.tabPage5.PerformLayout(); - this.tabPage8.ResumeLayout(false); + this.tabPreDefinedRules.ResumeLayout(false); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); - this.tabPage6.ResumeLayout(false); - this.tabPage6.PerformLayout(); - this.tabPage7.ResumeLayout(false); - this.tabPage7.PerformLayout(); - this.tabPage9.ResumeLayout(false); - this.tabPage9.PerformLayout(); + this.tabKCP.ResumeLayout(false); + this.tabKCP.PerformLayout(); + this.tabGUI.ResumeLayout(false); + this.tabGUI.PerformLayout(); + this.tabUserPAC.ResumeLayout(false); + this.tabUserPAC.PerformLayout(); this.panel4.ResumeLayout(false); this.panel2.ResumeLayout(false); this.ResumeLayout(false); @@ -666,8 +666,8 @@ private System.Windows.Forms.CheckBox chkudpEnabled; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TabPage tabBasic; + private System.Windows.Forms.TabPage tabRouting; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.ComboBox cmbprotocol; @@ -686,7 +686,7 @@ private System.Windows.Forms.TabPage tabPage5; private System.Windows.Forms.TextBox txtUserdirect; private System.Windows.Forms.TextBox txtUserblock; - private System.Windows.Forms.TabPage tabPage6; + private System.Windows.Forms.TabPage tabKCP; private System.Windows.Forms.TextBox txtKcpmtu; private System.Windows.Forms.Label label6; private System.Windows.Forms.TextBox txtKcptti; @@ -700,7 +700,7 @@ private System.Windows.Forms.TextBox txtKcpuplinkCapacity; private System.Windows.Forms.Label label9; private System.Windows.Forms.CheckBox chkKcpcongestion; - private System.Windows.Forms.TabPage tabPage7; + private System.Windows.Forms.TabPage tabGUI; private System.Windows.Forms.CheckBox chkAutoRun; private System.Windows.Forms.Label label13; private System.Windows.Forms.TextBox txturlGFWList; @@ -718,8 +718,8 @@ private System.Windows.Forms.Label lbFreshrate; private System.Windows.Forms.Label label16; private System.Windows.Forms.ComboBox cmblistenerType; - private System.Windows.Forms.TabPage tabPage8; - private System.Windows.Forms.TabPage tabPage9; + private System.Windows.Forms.TabPage tabPreDefinedRules; + private System.Windows.Forms.TabPage tabUserPAC; private System.Windows.Forms.TextBox txtuserPacRule; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Label label4; diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs index 6fa88f50..5d69093d 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs @@ -9,8 +9,10 @@ namespace v2rayN.Forms { public partial class OptionSettingForm : BaseForm { - public OptionSettingForm() + private string _tabOpened; + public OptionSettingForm(string tabOpened = "") { + _tabOpened = tabOpened; InitializeComponent(); } @@ -25,6 +27,18 @@ namespace v2rayN.Forms InitGUI(); InitUserPAC(); + + var tab = tabControl1.TabPages[_tabOpened]; + var tab2 = tabControl2.TabPages[_tabOpened]; + if (tab != null) + { + tabControl1.SelectedTab = tab; + } + if (tab2 != null) + { + tabControl1.SelectedTab = tabRouting; + tabControl2.SelectedTab = tab2; + } } /// <summary> @@ -78,8 +92,7 @@ namespace v2rayN.Forms { //路由 cmbdomainStrategy.Text = config.domainStrategy; - int.TryParse(config.routingMode, out int routingMode); - cmbroutingMode.SelectedIndex = routingMode; + cmbroutingMode.SelectedIndex = config.routingMode; txtUseragent.Text = Utils.List2String(config.useragent, true); txtUserdirect.Text = Utils.List2String(config.userdirect, true); @@ -276,7 +289,7 @@ namespace v2rayN.Forms { //路由 string domainStrategy = cmbdomainStrategy.Text; - string routingMode = cmbroutingMode.SelectedIndex.ToString(); + int routingMode = cmbroutingMode.SelectedIndex; string useragent = txtUseragent.Text.TrimEx(); string userdirect = txtUserdirect.Text.TrimEx(); diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx index 7f8ef414..90244957 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx @@ -120,24 +120,36 @@ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <value>6, 12</value> </data> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <value>662, 675</value> </data> - <data name="$this.Localizable" type="System.Boolean, mscorlib"> - <value>True</value> - </data> <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>4, 4, 4, 4</value> </data> + <data name=">>$this.Name" xml:space="preserve"> + <value>OptionSettingForm</value> + </data> <data name="$this.Text" xml:space="preserve"> <value>Settings</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="btnClose.Location" type="System.Drawing.Point, System.Drawing"> <value>355, 16</value> </data> + <data name=">>btnClose.Name" xml:space="preserve"> + <value>btnClose</value> + </data> + <data name=">>btnClose.Parent" xml:space="preserve"> + <value>panel2</value> + </data> <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing"> <value>75, 23</value> </data> @@ -147,9 +159,27 @@ <data name="btnClose.Text" xml:space="preserve"> <value>&Cancel</value> </data> + <data name=">>btnClose.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=">>btnClose.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing"> <value>267, 16</value> </data> + <data name=">>btnOK.Name" xml:space="preserve"> + <value>btnOK</value> + </data> + <data name=">>btnOK.Name" xml:space="preserve"> + <value>btnOK</value> + </data> + <data name=">>btnOK.Parent" xml:space="preserve"> + <value>panel2</value> + </data> + <data name=">>btnOK.Parent" xml:space="preserve"> + <value>panel2</value> + </data> <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing"> <value>75, 23</value> </data> @@ -159,6 +189,18 @@ <data name="btnOK.Text" xml:space="preserve"> <value>&OK</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=">>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=">>btnOK.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name=">>btnOK.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="btnSetDefRountingRule.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <value>Top, Right</value> </data> @@ -168,6 +210,18 @@ <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing"> <value>322, 10</value> </data> + <data name=">>btnSetDefRountingRule.Name" xml:space="preserve"> + <value>btnSetDefRountingRule</value> + </data> + <data name=">>btnSetDefRountingRule.Name" xml:space="preserve"> + <value>btnSetDefRountingRule</value> + </data> + <data name=">>btnSetDefRountingRule.Parent" xml:space="preserve"> + <value>panel3</value> + </data> + <data name=">>btnSetDefRountingRule.Parent" xml:space="preserve"> + <value>panel3</value> + </data> <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing"> <value>229, 23</value> </data> @@ -177,21 +231,69 @@ <data name="btnSetDefRountingRule.Text" xml:space="preserve"> <value>Set default custom routing rules</value> </data> + <data name=">>btnSetDefRountingRule.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=">>btnSetDefRountingRule.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=">>btnSetDefRountingRule.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name=">>btnSetDefRountingRule.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="cbFreshrate.Location" type="System.Drawing.Point, System.Drawing"> <value>161, 84</value> </data> + <data name=">>cbFreshrate.Name" xml:space="preserve"> + <value>cbFreshrate</value> + </data> + <data name=">>cbFreshrate.Name" xml:space="preserve"> + <value>cbFreshrate</value> + </data> + <data name=">>cbFreshrate.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>cbFreshrate.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="cbFreshrate.Size" type="System.Drawing.Size, System.Drawing"> <value>58, 20</value> </data> <data name="cbFreshrate.TabIndex" type="System.Int32, mscorlib"> <value>32</value> </data> + <data name=">>cbFreshrate.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=">>cbFreshrate.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=">>cbFreshrate.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name=">>cbFreshrate.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="chkAllowIn2.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chkAllowIn2.Location" type="System.Drawing.Point, System.Drawing"> <value>15, 63</value> </data> + <data name=">>chkAllowIn2.Name" xml:space="preserve"> + <value>chkAllowIn2</value> + </data> + <data name=">>chkAllowIn2.Name" xml:space="preserve"> + <value>chkAllowIn2</value> + </data> + <data name=">>chkAllowIn2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>chkAllowIn2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing"> <value>120, 16</value> </data> @@ -201,15 +303,39 @@ <data name="chkAllowIn2.Text" xml:space="preserve"> <value>listening port 2</value> </data> + <data name=">>chkAllowIn2.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkAllowIn2.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <data name="chkAllowIn2.Visible" type="System.Boolean, mscorlib"> <value>False</value> </data> + <data name=">>chkAllowIn2.ZOrder" xml:space="preserve"> + <value>7</value> + </data> + <data name=">>chkAllowIn2.ZOrder" xml:space="preserve"> + <value>7</value> + </data> <data name="chkAllowLANConn.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chkAllowLANConn.Location" type="System.Drawing.Point, System.Drawing"> <value>15, 38</value> </data> + <data name=">>chkAllowLANConn.Name" xml:space="preserve"> + <value>chkAllowLANConn</value> + </data> + <data name=">>chkAllowLANConn.Name" xml:space="preserve"> + <value>chkAllowLANConn</value> + </data> + <data name=">>chkAllowLANConn.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>chkAllowLANConn.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing"> <value>204, 16</value> </data> @@ -219,12 +345,36 @@ <data name="chkAllowLANConn.Text" xml:space="preserve"> <value>Allow connections from the LAN</value> </data> + <data name=">>chkAllowLANConn.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkAllowLANConn.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkAllowLANConn.ZOrder" xml:space="preserve"> + <value>4</value> + </data> + <data name=">>chkAllowLANConn.ZOrder" xml:space="preserve"> + <value>4</value> + </data> <data name="chkAutoRun.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chkAutoRun.Location" type="System.Drawing.Point, System.Drawing"> <value>15, 16</value> </data> + <data name=">>chkAutoRun.Name" xml:space="preserve"> + <value>chkAutoRun</value> + </data> + <data name=">>chkAutoRun.Name" xml:space="preserve"> + <value>chkAutoRun</value> + </data> + <data name=">>chkAutoRun.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>chkAutoRun.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing"> <value>246, 16</value> </data> @@ -234,6 +384,18 @@ <data name="chkAutoRun.Text" xml:space="preserve"> <value>Automatically start at system startup</value> </data> + <data name=">>chkAutoRun.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkAutoRun.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkAutoRun.ZOrder" xml:space="preserve"> + <value>7</value> + </data> + <data name=">>chkAutoRun.ZOrder" xml:space="preserve"> + <value>7</value> + </data> <data name="chkEnableStatistics.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> @@ -243,6 +405,18 @@ <data name="chkEnableStatistics.Location" type="System.Drawing.Point, System.Drawing"> <value>15, 62</value> </data> + <data name=">>chkEnableStatistics.Name" xml:space="preserve"> + <value>chkEnableStatistics</value> + </data> + <data name=">>chkEnableStatistics.Name" xml:space="preserve"> + <value>chkEnableStatistics</value> + </data> + <data name=">>chkEnableStatistics.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>chkEnableStatistics.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing"> <value>576, 16</value> </data> @@ -252,12 +426,36 @@ <data name="chkEnableStatistics.Text" xml:space="preserve"> <value>Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client)</value> </data> + <data name=">>chkEnableStatistics.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkEnableStatistics.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkEnableStatistics.ZOrder" xml:space="preserve"> + <value>3</value> + </data> + <data name=">>chkEnableStatistics.ZOrder" xml:space="preserve"> + <value>3</value> + </data> <data name="chkKcpcongestion.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chkKcpcongestion.Location" type="System.Drawing.Point, System.Drawing"> <value>20, 143</value> </data> + <data name=">>chkKcpcongestion.Name" xml:space="preserve"> + <value>chkKcpcongestion</value> + </data> + <data name=">>chkKcpcongestion.Name" xml:space="preserve"> + <value>chkKcpcongestion</value> + </data> + <data name=">>chkKcpcongestion.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>chkKcpcongestion.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="chkKcpcongestion.Size" type="System.Drawing.Size, System.Drawing"> <value>84, 16</value> </data> @@ -267,6 +465,18 @@ <data name="chkKcpcongestion.Text" xml:space="preserve"> <value>congestion</value> </data> + <data name=">>chkKcpcongestion.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkKcpcongestion.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkKcpcongestion.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>chkKcpcongestion.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="chkKeepOlderDedupl.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> @@ -276,6 +486,18 @@ <data name="chkKeepOlderDedupl.Location" type="System.Drawing.Point, System.Drawing"> <value>15, 110</value> </data> + <data name=">>chkKeepOlderDedupl.Name" xml:space="preserve"> + <value>chkKeepOlderDedupl</value> + </data> + <data name=">>chkKeepOlderDedupl.Name" xml:space="preserve"> + <value>chkKeepOlderDedupl</value> + </data> + <data name=">>chkKeepOlderDedupl.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>chkKeepOlderDedupl.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing"> <value>198, 16</value> </data> @@ -285,12 +507,36 @@ <data name="chkKeepOlderDedupl.Text" xml:space="preserve"> <value>Keep older when deduplication</value> </data> + <data name=">>chkKeepOlderDedupl.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkKeepOlderDedupl.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkKeepOlderDedupl.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>chkKeepOlderDedupl.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="chklogEnabled.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chklogEnabled.Location" type="System.Drawing.Point, System.Drawing"> <value>15, 160</value> </data> + <data name=">>chklogEnabled.Name" xml:space="preserve"> + <value>chklogEnabled</value> + </data> + <data name=">>chklogEnabled.Name" xml:space="preserve"> + <value>chklogEnabled</value> + </data> + <data name=">>chklogEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>chklogEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing"> <value>126, 16</value> </data> @@ -300,12 +546,36 @@ <data name="chklogEnabled.Text" xml:space="preserve"> <value>Record local logs</value> </data> + <data name=">>chklogEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chklogEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chklogEnabled.ZOrder" xml:space="preserve"> + <value>15</value> + </data> + <data name=">>chklogEnabled.ZOrder" xml:space="preserve"> + <value>15</value> + </data> <data name="chkmuxEnabled.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chkmuxEnabled.Location" type="System.Drawing.Point, System.Drawing"> <value>15, 129</value> </data> + <data name=">>chkmuxEnabled.Name" xml:space="preserve"> + <value>chkmuxEnabled</value> + </data> + <data name=">>chkmuxEnabled.Name" xml:space="preserve"> + <value>chkmuxEnabled</value> + </data> + <data name=">>chkmuxEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>chkmuxEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing"> <value>174, 16</value> </data> @@ -315,6 +585,18 @@ <data name="chkmuxEnabled.Text" xml:space="preserve"> <value>Turn on Mux Multiplexing </value> </data> + <data name=">>chkmuxEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkmuxEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkmuxEnabled.ZOrder" xml:space="preserve"> + <value>6</value> + </data> + <data name=">>chkmuxEnabled.ZOrder" xml:space="preserve"> + <value>6</value> + </data> <data name="chksniffingEnabled.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> @@ -324,6 +606,18 @@ <data name="chksniffingEnabled.Location" type="System.Drawing.Point, System.Drawing"> <value>468, 27</value> </data> + <data name=">>chksniffingEnabled.Name" xml:space="preserve"> + <value>chksniffingEnabled</value> + </data> + <data name=">>chksniffingEnabled.Name" xml:space="preserve"> + <value>chksniffingEnabled</value> + </data> + <data name=">>chksniffingEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>chksniffingEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing"> <value>120, 16</value> </data> @@ -333,6 +627,18 @@ <data name="chksniffingEnabled.Text" xml:space="preserve"> <value>Turn on Sniffing</value> </data> + <data name=">>chksniffingEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chksniffingEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chksniffingEnabled.ZOrder" xml:space="preserve"> + <value>3</value> + </data> + <data name=">>chksniffingEnabled.ZOrder" xml:space="preserve"> + <value>3</value> + </data> <data name="chksniffingEnabled2.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> @@ -342,6 +648,18 @@ <data name="chksniffingEnabled2.Location" type="System.Drawing.Point, System.Drawing"> <value>468, 60</value> </data> + <data name=">>chksniffingEnabled2.Name" xml:space="preserve"> + <value>chksniffingEnabled2</value> + </data> + <data name=">>chksniffingEnabled2.Name" xml:space="preserve"> + <value>chksniffingEnabled2</value> + </data> + <data name=">>chksniffingEnabled2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>chksniffingEnabled2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing"> <value>120, 16</value> </data> @@ -351,15 +669,39 @@ <data name="chksniffingEnabled2.Text" xml:space="preserve"> <value>Turn on Sniffing</value> </data> + <data name=">>chksniffingEnabled2.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chksniffingEnabled2.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <data name="chksniffingEnabled2.Visible" type="System.Boolean, mscorlib"> <value>False</value> </data> + <data name=">>chksniffingEnabled2.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name=">>chksniffingEnabled2.ZOrder" xml:space="preserve"> + <value>2</value> + </data> <data name="chkudpEnabled.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chkudpEnabled.Location" type="System.Drawing.Point, System.Drawing"> <value>369, 27</value> </data> + <data name=">>chkudpEnabled.Name" xml:space="preserve"> + <value>chkudpEnabled</value> + </data> + <data name=">>chkudpEnabled.Name" xml:space="preserve"> + <value>chkudpEnabled</value> + </data> + <data name=">>chkudpEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>chkudpEnabled.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing"> <value>84, 16</value> </data> @@ -369,12 +711,36 @@ <data name="chkudpEnabled.Text" xml:space="preserve"> <value>Enable UDP</value> </data> + <data name=">>chkudpEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkudpEnabled.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkudpEnabled.ZOrder" xml:space="preserve"> + <value>14</value> + </data> + <data name=">>chkudpEnabled.ZOrder" xml:space="preserve"> + <value>14</value> + </data> <data name="chkudpEnabled2.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="chkudpEnabled2.Location" type="System.Drawing.Point, System.Drawing"> <value>369, 62</value> </data> + <data name=">>chkudpEnabled2.Name" xml:space="preserve"> + <value>chkudpEnabled2</value> + </data> + <data name=">>chkudpEnabled2.Name" xml:space="preserve"> + <value>chkudpEnabled2</value> + </data> + <data name=">>chkudpEnabled2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>chkudpEnabled2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing"> <value>84, 16</value> </data> @@ -384,9 +750,21 @@ <data name="chkudpEnabled2.Text" xml:space="preserve"> <value>Enable UDP</value> </data> + <data name=">>chkudpEnabled2.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>chkudpEnabled2.Type" xml:space="preserve"> + <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <data name="chkudpEnabled2.Visible" type="System.Boolean, mscorlib"> <value>False</value> </data> + <data name=">>chkudpEnabled2.ZOrder" xml:space="preserve"> + <value>8</value> + </data> + <data name=">>chkudpEnabled2.ZOrder" xml:space="preserve"> + <value>8</value> + </data> <data name="cmbdomainStrategy.Items" xml:space="preserve"> <value>AsIs</value> </data> @@ -399,12 +777,36 @@ <data name="cmbdomainStrategy.Location" type="System.Drawing.Point, System.Drawing"> <value>115, 10</value> </data> + <data name=">>cmbdomainStrategy.Name" xml:space="preserve"> + <value>cmbdomainStrategy</value> + </data> + <data name=">>cmbdomainStrategy.Name" xml:space="preserve"> + <value>cmbdomainStrategy</value> + </data> + <data name=">>cmbdomainStrategy.Parent" xml:space="preserve"> + <value>panel3</value> + </data> + <data name=">>cmbdomainStrategy.Parent" xml:space="preserve"> + <value>panel3</value> + </data> <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing"> <value>165, 20</value> </data> <data name="cmbdomainStrategy.TabIndex" type="System.Int32, mscorlib"> <value>16</value> </data> + <data name=">>cmbdomainStrategy.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=">>cmbdomainStrategy.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=">>cmbdomainStrategy.ZOrder" xml:space="preserve"> + <value>3</value> + </data> + <data name=">>cmbdomainStrategy.ZOrder" xml:space="preserve"> + <value>3</value> + </data> <data name="cmblistenerType.Items" xml:space="preserve"> <value>Not Enabled Http Proxy</value> </data> @@ -429,12 +831,36 @@ <data name="cmblistenerType.Location" type="System.Drawing.Point, System.Drawing"> <value>124, 94</value> </data> + <data name=">>cmblistenerType.Name" xml:space="preserve"> + <value>cmblistenerType</value> + </data> + <data name=">>cmblistenerType.Name" xml:space="preserve"> + <value>cmblistenerType</value> + </data> + <data name=">>cmblistenerType.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>cmblistenerType.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="cmblistenerType.Size" type="System.Drawing.Size, System.Drawing"> <value>464, 20</value> </data> <data name="cmblistenerType.TabIndex" type="System.Int32, mscorlib"> <value>33</value> </data> + <data name=">>cmblistenerType.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=">>cmblistenerType.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=">>cmblistenerType.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name=">>cmblistenerType.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="cmbloglevel.Items" xml:space="preserve"> <value>debug</value> </data> @@ -453,12 +879,36 @@ <data name="cmbloglevel.Location" type="System.Drawing.Point, System.Drawing"> <value>257, 158</value> </data> + <data name=">>cmbloglevel.Name" xml:space="preserve"> + <value>cmbloglevel</value> + </data> + <data name=">>cmbloglevel.Name" xml:space="preserve"> + <value>cmbloglevel</value> + </data> + <data name=">>cmbloglevel.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>cmbloglevel.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="cmbloglevel.Size" type="System.Drawing.Size, System.Drawing"> <value>97, 20</value> </data> <data name="cmbloglevel.TabIndex" type="System.Int32, mscorlib"> <value>6</value> </data> + <data name=">>cmbloglevel.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=">>cmbloglevel.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=">>cmbloglevel.ZOrder" xml:space="preserve"> + <value>16</value> + </data> + <data name=">>cmbloglevel.ZOrder" xml:space="preserve"> + <value>16</value> + </data> <data name="cmbprotocol.Enabled" type="System.Boolean, mscorlib"> <value>False</value> </data> @@ -471,12 +921,36 @@ <data name="cmbprotocol.Location" type="System.Drawing.Point, System.Drawing"> <value>257, 25</value> </data> + <data name=">>cmbprotocol.Name" xml:space="preserve"> + <value>cmbprotocol</value> + </data> + <data name=">>cmbprotocol.Name" xml:space="preserve"> + <value>cmbprotocol</value> + </data> + <data name=">>cmbprotocol.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>cmbprotocol.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="cmbprotocol.Size" type="System.Drawing.Size, System.Drawing"> <value>97, 20</value> </data> <data name="cmbprotocol.TabIndex" type="System.Int32, mscorlib"> <value>12</value> </data> + <data name=">>cmbprotocol.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=">>cmbprotocol.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=">>cmbprotocol.ZOrder" xml:space="preserve"> + <value>12</value> + </data> + <data name=">>cmbprotocol.ZOrder" xml:space="preserve"> + <value>12</value> + </data> <data name="cmbprotocol2.Items" xml:space="preserve"> <value>socks</value> </data> @@ -486,15 +960,39 @@ <data name="cmbprotocol2.Location" type="System.Drawing.Point, System.Drawing"> <value>257, 60</value> </data> + <data name=">>cmbprotocol2.Name" xml:space="preserve"> + <value>cmbprotocol2</value> + </data> + <data name=">>cmbprotocol2.Name" xml:space="preserve"> + <value>cmbprotocol2</value> + </data> + <data name=">>cmbprotocol2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>cmbprotocol2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="cmbprotocol2.Size" type="System.Drawing.Size, System.Drawing"> <value>97, 20</value> </data> <data name="cmbprotocol2.TabIndex" type="System.Int32, mscorlib"> <value>17</value> </data> + <data name=">>cmbprotocol2.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=">>cmbprotocol2.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="cmbprotocol2.Visible" type="System.Boolean, mscorlib"> <value>False</value> </data> + <data name=">>cmbprotocol2.ZOrder" xml:space="preserve"> + <value>9</value> + </data> + <data name=">>cmbprotocol2.ZOrder" xml:space="preserve"> + <value>9</value> + </data> <data name="cmbroutingMode.Items" xml:space="preserve"> <value>Global</value> </data> @@ -510,42 +1008,102 @@ <data name="cmbroutingMode.Location" type="System.Drawing.Point, System.Drawing"> <value>21, 17</value> </data> + <data name=">>cmbroutingMode.Name" xml:space="preserve"> + <value>cmbroutingMode</value> + </data> + <data name=">>cmbroutingMode.Parent" xml:space="preserve"> + <value>tabPreDefinedRules</value> + </data> <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing"> <value>255, 20</value> </data> <data name="cmbroutingMode.TabIndex" type="System.Int32, mscorlib"> <value>14</value> </data> + <data name=">>cmbroutingMode.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=">>cmbroutingMode.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing"> <value>3, 3</value> </data> + <data name=">>groupBox1.Name" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>groupBox1.Name" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>groupBox1.Parent" xml:space="preserve"> + <value>tabBasic</value> + </data> + <data name=">>groupBox1.Parent" xml:space="preserve"> + <value>tabBasic</value> + </data> <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing"> <value>648, 573</value> </data> <data name="groupBox1.TabIndex" type="System.Int32, mscorlib"> <value>6</value> </data> + <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=">>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=">>groupBox1.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>groupBox1.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing"> <value>3, 3</value> </data> + <data name=">>groupBox2.Name" xml:space="preserve"> + <value>groupBox2</value> + </data> + <data name=">>groupBox2.Parent" xml:space="preserve"> + <value>tabRouting</value> + </data> <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing"> <value>648, 573</value> </data> <data name="groupBox2.TabIndex" type="System.Int32, mscorlib"> <value>12</value> </data> + <data name=">>groupBox2.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=">>groupBox2.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="label1.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label1.Location" type="System.Drawing.Point, System.Drawing"> <value>206, 29</value> </data> + <data name=">>label1.Name" xml:space="preserve"> + <value>label1</value> + </data> + <data name=">>label1.Name" xml:space="preserve"> + <value>label1</value> + </data> + <data name=">>label1.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>label1.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="label1.Size" type="System.Drawing.Size, System.Drawing"> <value>53, 12</value> </data> @@ -555,12 +1113,36 @@ <data name="label1.Text" xml:space="preserve"> <value>protocol</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=">>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=">>label1.ZOrder" xml:space="preserve"> + <value>13</value> + </data> + <data name=">>label1.ZOrder" xml:space="preserve"> + <value>13</value> + </data> <data name="label10.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label10.Location" type="System.Drawing.Point, System.Drawing"> <value>236, 104</value> </data> + <data name=">>label10.Name" xml:space="preserve"> + <value>label10</value> + </data> + <data name=">>label10.Name" xml:space="preserve"> + <value>label10</value> + </data> + <data name=">>label10.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>label10.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="label10.Size" type="System.Drawing.Size, System.Drawing"> <value>95, 12</value> </data> @@ -570,12 +1152,36 @@ <data name="label10.Text" xml:space="preserve"> <value>writeBufferSize</value> </data> + <data name=">>label10.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=">>label10.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=">>label10.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name=">>label10.ZOrder" xml:space="preserve"> + <value>2</value> + </data> <data name="label11.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label11.Location" type="System.Drawing.Point, System.Drawing"> <value>18, 104</value> </data> + <data name=">>label11.Name" xml:space="preserve"> + <value>label11</value> + </data> + <data name=">>label11.Name" xml:space="preserve"> + <value>label11</value> + </data> + <data name=">>label11.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>label11.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="label11.Size" type="System.Drawing.Size, System.Drawing"> <value>89, 12</value> </data> @@ -585,12 +1191,36 @@ <data name="label11.Text" xml:space="preserve"> <value>readBufferSize</value> </data> + <data name=">>label11.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=">>label11.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=">>label11.ZOrder" xml:space="preserve"> + <value>4</value> + </data> + <data name=">>label11.ZOrder" xml:space="preserve"> + <value>4</value> + </data> <data name="label13.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label13.Location" type="System.Drawing.Point, System.Drawing"> <value>30, 176</value> </data> + <data name=">>label13.Name" xml:space="preserve"> + <value>label13</value> + </data> + <data name=">>label13.Name" xml:space="preserve"> + <value>label13</value> + </data> + <data name=">>label13.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>label13.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="label13.Size" type="System.Drawing.Size, System.Drawing"> <value>431, 12</value> </data> @@ -600,12 +1230,36 @@ <data name="label13.Text" xml:space="preserve"> <value>Custom GFWList address (please fill in the blank without customization)</value> </data> + <data name=">>label13.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=">>label13.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=">>label13.ZOrder" xml:space="preserve"> + <value>6</value> + </data> + <data name=">>label13.ZOrder" xml:space="preserve"> + <value>6</value> + </data> <data name="label14.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label14.Location" type="System.Drawing.Point, System.Drawing"> <value>33, 204</value> </data> + <data name=">>label14.Name" xml:space="preserve"> + <value>label14</value> + </data> + <data name=">>label14.Name" xml:space="preserve"> + <value>label14</value> + </data> + <data name=">>label14.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>label14.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="label14.Size" type="System.Drawing.Size, System.Drawing"> <value>281, 12</value> </data> @@ -615,6 +1269,18 @@ <data name="label14.Text" xml:space="preserve"> <value>Custom DNS (multiple, separated by commas (,))</value> </data> + <data name=">>label14.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=">>label14.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=">>label14.ZOrder" xml:space="preserve"> + <value>5</value> + </data> + <data name=">>label14.ZOrder" xml:space="preserve"> + <value>5</value> + </data> <data name="label16.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> @@ -624,6 +1290,18 @@ <data name="label16.Location" type="System.Drawing.Point, System.Drawing"> <value>42, 98</value> </data> + <data name=">>label16.Name" xml:space="preserve"> + <value>label16</value> + </data> + <data name=">>label16.Name" xml:space="preserve"> + <value>label16</value> + </data> + <data name=">>label16.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>label16.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="label16.Size" type="System.Drawing.Size, System.Drawing"> <value>65, 12</value> </data> @@ -633,12 +1311,36 @@ <data name="label16.Text" xml:space="preserve"> <value>Http proxy</value> </data> + <data name=">>label16.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=">>label16.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=">>label16.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>label16.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="label2.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label2.Location" type="System.Drawing.Point, System.Drawing"> <value>33, 29</value> </data> + <data name=">>label2.Name" xml:space="preserve"> + <value>label2</value> + </data> + <data name=">>label2.Name" xml:space="preserve"> + <value>label2</value> + </data> + <data name=">>label2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>label2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="label2.Size" type="System.Drawing.Size, System.Drawing"> <value>89, 12</value> </data> @@ -648,12 +1350,36 @@ <data name="label2.Text" xml:space="preserve"> <value>Listening port</value> </data> + <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=">>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=">>label2.ZOrder" xml:space="preserve"> + <value>19</value> + </data> + <data name=">>label2.ZOrder" xml:space="preserve"> + <value>19</value> + </data> <data name="label3.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label3.Location" type="System.Drawing.Point, System.Drawing"> <value>206, 64</value> </data> + <data name=">>label3.Name" xml:space="preserve"> + <value>label3</value> + </data> + <data name=">>label3.Name" xml:space="preserve"> + <value>label3</value> + </data> + <data name=">>label3.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>label3.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="label3.Size" type="System.Drawing.Size, System.Drawing"> <value>53, 12</value> </data> @@ -663,15 +1389,39 @@ <data name="label3.Text" xml:space="preserve"> <value>protocol</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> + <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> <data name="label3.Visible" type="System.Boolean, mscorlib"> <value>False</value> </data> + <data name=">>label3.ZOrder" xml:space="preserve"> + <value>10</value> + </data> + <data name=">>label3.ZOrder" xml:space="preserve"> + <value>10</value> + </data> <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <value>NoControl</value> </data> <data name="label4.Location" type="System.Drawing.Point, System.Drawing"> <value>5, 11</value> </data> + <data name=">>label4.Name" xml:space="preserve"> + <value>label4</value> + </data> + <data name=">>label4.Name" xml:space="preserve"> + <value>label4</value> + </data> + <data name=">>label4.Parent" xml:space="preserve"> + <value>panel4</value> + </data> + <data name=">>label4.Parent" xml:space="preserve"> + <value>panel4</value> + </data> <data name="label4.Size" type="System.Drawing.Size, System.Drawing"> <value>598, 16</value> </data> @@ -681,12 +1431,36 @@ <data name="label4.Text" xml:space="preserve"> <value>*Set user pac rules, separated by commas (,)</value> </data> + <data name=">>label4.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=">>label4.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=">>label4.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>label4.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="label5.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label5.Location" type="System.Drawing.Point, System.Drawing"> <value>193, 162</value> </data> + <data name=">>label5.Name" xml:space="preserve"> + <value>label5</value> + </data> + <data name=">>label5.Name" xml:space="preserve"> + <value>label5</value> + </data> + <data name=">>label5.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>label5.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="label5.Size" type="System.Drawing.Size, System.Drawing"> <value>59, 12</value> </data> @@ -696,12 +1470,36 @@ <data name="label5.Text" xml:space="preserve"> <value>Log level</value> </data> + <data name=">>label5.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=">>label5.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=">>label5.ZOrder" xml:space="preserve"> + <value>17</value> + </data> + <data name=">>label5.ZOrder" xml:space="preserve"> + <value>17</value> + </data> <data name="label6.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label6.Location" type="System.Drawing.Point, System.Drawing"> <value>18, 28</value> </data> + <data name=">>label6.Name" xml:space="preserve"> + <value>label6</value> + </data> + <data name=">>label6.Name" xml:space="preserve"> + <value>label6</value> + </data> + <data name=">>label6.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>label6.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="label6.Size" type="System.Drawing.Size, System.Drawing"> <value>23, 12</value> </data> @@ -711,12 +1509,36 @@ <data name="label6.Text" xml:space="preserve"> <value>mtu</value> </data> + <data name=">>label6.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=">>label6.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=">>label6.ZOrder" xml:space="preserve"> + <value>12</value> + </data> + <data name=">>label6.ZOrder" xml:space="preserve"> + <value>12</value> + </data> <data name="label7.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label7.Location" type="System.Drawing.Point, System.Drawing"> <value>236, 28</value> </data> + <data name=">>label7.Name" xml:space="preserve"> + <value>label7</value> + </data> + <data name=">>label7.Name" xml:space="preserve"> + <value>label7</value> + </data> + <data name=">>label7.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>label7.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="label7.Size" type="System.Drawing.Size, System.Drawing"> <value>23, 12</value> </data> @@ -726,12 +1548,36 @@ <data name="label7.Text" xml:space="preserve"> <value>tti</value> </data> + <data name=">>label7.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=">>label7.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=">>label7.ZOrder" xml:space="preserve"> + <value>10</value> + </data> + <data name=">>label7.ZOrder" xml:space="preserve"> + <value>10</value> + </data> <data name="label8.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label8.Location" type="System.Drawing.Point, System.Drawing"> <value>236, 66</value> </data> + <data name=">>label8.Name" xml:space="preserve"> + <value>label8</value> + </data> + <data name=">>label8.Name" xml:space="preserve"> + <value>label8</value> + </data> + <data name=">>label8.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>label8.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="label8.Size" type="System.Drawing.Size, System.Drawing"> <value>101, 12</value> </data> @@ -741,12 +1587,36 @@ <data name="label8.Text" xml:space="preserve"> <value>downlinkCapacity</value> </data> + <data name=">>label8.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=">>label8.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=">>label8.ZOrder" xml:space="preserve"> + <value>6</value> + </data> + <data name=">>label8.ZOrder" xml:space="preserve"> + <value>6</value> + </data> <data name="label9.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> <data name="label9.Location" type="System.Drawing.Point, System.Drawing"> <value>18, 66</value> </data> + <data name=">>label9.Name" xml:space="preserve"> + <value>label9</value> + </data> + <data name=">>label9.Name" xml:space="preserve"> + <value>label9</value> + </data> + <data name=">>label9.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>label9.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="label9.Size" type="System.Drawing.Size, System.Drawing"> <value>89, 12</value> </data> @@ -756,9 +1626,33 @@ <data name="label9.Text" xml:space="preserve"> <value>uplinkCapacity</value> </data> + <data name=">>label9.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=">>label9.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=">>label9.ZOrder" xml:space="preserve"> + <value>8</value> + </data> + <data name=">>label9.ZOrder" xml:space="preserve"> + <value>8</value> + </data> <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing"> <value>5, 45</value> </data> + <data name=">>labRoutingTips.Name" xml:space="preserve"> + <value>labRoutingTips</value> + </data> + <data name=">>labRoutingTips.Name" xml:space="preserve"> + <value>labRoutingTips</value> + </data> + <data name=">>labRoutingTips.Parent" xml:space="preserve"> + <value>panel3</value> + </data> + <data name=">>labRoutingTips.Parent" xml:space="preserve"> + <value>panel3</value> + </data> <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing"> <value>598, 16</value> </data> @@ -768,6 +1662,18 @@ <data name="labRoutingTips.Text" xml:space="preserve"> <value>*Set the rules, separated by commas (,); support Domain (pure string / regular / subdomain) and IP</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> + </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> + </data> + <data name=">>labRoutingTips.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name=">>labRoutingTips.ZOrder" xml:space="preserve"> + <value>2</value> + </data> <data name="lbFreshrate.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> @@ -777,6 +1683,18 @@ <data name="lbFreshrate.Location" type="System.Drawing.Point, System.Drawing"> <value>30, 87</value> </data> + <data name=">>lbFreshrate.Name" xml:space="preserve"> + <value>lbFreshrate</value> + </data> + <data name=">>lbFreshrate.Name" xml:space="preserve"> + <value>lbFreshrate</value> + </data> + <data name=">>lbFreshrate.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>lbFreshrate.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing"> <value>125, 12</value> </data> @@ -786,6 +1704,18 @@ <data name="lbFreshrate.Text" xml:space="preserve"> <value>Statistics freshrate</value> </data> + <data name=">>lbFreshrate.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=">>lbFreshrate.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=">>lbFreshrate.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name=">>lbFreshrate.ZOrder" xml:space="preserve"> + <value>2</value> + </data> <data name="linkLabelRoutingDoc.AutoSize" type="System.Boolean, mscorlib"> <value>True</value> </data> @@ -795,6 +1725,18 @@ <data name="linkLabelRoutingDoc.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>0, 0, 0, 0</value> </data> + <data name=">>linkLabelRoutingDoc.Name" xml:space="preserve"> + <value>linkLabelRoutingDoc</value> + </data> + <data name=">>linkLabelRoutingDoc.Name" xml:space="preserve"> + <value>linkLabelRoutingDoc</value> + </data> + <data name=">>linkLabelRoutingDoc.Parent" xml:space="preserve"> + <value>panel3</value> + </data> + <data name=">>linkLabelRoutingDoc.Parent" xml:space="preserve"> + <value>panel3</value> + </data> <data name="linkLabelRoutingDoc.Size" type="System.Drawing.Size, System.Drawing"> <value>95, 12</value> </data> @@ -804,114 +1746,267 @@ <data name="linkLabelRoutingDoc.Text" xml:space="preserve"> <value>Domain strategy</value> </data> + <data name=">>linkLabelRoutingDoc.Type" xml:space="preserve"> + <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>linkLabelRoutingDoc.Type" xml:space="preserve"> + <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>linkLabelRoutingDoc.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>linkLabelRoutingDoc.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Top</value> </data> <data name="panel1.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 0</value> </data> + <data name=">>panel1.Name" xml:space="preserve"> + <value>panel1</value> + </data> + <data name=">>panel1.Parent" xml:space="preserve"> + <value>$this</value> + </data> <data name="panel1.Size" type="System.Drawing.Size, System.Drawing"> <value>662, 10</value> </data> <data name="panel1.TabIndex" type="System.Int32, mscorlib"> <value>9</value> </data> + <data name=">>panel1.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=">>panel1.ZOrder" xml:space="preserve"> + <value>2</value> + </data> <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Bottom</value> </data> <data name="panel2.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 615</value> </data> + <data name=">>panel2.Name" xml:space="preserve"> + <value>panel2</value> + </data> + <data name=">>panel2.Parent" xml:space="preserve"> + <value>$this</value> + </data> <data name="panel2.Size" type="System.Drawing.Size, System.Drawing"> <value>662, 60</value> </data> <data name="panel2.TabIndex" type="System.Int32, mscorlib"> <value>11</value> </data> + <data name=">>panel2.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=">>panel2.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Top</value> </data> <data name="panel3.Location" type="System.Drawing.Point, System.Drawing"> <value>3, 17</value> </data> + <data name=">>panel3.Name" xml:space="preserve"> + <value>panel3</value> + </data> + <data name=">>panel3.Parent" xml:space="preserve"> + <value>groupBox2</value> + </data> <data name="panel3.Size" type="System.Drawing.Size, System.Drawing"> <value>642, 67</value> </data> <data name="panel3.TabIndex" type="System.Int32, mscorlib"> <value>19</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> + <data name=">>panel3.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Top</value> </data> <data name="panel4.Location" type="System.Drawing.Point, System.Drawing"> <value>3, 3</value> </data> + <data name=">>panel4.Name" xml:space="preserve"> + <value>panel4</value> + </data> + <data name=">>panel4.Name" xml:space="preserve"> + <value>panel4</value> + </data> + <data name=">>panel4.Parent" xml:space="preserve"> + <value>tabUserPAC</value> + </data> + <data name=">>panel4.Parent" xml:space="preserve"> + <value>tabUserPAC</value> + </data> <data name="panel4.Size" type="System.Drawing.Size, System.Drawing"> <value>648, 37</value> </data> <data name="panel4.TabIndex" type="System.Int32, mscorlib"> <value>20</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=">>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=">>panel4.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name=">>panel4.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name="tabBasic.Location" type="System.Drawing.Point, System.Drawing"> + <value>4, 22</value> + </data> + <data name=">>tabBasic.Name" xml:space="preserve"> + <value>tabBasic</value> + </data> + <data name="tabBasic.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <value>3, 3, 3, 3</value> + </data> + <data name=">>tabBasic.Parent" xml:space="preserve"> + <value>tabControl1</value> + </data> + <data name="tabBasic.Size" type="System.Drawing.Size, System.Drawing"> + <value>654, 579</value> + </data> + <data name="tabBasic.TabIndex" type="System.Int32, mscorlib"> + <value>0</value> + </data> + <data name="tabBasic.Text" xml:space="preserve"> + <value>Core: basic settings</value> + </data> + <data name=">>tabBasic.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabBasic.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="tabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 10</value> </data> + <data name=">>tabControl1.Name" xml:space="preserve"> + <value>tabControl1</value> + </data> + <data name=">>tabControl1.Parent" xml:space="preserve"> + <value>$this</value> + </data> <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing"> <value>662, 605</value> </data> <data name="tabControl1.TabIndex" type="System.Int32, mscorlib"> <value>10</value> </data> + <data name=">>tabControl1.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabControl1.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="tabControl2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing"> <value>3, 84</value> </data> + <data name=">>tabControl2.Name" xml:space="preserve"> + <value>tabControl2</value> + </data> + <data name=">>tabControl2.Parent" xml:space="preserve"> + <value>groupBox2</value> + </data> <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing"> <value>642, 486</value> </data> <data name="tabControl2.TabIndex" type="System.Int32, mscorlib"> <value>12</value> </data> - <data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing"> - <value>4, 22</value> + <data name=">>tabControl2.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>3, 3, 3, 3</value> - </data> - <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing"> - <value>654, 579</value> - </data> - <data name="tabPage1.TabIndex" type="System.Int32, mscorlib"> + <data name=">>tabControl2.ZOrder" xml:space="preserve"> <value>0</value> </data> - <data name="tabPage1.Text" xml:space="preserve"> - <value>Core: basic settings</value> - </data> - <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing"> + <data name="tabGUI.Location" type="System.Drawing.Point, System.Drawing"> <value>4, 22</value> </data> - <data name="tabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <data name=">>tabGUI.Name" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name="tabGUI.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>3, 3, 3, 3</value> </data> - <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing"> + <data name=">>tabGUI.Parent" xml:space="preserve"> + <value>tabControl1</value> + </data> + <data name="tabGUI.Size" type="System.Drawing.Size, System.Drawing"> <value>654, 579</value> </data> - <data name="tabPage2.TabIndex" type="System.Int32, mscorlib"> - <value>1</value> + <data name="tabGUI.TabIndex" type="System.Int32, mscorlib"> + <value>3</value> </data> - <data name="tabPage2.Text" xml:space="preserve"> - <value>Core: Routing settings</value> + <data name="tabGUI.Text" xml:space="preserve"> + <value>v2rayN settings</value> + </data> + <data name=">>tabGUI.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabGUI.ZOrder" xml:space="preserve"> + <value>3</value> + </data> + <data name="tabKCP.Location" type="System.Drawing.Point, System.Drawing"> + <value>4, 22</value> + </data> + <data name=">>tabKCP.Name" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name="tabKCP.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <value>3, 3, 3, 3</value> + </data> + <data name=">>tabKCP.Parent" xml:space="preserve"> + <value>tabControl1</value> + </data> + <data name="tabKCP.Size" type="System.Drawing.Size, System.Drawing"> + <value>654, 579</value> + </data> + <data name="tabKCP.TabIndex" type="System.Int32, mscorlib"> + <value>2</value> + </data> + <data name="tabKCP.Text" xml:space="preserve"> + <value>Core: KCP settings</value> + </data> + <data name=">>tabKCP.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabKCP.ZOrder" xml:space="preserve"> + <value>2</value> </data> <data name="tabPage3.Location" type="System.Drawing.Point, System.Drawing"> <value>4, 22</value> </data> + <data name=">>tabPage3.Name" xml:space="preserve"> + <value>tabPage3</value> + </data> <data name="tabPage3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>3, 3, 3, 3</value> </data> + <data name=">>tabPage3.Parent" xml:space="preserve"> + <value>tabControl2</value> + </data> <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing"> <value>634, 460</value> </data> @@ -921,12 +2016,24 @@ <data name="tabPage3.Text" xml:space="preserve"> <value>1.Proxy Domain or IP</value> </data> + <data name=">>tabPage3.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabPage3.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="tabPage4.Location" type="System.Drawing.Point, System.Drawing"> <value>4, 22</value> </data> + <data name=">>tabPage4.Name" xml:space="preserve"> + <value>tabPage4</value> + </data> <data name="tabPage4.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>3, 3, 3, 3</value> </data> + <data name=">>tabPage4.Parent" xml:space="preserve"> + <value>tabControl2</value> + </data> <data name="tabPage4.Size" type="System.Drawing.Size, System.Drawing"> <value>634, 460</value> </data> @@ -936,12 +2043,24 @@ <data name="tabPage4.Text" xml:space="preserve"> <value>2.Direct Domain or IP</value> </data> + <data name=">>tabPage4.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabPage4.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="tabPage5.Location" type="System.Drawing.Point, System.Drawing"> <value>4, 22</value> </data> + <data name=">>tabPage5.Name" xml:space="preserve"> + <value>tabPage5</value> + </data> <data name="tabPage5.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>3, 3, 3, 3</value> </data> + <data name=">>tabPage5.Parent" xml:space="preserve"> + <value>tabControl2</value> + </data> <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing"> <value>634, 460</value> </data> @@ -951,165 +2070,432 @@ <data name="tabPage5.Text" xml:space="preserve"> <value>3.Block Domain or IP</value> </data> - <data name="tabPage6.Location" type="System.Drawing.Point, System.Drawing"> - <value>4, 22</value> + <data name=">>tabPage5.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="tabPage6.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>3, 3, 3, 3</value> - </data> - <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing"> - <value>654, 579</value> - </data> - <data name="tabPage6.TabIndex" type="System.Int32, mscorlib"> + <data name=">>tabPage5.ZOrder" xml:space="preserve"> <value>2</value> </data> - <data name="tabPage6.Text" xml:space="preserve"> - <value>Core: KCP settings</value> - </data> - <data name="tabPage7.Location" type="System.Drawing.Point, System.Drawing"> + <data name="tabPreDefinedRules.Location" type="System.Drawing.Point, System.Drawing"> <value>4, 22</value> </data> - <data name="tabPage7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <data name=">>tabPreDefinedRules.Name" xml:space="preserve"> + <value>tabPreDefinedRules</value> + </data> + <data name="tabPreDefinedRules.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>3, 3, 3, 3</value> </data> - <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing"> - <value>654, 579</value> + <data name=">>tabPreDefinedRules.Parent" xml:space="preserve"> + <value>tabControl2</value> </data> - <data name="tabPage7.TabIndex" type="System.Int32, mscorlib"> - <value>3</value> - </data> - <data name="tabPage7.Text" xml:space="preserve"> - <value>v2rayN settings</value> - </data> - <data name="tabPage8.Location" type="System.Drawing.Point, System.Drawing"> - <value>4, 22</value> - </data> - <data name="tabPage8.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>3, 3, 3, 3</value> - </data> - <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing"> + <data name="tabPreDefinedRules.Size" type="System.Drawing.Size, System.Drawing"> <value>634, 460</value> </data> - <data name="tabPage8.TabIndex" type="System.Int32, mscorlib"> + <data name="tabPreDefinedRules.TabIndex" type="System.Int32, mscorlib"> <value>3</value> </data> - <data name="tabPage8.Text" xml:space="preserve"> + <data name="tabPreDefinedRules.Text" xml:space="preserve"> <value>4.Pre-defined rules</value> </data> - <data name="tabPage9.Location" type="System.Drawing.Point, System.Drawing"> + <data name=">>tabPreDefinedRules.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabPreDefinedRules.ZOrder" xml:space="preserve"> + <value>3</value> + </data> + <data name="tabRouting.Location" type="System.Drawing.Point, System.Drawing"> <value>4, 22</value> </data> - <data name="tabPage9.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <data name=">>tabRouting.Name" xml:space="preserve"> + <value>tabRouting</value> + </data> + <data name="tabRouting.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>3, 3, 3, 3</value> </data> - <data name="tabPage9.Size" type="System.Drawing.Size, System.Drawing"> + <data name=">>tabRouting.Parent" xml:space="preserve"> + <value>tabControl1</value> + </data> + <data name="tabRouting.Size" type="System.Drawing.Size, System.Drawing"> <value>654, 579</value> </data> - <data name="tabPage9.TabIndex" type="System.Int32, mscorlib"> + <data name="tabRouting.TabIndex" type="System.Int32, mscorlib"> + <value>1</value> + </data> + <data name="tabRouting.Text" xml:space="preserve"> + <value>Core: Routing settings</value> + </data> + <data name=">>tabRouting.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabRouting.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name="tabUserPAC.Location" type="System.Drawing.Point, System.Drawing"> + <value>4, 22</value> + </data> + <data name=">>tabUserPAC.Name" xml:space="preserve"> + <value>tabUserPAC</value> + </data> + <data name="tabUserPAC.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <value>3, 3, 3, 3</value> + </data> + <data name=">>tabUserPAC.Parent" xml:space="preserve"> + <value>tabControl1</value> + </data> + <data name="tabUserPAC.Size" type="System.Drawing.Size, System.Drawing"> + <value>654, 579</value> + </data> + <data name="tabUserPAC.TabIndex" type="System.Int32, mscorlib"> <value>4</value> </data> - <data name="tabPage9.Text" xml:space="preserve"> + <data name="tabUserPAC.Text" xml:space="preserve"> <value>User PAC settings</value> </data> + <data name=">>tabUserPAC.Type" xml:space="preserve"> + <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>tabUserPAC.ZOrder" xml:space="preserve"> + <value>4</value> + </data> <data name="txtKcpdownlinkCapacity.Location" type="System.Drawing.Point, System.Drawing"> <value>345, 62</value> </data> + <data name=">>txtKcpdownlinkCapacity.Name" xml:space="preserve"> + <value>txtKcpdownlinkCapacity</value> + </data> + <data name=">>txtKcpdownlinkCapacity.Name" xml:space="preserve"> + <value>txtKcpdownlinkCapacity</value> + </data> + <data name=">>txtKcpdownlinkCapacity.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>txtKcpdownlinkCapacity.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="txtKcpdownlinkCapacity.Size" type="System.Drawing.Size, System.Drawing"> <value>94, 21</value> </data> <data name="txtKcpdownlinkCapacity.TabIndex" type="System.Int32, mscorlib"> <value>11</value> </data> + <data name=">>txtKcpdownlinkCapacity.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=">>txtKcpdownlinkCapacity.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=">>txtKcpdownlinkCapacity.ZOrder" xml:space="preserve"> + <value>5</value> + </data> + <data name=">>txtKcpdownlinkCapacity.ZOrder" xml:space="preserve"> + <value>5</value> + </data> <data name="txtKcpmtu.Location" type="System.Drawing.Point, System.Drawing"> <value>111, 24</value> </data> + <data name=">>txtKcpmtu.Name" xml:space="preserve"> + <value>txtKcpmtu</value> + </data> + <data name=">>txtKcpmtu.Name" xml:space="preserve"> + <value>txtKcpmtu</value> + </data> + <data name=">>txtKcpmtu.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>txtKcpmtu.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="txtKcpmtu.Size" type="System.Drawing.Size, System.Drawing"> <value>94, 21</value> </data> <data name="txtKcpmtu.TabIndex" type="System.Int32, mscorlib"> <value>5</value> </data> + <data name=">>txtKcpmtu.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=">>txtKcpmtu.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=">>txtKcpmtu.ZOrder" xml:space="preserve"> + <value>11</value> + </data> + <data name=">>txtKcpmtu.ZOrder" xml:space="preserve"> + <value>11</value> + </data> <data name="txtKcpreadBufferSize.Location" type="System.Drawing.Point, System.Drawing"> <value>111, 100</value> </data> + <data name=">>txtKcpreadBufferSize.Name" xml:space="preserve"> + <value>txtKcpreadBufferSize</value> + </data> + <data name=">>txtKcpreadBufferSize.Name" xml:space="preserve"> + <value>txtKcpreadBufferSize</value> + </data> + <data name=">>txtKcpreadBufferSize.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>txtKcpreadBufferSize.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="txtKcpreadBufferSize.Size" type="System.Drawing.Size, System.Drawing"> <value>94, 21</value> </data> <data name="txtKcpreadBufferSize.TabIndex" type="System.Int32, mscorlib"> <value>13</value> </data> + <data name=">>txtKcpreadBufferSize.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=">>txtKcpreadBufferSize.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=">>txtKcpreadBufferSize.ZOrder" xml:space="preserve"> + <value>3</value> + </data> + <data name=">>txtKcpreadBufferSize.ZOrder" xml:space="preserve"> + <value>3</value> + </data> <data name="txtKcptti.Location" type="System.Drawing.Point, System.Drawing"> <value>345, 24</value> </data> + <data name=">>txtKcptti.Name" xml:space="preserve"> + <value>txtKcptti</value> + </data> + <data name=">>txtKcptti.Name" xml:space="preserve"> + <value>txtKcptti</value> + </data> + <data name=">>txtKcptti.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>txtKcptti.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="txtKcptti.Size" type="System.Drawing.Size, System.Drawing"> <value>94, 21</value> </data> <data name="txtKcptti.TabIndex" type="System.Int32, mscorlib"> <value>7</value> </data> + <data name=">>txtKcptti.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=">>txtKcptti.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=">>txtKcptti.ZOrder" xml:space="preserve"> + <value>9</value> + </data> + <data name=">>txtKcptti.ZOrder" xml:space="preserve"> + <value>9</value> + </data> <data name="txtKcpuplinkCapacity.Location" type="System.Drawing.Point, System.Drawing"> <value>111, 62</value> </data> + <data name=">>txtKcpuplinkCapacity.Name" xml:space="preserve"> + <value>txtKcpuplinkCapacity</value> + </data> + <data name=">>txtKcpuplinkCapacity.Name" xml:space="preserve"> + <value>txtKcpuplinkCapacity</value> + </data> + <data name=">>txtKcpuplinkCapacity.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>txtKcpuplinkCapacity.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="txtKcpuplinkCapacity.Size" type="System.Drawing.Size, System.Drawing"> <value>94, 21</value> </data> <data name="txtKcpuplinkCapacity.TabIndex" type="System.Int32, mscorlib"> <value>9</value> </data> + <data name=">>txtKcpuplinkCapacity.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=">>txtKcpuplinkCapacity.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=">>txtKcpuplinkCapacity.ZOrder" xml:space="preserve"> + <value>7</value> + </data> + <data name=">>txtKcpuplinkCapacity.ZOrder" xml:space="preserve"> + <value>7</value> + </data> <data name="txtKcpwriteBufferSize.Location" type="System.Drawing.Point, System.Drawing"> <value>345, 100</value> </data> + <data name=">>txtKcpwriteBufferSize.Name" xml:space="preserve"> + <value>txtKcpwriteBufferSize</value> + </data> + <data name=">>txtKcpwriteBufferSize.Name" xml:space="preserve"> + <value>txtKcpwriteBufferSize</value> + </data> + <data name=">>txtKcpwriteBufferSize.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> + <data name=">>txtKcpwriteBufferSize.Parent" xml:space="preserve"> + <value>tabKCP</value> + </data> <data name="txtKcpwriteBufferSize.Size" type="System.Drawing.Size, System.Drawing"> <value>94, 21</value> </data> <data name="txtKcpwriteBufferSize.TabIndex" type="System.Int32, mscorlib"> <value>15</value> </data> + <data name=">>txtKcpwriteBufferSize.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=">>txtKcpwriteBufferSize.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=">>txtKcpwriteBufferSize.ZOrder" xml:space="preserve"> + <value>1</value> + </data> + <data name=">>txtKcpwriteBufferSize.ZOrder" xml:space="preserve"> + <value>1</value> + </data> <data name="txtlocalPort.Location" type="System.Drawing.Point, System.Drawing"> <value>124, 25</value> </data> + <data name=">>txtlocalPort.Name" xml:space="preserve"> + <value>txtlocalPort</value> + </data> + <data name=">>txtlocalPort.Name" xml:space="preserve"> + <value>txtlocalPort</value> + </data> + <data name=">>txtlocalPort.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>txtlocalPort.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="txtlocalPort.Size" type="System.Drawing.Size, System.Drawing"> <value>78, 21</value> </data> <data name="txtlocalPort.TabIndex" type="System.Int32, mscorlib"> <value>3</value> </data> + <data name=">>txtlocalPort.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=">>txtlocalPort.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=">>txtlocalPort.ZOrder" xml:space="preserve"> + <value>18</value> + </data> + <data name=">>txtlocalPort.ZOrder" xml:space="preserve"> + <value>18</value> + </data> <data name="txtlocalPort2.Location" type="System.Drawing.Point, System.Drawing"> <value>124, 60</value> </data> + <data name=">>txtlocalPort2.Name" xml:space="preserve"> + <value>txtlocalPort2</value> + </data> + <data name=">>txtlocalPort2.Name" xml:space="preserve"> + <value>txtlocalPort2</value> + </data> + <data name=">>txtlocalPort2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>txtlocalPort2.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="txtlocalPort2.Size" type="System.Drawing.Size, System.Drawing"> <value>78, 21</value> </data> <data name="txtlocalPort2.TabIndex" type="System.Int32, mscorlib"> <value>14</value> </data> + <data name=">>txtlocalPort2.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=">>txtlocalPort2.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="txtlocalPort2.Visible" type="System.Boolean, mscorlib"> <value>False</value> </data> + <data name=">>txtlocalPort2.ZOrder" xml:space="preserve"> + <value>11</value> + </data> + <data name=">>txtlocalPort2.ZOrder" xml:space="preserve"> + <value>11</value> + </data> <data name="txtremoteDNS.Location" type="System.Drawing.Point, System.Drawing"> <value>33, 228</value> </data> <data name="txtremoteDNS.Multiline" type="System.Boolean, mscorlib"> <value>True</value> </data> + <data name=">>txtremoteDNS.Name" xml:space="preserve"> + <value>txtremoteDNS</value> + </data> + <data name=">>txtremoteDNS.Name" xml:space="preserve"> + <value>txtremoteDNS</value> + </data> + <data name=">>txtremoteDNS.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> + <data name=">>txtremoteDNS.Parent" xml:space="preserve"> + <value>groupBox1</value> + </data> <data name="txtremoteDNS.Size" type="System.Drawing.Size, System.Drawing"> <value>555, 100</value> </data> <data name="txtremoteDNS.TabIndex" type="System.Int32, mscorlib"> <value>30</value> </data> + <data name=">>txtremoteDNS.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=">>txtremoteDNS.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=">>txtremoteDNS.ZOrder" xml:space="preserve"> + <value>4</value> + </data> + <data name=">>txtremoteDNS.ZOrder" xml:space="preserve"> + <value>4</value> + </data> <data name="txturlGFWList.Location" type="System.Drawing.Point, System.Drawing"> <value>32, 205</value> </data> <data name="txturlGFWList.Multiline" type="System.Boolean, mscorlib"> <value>True</value> </data> + <data name=">>txturlGFWList.Name" xml:space="preserve"> + <value>txturlGFWList</value> + </data> + <data name=">>txturlGFWList.Name" xml:space="preserve"> + <value>txturlGFWList</value> + </data> + <data name=">>txturlGFWList.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> + <data name=">>txturlGFWList.Parent" xml:space="preserve"> + <value>tabGUI</value> + </data> <data name="txturlGFWList.Size" type="System.Drawing.Size, System.Drawing"> <value>541, 100</value> </data> <data name="txturlGFWList.TabIndex" type="System.Int32, mscorlib"> <value>28</value> </data> + <data name=">>txturlGFWList.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=">>txturlGFWList.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=">>txturlGFWList.ZOrder" xml:space="preserve"> + <value>5</value> + </data> + <data name=">>txturlGFWList.ZOrder" xml:space="preserve"> + <value>5</value> + </data> <data name="txtUseragent.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> @@ -1122,6 +2508,18 @@ <data name="txtUseragent.Multiline" type="System.Boolean, mscorlib"> <value>True</value> </data> + <data name=">>txtUseragent.Name" xml:space="preserve"> + <value>txtUseragent</value> + </data> + <data name=">>txtUseragent.Name" xml:space="preserve"> + <value>txtUseragent</value> + </data> + <data name=">>txtUseragent.Parent" xml:space="preserve"> + <value>tabPage3</value> + </data> + <data name=">>txtUseragent.Parent" xml:space="preserve"> + <value>tabPage3</value> + </data> <data name="txtUseragent.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms"> <value>Vertical</value> </data> @@ -1131,6 +2529,18 @@ <data name="txtUseragent.TabIndex" type="System.Int32, mscorlib"> <value>0</value> </data> + <data name=">>txtUseragent.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=">>txtUseragent.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=">>txtUseragent.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>txtUseragent.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="txtUserblock.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> @@ -1143,6 +2553,18 @@ <data name="txtUserblock.Multiline" type="System.Boolean, mscorlib"> <value>True</value> </data> + <data name=">>txtUserblock.Name" xml:space="preserve"> + <value>txtUserblock</value> + </data> + <data name=">>txtUserblock.Name" xml:space="preserve"> + <value>txtUserblock</value> + </data> + <data name=">>txtUserblock.Parent" xml:space="preserve"> + <value>tabPage5</value> + </data> + <data name=">>txtUserblock.Parent" xml:space="preserve"> + <value>tabPage5</value> + </data> <data name="txtUserblock.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms"> <value>Vertical</value> </data> @@ -1152,6 +2574,18 @@ <data name="txtUserblock.TabIndex" type="System.Int32, mscorlib"> <value>1</value> </data> + <data name=">>txtUserblock.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=">>txtUserblock.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=">>txtUserblock.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>txtUserblock.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="txtUserdirect.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> @@ -1164,6 +2598,18 @@ <data name="txtUserdirect.Multiline" type="System.Boolean, mscorlib"> <value>True</value> </data> + <data name=">>txtUserdirect.Name" xml:space="preserve"> + <value>txtUserdirect</value> + </data> + <data name=">>txtUserdirect.Name" xml:space="preserve"> + <value>txtUserdirect</value> + </data> + <data name=">>txtUserdirect.Parent" xml:space="preserve"> + <value>tabPage4</value> + </data> + <data name=">>txtUserdirect.Parent" xml:space="preserve"> + <value>tabPage4</value> + </data> <data name="txtUserdirect.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms"> <value>Vertical</value> </data> @@ -1173,6 +2619,18 @@ <data name="txtUserdirect.TabIndex" type="System.Int32, mscorlib"> <value>1</value> </data> + <data name=">>txtUserdirect.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=">>txtUserdirect.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=">>txtUserdirect.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>txtUserdirect.ZOrder" xml:space="preserve"> + <value>0</value> + </data> <data name="txtuserPacRule.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> @@ -1185,6 +2643,18 @@ <data name="txtuserPacRule.Multiline" type="System.Boolean, mscorlib"> <value>True</value> </data> + <data name=">>txtuserPacRule.Name" xml:space="preserve"> + <value>txtuserPacRule</value> + </data> + <data name=">>txtuserPacRule.Name" xml:space="preserve"> + <value>txtuserPacRule</value> + </data> + <data name=">>txtuserPacRule.Parent" xml:space="preserve"> + <value>tabUserPAC</value> + </data> + <data name=">>txtuserPacRule.Parent" xml:space="preserve"> + <value>tabUserPAC</value> + </data> <data name="txtuserPacRule.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms"> <value>Vertical</value> </data> @@ -1194,4 +2664,16 @@ <data name="txtuserPacRule.TabIndex" type="System.Int32, mscorlib"> <value>21</value> </data> + <data name=">>txtuserPacRule.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=">>txtuserPacRule.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=">>txtuserPacRule.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name=">>txtuserPacRule.ZOrder" xml:space="preserve"> + <value>0</value> + </data> </root> \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx index 1509bce5..b2ecd834 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx @@ -312,17 +312,20 @@ <data name="panel3.Size" type="System.Drawing.Size, System.Drawing"> <value>642, 72</value> </data> + <data name="tabBasic.Text" xml:space="preserve"> + <value> Core:基础设置 </value> + </data> <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing"> <value>3, 89</value> </data> <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing"> <value>642, 481</value> </data> - <data name="tabPage1.Text" xml:space="preserve"> - <value> Core:基础设置 </value> + <data name="tabGUI.Text" xml:space="preserve"> + <value> v2rayN设置 </value> </data> - <data name="tabPage2.Text" xml:space="preserve"> - <value> Core:路由设置 </value> + <data name="tabKCP.Text" xml:space="preserve"> + <value> Core:KCP设置 </value> </data> <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing"> <value>634, 455</value> @@ -342,19 +345,16 @@ <data name="tabPage5.Text" xml:space="preserve"> <value> 3.阻止的Domain或IP </value> </data> - <data name="tabPage6.Text" xml:space="preserve"> - <value> Core:KCP设置 </value> - </data> - <data name="tabPage7.Text" xml:space="preserve"> - <value> v2rayN设置 </value> - </data> <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing"> <value>634, 455</value> </data> - <data name="tabPage8.Text" xml:space="preserve"> + <data name="tabPreDefinedRules.Text" xml:space="preserve"> <value> 4.预定义规则 </value> </data> - <data name="tabPage9.Text" xml:space="preserve"> + <data name="tabRouting.Text" xml:space="preserve"> + <value> Core:路由设置 </value> + </data> + <data name="tabUserPAC.Text" xml:space="preserve"> <value> 用户PAC设置 </value> </data> <data name="txtUseragent.Size" type="System.Drawing.Size, System.Drawing"> diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index c6748e56..3dae84b1 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -85,10 +85,6 @@ namespace v2rayN.Handler { config.domainStrategy = "IPIfNonMatch"; } - if (Utils.IsNullOrEmpty(config.routingMode)) - { - config.routingMode = "0"; - } if (config.useragent == null) { config.useragent = new List<string>(); diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs index 519b51e2..f14296dc 100644 --- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs +++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs @@ -145,7 +145,7 @@ namespace v2rayN.Handler } } - public async Task<int> RunAvailabilityCheck() // alias: isLive + public int RunAvailabilityCheck() // alias: isLive { try { diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs index 9ea93933..1296112a 100644 --- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs @@ -195,15 +195,15 @@ namespace v2rayN.Handler switch (config.routingMode) { - case "0": + case 0: break; - case "1": + case 1: routingGeo("ip", "private", Global.directTag, ref v2rayConfig); break; - case "2": + case 2: routingGeo("", "cn", Global.directTag, ref v2rayConfig); break; - case "3": + case 3: routingGeo("ip", "private", Global.directTag, ref v2rayConfig); routingGeo("", "cn", Global.directTag, ref v2rayConfig); break; diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index 515114df..d48da6ee 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -71,7 +71,7 @@ namespace v2rayN.Mode /// <summary> /// 路由模式 /// </summary> - public string routingMode + public int routingMode { get; set; } diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index b5b956d6..916fc039 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -690,6 +690,42 @@ namespace v2rayN.Resx { } } + /// <summary> + /// 查找类似 Bypass CN 的本地化字符串。 + /// </summary> + internal static string RoutingModeBypassCN { + get { + return ResourceManager.GetString("RoutingModeBypassCN", resourceCulture); + } + } + + /// <summary> + /// 查找类似 Bypass LAN 的本地化字符串。 + /// </summary> + internal static string RoutingModeBypassLAN { + get { + return ResourceManager.GetString("RoutingModeBypassLAN", resourceCulture); + } + } + + /// <summary> + /// 查找类似 Bypass LAN+CN 的本地化字符串。 + /// </summary> + internal static string RoutingModeBypassLANCN { + get { + return ResourceManager.GetString("RoutingModeBypassLANCN", resourceCulture); + } + } + + /// <summary> + /// 查找类似 Global 的本地化字符串。 + /// </summary> + internal static string RoutingModeGlobal { + get { + return ResourceManager.GetString("RoutingModeGlobal", resourceCulture); + } + } + /// <summary> /// 查找类似 The client configuration file is saved at: {0} 的本地化字符串。 /// </summary> @@ -708,6 +744,15 @@ namespace v2rayN.Resx { } } + /// <summary> + /// 查找类似 ... 的本地化字符串。 + /// </summary> + internal static string ServerLatencyChecking { + get { + return ResourceManager.GetString("ServerLatencyChecking", resourceCulture); + } + } + /// <summary> /// 查找类似 SlowFresh 的本地化字符串。 /// </summary> @@ -789,5 +834,14 @@ namespace v2rayN.Resx { return ResourceManager.GetString("TestMeOutput", resourceCulture); } } + + /// <summary> + /// 查找类似 Latency: {0} 的本地化字符串。 + /// </summary> + internal static string toolSslServerLatency { + get { + return ResourceManager.GetString("toolSslServerLatency", resourceCulture); + } + } } } diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 50d37abe..9066ae09 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -327,12 +327,27 @@ <data name="RemoveServer" xml:space="preserve"> <value>Are you sure to remove the server?</value> </data> + <data name="RoutingModeBypassCN" xml:space="preserve"> + <value>Bypass CN</value> + </data> + <data name="RoutingModeBypassLAN" xml:space="preserve"> + <value>Bypass LAN</value> + </data> + <data name="RoutingModeBypassLANCN" xml:space="preserve"> + <value>Bypass LAN+CN</value> + </data> + <data name="RoutingModeGlobal" xml:space="preserve"> + <value>Global</value> + </data> <data name="SaveClientConfigurationIn" xml:space="preserve"> <value>The client configuration file is saved at: {0}</value> </data> <data name="SaveServerConfigurationIn" xml:space="preserve"> <value>The server configuration file is saved at: {0}</value> </data> + <data name="ServerLatencyChecking" xml:space="preserve"> + <value>...</value> + </data> <data name="SlowFresh" xml:space="preserve"> <value>SlowFresh</value> </data> @@ -361,4 +376,7 @@ <data name="TestMeOutput" xml:space="preserve"> <value>The ping of current service: {0}</value> </data> + <data name="toolSslServerLatency" xml:space="preserve"> + <value>Latency: {0}</value> + </data> </root> \ No newline at end of file diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index 4b312497..c88b54ae 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -327,12 +327,27 @@ <data name="RemoveServer" xml:space="preserve"> <value>是否确定移除服务器?</value> </data> + <data name="RoutingModeBypassCN" xml:space="preserve"> + <value>绕过大陆</value> + </data> + <data name="RoutingModeBypassLAN" xml:space="preserve"> + <value>绕过局域网</value> + </data> + <data name="RoutingModeBypassLANCN" xml:space="preserve"> + <value>绕过局域网和大陆</value> + </data> + <data name="RoutingModeGlobal" xml:space="preserve"> + <value>路由: 全局</value> + </data> <data name="SaveClientConfigurationIn" xml:space="preserve"> <value>客户端配置文件保存在:{0}</value> </data> <data name="SaveServerConfigurationIn" xml:space="preserve"> <value>服务端配置文件保存在:{0}</value> </data> + <data name="ServerLatencyChecking" xml:space="preserve"> + <value>...</value> + </data> <data name="SlowFresh" xml:space="preserve"> <value>慢</value> </data> @@ -361,4 +376,7 @@ <data name="TestMeOutput" xml:space="preserve"> <value>当前服务的真连接延迟: {0}</value> </data> + <data name="toolSslServerLatency" xml:space="preserve"> + <value>延迟: {0}</value> + </data> </root> \ No newline at end of file