diff --git a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs index c398397b..31ae1b74 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs @@ -37,7 +37,6 @@ this.label24 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.panTlsMore = new System.Windows.Forms.Panel(); - this.label22 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label(); this.cmbAllowInsecure = new System.Windows.Forms.ComboBox(); this.label20 = new System.Windows.Forms.Label(); @@ -88,14 +87,15 @@ // // btnClose // - this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; resources.ApplyResources(this.btnClose, "btnClose"); + this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnClose.Name = "btnClose"; this.btnClose.UseVisualStyleBackColor = true; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // // groupBox1 // + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.btnGUID); this.groupBox1.Controls.Add(this.label13); this.groupBox1.Controls.Add(this.groupBox2); @@ -115,7 +115,6 @@ this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.txtAddress); this.groupBox1.Controls.Add(this.label1); - resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // @@ -133,6 +132,7 @@ // // groupBox2 // + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Controls.Add(this.label24); this.groupBox2.Controls.Add(this.label23); this.groupBox2.Controls.Add(this.panTlsMore); @@ -150,7 +150,6 @@ this.groupBox2.Controls.Add(this.label11); this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.cmbHeaderType); - resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // @@ -166,17 +165,11 @@ // // panTlsMore // - this.panTlsMore.Controls.Add(this.label22); + resources.ApplyResources(this.panTlsMore, "panTlsMore"); this.panTlsMore.Controls.Add(this.label21); this.panTlsMore.Controls.Add(this.cmbAllowInsecure); - resources.ApplyResources(this.panTlsMore, "panTlsMore"); this.panTlsMore.Name = "panTlsMore"; // - // label22 - // - resources.ApplyResources(this.label22, "label22"); - this.label22.Name = "label22"; - // // label21 // resources.ApplyResources(this.label21, "label21"); @@ -184,13 +177,13 @@ // // cmbAllowInsecure // + resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure"); this.cmbAllowInsecure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbAllowInsecure.FormattingEnabled = true; this.cmbAllowInsecure.Items.AddRange(new object[] { resources.GetString("cmbAllowInsecure.Items"), resources.GetString("cmbAllowInsecure.Items1"), resources.GetString("cmbAllowInsecure.Items2")}); - resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure"); this.cmbAllowInsecure.Name = "cmbAllowInsecure"; // // label20 @@ -235,12 +228,12 @@ // // cmbStreamSecurity // + resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity"); this.cmbStreamSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbStreamSecurity.FormattingEnabled = true; this.cmbStreamSecurity.Items.AddRange(new object[] { resources.GetString("cmbStreamSecurity.Items"), resources.GetString("cmbStreamSecurity.Items1")}); - resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity"); this.cmbStreamSecurity.Name = "cmbStreamSecurity"; this.cmbStreamSecurity.SelectedIndexChanged += new System.EventHandler(this.cmbStreamSecurity_SelectedIndexChanged); // @@ -266,6 +259,7 @@ // // cmbHeaderType // + resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType"); this.cmbHeaderType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbHeaderType.FormattingEnabled = true; this.cmbHeaderType.Items.AddRange(new object[] { @@ -276,7 +270,6 @@ resources.GetString("cmbHeaderType.Items4"), resources.GetString("cmbHeaderType.Items5"), resources.GetString("cmbHeaderType.Items6")}); - resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType"); this.cmbHeaderType.Name = "cmbHeaderType"; // // label9 @@ -291,6 +284,7 @@ // // cmbNetwork // + resources.ApplyResources(this.cmbNetwork, "cmbNetwork"); this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbNetwork.FormattingEnabled = true; this.cmbNetwork.Items.AddRange(new object[] { @@ -299,7 +293,6 @@ resources.GetString("cmbNetwork.Items2"), resources.GetString("cmbNetwork.Items3"), resources.GetString("cmbNetwork.Items4")}); - resources.ApplyResources(this.cmbNetwork, "cmbNetwork"); this.cmbNetwork.Name = "cmbNetwork"; this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged); // @@ -310,6 +303,7 @@ // // cmbSecurity // + resources.ApplyResources(this.cmbSecurity, "cmbSecurity"); this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSecurity.FormattingEnabled = true; this.cmbSecurity.Items.AddRange(new object[] { @@ -317,7 +311,6 @@ resources.GetString("cmbSecurity.Items1"), resources.GetString("cmbSecurity.Items2"), resources.GetString("cmbSecurity.Items3")}); - resources.ApplyResources(this.cmbSecurity, "cmbSecurity"); this.cmbSecurity.Name = "cmbSecurity"; // // txtRemarks @@ -377,9 +370,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 @@ -396,42 +389,42 @@ // // menuServer // + resources.ApplyResources(this.menuServer, "menuServer"); this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MenuItem1}); - resources.ApplyResources(this.menuServer, "menuServer"); this.menuServer.Name = "menuServer"; // // MenuItem1 // + resources.ApplyResources(this.MenuItem1, "MenuItem1"); this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MenuItemImportClient, this.MenuItemImportServer, this.toolStripSeparator1, this.MenuItemImportClipboard}); this.MenuItem1.Name = "MenuItem1"; - resources.ApplyResources(this.MenuItem1, "MenuItem1"); // // MenuItemImportClient // - this.MenuItemImportClient.Name = "MenuItemImportClient"; resources.ApplyResources(this.MenuItemImportClient, "MenuItemImportClient"); + this.MenuItemImportClient.Name = "MenuItemImportClient"; this.MenuItemImportClient.Click += new System.EventHandler(this.MenuItemImportClient_Click); // // MenuItemImportServer // - this.MenuItemImportServer.Name = "MenuItemImportServer"; resources.ApplyResources(this.MenuItemImportServer, "MenuItemImportServer"); + this.MenuItemImportServer.Name = "MenuItemImportServer"; this.MenuItemImportServer.Click += new System.EventHandler(this.MenuItemImportServer_Click); // // toolStripSeparator1 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); + this.toolStripSeparator1.Name = "toolStripSeparator1"; // // MenuItemImportClipboard // - this.MenuItemImportClipboard.Name = "MenuItemImportClipboard"; resources.ApplyResources(this.MenuItemImportClipboard, "MenuItemImportClipboard"); + this.MenuItemImportClipboard.Name = "MenuItemImportClipboard"; this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click); // // AddServerForm @@ -508,7 +501,6 @@ private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label21; private System.Windows.Forms.ComboBox cmbAllowInsecure; - private System.Windows.Forms.Label label22; private System.Windows.Forms.Panel panTlsMore; private System.Windows.Forms.Label label24; private System.Windows.Forms.Label label23; diff --git a/v2rayN/v2rayN/Forms/AddServerForm.resx b/v2rayN/v2rayN/Forms/AddServerForm.resx index 164ad2dc..107bae98 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.resx +++ b/v2rayN/v2rayN/Forms/AddServerForm.resx @@ -117,700 +117,1249 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 + - - - - 6, 12 + + 113, 12 - - 729, 569 + + 12 - - True - - - Edit or add a [VMess] server - - - 396, 17 - - - 75, 23 - - - 4 - - - &Cancel - - - 411, 83 - - - 75, 23 - - - 23 - - - &Generate - - - 303, 17 - - - 75, 23 - - - 5 - - - &OK - - - - - - true - - - false - - - 107, 7 - - - 91, 20 - - - 30 - - - none - - - http - - - srtp - - - utp - - - wechat-video - - - dtls - - - wireguard + + 285, 203 124, 30 - - 143, 20 + + groupBox2 - - 18 + + 9 - - tcp + + Path - - kcp + + 83, 12 - - ws + + Transport protocol(network) - - h2 + + 10 - - quic + + panTlsMore - - 195, 171 + + groupBox1 - - 143, 20 + + 1 - - 12 + + label15 - - aes-128-gcm + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - chacha20-poly1305 + + cmbStreamSecurity - - auto + + 3)h2 host Separated by commas (,) - - none - - - 195, 143 - - - 143, 20 - - - 6 - - - - - - tls - - - 124, 197 - - - 143, 20 - - - 21 - - - Fill - - - 0, 35 - - - 729, 474 + + + Top + 3 - - Server - - - Bottom - - - 3, 237 - - - 723, 234 - - - 21 - - - Keep the default value if it is not clear - - - True - - - 12, 31 - - - 47, 12 - - - 0 - - - Address - - - True - - - 9, 62 - - - 143, 12 - 17 - - Camouflage domain(host) + + false - + + 16 + + True - - 9, 34 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 95, 12 + + System.Windows.Forms.Label, 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 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 + + + 21 + + + 411, 83 + + + Address + + + groupBox1 + + + 59, 12 + + + 1)ws path 19 - - Camouflage type + + True - + + 26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtId + + + True + + + 729, 474 + + + + + + 12, 89 + + + groupBox2 + + + tls + + + True + + + 299, 12 + + + panTlsMore + + + 13 + + + aes-128-gcm + + + groupBox1 + + + 127, 85 + + + 13 + + + 12, 203 + + + 1 + + + label10 + + + 723, 234 + + + 4 + + + label21 + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 143, 12 + + + groupBox2 + + + toolStripSeparator1 + + + NoControl + + + 21 + + + label11 + + + 5 + + + 158, 58 + + + 2 + + + 29, 12 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 234, 6 + + + 237, 22 + + + TLS + + + 3)QUIC key + + + 127, 56 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtPort + + + 2 + + + groupBox1 + + + Bottom + + + True + + + 127, 199 + + + System.Windows.Forms.Label, 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 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 29, 12 + + + ws + + + 16 + + + 9, 34 + + + 18 + + + Import server configuration + + + 6, 12 + + + 1 + + + 7 + + + 15 + + + label17 + + + panel1 + + + label14 + + + groupBox2 + + + 5 + + + 215, 12 + + + 0, 0 + + + 396, 17 + + + 338, 35 + + + 12, 60 + + + MenuItemImportClient + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + &Generate + + + Encryption method (security) + + + none + + + txtRemarks + + + 47, 12 + + + v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + groupBox2 + + + panel2 + + + true + + + panTlsMore + + + True + + + 127, 114 + + + 284, 189 + + + 95, 12 + + + NoControl + + + 353, 175 + + + cmbNetwork + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 22 + + + groupBox1 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 127, 27 + + + label12 + + + AlterId + + True 282, 34 - - 299, 12 + + 9 - - 20 + + 25 - - *tcp or kcp or QUIC camouflage type, default none + + label23 - - True + + groupBox1 - - 285, 203 + + 143, 20 - - 113, 12 + + 1 - - 22 + + $this - - * Fill in manually + + System.Windows.Forms.GroupBox, 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 + + + 33 + + + 6 + + + none + + + 0 + + + 47, 12 + + + label8 + + + &Cancel + + + label13 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtAlterId + + + 35 + + + 10 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 11 + + True 469, 53 - - 215, 12 + + label9 - - 23 + + label20 - - 1)http host Separated by commas (,) + + 124, 125 - + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + label18 + + + MenuItem1 + + + label1 + + + 13 + + + 34 + + + 143, 20 + + + groupBox2 + + True - - 9, 201 + + btnClose - - 23, 12 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 22 + + label19 - - TLS + + 143, 21 - - True + + 95, 12 - - 526, 130 + + groupBox1 - - 59, 12 + + 0, 35 - - 24 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1)ws path + + 729, 60 - - True + + allowInsecure - - 469, 68 - - - 59, 12 - - - 25 - - - 2)ws host - - - True - - - 526, 147 - - - 59, 12 - - - 26 - - - 2)h2 path - - - True - - - 9, 125 - - - 29, 12 - - - 27 - - - Path - - - True - - - 12, 60 - - - 29, 12 - - - 2 - - - Port - - + True 469, 83 - - 203, 12 + + $this - - 29 + + quic - - 3)h2 host Separated by commas (,) + + groupBox2 + + + h2 + + + kcp + + + 7 + + + 143, 21 + + + 526, 130 + + + 18 + + + 12, 147 + + + 15 + + + groupBox1 + + + label2 + + + groupBox2 + + + 24 + + + groupBox2 + + + 119, 12 + + + True True + + Bottom + + + 91, 20 + + + 27 + + + 23 + + + groupBox2 + + + 14 + + + Port + + + groupBox2 + + + Fill + + + chacha20-poly1305 + + + 15 + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 75, 23 + + + 4 + + + True + + + 8 + + + groupBox1 + + + 8 + + + *Recommended (auto) + + + 195, 143 + + + 3 + + + groupBox1 + + + 0, 509 + + + 143, 20 + + + 23 + + + 6 + + + 7 + + + 14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 3, 237 + + + Import configuration file + + + wechat-video + + + 12 + + + 23, 12 + + + 729, 10 + + + 470, 99 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 22 + + + 396, 54 + + + 300, 53 + + + 1)http host Separated by commas (,) + + + 12, 31 + + + 11 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dtls + + + MenuItemImportServer + + + groupBox2 + + + panel2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + AddServerForm + + + wireguard + + + groupBox1 + + + + + + Server + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 303, 17 + + + 2)ws host + + + groupBox1 + + + txtAddress + + + True + + + 2)h2 path + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 167, 12 + + + 8 + + + Keep the default value if it is not clear + + + groupBox2 + + + * Fill in manually + + + 9, 125 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 12 + + + True + 12, 11 - - 83, 12 - - - 31 - - - allowInsecure - - - True - - - 205, 11 - - - 113, 12 - - - 32 - - - Default value false - - - True - - - NoControl - - - 470, 99 - 89, 12 - - 34 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4)QUIC securty + + 143, 21 - - True - - - NoControl - - - 526, 165 + + 1 65, 12 - - 35 + + txtPath - - 3)QUIC key + + 162, 21 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtRequestHost + + + 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 + + + Alias (remarks) + + + groupBox2 + + + label7 + + + 4 + + + cmbAllowInsecure + + + &OK + + + 6 + + + 3 + + + http + + True - - 12, 89 + + 526, 147 - - 53, 12 + + 6 - + + groupBox2 + + + menuServer + + + 20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + 4 UUID(id) - - True + + $this - - 12, 118 + + MenuItemImportClipboard - - 47, 12 + + $this - - 6 + + 3 - - AlterId - - - True - - - 12, 147 - - - 173, 12 - - - 8 - - - Encryption method (security) - - - True - - - 12, 203 - - - 95, 12 - - - 10 - - - Alias (remarks) - - - True - - - 12, 175 - - - 167, 12 - - - 13 - - - Transport protocol(network) - - - True - - - 353, 147 - - - 119, 12 - - - 14 - - - *Recommended (auto) - - - True - - - 353, 175 - - - 113, 12 - - - 15 - - - *Default value tcp - - - 162, 21 - - - Import configuration file + + groupBox1 237, 22 - - Import client configuration + + 143, 20 - - 237, 22 + + True - - Import URL from clipboard + + 5 - - 237, 22 + + 0 - - Import server configuration + + Camouflage domain(host) - - 0, 0 + + 0 - - 729, 25 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 + + 113, 12 - - 17, 17 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top + + 195, 171 - - 0, 25 + + 203, 12 - - 729, 10 + + utp - - 6 + + 124, 197 - - Bottom + + 30 - - 0, 509 + + 17 - - 729, 60 - - - 7 - - - 284, 189 - - - 338, 35 - - - 33 - - - 234, 6 - - - 127, 27 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 359, 21 - - 1 + + 29 - - 127, 114 + + auto - - 143, 21 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7 + + 469, 68 - - 127, 85 + + 2 - - 278, 21 + + 9, 62 - - 5 + + label3 - - 124, 125 + + srtp - + + 8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Import URL from clipboard + + True - - 396, 54 + + 75, 23 - - 28 + + 173, 12 - - 127, 56 + + *Default value tcp - - 143, 21 + + 0 - - 3 + + 729, 569 - - 127, 199 + + label4 - - 143, 21 + + 31 - + + True + + + 9, 201 + + + 353, 147 + + + Edit or add a [VMess] server + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 11 - - 158, 58 + + groupBox1 - - True + + label5 - - 300, 53 + + 3 + + + label16 + + + btnOK + + + 237, 22 16 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 28 + + + 107, 7 + + + groupBox1 + + + Import client configuration + + + 12, 118 + + + 4)QUIC securty + + + 0, 25 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + cmbSecurity + + + tcp + + + 6 + + + btnGUID + + + 75, 23 + + + *tcp or kcp or QUIC camouflage type, default none + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + Camouflage type + + + 0 + + + groupBox2 + + + 278, 21 + + + 12, 175 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label24 + + + 59, 12 + + + panel2 + + + 14 + + + groupBox2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + label6 + + + 59, 12 + + + 10 + + + 729, 25 + + + cmbHeaderType + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 526, 165 + + + 2 + + + 53, 12 + + + True + + + 17, 17 + \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx index 4d3d4405..21b0e231 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx @@ -117,64 +117,55 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 编辑或添加[VMess]服务器 - 取消(&C) - - 生成(&G) - - - 确定(&O) - - - 127, 171 - - - 211, 20 - - - 127, 143 - - - 211, 20 - 服务器 - - 不清楚则保持默认值 - - - 83, 12 - - - 地址(address) - - - 89, 12 - - - 伪装域名(host) - - - 89, 12 - - - 伪装类型(type) - - - 197, 12 - - - *tcp或kcp或QUIC伪装类型,默认none + + 生成(&G) *手填,方便识别管理 + + 不清楚则保持默认值 + + + + 95, 12 + + + 3)QUIC 加密密钥 + + + 95, 12 + + + 4)QUIC 加密方式 + + + 203, 12 + + + 是否允许不安全连接(allowInsecure) + + + 223, 7 + + + 149, 12 + + + 3)h2 host中间逗号(,)隔开 + + + 65, 12 + + + 路径(path) + 161, 12 @@ -187,71 +178,35 @@ 底层传输安全 - - 65, 12 + + 197, 12 - - 路径(path) + + *tcp或kcp或QUIC伪装类型,默认none - - 65, 12 + + 124, 58 - - 端口(port) + + 334, 51 - - 149, 12 + + 89, 12 - - 3)h2 host中间逗号(,)隔开 + + 伪装类型(type) - - 53, 12 + + 89, 12 - - 默认false + + 伪装域名(host) - - 95, 12 + + 143, 12 - - 4)QUIC 加密方式 - - - 95, 12 - - - 3)QUIC 加密密钥 - - - 65, 12 - - - 用户ID(id) - - - 95, 12 - - - 额外ID(alterId) - - - 113, 12 - - - 加密方式(security) - - - 83, 12 - - - 别名(remarks) - - - 107, 12 - - - 传输协议(network) + + *默认tcp,选错会无法连接 113, 12 @@ -259,11 +214,62 @@ *随便选,建议(auto) - - 143, 12 + + 127, 171 - - *默认tcp,选错会无法连接 + + 211, 20 + + + 107, 12 + + + 传输协议(network) + + + 127, 143 + + + 211, 20 + + + 83, 12 + + + 别名(remarks) + + + 113, 12 + + + 加密方式(security) + + + 95, 12 + + + 额外ID(alterId) + + + 65, 12 + + + 用户ID(id) + + + 65, 12 + + + 端口(port) + + + 83, 12 + + + 地址(address) + + + 确定(&O) 92, 21 @@ -277,12 +283,6 @@ 导入客户端配置 - - 171, 22 - - - 从剪贴板导入URL - 171, 22 @@ -292,10 +292,13 @@ 168, 6 - - 124, 58 + + 171, 22 - - 334, 51 + + 从剪贴板导入URL + + + 编辑或添加[VMess]服务器 \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs index 7c009fc6..62af6048 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs @@ -33,6 +33,7 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.chkdefAllowInsecure = new System.Windows.Forms.CheckBox(); this.label16 = new System.Windows.Forms.Label(); this.cmblistenerType = new System.Windows.Forms.ComboBox(); this.chksniffingEnabled2 = new System.Windows.Forms.CheckBox(); @@ -119,32 +120,34 @@ // // btnClose // - this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; resources.ApplyResources(this.btnClose, "btnClose"); + this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnClose.Name = "btnClose"; this.btnClose.UseVisualStyleBackColor = true; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // // 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.tabPage9); - resources.ApplyResources(this.tabControl1, "tabControl1"); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; // // tabPage1 // - this.tabPage1.Controls.Add(this.groupBox1); resources.ApplyResources(this.tabPage1, "tabPage1"); + this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Name = "tabPage1"; this.tabPage1.UseVisualStyleBackColor = true; // // groupBox1 // + resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.chkdefAllowInsecure); this.groupBox1.Controls.Add(this.label16); this.groupBox1.Controls.Add(this.cmblistenerType); this.groupBox1.Controls.Add(this.chksniffingEnabled2); @@ -165,10 +168,15 @@ 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; // + // chkdefAllowInsecure + // + resources.ApplyResources(this.chkdefAllowInsecure, "chkdefAllowInsecure"); + this.chkdefAllowInsecure.Name = "chkdefAllowInsecure"; + this.chkdefAllowInsecure.UseVisualStyleBackColor = true; + // // label16 // resources.ApplyResources(this.label16, "label16"); @@ -176,6 +184,7 @@ // // cmblistenerType // + resources.ApplyResources(this.cmblistenerType, "cmblistenerType"); this.cmblistenerType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmblistenerType.FormattingEnabled = true; this.cmblistenerType.Items.AddRange(new object[] { @@ -186,7 +195,6 @@ resources.GetString("cmblistenerType.Items4"), resources.GetString("cmblistenerType.Items5"), resources.GetString("cmblistenerType.Items6")}); - resources.ApplyResources(this.cmblistenerType, "cmblistenerType"); this.cmblistenerType.Name = "cmblistenerType"; // // chksniffingEnabled2 @@ -232,12 +240,12 @@ // // cmbprotocol2 // + resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2"); this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbprotocol2.FormattingEnabled = true; this.cmbprotocol2.Items.AddRange(new object[] { resources.GetString("cmbprotocol2.Items"), resources.GetString("cmbprotocol2.Items1")}); - resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2"); this.cmbprotocol2.Name = "cmbprotocol2"; // // label3 @@ -252,8 +260,8 @@ // // cmbprotocol // - this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; resources.ApplyResources(this.cmbprotocol, "cmbprotocol"); + this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbprotocol.FormattingEnabled = true; this.cmbprotocol.Items.AddRange(new object[] { resources.GetString("cmbprotocol.Items"), @@ -279,6 +287,7 @@ // // cmbloglevel // + resources.ApplyResources(this.cmbloglevel, "cmbloglevel"); this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbloglevel.FormattingEnabled = true; this.cmbloglevel.Items.AddRange(new object[] { @@ -287,7 +296,6 @@ resources.GetString("cmbloglevel.Items2"), resources.GetString("cmbloglevel.Items3"), resources.GetString("cmbloglevel.Items4")}); - resources.ApplyResources(this.cmbloglevel, "cmbloglevel"); this.cmbloglevel.Name = "cmbloglevel"; // // label5 @@ -307,33 +315,33 @@ // // tabPage2 // - this.tabPage2.Controls.Add(this.groupBox2); resources.ApplyResources(this.tabPage2, "tabPage2"); + this.tabPage2.Controls.Add(this.groupBox2); this.tabPage2.Name = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; // // groupBox2 // + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Controls.Add(this.tabControl2); this.groupBox2.Controls.Add(this.panel3); - resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // // tabControl2 // + resources.ApplyResources(this.tabControl2, "tabControl2"); this.tabControl2.Controls.Add(this.tabPage3); this.tabControl2.Controls.Add(this.tabPage4); this.tabControl2.Controls.Add(this.tabPage5); this.tabControl2.Controls.Add(this.tabPage8); - resources.ApplyResources(this.tabControl2, "tabControl2"); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; // // tabPage3 // - this.tabPage3.Controls.Add(this.txtUseragent); resources.ApplyResources(this.tabPage3, "tabPage3"); + this.tabPage3.Controls.Add(this.txtUseragent); this.tabPage3.Name = "tabPage3"; this.tabPage3.UseVisualStyleBackColor = true; // @@ -344,8 +352,8 @@ // // tabPage4 // - this.tabPage4.Controls.Add(this.txtUserdirect); resources.ApplyResources(this.tabPage4, "tabPage4"); + this.tabPage4.Controls.Add(this.txtUserdirect); this.tabPage4.Name = "tabPage4"; this.tabPage4.UseVisualStyleBackColor = true; // @@ -356,8 +364,8 @@ // // tabPage5 // - this.tabPage5.Controls.Add(this.txtUserblock); resources.ApplyResources(this.tabPage5, "tabPage5"); + this.tabPage5.Controls.Add(this.txtUserblock); this.tabPage5.Name = "tabPage5"; this.tabPage5.UseVisualStyleBackColor = true; // @@ -368,13 +376,14 @@ // // tabPage8 // - this.tabPage8.Controls.Add(this.cmbroutingMode); resources.ApplyResources(this.tabPage8, "tabPage8"); + this.tabPage8.Controls.Add(this.cmbroutingMode); this.tabPage8.Name = "tabPage8"; this.tabPage8.UseVisualStyleBackColor = true; // // cmbroutingMode // + resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode"); this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbroutingMode.FormattingEnabled = true; this.cmbroutingMode.Items.AddRange(new object[] { @@ -382,16 +391,15 @@ resources.GetString("cmbroutingMode.Items1"), resources.GetString("cmbroutingMode.Items2"), resources.GetString("cmbroutingMode.Items3")}); - resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode"); this.cmbroutingMode.Name = "cmbroutingMode"; // // panel3 // + resources.ApplyResources(this.panel3, "panel3"); this.panel3.Controls.Add(this.linkLabelRoutingDoc); this.panel3.Controls.Add(this.btnSetDefRountingRule); this.panel3.Controls.Add(this.labRoutingTips); this.panel3.Controls.Add(this.cmbdomainStrategy); - resources.ApplyResources(this.panel3, "panel3"); this.panel3.Name = "panel3"; // // linkLabelRoutingDoc @@ -410,23 +418,24 @@ // // labRoutingTips // - this.labRoutingTips.ForeColor = System.Drawing.Color.Brown; resources.ApplyResources(this.labRoutingTips, "labRoutingTips"); + this.labRoutingTips.ForeColor = System.Drawing.Color.Brown; this.labRoutingTips.Name = "labRoutingTips"; // // cmbdomainStrategy // + resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy"); this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbdomainStrategy.FormattingEnabled = true; this.cmbdomainStrategy.Items.AddRange(new object[] { resources.GetString("cmbdomainStrategy.Items"), resources.GetString("cmbdomainStrategy.Items1"), resources.GetString("cmbdomainStrategy.Items2")}); - resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy"); this.cmbdomainStrategy.Name = "cmbdomainStrategy"; // // tabPage6 // + resources.ApplyResources(this.tabPage6, "tabPage6"); this.tabPage6.Controls.Add(this.chkKcpcongestion); this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize); this.tabPage6.Controls.Add(this.label10); @@ -440,7 +449,6 @@ 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; // @@ -512,6 +520,7 @@ // // tabPage7 // + resources.ApplyResources(this.tabPage7, "tabPage7"); this.tabPage7.Controls.Add(this.chkKeepOlderDedupl); this.tabPage7.Controls.Add(this.cbFreshrate); this.tabPage7.Controls.Add(this.lbFreshrate); @@ -520,7 +529,6 @@ 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; // @@ -532,9 +540,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 @@ -572,9 +580,9 @@ // // tabPage9 // + resources.ApplyResources(this.tabPage9, "tabPage9"); 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; // @@ -585,21 +593,21 @@ // // panel4 // - this.panel4.Controls.Add(this.label4); resources.ApplyResources(this.panel4, "panel4"); + this.panel4.Controls.Add(this.label4); this.panel4.Name = "panel4"; // // label4 // - this.label4.ForeColor = System.Drawing.Color.Brown; resources.ApplyResources(this.label4, "label4"); + this.label4.ForeColor = System.Drawing.Color.Brown; this.label4.Name = "label4"; // // 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 @@ -725,5 +733,6 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.CheckBox chkKeepOlderDedupl; private System.Windows.Forms.LinkLabel linkLabelRoutingDoc; + private System.Windows.Forms.CheckBox chkdefAllowInsecure; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs index 6fa88f50..4baea990 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs @@ -69,6 +69,8 @@ namespace v2rayN.Forms txtremoteDNS.Text = config.remoteDNS; cmblistenerType.SelectedIndex = (int)config.listenerType; + + chkdefAllowInsecure.Checked = config.defAllowInsecure; } /// @@ -265,6 +267,8 @@ namespace v2rayN.Forms config.listenerType = (ListenerType)Enum.ToObject(typeof(ListenerType), cmblistenerType.SelectedIndex); + config.defAllowInsecure = chkdefAllowInsecure.Checked; + return 0; } diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx index 7f8ef414..2d85641a 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx @@ -117,1081 +117,1957 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 6, 12 - - - 662, 675 - - - True - - - 4, 4, 4, 4 - - - Settings - - - 355, 16 - - - 75, 23 - - - 7 - - - &Cancel - - - 267, 16 - - - 75, 23 - - - 8 - - - &OK - - - Top, Right - - - True - - - 322, 10 - - - 229, 23 - - - 18 - - - Set default custom routing rules - - - 161, 84 - - - 58, 20 - - - 32 - True - - 15, 63 - - - 120, 16 - - - 19 - - - listening port 2 - - - False - - - True - - - 15, 38 - - - 204, 16 - - - 29 - - - Allow connections from the LAN - - - True - - - 15, 16 - - - 246, 16 - - - 23 - - - Automatically start at system startup - - - True - - - NoControl - - - 15, 62 - - - 576, 16 - - - 29 - - - Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client) - - - True - - - 20, 143 - - - 84, 16 - - - 20 - - - congestion - - - True - - - NoControl - - - 15, 110 - - - 198, 16 - - - 33 - - - Keep older when deduplication - - - True - - - 15, 160 - - - 126, 16 - - - 9 - - - Record local logs - - - True - - - 15, 129 - - - 174, 16 - - - 20 - - - Turn on Mux Multiplexing - - - True - - - NoControl - - - 468, 27 - - - 120, 16 - - - 31 - - - Turn on Sniffing - - - True - - - NoControl - - - 468, 60 - - - 120, 16 - - - 32 - - - Turn on Sniffing - - - False - - - True - - - 369, 27 - - - 84, 16 - - - 10 - - - Enable UDP - - - True - - - 369, 62 - - - 84, 16 - - - 18 - - - Enable UDP - - - False - - - AsIs - - - IPIfNonMatch - - - IPOnDemand - - - 115, 10 - - - 165, 20 - - - 16 - - - Not Enabled Http Proxy - - - Open Http proxy and automatically configure proxy server (global mode) - - - Open PAC and automatically configure PAC (PAC mode) - - - Only open Http proxy, do not automatically configure proxy server (direct mode) - - - Only open PAC, do not automatically configure PAC - - - Only open Http proxy and do nothing - - - Only open PAC and do nothing - - - 124, 94 - - - 464, 20 - - - 33 - - - debug - - - info - - - warning - - - error - - - none - - - 257, 158 - - - 97, 20 - - - 6 - - - False - - - socks - - - http - - - 257, 25 - - - 97, 20 - - - 12 - - - socks - - - http - - - 257, 60 - - - 97, 20 - - - 17 - - - False - - - Global - - - Bypassing the LAN address - - - Bypass mainland address - - - Bypassing LAN and mainland address - - - 21, 17 - - - 255, 20 - - - 14 - - - Fill - - - 3, 3 - - - 648, 573 - - - 6 - - - Fill - - - 3, 3 - - - 648, 573 - - - 12 - - - True - - - 206, 29 - - - 53, 12 - - - 11 - - - protocol - - - True - - - 236, 104 - - - 95, 12 - - - 14 - - - writeBufferSize - - - True - - - 18, 104 - - - 89, 12 - - - 12 - - - readBufferSize - - - True - - - 30, 176 - - - 431, 12 - - - 27 - - - Custom GFWList address (please fill in the blank without customization) - - - True - - - 33, 204 - - - 281, 12 - - - 29 - - - Custom DNS (multiple, separated by commas (,)) - - - True - - - NoControl - - - 42, 98 - - - 65, 12 - - - 34 - - - Http proxy - - - True - - - 33, 29 - - - 89, 12 - - - 2 - - - Listening port - - - True - - - 206, 64 - - - 53, 12 - - - 16 - - - protocol - - - False - - - NoControl - - - 5, 11 - - - 598, 16 - - - 13 - - - *Set user pac rules, separated by commas (,) - - - True - - - 193, 162 - - - 59, 12 - - - 8 - - - Log level - - - True - - - 18, 28 - - - 23, 12 - - - 4 - - - mtu - - - True - - - 236, 28 - - - 23, 12 - - - 6 - - - tti - - - True - - - 236, 66 - - - 101, 12 - - - 10 - - - downlinkCapacity - - - True - - - 18, 66 - - - 89, 12 - - - 8 - - - uplinkCapacity - - - 5, 45 - - - 598, 16 - - - 13 - - - *Set the rules, separated by commas (,); support Domain (pure string / regular / subdomain) and IP - - - True - - - NoControl - - - 30, 87 - - - 125, 12 - - - 30 - - - Statistics freshrate - - - True - - - 5, 14 - - - 0, 0, 0, 0 - - - 95, 12 - - - 19 - - - Domain strategy - - - Top - - - 0, 0 - - - 662, 10 - - - 9 - - - Bottom - - - 0, 615 - - - 662, 60 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 11 - - Top + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 17 + + groupBox2 - - 642, 67 + + 2 - - 19 + + + 30, 176 - - Top - - - 3, 3 - - - 648, 37 - - - 20 - - - Fill - - - 0, 10 - - - 662, 605 - - - 10 - - - Fill - - - 3, 84 - - - 642, 486 - - - 12 - - - 4, 22 - - - 3, 3, 3, 3 - - - 654, 579 - - - 0 - - - Core: basic settings - - - 4, 22 - - - 3, 3, 3, 3 - - - 654, 579 - - - 1 - - - Core: Routing settings - - - 4, 22 - - - 3, 3, 3, 3 - - - 634, 460 - - - 0 - - - 1.Proxy Domain or IP - - - 4, 22 - - - 3, 3, 3, 3 + + Record local logs 634, 460 - - 1 - - - 2.Direct Domain or IP - - - 4, 22 - - - 3, 3, 3, 3 - - - 634, 460 - - - 2 - - - 3.Block Domain or IP + + 12 4, 22 - - 3, 3, 3, 3 + + txtKcpwriteBufferSize - - 654, 579 + + txtuserPacRule - + 2 - - Core: KCP settings + + False - - 4, 22 + + 18 - - 3, 3, 3, 3 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 654, 579 + + tabControl1 - - 3 - - - v2rayN settings - - - 4, 22 - - - 3, 3, 3, 3 - - - 634, 460 - - - 3 - - - 4.Pre-defined rules - - - 4, 22 - - - 3, 3, 3, 3 - - - 654, 579 - - - 4 - - - User PAC settings - - - 345, 62 - - - 94, 21 - - - 11 - - - 111, 24 - - - 94, 21 + + groupBox1 5 - - 111, 100 - - - 94, 21 - - - 13 - - - 345, 24 - - - 94, 21 - - - 7 - - - 111, 62 - - + 94, 21 9 - - 345, 100 + + groupBox1 - - 94, 21 + + tabPage9 - - 15 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 124, 25 + + linkLabelRoutingDoc - - 78, 21 + + 468, 60 - - 3 + + + Top - - 124, 60 + + 102, 16 - - 78, 21 + + 6 - - 14 + + txtKcptti - - False + + tabPage3 - - 33, 228 + + 4, 22 - - True + + cmblistenerType - - 555, 100 - - - 30 - - - 32, 205 - - - True - - - 541, 100 - - - 28 - - - Fill - - - 3, 3 - - + 0 - - True - - - Vertical - - - 628, 454 + + 634, 460 0 - - Fill + + 111, 100 + + + True + + + System.Windows.Forms.Label, 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 3, 3 - - 0 + + 598, 16 - + + Core: basic settings + + True - - Vertical + + 120, 16 - - 628, 454 + + 281, 12 - - 1 + + panel3 - - Fill - - - 3, 3 - - - 0 - - + True - - Vertical + + tti + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 84, 16 + + + groupBox1 + + + 65, 12 628, 454 - - 1 + + tabPage7 - + + Only open PAC, do not automatically configure PAC + + + 12 + + + 662, 60 + + + 20 + + + http + + + 7 + + + chkdefAllowInsecure + + + 648, 573 + + + 206, 64 + + + 95, 12 + + + tabPage6 + + + 14 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 15, 63 + + + tabControl2 + + + 16 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - 3, 40 + + Enable UDP + + + 94, 21 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + &Cancel + + + label10 + + + 648, 573 + + + Vertical + + + groupBox1 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 - + + 1 + + + Bypassing the LAN address + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bypassing LAN and mainland address + + + Bypass mainland address + + + Top + + + 12 + + + txtKcpmtu + + + lbFreshrate + + + 1 + + + label11 + + + 29 + + + 1 + + + NoControl + + + Turn on Sniffing + + + Only open Http proxy, do not automatically configure proxy server (direct mode) + + + False + + + 4 + + + tabPage6 + + + False + + + tabControl2 + + + 1 + + + $this + + + 7 + + + 3 + + + 4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + readBufferSize + + + 0 + + + tabPage6 + + + 3 + + True + + 18 + + + True + + + Fill + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + congestion + + + NoControl + + + groupBox1 + + + panel3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 + + + 89, 12 + + + info + + + txtUseragent + + + 1 + + + tabPage7 + + + v2rayN settings + + + 20 + + + groupBox1 + + + 16 + + + Not Enabled Http Proxy + + + 14 + + + 32 + + + 628, 454 + + + 6, 12 + + + groupBox1 + + + System.Windows.Forms.TabPage, 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 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtKcpdownlinkCapacity + + + 198, 16 + + + Automatically start at system startup + + + 3, 3, 3, 3 + + + 1 + + + Http proxy + + + 4 + + + groupBox1 + + + tabPage6 + + + 355, 16 + + + 3, 3, 3, 3 + + + 97, 20 + + + 3 + + + 662, 605 + + + 33, 29 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 78, 21 + + + 5, 45 + + + Custom DNS (multiple, separated by commas (,)) + + + tabControl1 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 598, 16 + + + v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + warning + + + groupBox1 + + + 0 + + + tabPage7 + + + Statistics freshrate + + + label5 + + + 120, 16 + + + 20 + + + 89, 12 + + + Only open Http proxy and do nothing + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 18, 66 + + + 20, 143 + + + 11 + + + 4, 4, 4, 4 + + + tabPage6 + + + btnClose + + + Turn on Sniffing + + + groupBox1 + + + 18, 28 + + + 30 + + + 34 + + + 20 + + + 29 + + + 0 + + + 21, 17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 14 + + + 19 + + + 4, 22 + + + *Set user pac rules, separated by commas (,) + + + True + + + chksniffingEnabled + + + 6 + + + 174, 16 + + + 16 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 18, 104 + + + tabPage2 + + + NoControl + + + 97, 20 + + + socks + + + tabPage5 + + + 576, 16 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 464, 20 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage9 + + + True + + + tabPage6 + + + *Set the rules, separated by commas (,); support Domain (pure string / regular / subdomain) and IP + + + tabPage3 + + + 30 + + + 53, 12 + + + 17 + + + label8 + + + 468, 27 + + + label13 + + + chkAutoRun + + + tabControl2 + + + 654, 579 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 345, 62 + + + 15 + + + 12 + + + 1 + + + chkudpEnabled + + + True + + + 33, 253 + + + tabPage1 + + + 5 + + + tabPage6 + + + 2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 + + + btnSetDefRountingRule + + + True + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 32 + + + label1 + + + 84, 16 + + + tabPage8 + + + True + + + panel4 + + + label7 + + + allowInsecure + + + txtlocalPort + + + True + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 3, 17 + + + 3, 40 + + + labRoutingTips + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 + + + 124, 25 + + + protocol + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl2 + + + Top, Right + + + Turn on Mux Multiplexing + + + True + + + 23, 12 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 555, 100 + + + socks + + + 0 + + + 3, 3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + chkAllowLANConn + + + 84, 16 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + tabControl1 + + + True + + + tabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 15, 38 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + 10 + + + 369, 62 + + + 13 + + + 1.Proxy Domain or IP + + + groupBox1 + + + panel3 + + + NoControl + + + 654, 579 + + + chkEnableStatistics + + + 14 + + + 8 + + + 7 + + + http + + + 53, 12 + + + 193, 162 + + + True + + + 2 + + + 0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + label2 + + + 165, 20 + + + False + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 3, 3 + + + 9 + + + groupBox1 + + + 4.Pre-defined rules + + + 101, 12 + + + 3 + + + 12 + + + 431, 12 + + + Domain strategy + + + cmbprotocol + + + 648, 37 + + + True + + + Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client) + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 + + + Listening port + Vertical + + Fill + + + 1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Vertical + + + 1 + + + 28 + + + 257, 60 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 94, 21 + + + True + + + cmbprotocol2 + + + Open Http proxy and automatically configure proxy server (global mode) + + + groupBox2 + + + chkKeepOlderDedupl + + + 15, 129 + + + 255, 20 + + + mtu + + + True + + + True + + + True + + + chkKcpcongestion + + + 1 + + + 0 + + + 257, 25 + + + 3, 84 + + + groupBox1 + + + Top + + + listening port 2 + + + 97, 20 + + + chkAllowIn2 + + + tabPage2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + False + + + 3 + + + 33 + + + 4, 22 + + + 9 + + + 541, 100 + + + Core: KCP settings + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + error + + + 15, 160 + + + True + + + 59, 12 + + + 5, 14 + + + groupBox1 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 634, 460 + + + 12 + + + 120, 16 + + + 662, 10 + + + txtlocalPort2 + + + Only open PAC and do nothing + + + True + + + Fill + + + groupBox1 + + + 654, 579 + + + 7 + + + 27 + + + 10 + + + False + + + Vertical + + + 206, 29 + + + 8 + + + txtUserdirect + + + chkudpEnabled2 + + + 0 + + + 0 + 648, 536 + + Allow connections from the LAN + + + 161, 84 + + + panel3 + + + 0 + + + tabPage6 + + + tabControl2 + + + 30, 87 + + + txtKcpreadBufferSize + + + 4 + + + panel2 + + + 3 + + + 8 + + + 35 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + User PAC settings + + + 95, 12 + + + tabPage7 + + + 10 + + + none + + + Log level + + + tabControl1 + + + protocol + + + 6 + + + tabPage4 + + + NoControl + + + 2 + + + AsIs + + + 15, 62 + + + 7 + + + tabPage7 + + + 642, 486 + + + 4, 22 + + + 58, 20 + + + groupBox1 + + + 1 + + + 42, 98 + + + 13 + + + 13 + + + 2 + + + downlinkCapacity + + + True + + + 78, 21 + + + tabPage7 + + + True + + + 19 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + cmbroutingMode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + 23, 12 + + + True + + + 8 + + + True + + + 3, 3, 3, 3 + + + Custom GFWList address (please fill in the blank without customization) + + + 345, 100 + + + panel3 + + + 75, 23 + + + 654, 579 + + + 10 + + + 204, 16 + + + 17 + + + 628, 454 + + + debug + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 6 + + + 1 + + + txtUserblock + + + 229, 23 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 15 + + + 2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 11 + + + 18 + + + 126, 16 + + + 345, 24 + + + NoControl + + + 4, 22 + + + cmbdomainStrategy + + + False + + + 257, 158 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + &OK + + + 10 + + + 634, 460 + + + panel2 + + + txtKcpuplinkCapacity + + + 115, 10 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage4 + + + chklogEnabled + + + chksniffingEnabled2 + + + tabPage7 + + + 642, 67 + + + 0 + + + 4, 22 + + + True + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage5 + + + 9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + IPIfNonMatch + + + groupBox1 + + + 4, 22 + + + 23 + + + 3.Block Domain or IP + + + label3 + + + 6 + + + 236, 66 + + + tabPage7 + + + $this + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + $this + + + 8 + + + txtremoteDNS + + + 3, 3 + + + 0, 615 + + + 19 + + + 33 + + + 94, 21 + + + 4, 22 + + + writeBufferSize + + + 11 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 89, 12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 31 + + + 369, 27 + + + 4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + tabPage6 + + + groupBox1 + + + groupBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + True + + + 29 + + + Fill + + + True + + + 3, 3 + + + OptionSettingForm + + + 124, 94 + + + Core: Routing settings + + + 13 + + + tabPage8 + + + 2 + + + 236, 104 + + + 5 + + + Open PAC and automatically configure PAC (PAC mode) + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + tabPage9 + + + 94, 21 + + + 75, 23 + + + 15, 16 + + + 33, 277 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0, 0, 0 + + + 662, 675 + + + uplinkCapacity + + + IPOnDemand + + + NoControl + + + True + + + 6 + + + 1 + + + 0 + + + Settings + + + 0 + + + 3, 3, 3, 3 + + + 3, 3 + + + 32, 205 + + + cmbloglevel + + + 111, 62 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label4 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + label16 + + + btnOK + + + Set default custom routing rules + + + tabPage6 + + + txturlGFWList + + + chkmuxEnabled + + + 654, 579 + + + tabPage6 + + + tabControl1 + + + 0 + + + 15, 110 + + + 5, 11 + + + 0 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0 + + + Enable UDP + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 + + + groupBox1 + + + 19 + + + 2.Direct Domain or IP + + + 267, 16 + + + Global + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 9 + + + 0 + + + 322, 10 + + + 15, 192 + + + 0 + + + 94, 21 + + + 3 + + + Keep older when deduplication + + + 3, 3, 3, 3 + + + 236, 28 + + + Bottom + + + 3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + groupBox1 + + + 125, 12 + + + 3, 3, 3, 3 + + + 11 + + + 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 + + + 124, 60 + + + cbFreshrate + + + 246, 16 + + + tabPage6 + + + label6 + + + 111, 24 + + + panel2 + 21 + + label9 + + + 0, 10 + + + panel1 + + + 2 + + + label14 + + + True + \ 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..5903b366 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx @@ -117,88 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 参数设置 - 取消(&C) - - 确定(&O) - - - - NoControl + + Core:基础设置 - - 351, 14 + + 222, 16 - - 201, 23 + + 是否允许不安全连接(allowInsecure) - - 一键设置默认自定义路由规则 + + 53, 12 - - 102, 16 - - - 本地监听端口2 - - - 144, 16 - - - 允许来自局域网的连接 - - - 180, 16 - - - 开机自动启动(可能会不成功) - - - 384, 16 - - - 启用统计(实时网速显示和使用流量显示，需要重启v2rayN客户端) - - - 去重时保留序号较小的项 - - - 156, 16 - - - 记录本地日志(默认关闭) - - - 开启Mux多路复用(默认开启) - - - 96, 16 - - - 开启流量探测 - - - 96, 16 - - - 开启流量探测 - - - 66, 16 - - - 开启UDP - - - 66, 16 - - - 开启UDP + + Http代理 关闭Http代理 @@ -221,6 +157,117 @@ 仅开启PAC,不改变系统代理 + + 96, 16 + + + 开启流量探测 + + + 96, 16 + + + 开启流量探测 + + + 191, 12 + + + 自定义DNS(可多个,用逗号(,)隔开) + + + 开启Mux多路复用(默认开启) + + + 102, 16 + + + 本地监听端口2 + + + 66, 16 + + + 开启UDP + + + 29, 12 + + + 协议 + + + 29, 12 + + + 协议 + + + 66, 16 + + + 开启UDP + + + 156, 16 + + + 记录本地日志(默认关闭) + + + 53, 12 + + + 日志等级 + + + 77, 12 + + + 本地监听端口 + + + Core:路由设置 + + + 3, 89 + + + 642, 481 + + + 634, 455 + + + 1.代理的Domain或IP + + + 628, 449 + + + 634, 455 + + + 2.直连的Domain或IP + + + 628, 449 + + + 634, 455 + + + 3.阻止的Domain或IP + + + 628, 449 + + + 634, 455 + + + 4.预定义规则 + 全局 @@ -239,53 +286,27 @@ 244, 20 - - 29, 12 + + 642, 72 - - 协议 - - - 227, 12 - - - 自定义GFWList地址(不需自定义请填空白) - - - 191, 12 - - - 自定义DNS(可多个,用逗号(,)隔开) - - - 53, 12 - - - 53, 12 - - - Http代理 - - + 77, 12 - - 本地监听端口 + + 域名解析策略 - - 29, 12 + + + NoControl - - 协议 + + 351, 14 - - *设置用户PAC规则，用逗号(,)隔开 + + 201, 23 - - 53, 12 - - - 日志等级 + + 一键设置默认自定义路由规则 @@ -300,70 +321,58 @@ *设置的规则，用逗号(,)隔开;支持Domain(纯字符串/正则/子域名)和IP - - 77, 12 - - - 统计刷新频率 - - - 域名解析策略 - - - 642, 72 - - - 3, 89 - - - 642, 481 - - - Core:基础设置 - - - Core:路由设置 - - - 634, 455 - - - 1.代理的Domain或IP - - - 634, 455 - - - 2.直连的Domain或IP - - - 634, 455 - - - 3.阻止的Domain或IP - Core:KCP设置 v2rayN设置 - - 634, 455 + + 156, 16 - - 4.预定义规则 + + 去重时保留序号较小的项 + + + 77, 12 + + + 统计刷新频率 + + + 372, 16 + + + 启用统计(实时网速显示和使用流量显示，需要重启v2rayN客户端) + + + 144, 16 + + + 允许来自局域网的连接 + + + 227, 12 + + + 自定义GFWList地址(不需自定义请填空白) + + + 180, 16 + + + 开机自动启动(可能会不成功) 用户PAC设置 - - 628, 449 + + *设置用户PAC规则，用逗号(,)隔开 - - 628, 449 + + 确定(&O) - - 628, 449 + + 参数设置 \ No newline at end of file diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index cfdb0f58..fefad821 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -147,10 +147,6 @@ namespace v2rayN.Handler //{ // config.remoteDNS = "1.1.1.1"; //} - if (Utils.IsNullOrEmpty(config.defaultAllowInsecure)) - { - config.defaultAllowInsecure = "false"; - } if (config.subItem == null) { @@ -219,7 +215,7 @@ namespace v2rayN.Handler //添加 if (Utils.IsNullOrEmpty(vmessItem.allowInsecure)) { - vmessItem.allowInsecure = config.defaultAllowInsecure; + vmessItem.allowInsecure = config.defAllowInsecure.ToString(); } config.vmess.Add(vmessItem); if (config.vmess.Count == 1) diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index 515114df..3c8bf76b 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -182,7 +182,7 @@ namespace v2rayN.Mode /// /// 是否允许不安全连接 /// - public string defaultAllowInsecure + public bool defAllowInsecure { get; set; } @@ -306,7 +306,7 @@ namespace v2rayN.Mode { if (index < 0 || Utils.IsNullOrEmpty(vmess[index].allowInsecure)) { - return Convert.ToBoolean(defaultAllowInsecure); + return defAllowInsecure; } return Convert.ToBoolean(vmess[index].allowInsecure); } @@ -704,7 +704,7 @@ namespace v2rayN.Mode [Serializable] public class UIItem { - + public System.Drawing.Size mainSize {