From 7d00ec90607e4d0df69a1c95509e4ecfdc82f59a Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Wed, 1 Jun 2022 20:58:38 +0800 Subject: [PATCH] remove keepOlderDedupl --- .../Forms/OptionSettingForm.Designer.cs | 9 - clashN/clashN/Forms/OptionSettingForm.cs | 2 - clashN/clashN/Forms/OptionSettingForm.resx | 1910 ++++++++--------- .../Forms/OptionSettingForm.zh-Hans.resx | 14 +- clashN/clashN/Mode/Config.cs | 2 - 5 files changed, 959 insertions(+), 978 deletions(-) diff --git a/clashN/clashN/Forms/OptionSettingForm.Designer.cs b/clashN/clashN/Forms/OptionSettingForm.Designer.cs index f779891..ef90f7f 100644 --- a/clashN/clashN/Forms/OptionSettingForm.Designer.cs +++ b/clashN/clashN/Forms/OptionSettingForm.Designer.cs @@ -57,7 +57,6 @@ this.txtautoUpdateInterval = new System.Windows.Forms.TextBox(); this.label15 = new System.Windows.Forms.Label(); this.chkIgnoreGeoUpdateCore = new System.Windows.Forms.CheckBox(); - this.chkKeepOlderDedupl = new System.Windows.Forms.CheckBox(); this.chkEnableStatistics = new System.Windows.Forms.CheckBox(); this.chkAutoRun = new System.Windows.Forms.CheckBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); @@ -204,7 +203,6 @@ this.tabPage7.Controls.Add(this.txtautoUpdateInterval); this.tabPage7.Controls.Add(this.label15); this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore); - this.tabPage7.Controls.Add(this.chkKeepOlderDedupl); this.tabPage7.Controls.Add(this.chkEnableStatistics); this.tabPage7.Controls.Add(this.chkAutoRun); this.tabPage7.Name = "tabPage7"; @@ -274,12 +272,6 @@ this.chkIgnoreGeoUpdateCore.Name = "chkIgnoreGeoUpdateCore"; this.chkIgnoreGeoUpdateCore.UseVisualStyleBackColor = true; // - // chkKeepOlderDedupl - // - resources.ApplyResources(this.chkKeepOlderDedupl, "chkKeepOlderDedupl"); - this.chkKeepOlderDedupl.Name = "chkKeepOlderDedupl"; - this.chkKeepOlderDedupl.UseVisualStyleBackColor = true; - // // chkEnableStatistics // resources.ApplyResources(this.chkEnableStatistics, "chkEnableStatistics"); @@ -384,7 +376,6 @@ private System.Windows.Forms.CheckBox chkAutoRun; private System.Windows.Forms.CheckBox chkAllowLANConn; private System.Windows.Forms.CheckBox chkEnableStatistics; - private System.Windows.Forms.CheckBox chkKeepOlderDedupl; private System.Windows.Forms.CheckBox chkIgnoreGeoUpdateCore; private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.TextBox txtsystemProxyExceptions; diff --git a/clashN/clashN/Forms/OptionSettingForm.cs b/clashN/clashN/Forms/OptionSettingForm.cs index 39ca6c5..1c9fbdd 100644 --- a/clashN/clashN/Forms/OptionSettingForm.cs +++ b/clashN/clashN/Forms/OptionSettingForm.cs @@ -55,7 +55,6 @@ namespace clashN.Forms chkAutoRun.Checked = Utils.IsAutoRun(); chkEnableStatistics.Checked = config.enableStatistics; - chkKeepOlderDedupl.Checked = config.keepOlderDedupl; chkIgnoreGeoUpdateCore.Checked = config.ignoreGeoUpdateCore; txtautoUpdateInterval.Text = config.autoUpdateInterval.ToString(); @@ -150,7 +149,6 @@ namespace clashN.Forms bool lastEnableStatistics = config.enableStatistics; config.enableStatistics = chkEnableStatistics.Checked; - config.keepOlderDedupl = chkKeepOlderDedupl.Checked; config.ignoreGeoUpdateCore = chkIgnoreGeoUpdateCore.Checked; config.autoUpdateInterval = Utils.ToInt(txtautoUpdateInterval.Text); diff --git a/clashN/clashN/Forms/OptionSettingForm.resx b/clashN/clashN/Forms/OptionSettingForm.resx index d275813..c4cf81f 100644 --- a/clashN/clashN/Forms/OptionSettingForm.resx +++ b/clashN/clashN/Forms/OptionSettingForm.resx @@ -57,1073 +57,1073 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - - 5, 6, 5, 6 - - - Fill - - - chkAllowLANConn - - - 0 - - - 78, 23 - - - - True - - - &OK - - - tabControl1 - - - Font settings (Require restart) - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 9 - - - 714, 418 - - - Subscription conversion Url - - - groupBox1 - - - chkIgnoreGeoUpdateCore - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 29 - - - True - - - 11 - - - 32, 113 - - - 39 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - label7 - - - label4 - - - True - - - 1 - - - Listening API port - - - label2 - - - NoControl - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 193, 150 - - - 2 - - - btnFontReset - - - 241, 21 - - - 10 - - - txtautoUpdateSubInterval - - - chkEnableSecurityProtocolTls13 - - - 131, 17 - - - txtautoUpdateInterval - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 345, 125 - - - 12 - - - 45 - - - 0 - - - label6 - - - tabPage7 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 11 - - - 95, 21 - - - tabPage1 - - - 4 - - - 345, 153 - - - Fill - - - 213, 21 - - - groupBox1 - - - 30 - - - groupBox1 - - - NoControl - - - 6, 283 - - - chkEnableIpv6 - - - Allow connections from the LAN - - - 355, 16 - - - 10 - - - 111, 17 - - - 2 - - - tabControl1 - - - Top - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Enable Security Protocol TLS v1.3 (subscription/update) - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 282, 32 - - - cmbloglevel - - - 78, 23 - - - label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - tabPage7 - - - 32, 154 - - - 722, 60 - - - 0, 10 - - - 108, 17 - - - 3, 3 - - - 3 - - - 2 - - - NoControl - - - 32, 276 - - - 97, 32 - - - NoControl - - - 3 - - - NoControl - - - 5 - - - groupBox1 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - 7, 17 - - 46 - - - True - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 10 - - - 722, 10 - - - clashN settings - - - 11 - - - groupBox1 - - - 32, 74 - - - Listening http(s) port - - - 75, 23 - - - 41 - - - txthttpPort - - - True - - - 1 - - - 1 - - - 97, 25 - - - NoControl - - - Use semicolon (;) - - - System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15, 16 - - - tabPage1 - - - 44 - - - 8 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label3 - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 9 - - - fontDialog1 - - - silent - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 78, 23 - - - 2 - - - Font reset - - - True - - - 42 - - - panel1 - - - True - - - NoControl - - - 32, 192 - - - 78, 23 - - - NoControl - - - 1 - - - 30, 156 - - - label15 - - - groupBox1 - - - 42 - - - System proxy settings - - - 722, 448 - - - groupBox2 - - - Set Windows10 UWP Loopback - - - tabPage7 - - - NoControl - - - System.Windows.Forms.FontDialog, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15, 97 - - - 193, 70 - - - 3, 3, 3, 3 - - - 75, 23 - - - tabPage7 - - - &Cancel - - - NoControl - - - Listening socks port - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 238, 21 - - - 15, 73 - - - 11 - - - OptionSettingForm - - - 638, 219 - - - 10 - - - 8 - - - 3 - - - warning - - - 282, 32 - - - 193, 109 - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - txtsystemProxyExceptions - - - 7 - - - 60, 17 - - - 37 - - - Enable Ipv6 - - - chkKeepOlderDedupl - - - 3 - - - debug - - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - txtAPIPort - - - btnFontSetting - - - 8, 28 - - - label1 - - - btnSetLoopback - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 209, 21 - - - btnOK - - - 303, 317 - - - 0 - - - Enable Statistics (Realtime netspeed and traffic records. Require restart) - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - 3, 3, 3, 3 - - - 5 - - - tabPage7 - - - True - - - Keep older when deduplication - - - 97, 23 - - - 246, 17 - - - 32, 34 - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8, 52 + + + 9 - - groupBox2 + + 8 - - True + + + NoControl - - cmbSubConvertUrl - - - 15, 355 - - - 446, 21 - - - groupBox1 - - - chkAutoRun - - - True - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 129, 17 + + 282, 32 tabPage7 - - 47 + + 8 - - txtmixedPort - - - Automatic update interval of subscriptions (hours) - - - 31 - - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0, 0 - - - 9 - - - Settings - - - tabPage3 - - - 0 - - - 6 - - - panel2 - - - 193, 272 - - - label5 - - - tabPage7 - - - Fill - - - tabPage7 - - - True - - - groupBox2 - - - Log level - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 30, 156 0, 0 - - groupBox1 - - - 492, 25 - - - 4, 26 - - - tabPage7 - tabControl1 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtAPIPort - - 714, 418 + + 45 - - Automatic update interval of Geo (hours) + + tabPage7 - - 8 + + NoControl - - 0 + + 3 - - $this + + 722, 518 - - 15, 230 + + 2 - - 38 + + btnSetLoopback - - 43 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 32 + + 129, 17 - - tabControl1 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 189, 226 - - - info - - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 714, 418 - - + True - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tabPage1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + btnOK + + + 1 + + + 11 + + + label5 + + + Ignore Geo files when updating core + + + 32, 276 + + + 30 + + + 2 + + + 75, 23 + + + NoControl + + + fontDialog1 + + 5 - + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 111, 17 + + + tabControl1 + + + 15, 317 + + + 32, 192 + + + label2 + + + 38 + + + 47 + + + 41 + + + chkEnableIpv6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtsystemProxyExceptions + + tabPage7 - + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 75, 23 + + + label13 + + + 32 + + + 282, 32 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + Subscription conversion Url + + + 9 + + + tabPage7 + + + 3 + + + OptionSettingForm + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label7 + + + groupBox2 + + + &OK + + + clashN.Forms.BaseForm, clashN, Culture=neutral, PublicKeyToken=null + + + 189, 226 + + + 0 + + + 37 + + + 42 + + + 390, 27 + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 8 + + 7 - + + 131, 17 + + + 3 + + + 241, 21 + + + 6 + + + 43 + + + 213, 21 + + + 44 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage7 - + + Log level + + + 11 + + + 1 + + + NoControl + + + Listening http(s) port + + + btnClose + + + NoControl + + + 722, 60 + + + 32, 74 + + + label6 + + + label15 + + + $this + + + chkAllowLANConn + + + 0 + + + Listening API port + + + 209, 21 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 78, 23 + + + 46 + + + 2 + + + txtautoUpdateSubInterval + + + tabPage7 + + + True + + + 238, 21 + + + groupBox2 + + + clashN settings + + + btnFontSetting + + + Use semicolon (;) + + + True + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + True + + + 23 + + + cmbloglevel + + + 10 + + + Listening socks port + + + txtsocksPort + + + 9 + + + 8, 52 + + + 97, 25 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 29 - - 0 - - - Vertical - - - panel2 - - - 6 - - - Core: basic settings - - - 722, 518 - - - 42 - - - 1 - - - txtsocksPort - - - groupBox1 - - - 708, 412 - - - True - - - Do not use proxy server for addresses beginning with - - - 4 - - - 714, 418 - - - 15, 45 - - - Ignore Geo files when updating core - - - True + + chkAutoRun 267, 16 - - 8 + + 4 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 26 + + + 0 + + + groupBox1 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 78, 23 + + + tabPage3 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 41 + + + Enable Ipv6 + + + 492, 25 + + + 32, 154 + + + 0 + + + 8, 28 + + + 6 + + + 4, 26 + + + 3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Automatically start at system startup + + + label1 + + + True + + + tabPage7 + + + 10 + + + 15, 16 + + + 714, 418 + + + 33 + + + tabPage7 + + + Exception + + + cmbSubConvertUrl + + + 3, 3 + + + 95, 21 + + + 7 + + + 193, 30 + + + txtautoUpdateInterval + + + 78, 23 + + + NoControl + + + 6 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + warning tabPage3 - - 41 + + 40 - - chkEnableStatistics + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - error + + NoControl - - 23 + + + 3, 3, 3, 3 + + + label3 + + + 4, 26 + + + &Cancel + + + tabPage7 + + + System proxy settings System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + Top + + + 193, 70 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + 129, 17 + + + 193, 150 + + + Set Windows10 UWP Loopback + + + 722, 10 + + + Keep older when deduplication + + + groupBox1 + + + 15, 97 + + + 31 + + + NoControl + + + 60, 17 + + + 2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + chkKeepOlderDedupl + + + groupBox1 + + + 15, 230 + + + 168, 17 + + + tabControl1 + + + 355, 16 + + + tabControl1 + + + 39 + + + groupBox2 + + + tabPage7 + + + 13 + + + 7 + + + tabPage7 + + + 1 + + + True + + + 193, 109 + + + 15, 185 + + + NoControl + + + True + + + 0 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 32, 34 + + + 15, 73 + + + panel2 + + 97, 23 32, 222 - - Listening mixed port + + chkEnableSecurityProtocolTls13 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage7 - - 0, 458 + + txthttpPort - - 2 + + 3, 3, 3, 3 - - 30, 128 + + label12 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 246, 17 - - 15, 317 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 36 + + groupBox1 - - 4, 26 + + groupBox1 - - 13 + + panel1 - - btnClose + + Automatic update interval of subscriptions (hours) - - $this + + Enable Statistics (Realtime netspeed and traffic records. Require restart) - - 168, 17 + + 10 - - 323, 17 + + 722, 448 - - 0 + + 4 - - 33 + + debug - - 193, 30 - - - Bottom - - - 299, 17 - - - 1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 708, 412 System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13 + + 299, 17 - + + 5, 6, 5, 6 + + 12 - - tabPage7 + + silent - - 6 - - - 129, 17 - - - tabPage7 - - - Automatically start at system startup - - - 2 - - - NoControl - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 30, 128 NoControl - - Exception - - - NoControl - - - 4, 26 - - - 390, 27 - - - 7 - - - 6 - - - groupBox1 - - - clashN.Forms.BaseForm, clashN, Culture=neutral, PublicKeyToken=null - - - 40 + + panel2 True - + + Font reset + + + $this + + + chkIgnoreGeoUpdateCore + + + 8 + + + 42 + + + 11 + + + 638, 219 + + True - - 15, 185 + + tabPage1 - + + 5 + + True - + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label4 + + + Settings + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 714, 418 + + + 6, 283 + + + NoControl + + + True + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 345, 153 + + + panel2 + + + 0, 0 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 6 + + + 0 + + + Enable Security Protocol TLS v1.3 (subscription/update) + + + Fill + + + tabPage7 + + + 0 + + + 97, 23 + + + groupBox1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 29 + + + 78, 23 + + + 345, 125 + + + btnFontReset + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 42 + + + System.Windows.Forms.FontDialog, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 714, 418 + + + 0, 458 + + + error + + + groupBox1 + + + NoControl + + + True + + + 32, 113 + + + groupBox1 + + + tabPage7 + + + Do not use proxy server for addresses beginning with + + + 11 + + + Allow connections from the LAN + + + info + + + 10 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Automatic update interval of Geo (hours) + + + 1 + + + 1 + + + 323, 17 + + + 108, 17 + + + $this + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 193, 272 + + + 2 + + + chkEnableStatistics + + + 0 + + + 15, 355 + + + Fill + + + 714, 418 + + + groupBox1 + + + Fill + + + Listening mixed port + + + 0, 10 + + + Core: basic settings + + + Bottom + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 303, 317 + + + 12 + + + 15, 45 + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Vertical + + + 36 + + + txtmixedPort + + + 97, 32 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 446, 21 + + + 11 + + + groupBox1 + + + 5 + + + Font settings (Require restart) + zh-Hans - - 25 + + True 17, 17 + + 25 + \ No newline at end of file diff --git a/clashN/clashN/Forms/OptionSettingForm.zh-Hans.resx b/clashN/clashN/Forms/OptionSettingForm.zh-Hans.resx index 5c13709..bbd1677 100644 --- a/clashN/clashN/Forms/OptionSettingForm.zh-Hans.resx +++ b/clashN/clashN/Forms/OptionSettingForm.zh-Hans.resx @@ -104,10 +104,10 @@ 本地http监听端口 - 648, 355 + 648, 392 - 654, 361 + 654, 398 Core:基础设置 @@ -166,12 +166,6 @@ 更新Core时忽略Geo文件 - - 159, 21 - - - 去重时保留序号较小的项 - 299, 21 @@ -203,13 +197,13 @@ 对于下列字符开头的地址不使用代理配置文件: - 654, 361 + 654, 398 例外 - 654, 361 + 654, 398 系统代理设置 diff --git a/clashN/clashN/Mode/Config.cs b/clashN/clashN/Mode/Config.cs index 4a2bcb9..49bd2a7 100644 --- a/clashN/clashN/Mode/Config.cs +++ b/clashN/clashN/Mode/Config.cs @@ -34,8 +34,6 @@ namespace clashN.Mode public bool enableStatistics { get; set; } - public bool keepOlderDedupl { get; set; } - public bool ignoreGeoUpdateCore { get; set; } public string systemProxyExceptions { get; set; }