From 939d600be1dda27ea1b6769f8360cf05fbc19b46 Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Sun, 14 Mar 2021 17:48:38 +0800 Subject: [PATCH] Refactor SettingForm --- Netch/Forms/SettingForm.Designer.cs | 368 ++++++++++++++-------------- Netch/Forms/SettingForm.cs | 2 +- 2 files changed, 185 insertions(+), 185 deletions(-) diff --git a/Netch/Forms/SettingForm.Designer.cs b/Netch/Forms/SettingForm.Designer.cs index 93342a0e..c55a9c0f 100644 --- a/Netch/Forms/SettingForm.Designer.cs +++ b/Netch/Forms/SettingForm.Designer.cs @@ -33,9 +33,6 @@ namespace Netch.Forms { this.TabControl = new System.Windows.Forms.TabControl(); this.GeneralTabPage = new System.Windows.Forms.TabPage(); - this.ServerPingTypeLabel = new System.Windows.Forms.Label(); - this.TCPingRadioBtn = new System.Windows.Forms.RadioButton(); - this.ICMPingRadioBtn = new System.Windows.Forms.RadioButton(); this.PortGroupBox = new System.Windows.Forms.GroupBox(); this.Socks5PortLabel = new System.Windows.Forms.Label(); this.Socks5PortTextBox = new System.Windows.Forms.TextBox(); @@ -45,12 +42,15 @@ namespace Netch.Forms this.RedirectorTextBox = new System.Windows.Forms.TextBox(); this.AllowDevicesCheckBox = new System.Windows.Forms.CheckBox(); this.ResolveServerHostnameCheckBox = new System.Windows.Forms.CheckBox(); + this.ServerPingTypeLabel = new System.Windows.Forms.Label(); + this.ICMPingRadioBtn = new System.Windows.Forms.RadioButton(); + this.TCPingRadioBtn = new System.Windows.Forms.RadioButton(); this.ProfileCountLabel = new System.Windows.Forms.Label(); this.ProfileCountTextBox = new System.Windows.Forms.TextBox(); - this.StartedPingLabel = new System.Windows.Forms.Label(); this.DetectionTickLabel = new System.Windows.Forms.Label(); - this.StartedPingIntervalTextBox = new System.Windows.Forms.TextBox(); this.DetectionTickTextBox = new System.Windows.Forms.TextBox(); + this.StartedPingLabel = new System.Windows.Forms.Label(); + this.StartedPingIntervalTextBox = new System.Windows.Forms.TextBox(); this.STUNServerLabel = new System.Windows.Forms.Label(); this.STUN_ServerComboBox = new System.Windows.Forms.ComboBox(); this.AclLabel = new System.Windows.Forms.Label(); @@ -59,16 +59,16 @@ namespace Netch.Forms this.LanguageComboBox = new System.Windows.Forms.ComboBox(); this.NFTabPage = new System.Windows.Forms.TabPage(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.DNSRedirectorCheckBox = new System.Windows.Forms.CheckBox(); - this.ModifiedDNSTextBox = new System.Windows.Forms.TextBox(); - this.ModifiedICMPTextBox = new System.Windows.Forms.TextBox(); - this.ICMPRedirectorCheckBox = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); - this.ModifiedDNSLabel = new System.Windows.Forms.Label(); - this.ChildProcessHandleCheckBox = new System.Windows.Forms.CheckBox(); - this.RedirectorSSCheckBox = new System.Windows.Forms.CheckBox(); this.ProcessProxyProtocolLabel = new System.Windows.Forms.Label(); this.ProcessProxyProtocolComboBox = new System.Windows.Forms.ComboBox(); + this.DNSRedirectorCheckBox = new System.Windows.Forms.CheckBox(); + this.RDRDNSLabel = new System.Windows.Forms.Label(); + this.RDRDNSTextBox = new System.Windows.Forms.TextBox(); + this.ICMPRedirectorCheckBox = new System.Windows.Forms.CheckBox(); + this.RDRICMPLabel = new System.Windows.Forms.Label(); + this.ModifiedICMPTextBox = new System.Windows.Forms.TextBox(); + this.RedirectorSSCheckBox = new System.Windows.Forms.CheckBox(); + this.ChildProcessHandleCheckBox = new System.Windows.Forms.CheckBox(); this.TAPTabPage = new System.Windows.Forms.TabPage(); this.TUNTAPGroupBox = new System.Windows.Forms.GroupBox(); this.TUNTAPAddressLabel = new System.Windows.Forms.Label(); @@ -84,8 +84,8 @@ namespace Netch.Forms this.UseFakeDNSCheckBox = new System.Windows.Forms.CheckBox(); this.GlobalBypassIPsButton = new System.Windows.Forms.Button(); this.v2rayTabPage = new System.Windows.Forms.TabPage(); - this.TLSAllowInsecureCheckBox = new System.Windows.Forms.CheckBox(); this.XrayConeCheckBox = new System.Windows.Forms.CheckBox(); + this.TLSAllowInsecureCheckBox = new System.Windows.Forms.CheckBox(); this.UseMuxCheckBox = new System.Windows.Forms.CheckBox(); this.KCPGroupBox = new System.Windows.Forms.GroupBox(); this.mtuLabel = new System.Windows.Forms.Label(); @@ -151,17 +151,17 @@ namespace Netch.Forms // GeneralTabPage // this.GeneralTabPage.BackColor = System.Drawing.SystemColors.ButtonFace; - this.GeneralTabPage.Controls.Add(this.ServerPingTypeLabel); - this.GeneralTabPage.Controls.Add(this.TCPingRadioBtn); - this.GeneralTabPage.Controls.Add(this.ICMPingRadioBtn); this.GeneralTabPage.Controls.Add(this.PortGroupBox); this.GeneralTabPage.Controls.Add(this.ResolveServerHostnameCheckBox); + this.GeneralTabPage.Controls.Add(this.ServerPingTypeLabel); + this.GeneralTabPage.Controls.Add(this.ICMPingRadioBtn); + this.GeneralTabPage.Controls.Add(this.TCPingRadioBtn); this.GeneralTabPage.Controls.Add(this.ProfileCountLabel); this.GeneralTabPage.Controls.Add(this.ProfileCountTextBox); - this.GeneralTabPage.Controls.Add(this.StartedPingLabel); this.GeneralTabPage.Controls.Add(this.DetectionTickLabel); - this.GeneralTabPage.Controls.Add(this.StartedPingIntervalTextBox); this.GeneralTabPage.Controls.Add(this.DetectionTickTextBox); + this.GeneralTabPage.Controls.Add(this.StartedPingLabel); + this.GeneralTabPage.Controls.Add(this.StartedPingIntervalTextBox); this.GeneralTabPage.Controls.Add(this.STUNServerLabel); this.GeneralTabPage.Controls.Add(this.STUN_ServerComboBox); this.GeneralTabPage.Controls.Add(this.AclLabel); @@ -175,37 +175,6 @@ namespace Netch.Forms this.GeneralTabPage.TabIndex = 0; this.GeneralTabPage.Text = "General"; // - // ServerPingTypeLabel - // - this.ServerPingTypeLabel.AutoSize = true; - this.ServerPingTypeLabel.Location = new System.Drawing.Point(267, 44); - this.ServerPingTypeLabel.Name = "ServerPingTypeLabel"; - this.ServerPingTypeLabel.Size = new System.Drawing.Size(89, 12); - this.ServerPingTypeLabel.TabIndex = 16; - this.ServerPingTypeLabel.Text = "ServerPingType"; - // - // TCPingRadioBtn - // - this.TCPingRadioBtn.AutoSize = true; - this.TCPingRadioBtn.Location = new System.Drawing.Point(332, 63); - this.TCPingRadioBtn.Name = "TCPingRadioBtn"; - this.TCPingRadioBtn.Size = new System.Drawing.Size(59, 16); - this.TCPingRadioBtn.TabIndex = 15; - this.TCPingRadioBtn.TabStop = true; - this.TCPingRadioBtn.Text = "TCPing"; - this.TCPingRadioBtn.UseVisualStyleBackColor = true; - // - // ICMPingRadioBtn - // - this.ICMPingRadioBtn.AutoSize = true; - this.ICMPingRadioBtn.Location = new System.Drawing.Point(268, 63); - this.ICMPingRadioBtn.Name = "ICMPingRadioBtn"; - this.ICMPingRadioBtn.Size = new System.Drawing.Size(65, 16); - this.ICMPingRadioBtn.TabIndex = 14; - this.ICMPingRadioBtn.TabStop = true; - this.ICMPingRadioBtn.Text = "ICMPing"; - this.ICMPingRadioBtn.UseVisualStyleBackColor = true; - // // PortGroupBox // this.PortGroupBox.Controls.Add(this.Socks5PortLabel); @@ -290,17 +259,48 @@ namespace Netch.Forms this.ResolveServerHostnameCheckBox.Location = new System.Drawing.Point(267, 15); this.ResolveServerHostnameCheckBox.Name = "ResolveServerHostnameCheckBox"; this.ResolveServerHostnameCheckBox.Size = new System.Drawing.Size(162, 16); - this.ResolveServerHostnameCheckBox.TabIndex = 2; + this.ResolveServerHostnameCheckBox.TabIndex = 1; this.ResolveServerHostnameCheckBox.Text = "Resolve Server Hostname"; this.ResolveServerHostnameCheckBox.UseVisualStyleBackColor = true; // + // ServerPingTypeLabel + // + this.ServerPingTypeLabel.AutoSize = true; + this.ServerPingTypeLabel.Location = new System.Drawing.Point(267, 44); + this.ServerPingTypeLabel.Name = "ServerPingTypeLabel"; + this.ServerPingTypeLabel.Size = new System.Drawing.Size(89, 12); + this.ServerPingTypeLabel.TabIndex = 2; + this.ServerPingTypeLabel.Text = "ServerPingType"; + // + // ICMPingRadioBtn + // + this.ICMPingRadioBtn.AutoSize = true; + this.ICMPingRadioBtn.Location = new System.Drawing.Point(268, 63); + this.ICMPingRadioBtn.Name = "ICMPingRadioBtn"; + this.ICMPingRadioBtn.Size = new System.Drawing.Size(65, 16); + this.ICMPingRadioBtn.TabIndex = 3; + this.ICMPingRadioBtn.TabStop = true; + this.ICMPingRadioBtn.Text = "ICMPing"; + this.ICMPingRadioBtn.UseVisualStyleBackColor = true; + // + // TCPingRadioBtn + // + this.TCPingRadioBtn.AutoSize = true; + this.TCPingRadioBtn.Location = new System.Drawing.Point(332, 63); + this.TCPingRadioBtn.Name = "TCPingRadioBtn"; + this.TCPingRadioBtn.Size = new System.Drawing.Size(59, 16); + this.TCPingRadioBtn.TabIndex = 4; + this.TCPingRadioBtn.TabStop = true; + this.TCPingRadioBtn.Text = "TCPing"; + this.TCPingRadioBtn.UseVisualStyleBackColor = true; + // // ProfileCountLabel // this.ProfileCountLabel.AutoSize = true; this.ProfileCountLabel.Location = new System.Drawing.Point(12, 160); this.ProfileCountLabel.Name = "ProfileCountLabel"; this.ProfileCountLabel.Size = new System.Drawing.Size(77, 12); - this.ProfileCountLabel.TabIndex = 3; + this.ProfileCountLabel.TabIndex = 5; this.ProfileCountLabel.Text = "ProfileCount"; // // ProfileCountTextBox @@ -308,50 +308,50 @@ namespace Netch.Forms this.ProfileCountTextBox.Location = new System.Drawing.Point(120, 157); this.ProfileCountTextBox.Name = "ProfileCountTextBox"; this.ProfileCountTextBox.Size = new System.Drawing.Size(90, 21); - this.ProfileCountTextBox.TabIndex = 4; + this.ProfileCountTextBox.TabIndex = 6; this.ProfileCountTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // StartedPingLabel - // - this.StartedPingLabel.AutoSize = true; - this.StartedPingLabel.Location = new System.Drawing.Point(12, 187); - this.StartedPingLabel.Name = "StartedPingLabel"; - this.StartedPingLabel.Size = new System.Drawing.Size(137, 12); - this.StartedPingLabel.TabIndex = 5; - this.StartedPingLabel.Text = "Delay test after start"; - // // DetectionTickLabel // this.DetectionTickLabel.AutoSize = true; this.DetectionTickLabel.Location = new System.Drawing.Point(225, 160); this.DetectionTickLabel.Name = "DetectionTickLabel"; this.DetectionTickLabel.Size = new System.Drawing.Size(119, 12); - this.DetectionTickLabel.TabIndex = 6; + this.DetectionTickLabel.TabIndex = 7; this.DetectionTickLabel.Text = "Detection Tick(sec)"; // - // StartedPingIntervalTextBox - // - this.StartedPingIntervalTextBox.Location = new System.Drawing.Point(177, 184); - this.StartedPingIntervalTextBox.Name = "StartedPingIntervalTextBox"; - this.StartedPingIntervalTextBox.Size = new System.Drawing.Size(68, 21); - this.StartedPingIntervalTextBox.TabIndex = 7; - this.StartedPingIntervalTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // DetectionTickTextBox // this.DetectionTickTextBox.Location = new System.Drawing.Point(366, 157); this.DetectionTickTextBox.Name = "DetectionTickTextBox"; this.DetectionTickTextBox.Size = new System.Drawing.Size(68, 21); - this.DetectionTickTextBox.TabIndex = 7; + this.DetectionTickTextBox.TabIndex = 8; this.DetectionTickTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // StartedPingLabel + // + this.StartedPingLabel.AutoSize = true; + this.StartedPingLabel.Location = new System.Drawing.Point(12, 187); + this.StartedPingLabel.Name = "StartedPingLabel"; + this.StartedPingLabel.Size = new System.Drawing.Size(137, 12); + this.StartedPingLabel.TabIndex = 9; + this.StartedPingLabel.Text = "Delay test after start"; + // + // StartedPingIntervalTextBox + // + this.StartedPingIntervalTextBox.Location = new System.Drawing.Point(177, 184); + this.StartedPingIntervalTextBox.Name = "StartedPingIntervalTextBox"; + this.StartedPingIntervalTextBox.Size = new System.Drawing.Size(68, 21); + this.StartedPingIntervalTextBox.TabIndex = 10; + this.StartedPingIntervalTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // STUNServerLabel // this.STUNServerLabel.AutoSize = true; this.STUNServerLabel.Location = new System.Drawing.Point(12, 216); this.STUNServerLabel.Name = "STUNServerLabel"; this.STUNServerLabel.Size = new System.Drawing.Size(71, 12); - this.STUNServerLabel.TabIndex = 8; + this.STUNServerLabel.TabIndex = 11; this.STUNServerLabel.Text = "STUN Server"; // // STUN_ServerComboBox @@ -360,7 +360,7 @@ namespace Netch.Forms this.STUN_ServerComboBox.Location = new System.Drawing.Point(120, 213); this.STUN_ServerComboBox.Name = "STUN_ServerComboBox"; this.STUN_ServerComboBox.Size = new System.Drawing.Size(314, 20); - this.STUN_ServerComboBox.TabIndex = 9; + this.STUN_ServerComboBox.TabIndex = 12; // // AclLabel // @@ -368,7 +368,7 @@ namespace Netch.Forms this.AclLabel.Location = new System.Drawing.Point(12, 248); this.AclLabel.Name = "AclLabel"; this.AclLabel.Size = new System.Drawing.Size(65, 12); - this.AclLabel.TabIndex = 10; + this.AclLabel.TabIndex = 13; this.AclLabel.Text = "Custom ACL"; // // AclAddrTextBox @@ -376,7 +376,7 @@ namespace Netch.Forms this.AclAddrTextBox.Location = new System.Drawing.Point(120, 245); this.AclAddrTextBox.Name = "AclAddrTextBox"; this.AclAddrTextBox.Size = new System.Drawing.Size(314, 21); - this.AclAddrTextBox.TabIndex = 11; + this.AclAddrTextBox.TabIndex = 14; this.AclAddrTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // LanguageLabel @@ -385,7 +385,7 @@ namespace Netch.Forms this.LanguageLabel.Location = new System.Drawing.Point(12, 277); this.LanguageLabel.Name = "LanguageLabel"; this.LanguageLabel.Size = new System.Drawing.Size(53, 12); - this.LanguageLabel.TabIndex = 12; + this.LanguageLabel.TabIndex = 15; this.LanguageLabel.Text = "Language"; // // LanguageComboBox @@ -395,16 +395,14 @@ namespace Netch.Forms this.LanguageComboBox.Location = new System.Drawing.Point(120, 274); this.LanguageComboBox.Name = "LanguageComboBox"; this.LanguageComboBox.Size = new System.Drawing.Size(121, 20); - this.LanguageComboBox.TabIndex = 13; + this.LanguageComboBox.TabIndex = 16; // // NFTabPage // this.NFTabPage.BackColor = System.Drawing.SystemColors.ButtonFace; this.NFTabPage.Controls.Add(this.groupBox1); - this.NFTabPage.Controls.Add(this.ChildProcessHandleCheckBox); this.NFTabPage.Controls.Add(this.RedirectorSSCheckBox); - this.NFTabPage.Controls.Add(this.ProcessProxyProtocolLabel); - this.NFTabPage.Controls.Add(this.ProcessProxyProtocolComboBox); + this.NFTabPage.Controls.Add(this.ChildProcessHandleCheckBox); this.NFTabPage.Location = new System.Drawing.Point(4, 25); this.NFTabPage.Name = "NFTabPage"; this.NFTabPage.Padding = new System.Windows.Forms.Padding(3); @@ -414,111 +412,113 @@ namespace Netch.Forms // // groupBox1 // + this.groupBox1.Controls.Add(this.ProcessProxyProtocolLabel); + this.groupBox1.Controls.Add(this.ProcessProxyProtocolComboBox); this.groupBox1.Controls.Add(this.DNSRedirectorCheckBox); - this.groupBox1.Controls.Add(this.ModifiedDNSTextBox); - this.groupBox1.Controls.Add(this.ModifiedICMPTextBox); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.ModifiedDNSLabel); + this.groupBox1.Controls.Add(this.RDRDNSLabel); + this.groupBox1.Controls.Add(this.RDRDNSTextBox); this.groupBox1.Controls.Add(this.ICMPRedirectorCheckBox); + this.groupBox1.Controls.Add(this.RDRICMPLabel); + this.groupBox1.Controls.Add(this.ModifiedICMPTextBox); this.groupBox1.Location = new System.Drawing.Point(5, 6); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(450, 81); - this.groupBox1.TabIndex = 8; + this.groupBox1.Size = new System.Drawing.Size(450, 117); + this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // - // DNSRedirectorCheckBox - // - this.DNSRedirectorCheckBox.AutoSize = true; - this.DNSRedirectorCheckBox.Location = new System.Drawing.Point(6, 20); - this.DNSRedirectorCheckBox.Name = "DNSRedirectorCheckBox"; - this.DNSRedirectorCheckBox.Size = new System.Drawing.Size(108, 16); - this.DNSRedirectorCheckBox.TabIndex = 0; - this.DNSRedirectorCheckBox.Text = "DNS Redirector"; - this.DNSRedirectorCheckBox.UseVisualStyleBackColor = true; - // - // ModifiedDNSTextBox - // - this.ModifiedDNSTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.DNSRedirectorCheckBox, "Checked", true)); - this.ModifiedDNSTextBox.Location = new System.Drawing.Point(253, 15); - this.ModifiedDNSTextBox.Name = "ModifiedDNSTextBox"; - this.ModifiedDNSTextBox.Size = new System.Drawing.Size(191, 21); - this.ModifiedDNSTextBox.TabIndex = 1; - this.ModifiedDNSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // ModifiedICMPTextBox - // - this.ModifiedICMPTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.ICMPRedirectorCheckBox, "Checked", true)); - this.ModifiedICMPTextBox.Location = new System.Drawing.Point(253, 47); - this.ModifiedICMPTextBox.Name = "ModifiedICMPTextBox"; - this.ModifiedICMPTextBox.Size = new System.Drawing.Size(191, 21); - this.ModifiedICMPTextBox.TabIndex = 5; - this.ModifiedICMPTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // ICMPRedirectorCheckBox - // - this.ICMPRedirectorCheckBox.AutoSize = true; - this.ICMPRedirectorCheckBox.Location = new System.Drawing.Point(6, 50); - this.ICMPRedirectorCheckBox.Name = "ICMPRedirectorCheckBox"; - this.ICMPRedirectorCheckBox.Size = new System.Drawing.Size(114, 16); - this.ICMPRedirectorCheckBox.TabIndex = 4; - this.ICMPRedirectorCheckBox.Text = "ICMP Redirector"; - this.ICMPRedirectorCheckBox.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(218, 50); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 12); - this.label1.TabIndex = 6; - this.label1.Text = "ICMP"; - // - // ModifiedDNSLabel - // - this.ModifiedDNSLabel.AutoSize = true; - this.ModifiedDNSLabel.Location = new System.Drawing.Point(224, 21); - this.ModifiedDNSLabel.Name = "ModifiedDNSLabel"; - this.ModifiedDNSLabel.Size = new System.Drawing.Size(23, 12); - this.ModifiedDNSLabel.TabIndex = 2; - this.ModifiedDNSLabel.Text = "DNS"; - // - // ChildProcessHandleCheckBox - // - this.ChildProcessHandleCheckBox.AutoSize = true; - this.ChildProcessHandleCheckBox.Location = new System.Drawing.Point(11, 119); - this.ChildProcessHandleCheckBox.Name = "ChildProcessHandleCheckBox"; - this.ChildProcessHandleCheckBox.Size = new System.Drawing.Size(144, 16); - this.ChildProcessHandleCheckBox.TabIndex = 7; - this.ChildProcessHandleCheckBox.Text = "Child Process Handle"; - this.ChildProcessHandleCheckBox.UseVisualStyleBackColor = true; - // - // RedirectorSSCheckBox - // - this.RedirectorSSCheckBox.AutoSize = true; - this.RedirectorSSCheckBox.Location = new System.Drawing.Point(11, 97); - this.RedirectorSSCheckBox.Name = "RedirectorSSCheckBox"; - this.RedirectorSSCheckBox.Size = new System.Drawing.Size(102, 16); - this.RedirectorSSCheckBox.TabIndex = 0; - this.RedirectorSSCheckBox.Text = "Redirector SS"; - this.RedirectorSSCheckBox.UseVisualStyleBackColor = true; - // // ProcessProxyProtocolLabel // this.ProcessProxyProtocolLabel.AutoSize = true; - this.ProcessProxyProtocolLabel.Location = new System.Drawing.Point(163, 98); + this.ProcessProxyProtocolLabel.Location = new System.Drawing.Point(23, 21); this.ProcessProxyProtocolLabel.Name = "ProcessProxyProtocolLabel"; this.ProcessProxyProtocolLabel.Size = new System.Drawing.Size(89, 12); - this.ProcessProxyProtocolLabel.TabIndex = 2; + this.ProcessProxyProtocolLabel.TabIndex = 0; this.ProcessProxyProtocolLabel.Text = "Proxy Protocol"; // // ProcessProxyProtocolComboBox // this.ProcessProxyProtocolComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ProcessProxyProtocolComboBox.FormattingEnabled = true; - this.ProcessProxyProtocolComboBox.Location = new System.Drawing.Point(258, 93); + this.ProcessProxyProtocolComboBox.Location = new System.Drawing.Point(118, 16); this.ProcessProxyProtocolComboBox.Name = "ProcessProxyProtocolComboBox"; this.ProcessProxyProtocolComboBox.Size = new System.Drawing.Size(191, 20); - this.ProcessProxyProtocolComboBox.TabIndex = 3; + this.ProcessProxyProtocolComboBox.TabIndex = 1; + // + // DNSRedirectorCheckBox + // + this.DNSRedirectorCheckBox.AutoSize = true; + this.DNSRedirectorCheckBox.Location = new System.Drawing.Point(6, 51); + this.DNSRedirectorCheckBox.Name = "DNSRedirectorCheckBox"; + this.DNSRedirectorCheckBox.Size = new System.Drawing.Size(108, 16); + this.DNSRedirectorCheckBox.TabIndex = 2; + this.DNSRedirectorCheckBox.Text = "DNS Redirector"; + this.DNSRedirectorCheckBox.UseVisualStyleBackColor = true; + // + // RDRDNSLabel + // + this.RDRDNSLabel.AutoSize = true; + this.RDRDNSLabel.Location = new System.Drawing.Point(224, 52); + this.RDRDNSLabel.Name = "RDRDNSLabel"; + this.RDRDNSLabel.Size = new System.Drawing.Size(23, 12); + this.RDRDNSLabel.TabIndex = 3; + this.RDRDNSLabel.Text = "DNS"; + // + // RDRDNSTextBox + // + this.RDRDNSTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.DNSRedirectorCheckBox, "Checked", true)); + this.RDRDNSTextBox.Location = new System.Drawing.Point(253, 46); + this.RDRDNSTextBox.Name = "RDRDNSTextBox"; + this.RDRDNSTextBox.Size = new System.Drawing.Size(191, 21); + this.RDRDNSTextBox.TabIndex = 4; + this.RDRDNSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // ICMPRedirectorCheckBox + // + this.ICMPRedirectorCheckBox.AutoSize = true; + this.ICMPRedirectorCheckBox.Location = new System.Drawing.Point(6, 81); + this.ICMPRedirectorCheckBox.Name = "ICMPRedirectorCheckBox"; + this.ICMPRedirectorCheckBox.Size = new System.Drawing.Size(114, 16); + this.ICMPRedirectorCheckBox.TabIndex = 5; + this.ICMPRedirectorCheckBox.Text = "ICMP Redirector"; + this.ICMPRedirectorCheckBox.UseVisualStyleBackColor = true; + // + // RDRICMPLabel + // + this.RDRICMPLabel.AutoSize = true; + this.RDRICMPLabel.Location = new System.Drawing.Point(218, 81); + this.RDRICMPLabel.Name = "RDRICMPLabel"; + this.RDRICMPLabel.Size = new System.Drawing.Size(29, 12); + this.RDRICMPLabel.TabIndex = 6; + this.RDRICMPLabel.Text = "ICMP"; + // + // ModifiedICMPTextBox + // + this.ModifiedICMPTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.ICMPRedirectorCheckBox, "Checked", true)); + this.ModifiedICMPTextBox.Location = new System.Drawing.Point(253, 78); + this.ModifiedICMPTextBox.Name = "ModifiedICMPTextBox"; + this.ModifiedICMPTextBox.Size = new System.Drawing.Size(191, 21); + this.ModifiedICMPTextBox.TabIndex = 7; + this.ModifiedICMPTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // RedirectorSSCheckBox + // + this.RedirectorSSCheckBox.AutoSize = true; + this.RedirectorSSCheckBox.Location = new System.Drawing.Point(11, 129); + this.RedirectorSSCheckBox.Name = "RedirectorSSCheckBox"; + this.RedirectorSSCheckBox.Size = new System.Drawing.Size(102, 16); + this.RedirectorSSCheckBox.TabIndex = 1; + this.RedirectorSSCheckBox.Text = "Redirector SS"; + this.RedirectorSSCheckBox.UseVisualStyleBackColor = true; + // + // ChildProcessHandleCheckBox + // + this.ChildProcessHandleCheckBox.AutoSize = true; + this.ChildProcessHandleCheckBox.Location = new System.Drawing.Point(11, 151); + this.ChildProcessHandleCheckBox.Name = "ChildProcessHandleCheckBox"; + this.ChildProcessHandleCheckBox.Size = new System.Drawing.Size(144, 16); + this.ChildProcessHandleCheckBox.TabIndex = 2; + this.ChildProcessHandleCheckBox.Text = "Child Process Handle"; + this.ChildProcessHandleCheckBox.UseVisualStyleBackColor = true; // // TAPTabPage // @@ -666,8 +666,8 @@ namespace Netch.Forms // v2rayTabPage // this.v2rayTabPage.BackColor = System.Drawing.SystemColors.ButtonFace; - this.v2rayTabPage.Controls.Add(this.TLSAllowInsecureCheckBox); this.v2rayTabPage.Controls.Add(this.XrayConeCheckBox); + this.v2rayTabPage.Controls.Add(this.TLSAllowInsecureCheckBox); this.v2rayTabPage.Controls.Add(this.UseMuxCheckBox); this.v2rayTabPage.Controls.Add(this.KCPGroupBox); this.v2rayTabPage.Location = new System.Drawing.Point(4, 25); @@ -677,33 +677,33 @@ namespace Netch.Forms this.v2rayTabPage.TabIndex = 3; this.v2rayTabPage.Text = "V2Ray"; // - // TLSAllowInsecureCheckBox - // - this.TLSAllowInsecureCheckBox.AutoSize = true; - this.TLSAllowInsecureCheckBox.Location = new System.Drawing.Point(6, 42); - this.TLSAllowInsecureCheckBox.Name = "TLSAllowInsecureCheckBox"; - this.TLSAllowInsecureCheckBox.Size = new System.Drawing.Size(126, 16); - this.TLSAllowInsecureCheckBox.TabIndex = 0; - this.TLSAllowInsecureCheckBox.Text = "TLS AllowInsecure"; - this.TLSAllowInsecureCheckBox.UseVisualStyleBackColor = true; - // // XrayConeCheckBox // this.XrayConeCheckBox.AutoSize = true; this.XrayConeCheckBox.Location = new System.Drawing.Point(6, 15); this.XrayConeCheckBox.Name = "XrayConeCheckBox"; this.XrayConeCheckBox.Size = new System.Drawing.Size(336, 16); - this.XrayConeCheckBox.TabIndex = 1; + this.XrayConeCheckBox.TabIndex = 0; this.XrayConeCheckBox.Text = "FullCone Support (Required Server Xray-core v1.3.0+)"; this.XrayConeCheckBox.UseVisualStyleBackColor = true; // + // TLSAllowInsecureCheckBox + // + this.TLSAllowInsecureCheckBox.AutoSize = true; + this.TLSAllowInsecureCheckBox.Location = new System.Drawing.Point(6, 42); + this.TLSAllowInsecureCheckBox.Name = "TLSAllowInsecureCheckBox"; + this.TLSAllowInsecureCheckBox.Size = new System.Drawing.Size(126, 16); + this.TLSAllowInsecureCheckBox.TabIndex = 1; + this.TLSAllowInsecureCheckBox.Text = "TLS AllowInsecure"; + this.TLSAllowInsecureCheckBox.UseVisualStyleBackColor = true; + // // UseMuxCheckBox // this.UseMuxCheckBox.AutoSize = true; this.UseMuxCheckBox.Location = new System.Drawing.Point(148, 42); this.UseMuxCheckBox.Name = "UseMuxCheckBox"; this.UseMuxCheckBox.Size = new System.Drawing.Size(66, 16); - this.UseMuxCheckBox.TabIndex = 1; + this.UseMuxCheckBox.TabIndex = 2; this.UseMuxCheckBox.Text = "Use Mux"; this.UseMuxCheckBox.UseVisualStyleBackColor = true; // @@ -725,7 +725,7 @@ namespace Netch.Forms this.KCPGroupBox.Location = new System.Drawing.Point(9, 75); this.KCPGroupBox.Name = "KCPGroupBox"; this.KCPGroupBox.Size = new System.Drawing.Size(427, 204); - this.KCPGroupBox.TabIndex = 2; + this.KCPGroupBox.TabIndex = 3; this.KCPGroupBox.TabStop = false; this.KCPGroupBox.Text = "KCP"; // @@ -1153,8 +1153,8 @@ namespace Netch.Forms private System.Windows.Forms.Label ChinaDNSLabel; private System.Windows.Forms.TextBox OtherDNSTextBox; private System.Windows.Forms.TextBox ChinaDNSTextBox; - private System.Windows.Forms.TextBox ModifiedDNSTextBox; - private System.Windows.Forms.Label ModifiedDNSLabel; + private System.Windows.Forms.TextBox RDRDNSTextBox; + private System.Windows.Forms.Label RDRDNSLabel; private System.Windows.Forms.CheckBox RedirectorSSCheckBox; private System.Windows.Forms.Label ServerPingTypeLabel; private System.Windows.Forms.RadioButton TCPingRadioBtn; @@ -1163,7 +1163,7 @@ namespace Netch.Forms private System.Windows.Forms.Label ProcessProxyProtocolLabel; private System.Windows.Forms.CheckBox ICMPRedirectorCheckBox; private System.Windows.Forms.TextBox ModifiedICMPTextBox; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label RDRICMPLabel; private System.Windows.Forms.CheckBox ChildProcessHandleCheckBox; private System.Windows.Forms.GroupBox groupBox1; } diff --git a/Netch/Forms/SettingForm.cs b/Netch/Forms/SettingForm.cs index 8aac6c89..8ba79aff 100644 --- a/Netch/Forms/SettingForm.cs +++ b/Netch/Forms/SettingForm.cs @@ -110,7 +110,7 @@ namespace Netch.Forms BindCheckBox(DNSRedirectorCheckBox, b => Global.Settings.RedirectDNS = b, Global.Settings.RedirectDNS); - BindTextBox(ModifiedDNSTextBox, s => DnsUtils.TrySplit(s, out _, 2), s => Global.Settings.RedirectDNSAddr = s, Global.Settings.RedirectDNSAddr); + BindTextBox(RDRDNSTextBox, s => DnsUtils.TrySplit(s, out _, 2), s => Global.Settings.RedirectDNSAddr = s, Global.Settings.RedirectDNSAddr); BindCheckBox(ICMPRedirectorCheckBox, b => Global.Settings.RedirectICMP = b, Global.Settings.RedirectICMP);