diff --git a/v2rayN/v2rayN/Forms/MainMsgControl.resx b/v2rayN/v2rayN/Forms/MainMsgControl.resx index a4461339..80eab070 100644 --- a/v2rayN/v2rayN/Forms/MainMsgControl.resx +++ b/v2rayN/v2rayN/Forms/MainMsgControl.resx @@ -375,9 +375,6 @@ 131, 18 - - zh-Hans - True diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs index f2d0fb9d..7ccbdfe3 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs @@ -104,6 +104,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.btnOK = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.chkEnableSystemProxyAdvanced = new System.Windows.Forms.CheckBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -118,34 +119,33 @@ // // btnClose // - resources.ApplyResources(this.btnClose, "btnClose"); this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.btnClose, "btnClose"); this.btnClose.Name = "btnClose"; this.btnClose.UseVisualStyleBackColor = true; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // // tabControl1 // - resources.ApplyResources(this.tabControl1, "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.tabPageCoreType); this.tabControl1.Controls.Add(this.tabPage3); + resources.ApplyResources(this.tabControl1, "tabControl1"); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; // // tabPage1 // - resources.ApplyResources(this.tabPage1, "tabPage1"); this.tabPage1.Controls.Add(this.groupBox1); + resources.ApplyResources(this.tabPage1, "tabPage1"); this.tabPage1.Name = "tabPage1"; this.tabPage1.UseVisualStyleBackColor = true; // // groupBox1 // - resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.label16); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.txtpass); @@ -162,6 +162,7 @@ this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.txtlocalPort); this.groupBox1.Controls.Add(this.label2); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // @@ -211,8 +212,8 @@ // // cmbprotocol // - resources.ApplyResources(this.cmbprotocol, "cmbprotocol"); this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.cmbprotocol, "cmbprotocol"); this.cmbprotocol.FormattingEnabled = true; this.cmbprotocol.Items.AddRange(new object[] { resources.GetString("cmbprotocol.Items"), @@ -238,7 +239,6 @@ // // cmbloglevel // - resources.ApplyResources(this.cmbloglevel, "cmbloglevel"); this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbloglevel.FormattingEnabled = true; this.cmbloglevel.Items.AddRange(new object[] { @@ -247,6 +247,7 @@ resources.GetString("cmbloglevel.Items2"), resources.GetString("cmbloglevel.Items3"), resources.GetString("cmbloglevel.Items4")}); + resources.ApplyResources(this.cmbloglevel, "cmbloglevel"); this.cmbloglevel.Name = "cmbloglevel"; // // label5 @@ -266,10 +267,10 @@ // // tabPage2 // - resources.ApplyResources(this.tabPage2, "tabPage2"); this.tabPage2.Controls.Add(this.linkDnsObjectDoc); this.tabPage2.Controls.Add(this.txtremoteDNS); this.tabPage2.Controls.Add(this.label14); + resources.ApplyResources(this.tabPage2, "tabPage2"); this.tabPage2.Name = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; // @@ -292,7 +293,6 @@ // // tabPage6 // - resources.ApplyResources(this.tabPage6, "tabPage6"); this.tabPage6.Controls.Add(this.chkKcpcongestion); this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize); this.tabPage6.Controls.Add(this.label10); @@ -306,6 +306,7 @@ 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; // @@ -377,7 +378,6 @@ // // tabPage7 // - resources.ApplyResources(this.tabPage7, "tabPage7"); this.tabPage7.Controls.Add(this.txttrayMenuServersLimit); this.tabPage7.Controls.Add(this.label17); this.tabPage7.Controls.Add(this.txtautoUpdateSubInterval); @@ -393,6 +393,7 @@ this.tabPage7.Controls.Add(this.lbFreshrate); this.tabPage7.Controls.Add(this.chkEnableStatistics); this.tabPage7.Controls.Add(this.chkAutoRun); + resources.ApplyResources(this.tabPage7, "tabPage7"); this.tabPage7.Name = "tabPage7"; this.tabPage7.UseVisualStyleBackColor = true; // @@ -459,9 +460,9 @@ // // cbFreshrate // - resources.ApplyResources(this.cbFreshrate, "cbFreshrate"); this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbFreshrate.FormattingEnabled = true; + resources.ApplyResources(this.cbFreshrate, "cbFreshrate"); this.cbFreshrate.Name = "cbFreshrate"; // // lbFreshrate @@ -483,7 +484,6 @@ // // tabPageCoreType // - resources.ApplyResources(this.tabPageCoreType, "tabPageCoreType"); this.tabPageCoreType.Controls.Add(this.cmbCoreType6); this.tabPageCoreType.Controls.Add(this.labCoreType6); this.tabPageCoreType.Controls.Add(this.cmbCoreType5); @@ -496,14 +496,15 @@ this.tabPageCoreType.Controls.Add(this.labCoreType2); this.tabPageCoreType.Controls.Add(this.cmbCoreType1); this.tabPageCoreType.Controls.Add(this.labCoreType1); + resources.ApplyResources(this.tabPageCoreType, "tabPageCoreType"); this.tabPageCoreType.Name = "tabPageCoreType"; this.tabPageCoreType.UseVisualStyleBackColor = true; // // cmbCoreType6 // - resources.ApplyResources(this.cmbCoreType6, "cmbCoreType6"); this.cmbCoreType6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType6.FormattingEnabled = true; + resources.ApplyResources(this.cmbCoreType6, "cmbCoreType6"); this.cmbCoreType6.Name = "cmbCoreType6"; // // labCoreType6 @@ -513,9 +514,9 @@ // // cmbCoreType5 // - resources.ApplyResources(this.cmbCoreType5, "cmbCoreType5"); this.cmbCoreType5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType5.FormattingEnabled = true; + resources.ApplyResources(this.cmbCoreType5, "cmbCoreType5"); this.cmbCoreType5.Name = "cmbCoreType5"; // // labCoreType5 @@ -525,9 +526,9 @@ // // cmbCoreType4 // - resources.ApplyResources(this.cmbCoreType4, "cmbCoreType4"); this.cmbCoreType4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType4.FormattingEnabled = true; + resources.ApplyResources(this.cmbCoreType4, "cmbCoreType4"); this.cmbCoreType4.Name = "cmbCoreType4"; // // labCoreType4 @@ -537,9 +538,9 @@ // // cmbCoreType3 // - resources.ApplyResources(this.cmbCoreType3, "cmbCoreType3"); this.cmbCoreType3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType3.FormattingEnabled = true; + resources.ApplyResources(this.cmbCoreType3, "cmbCoreType3"); this.cmbCoreType3.Name = "cmbCoreType3"; // // labCoreType3 @@ -549,9 +550,9 @@ // // cmbCoreType2 // - resources.ApplyResources(this.cmbCoreType2, "cmbCoreType2"); this.cmbCoreType2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType2.FormattingEnabled = true; + resources.ApplyResources(this.cmbCoreType2, "cmbCoreType2"); this.cmbCoreType2.Name = "cmbCoreType2"; // // labCoreType2 @@ -561,9 +562,9 @@ // // cmbCoreType1 // - resources.ApplyResources(this.cmbCoreType1, "cmbCoreType1"); this.cmbCoreType1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType1.FormattingEnabled = true; + resources.ApplyResources(this.cmbCoreType1, "cmbCoreType1"); this.cmbCoreType1.Name = "cmbCoreType1"; // // labCoreType1 @@ -573,17 +574,18 @@ // // tabPage3 // - resources.ApplyResources(this.tabPage3, "tabPage3"); this.tabPage3.Controls.Add(this.groupBox2); + resources.ApplyResources(this.tabPage3, "tabPage3"); this.tabPage3.Name = "tabPage3"; this.tabPage3.UseVisualStyleBackColor = true; // // groupBox2 // - resources.ApplyResources(this.groupBox2, "groupBox2"); + this.groupBox2.Controls.Add(this.chkEnableSystemProxyAdvanced); this.groupBox2.Controls.Add(this.label13); this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.txtsystemProxyExceptions); + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // @@ -604,9 +606,9 @@ // // panel2 // - resources.ApplyResources(this.panel2, "panel2"); this.panel2.Controls.Add(this.btnClose); this.panel2.Controls.Add(this.btnOK); + resources.ApplyResources(this.panel2, "panel2"); this.panel2.Name = "panel2"; // // btnOK @@ -621,6 +623,12 @@ resources.ApplyResources(this.panel1, "panel1"); this.panel1.Name = "panel1"; // + // chkEnableSystemProxyAdvanced + // + resources.ApplyResources(this.chkEnableSystemProxyAdvanced, "chkEnableSystemProxyAdvanced"); + this.chkEnableSystemProxyAdvanced.Name = "chkEnableSystemProxyAdvanced"; + this.chkEnableSystemProxyAdvanced.UseVisualStyleBackColor = true; + // // OptionSettingForm // resources.ApplyResources(this, "$this"); @@ -729,5 +737,6 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox txttrayMenuServersLimit; private System.Windows.Forms.Label label17; + private System.Windows.Forms.CheckBox chkEnableSystemProxyAdvanced; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs index 755344f5..e9b3a19e 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs @@ -58,6 +58,8 @@ namespace v2rayN.Forms chkdefAllowInsecure.Checked = config.defAllowInsecure; txtsystemProxyExceptions.Text = config.systemProxyExceptions; + + chkEnableSystemProxyAdvanced.Checked = config.enableSystemProxyAdvanced; } @@ -253,6 +255,8 @@ namespace v2rayN.Forms config.systemProxyExceptions = txtsystemProxyExceptions.Text.TrimEx(); + config.enableSystemProxyAdvanced = chkEnableSystemProxyAdvanced.Checked; + return 0; } diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx index b1ee7ec9..0d8cdf99 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx @@ -117,1826 +117,359 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage6 - - - 351, 211 - - - groupBox1 - - - - 6 - - - Listening port - - - 8 - - - 317, 12 - - - panel2 - - - tabPage7 - - - tabPage7 - 355, 16 - - tabPage7 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 97, 21 - - - error - - - 15, 129 - - - readBufferSize - - - - NoControl - - - chkudpEnabled - - - 45 - - - txtpass - - - 282, 23 - - - downlinkCapacity - - - mtu - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - labCoreType4 - - - 506, 16 - - - 41 - - - 36 - - - 10 - - - 120, 21 - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Log level - - - 351, 157 - - - groupBox1 - - - panel1 - - - tabPage6 - - - 620, 37 - - - 11 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 35 - - - 6 - - - 45, 150 - - - Enable UDP - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15, 131 - - - tabPage7 - - - 8, 41 - - - 45, 46 - - - 94, 21 - - - 390, 16 - - - groupBox1 - - - 2 - - - tabPage7 - - - 285, 25 - - - 15, 16 - - - 125, 12 - - - 97, 21 - - - cbFreshrate - - - Statistics freshrate - - - warning - - - 0 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - Keep older when deduplication - - - txtlocalPort - - - 84, 16 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - True - - - 15 - - - 193, 162 - - - 342, 17 - - - 95, 12 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 27, 188 - - - 8 - - - tabPage7 - - - 236, 66 - - - 1 - - - groupBox1 - - - 13 - - - 2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15, 39 - - - 124, 25 - - - True - - - 10 - - - 0 - - - 9 - - - protocol - - - True - - - tabPage6 - - - 3, 3, 3, 3 - - - True - - - chkEnableStatistics - - - OptionSettingForm - - - 8 - - - 12 - - - label14 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - Record local logs - - - Automatically adjust column width after updating subscription - - - Auth user - - - label15 - - - 43 - - - labCoreType3 - - - 5 - - - True - - - 117, 68 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 33, 29 - - - 11 - - - 117, 172 - - - Use semicolon (;) - - - 75, 23 - - - tabControl1 - - - tabPage2 - - - 12 - - - 3, 3, 3, 3 - - - groupBox1 - - - lbFreshrate - - - labCoreType1 - - - 44 - - - 10 - - - 9 - - - 14 - - - 4, 4, 4, 4 - - - NoControl - - - 4, 22 - - - Core Type - - - 736, 453 - - - 59, 12 - - - 15, 108 - - - True - - - 2 - - - True - - - uplinkCapacity - - - 0 - - - 36 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - none - - - 7 - - - 45, 98 - - - label10 - - - 94, 21 - - - 4 - - - True - - - 78, 21 - - - txtsystemProxyExceptions - - - 236, 104 - - - 42 - - - True - - - label11 - - - 1 - - - 12 - - - True - - - chkEnableAutoAdjustMainLvColWidth - - - 0 - - - 7 - - - NoControl - - - btnSetLoopback - - - chkEnableSecurityProtocolTls13 - - - 10 - - - 15, 160 - - - 97, 20 - - - 143, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - 23 - - - cmbloglevel - - - 496, 61 - - - label16 - - - 20 - - - v2rayN settings - - - groupBox1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - tabPage7 - - - 3 - - - 120, 16 - - - $this - - - groupBox1 - - - NoControl - - - cmbCoreType6 - - - True - - - 58, 20 - - - label17 - - - 97, 21 - - - v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - tabPageCoreType - - - tabPageCoreType - - - 496, 27 - - - linkDnsObjectDoc - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - cmbCoreType5 - - - tabPageCoreType - - - tabPageCoreType - - - 0, 463 - - - 143, 20 - - - 4, 22 - - - True - - - Bottom - - - tti - - - 468, 16 - - - Enable Security Protocol TLS v1.3 (subscription/update/speedtest) - - - 94, 21 - - - 0 - - - NoControl - - - groupBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - True - - - 6 - - - groupBox2 - - - 1 - - - 9 - - - 94, 21 - - - tabPage6 - - - Settings - - - True - - - 11 - - - 89, 12 - - - label12 - - - 1 - - - chkmuxEnabled - - - 0 - - - Automatic update interval of and Geo (hours) - - - label2 - - - 1 - - - groupBox1 - - - label6 - - - tabPage6 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 13 - - - label13 - - - 46 - - - tabControl1 - - - 111, 100 - - - 0 - - - 37 - - - 0 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 7 - - - Automatic update interval of subscriptions (hours) - - - Custom DNS (multiple, separated by commas (,)) - - - 1 - - - 30, 376 - - - chklogEnabled - - - True - - - 345, 62 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 59, 12 - - - 4 - - - 5 - - - 8, 17 - - - 41 - - - 39 - - - 111, 24 - - - 97, 21 - - - &OK - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - txtKcpmtu - - - 6 - - - Fill - - - 3, 3 - - - NoControl - - - 8, 52 - - - 4 - - - 102, 16 - - - cmbCoreType4 - - - groupBox2 - - - Fill - - - groupBox1 - - - 6 - - - 736, 523 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - txtKcpwriteBufferSize - - - 18, 28 - - - 101, 12 - - - 736, 10 - - - 236, 28 - - - groupBox2 - - - groupBox1 - - - NoControl - - - 8 - 75, 23 - - 0 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 345, 100 - - - 39 - - - 2 - - - 15, 63 - - - Exception - - - tabPage7 - - - 38 - - - chkIgnoreGeoUpdateCore - - - NoControl - - - chksniffingEnabled - - - tabPage7 - - - 5 - - - labCoreType6 - - - 198, 16 - - - 0, 0, 0, 0 - - - 15, 62 - - - 0, 10 - - - NoControl - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 42 - - - 397, 65 - - - tabPageCoreType - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 11 - - - 53, 12 - - - 2 - - - tabPageCoreType - - - Core Type - - - True - - - 5 - - - 728, 427 - - - labCoreType2 - - + + 7 - - Tray right-click menu servers display limit - - - NoControl - - - 8, 28 - - - 9 - - - 59, 12 - - - chkKeepOlderDedupl - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 84, 16 - - - txtautoUpdateSubInterval - - - NoControl - - - label5 - - - 59, 12 - - - 728, 427 - - - Core Type - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 728, 427 - - - True - - - 489, 41 - - - tabControl1 - - - 1 - - - tabPage1 - - - 45, 176 - - - 10 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 9 - - - 3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 43 - - - 47 - - - 59, 12 - - - allowInsecure - - - 36 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 10 - - - tabPage7 - - - Core Type - - - 728, 427 - - - True - - - btnOK - - - True - - - 8 - - - cmbCoreType3 - - - 397, 27 - - - 42 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 41 - - - 42 - - - 45, 124 - - - tabPage7 - - - tabControl1 - - - 59, 12 - - - 10 - - - tabControl1 - - - Core: basic settings - - - 6 - - - CoreType settings - - - 6 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 263, 12 - - - panel2 - - - tabPage7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - chkAutoRun - - - 143, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15, 192 - - - tabPage2 - - - btnClose - - - 638, 356 - - - chkdefAllowInsecure - - - 0 - - - 638, 219 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4 - - - tabPage3 - - - 40 - - - 143, 20 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - txtKcptti - - - 23, 12 - - - 3, 3, 3, 3 - - - 23, 12 - - - 4, 22 - - - True - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 30 - - - 285, 61 - - - 45, 72 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 143, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - writeBufferSize - - - 117, 146 - - - Ignore Geo files when updating core - - - 736, 60 - - - 39 - - - 38 - - - txtKcpdownlinkCapacity - - - 117, 42 - - - label4 - - - 29 - - - label8 - - - 257, 158 - - - txtKcpreadBufferSize - - - NoControl - - - True - &Cancel - - 15, 85 + + btnClose - - 3, 3, 3, 3 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 351, 184 + + panel2 - - NoControl - - - groupBox1 - - - chkAllowLANConn - - - 32 - - - tabPage6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 27, 215 - - - 89, 12 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 234, 16 - - - 89, 12 - - - 12 - - - Automatically start at system startup - - - congestion - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 107, 12 - - - groupBox1 - - - False - - - 97, 20 - - - 4 - - - 11 - - - tabPage6 - - - txtuser - - - tabControl1 - - - 107, 12 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 20 - - - 117, 120 - - - True - - - 143, 20 - - - 345, 24 - - - Top - - - 11 - - - True - - - NoControl - - - 4, 22 - - - NoControl - - - 8 - - - 59, 12 - - - 39 - - - 18, 66 - - - Allow connections from the LAN - - - True - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - 18, 104 - - - Set Windows10 UWP Loopback - - - txtautoUpdateInterval - - - 9 - - - 246, 16 - - - tabPage1 - - - 2 - - - 94, 21 - - - Fill - - - True - - - 13 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 5 - - - Turn on Mux Multiplexing - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 22 - - - 6 - - - tabPageCoreType - - - tabPageCoreType - - - groupBox1 - - - 7 - - - 94, 21 - - - Turn on Sniffing - - - socks - - - tabPageCoreType - - - 117, 94 - - - 14 - - - 29 - - - http - - - True - - - NoControl - - - Vertical - - - 8 - - - True - - - 37 - - - label1 - - - 31 - - - groupBox1 - - - 37 - - - $this - - - 728, 427 - - - 3 - - - label9 - - - True - - - tabPage7 - - - txttrayMenuServersLimit - - - Support DnsObject - - - True - - - 267, 16 - - - NoControl - - - txtKcpuplinkCapacity - - - 3 - - - tabPage6 - - - 40 - - - 174, 16 - - - 224, 29 - - - 40 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 722, 421 - - - 2 + + 0 True - - 224, 65 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Vertical - - - Core Type - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 22 - - - cmbCoreType2 - - - 38 - - - 281, 12 - - + + NoControl - - 20, 143 + + 397, 65 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Core Type - - - 44 - - - True - - - System proxy settings - - - 15 - - - 126, 16 - - - cmbCoreType1 - - - label3 - - - 5 - - - tabPage6 - - - 2 - - - label7 - - - NoControl - - + 59, 12 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - txtremoteDNS + + 39 Auth pass - - tabPage7 + + label16 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 - - 40 + + 0 - + + True + + + NoControl + + + 224, 65 + + + 59, 12 + + + 38 + + + Auth user + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 496, 61 + + + 120, 21 + + + 37 + + + txtpass + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + 285, 61 + + + 97, 21 + + + 36 + + + txtuser + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + True + + + NoControl + + + 15, 192 + + + 102, 16 + + + 35 + + + allowInsecure + + + chkdefAllowInsecure + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 + + + 4 + + + True + + + 15, 63 + 204, 16 - - 6, 12 + + 29 - + + Allow connections from the LAN + + + chkAllowLANConn + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + True + + + NoControl + + + 496, 27 + + + 120, 16 + + + 31 + + + Turn on Sniffing + + + chksniffingEnabled + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + True + + + 15, 129 + + + 174, 16 + + + 20 + + + Turn on Mux Multiplexing + + + chkmuxEnabled + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 7 + + + False + + + socks + + + http + + + 285, 25 + + + 97, 20 + + 12 - - 2 + + cmbprotocol - + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 8 + + + True + + + 224, 29 + + + 53, 12 + + + 11 + + + protocol + + + label1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Core: DNS settings + + groupBox1 - - 45 + + 9 - - 59, 12 + + True - - 27, 161 + + 397, 27 - - 0, 0 + + 84, 16 - - Enable Statistics (Realtime netspeed and traffic records. Require restart) + + 10 - - $this + + Enable UDP - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + chkudpEnabled - - panel2 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 10 + + + True + + + 15, 160 + + + 126, 16 + + + 9 + + + Record local logs + + + chklogEnabled + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 11 debug @@ -1944,169 +477,1660 @@ info - - Core: KCP settings + + warning - - 5 + + error - - tabControl1 + + none - - labCoreType5 + + 257, 158 - - 111, 62 + + 97, 20 - + + 6 + + + cmbloglevel + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 12 + + + True + + + 193, 162 + + + 59, 12 + + + 8 + + + Log level + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 13 + + + 124, 25 + + + 78, 21 + + + 3 + + + txtlocalPort + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 305, 12 + + groupBox1 + + + 14 + + + True + + + 33, 29 + + + 89, 12 + + + 2 + + + Listening port + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 15 + + + Fill + + + 3, 3 + + + 722, 421 + + + 6 + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 728, 427 + + + 0 + + + Core: basic settings + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + + + True + + + NoControl + + + 342, 17 + + + 0, 0, 0, 0 + + + 107, 12 + + + 40 + + + Support DnsObject + + + linkDnsObjectDoc + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 0 + + + 8, 41 + + + True + + + Vertical + + + 638, 356 + + + 39 + + + txtremoteDNS + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 1 + + + True + + + NoControl + + + 8, 17 + + + 281, 12 38 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Custom DNS (multiple, separated by commas (,)) - + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 2 + + + 4, 22 + + + 728, 427 + + 4 - - chkKcpcongestion + + Core: DNS settings + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 1 + + True + + + 20, 143 + + + 84, 16 + + + 20 + + + congestion + + + chkKcpcongestion + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + 0 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 345, 100 - - 33 + + 94, 21 - + + 15 + + + txtKcpwriteBufferSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 1 + + + True + + + 236, 104 + + + 95, 12 + + + 14 + + + writeBufferSize + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 2 + + + 111, 100 + + + 94, 21 + + + 13 + + + txtKcpreadBufferSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 3 + + + True + + + 18, 104 + + + 89, 12 + + + 12 + + + readBufferSize + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 4 + + + 345, 62 + + + 94, 21 + + + 11 + + + txtKcpdownlinkCapacity + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 5 + + + True + + + 236, 66 + + + 101, 12 + + + 10 + + + downlinkCapacity + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 6 + + + 111, 62 + + + 94, 21 + + + 9 + + + txtKcpuplinkCapacity + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + 7 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 18, 66 - - 269, 12 + + 89, 12 - - 728, 427 + + 8 - - NoControl + + uplinkCapacity - - tabPageCoreType + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tabPage6 - + + 8 + + + 345, 24 + + + 94, 21 + + + 7 + + + txtKcptti + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 9 + + + True + + + 236, 28 + + + 23, 12 + + + 6 + + + tti + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 10 + + + 111, 24 + + + 94, 21 + + + 5 + + + txtKcpmtu + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 11 + + + True + + + 18, 28 + + + 23, 12 + + + 4 + + + mtu + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 12 + + + 4, 22 + + + 3, 3, 3, 3 + + 728, 427 - + + 2 + + + Core: KCP settings + + + tabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 2 + + + 351, 211 + + + 97, 21 + + + 45 + + + txttrayMenuServersLimit + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 0 + + + True + + + NoControl + + + 27, 215 + + + 263, 12 + + + 44 + + + Tray right-click menu servers display limit + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 1 + + + 351, 184 + + + 97, 21 + + + 43 + + + txtautoUpdateSubInterval + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 2 + + + True + + + NoControl + + + 27, 188 + + + 305, 12 + + + 42 + + + Automatic update interval of subscriptions (hours) + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 3 + + + 15, 131 + + + 506, 16 + + + 41 + + + Enable Security Protocol TLS v1.3 (subscription/update/speedtest) + + + chkEnableSecurityProtocolTls13 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 4 + + + True + + + NoControl + + + 15, 108 + + + 390, 16 + + + 40 + + + Automatically adjust column width after updating subscription + + + chkEnableAutoAdjustMainLvColWidth + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 5 + + + NoControl + + + 30, 376 + + + 282, 23 + + + 39 + + + Set Windows10 UWP Loopback + + + btnSetLoopback + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tabPage7 + + + 6 + + + 351, 157 + + + 97, 21 + + + 38 + + + txtautoUpdateInterval + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 7 + + + True + + + NoControl + + + 27, 161 + + + 269, 12 + + + 37 + + + Automatic update interval of and Geo (hours) + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 8 + + + True + + + NoControl + + + 15, 85 + + + 234, 16 + + + 36 + + + Ignore Geo files when updating core + + + chkIgnoreGeoUpdateCore + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 9 + + + True + + + NoControl + + + 15, 62 + + + 198, 16 + + + 33 + + + Keep older when deduplication + + + chkKeepOlderDedupl + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 10 + + + 620, 37 + + + 58, 20 + + + 32 + + + cbFreshrate + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 11 + + + True + + + NoControl + + + 489, 41 + + + 125, 12 + + + 30 + + + Statistics freshrate + + + lbFreshrate + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 12 + + + True + + + NoControl + + + 15, 39 + + + 468, 16 + + + 29 + + + Enable Statistics (Realtime netspeed and traffic records. Require restart) + + + chkEnableStatistics + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 13 + + + True + + + 15, 16 + + + 246, 16 + + + 23 + + + Automatically start at system startup + + + chkAutoRun + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 14 + + + 4, 22 + + + 3, 3, 3, 3 + + + 728, 427 + + + 3 + + + v2rayN settings + + + tabPage7 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 3 + + + 117, 172 + + + 143, 20 + + + 46 + + + cmbCoreType6 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 0 + + + True + + + NoControl + + + 45, 176 + + + 59, 12 + + + 47 + + + Core Type + + + labCoreType6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 1 + + + 117, 146 + + + 143, 20 + + + 44 + + + cmbCoreType5 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 2 + + + True + + + NoControl + + + 45, 150 + + + 59, 12 + + + 45 + + + Core Type + + + labCoreType5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 3 + + + 117, 120 + + + 143, 20 + + + 42 + + + cmbCoreType4 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 4 + + + True + + + NoControl + + + 45, 124 + + + 59, 12 + + + 43 + + + Core Type + + + labCoreType4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 5 + + + 117, 94 + + + 143, 20 + + + 40 + + + cmbCoreType3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 6 + + + True + + + NoControl + + + 45, 98 + + + 59, 12 + + + 41 + + + Core Type + + + labCoreType3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 7 + + + 117, 68 + + + 143, 20 + + + 38 + + + cmbCoreType2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 8 + + + True + + + NoControl + + + 45, 72 + + + 59, 12 + + + 39 + + + Core Type + + + labCoreType2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tabPageCoreType - + + 9 + + + 117, 42 + + + 143, 20 + + + 36 + + + cmbCoreType1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 10 + + True - - 6, 283 + + NoControl - - 11 + + 45, 46 - - cmbprotocol + + 59, 12 - - 2 + + 37 - + + Core Type + + + labCoreType1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPageCoreType + + 11 + + + 4, 22 + + + 3, 3, 3, 3 + + + 728, 427 + + + 6 + + + CoreType settings + + + tabPageCoreType + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + 4 - - 3 + + NoControl - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8, 328 - - tabPage6 + + 502, 16 - - tabPage2 + + 43 - - tabPageCoreType + + Enable system proxy advanced settings (http/https/ftp/socks) - + + chkEnableSystemProxyAdvanced + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + True + + NoControl + + + 6, 283 + + + 107, 12 + + + 42 + + + Use semicolon (;) + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + True + + + NoControl + + + 8, 28 + + + 317, 12 + + + 40 + Do not use proxy server for addresses beginning with + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + 8, 52 + + + True + + + Vertical + + + 638, 219 + + + 41 + + + txtsystemProxyExceptions + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + + Fill + + + 0, 0 + + + 728, 427 + + + 42 + + + Exception + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 0 + + + 4, 22 + + + 728, 427 + + + 5 + + + System proxy settings + + + tabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 5 + + + Fill + + + 0, 10 + + + 736, 453 + + + 10 + + + tabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 267, 16 + + + 75, 23 + + + 8 + + + &OK + + + btnOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 1 + + + Bottom + + + 0, 463 + + + 736, 60 + + + 11 + + + panel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top + 0, 0 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 736, 10 - - NoControl - - - 3 - - + 9 - - 14 + + panel1 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - tabPage6 - - - 1 - - - 0 + + 2 True - - zh-Hans - + + 6, 12 + + + 736, 523 + + + 4, 4, 4, 4 + + + Settings + + + OptionSettingForm + + + v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ 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 10e4a4a0..23abe7be 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx @@ -373,4 +373,7 @@ 参数设置 + + 开启系统代理高级设置 (http/https/ftp/socks) + \ No newline at end of file diff --git a/v2rayN/v2rayN/Handler/SysProxyHandle.cs b/v2rayN/v2rayN/Handler/SysProxyHandle.cs index ba752ca1..da183a85 100644 --- a/v2rayN/v2rayN/Handler/SysProxyHandle.cs +++ b/v2rayN/v2rayN/Handler/SysProxyHandle.cs @@ -60,6 +60,7 @@ namespace v2rayN.Handler try { int port = config.GetLocalPort(Global.InboundHttp); + int portSocks = config.GetLocalPort(Global.InboundSocks); if (port <= 0) { return false; @@ -67,7 +68,17 @@ namespace v2rayN.Handler if (type == ESysProxyType.ForcedChange) { var strExceptions = $"{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}"; - SetIEProxy(true, $"{Global.Loopback}:{port}", strExceptions); + + var strProxy = string.Empty; + if (config.enableSystemProxyAdvanced) + { + strProxy = string.Format("http={0}:{1};https={0}:{1};ftp={0}:{1};socks={0}:{2}", Global.Loopback, port, portSocks); + } + else + { + strProxy = $"{Global.Loopback}:{port}"; + } + SetIEProxy(true, strProxy, strExceptions); } else if (type == ESysProxyType.ForcedClear) { @@ -96,41 +107,6 @@ namespace v2rayN.Handler } } - public static void SetIEProxy(bool enable, bool global, string strProxy) - { - //Read(); - - //if (!_userSettings.UserSettingsRecorded) - //{ - // // record user settings - // ExecSysproxy("query"); - // //ParseQueryStr(_queryStr); - //} - - string arguments; - if (enable) - { - arguments = global - ? $"global {strProxy} {Global.IEProxyExceptions}" - : $"pac {strProxy}"; - } - else - { - // restore user settings - string flags = _userSettings.Flags; - string proxy_server = _userSettings.ProxyServer ?? "-"; - string bypass_list = _userSettings.BypassList ?? "-"; - string pac_url = _userSettings.PacUrl ?? "-"; - arguments = $"set {flags} {proxy_server} {bypass_list} {pac_url}"; - - // have to get new settings - _userSettings.UserSettingsRecorded = false; - } - - //Save(); - ExecSysproxy(arguments); - } - public static void SetIEProxy(bool global, string strProxy, string strExceptions) { diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index 699448e9..07f51647 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -124,6 +124,7 @@ namespace v2rayN.Mode { get; set; } + public bool enableSystemProxyAdvanced { get; set; } public int autoUpdateInterval { get; set; } = 0;