diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index eb7d337d..dc304ef3 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -1189,8 +1189,8 @@ namespace v2rayN.Forms { try { - up /= (ulong)(config.statisticsFreshRate / 1000f); - down /= (ulong)(config.statisticsFreshRate / 1000f); + up /= (ulong)(config.statisticsFreshRate); + down /= (ulong)(config.statisticsFreshRate); mainMsgControl.SetToolSslInfo("speed", string.Format("{0}/s↑ | {1}/s↓", Utils.HumanFy(up), Utils.HumanFy(down))); foreach (var it in statistics) diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs index 052f42fe..d2968958 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs @@ -68,6 +68,7 @@ this.txtKcpmtu = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.tabPage7 = new System.Windows.Forms.TabPage(); + this.numStatisticsFreshRate = new System.Windows.Forms.NumericUpDown(); this.txttrayMenuServersLimit = new System.Windows.Forms.TextBox(); this.label17 = new System.Windows.Forms.Label(); this.txtautoUpdateSubInterval = new System.Windows.Forms.TextBox(); @@ -79,7 +80,6 @@ this.label15 = new System.Windows.Forms.Label(); this.chkIgnoreGeoUpdateCore = new System.Windows.Forms.CheckBox(); this.chkKeepOlderDedupl = new System.Windows.Forms.CheckBox(); - this.cbFreshrate = new System.Windows.Forms.ComboBox(); this.lbFreshrate = new System.Windows.Forms.Label(); this.chkEnableStatistics = new System.Windows.Forms.CheckBox(); this.chkAutoRun = new System.Windows.Forms.CheckBox(); @@ -112,6 +112,7 @@ this.tabPage2.SuspendLayout(); this.tabPage6.SuspendLayout(); this.tabPage7.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numStatisticsFreshRate)).BeginInit(); this.tabPageCoreType.SuspendLayout(); this.tabPage3.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -120,33 +121,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.tabPageCoreType); this.tabControl1.Controls.Add(this.tabPage3); - 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.label16); this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.txtpass); @@ -163,7 +165,6 @@ 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; // @@ -213,8 +214,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"), @@ -240,6 +241,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[] { @@ -248,7 +250,6 @@ resources.GetString("cmbloglevel.Items2"), resources.GetString("cmbloglevel.Items3"), resources.GetString("cmbloglevel.Items4")}); - resources.ApplyResources(this.cmbloglevel, "cmbloglevel"); this.cmbloglevel.Name = "cmbloglevel"; // // label5 @@ -268,10 +269,10 @@ // // tabPage2 // + resources.ApplyResources(this.tabPage2, "tabPage2"); this.tabPage2.Controls.Add(this.linkDnsObjectDoc); this.tabPage2.Controls.Add(this.txtremoteDNS); this.tabPage2.Controls.Add(this.label14); - resources.ApplyResources(this.tabPage2, "tabPage2"); this.tabPage2.Name = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; // @@ -294,6 +295,7 @@ // // tabPage6 // + resources.ApplyResources(this.tabPage6, "tabPage6"); this.tabPage6.Controls.Add(this.chkKcpcongestion); this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize); this.tabPage6.Controls.Add(this.label10); @@ -307,7 +309,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; // @@ -379,6 +380,8 @@ // // tabPage7 // + resources.ApplyResources(this.tabPage7, "tabPage7"); + this.tabPage7.Controls.Add(this.numStatisticsFreshRate); this.tabPage7.Controls.Add(this.txttrayMenuServersLimit); this.tabPage7.Controls.Add(this.label17); this.tabPage7.Controls.Add(this.txtautoUpdateSubInterval); @@ -390,14 +393,17 @@ this.tabPage7.Controls.Add(this.label15); this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore); this.tabPage7.Controls.Add(this.chkKeepOlderDedupl); - this.tabPage7.Controls.Add(this.cbFreshrate); this.tabPage7.Controls.Add(this.lbFreshrate); this.tabPage7.Controls.Add(this.chkEnableStatistics); this.tabPage7.Controls.Add(this.chkAutoRun); - resources.ApplyResources(this.tabPage7, "tabPage7"); this.tabPage7.Name = "tabPage7"; this.tabPage7.UseVisualStyleBackColor = true; // + // numStatisticsFreshRate + // + resources.ApplyResources(this.numStatisticsFreshRate, "numStatisticsFreshRate"); + this.numStatisticsFreshRate.Name = "numStatisticsFreshRate"; + // // txttrayMenuServersLimit // resources.ApplyResources(this.txttrayMenuServersLimit, "txttrayMenuServersLimit"); @@ -459,13 +465,6 @@ this.chkKeepOlderDedupl.Name = "chkKeepOlderDedupl"; this.chkKeepOlderDedupl.UseVisualStyleBackColor = true; // - // cbFreshrate - // - this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbFreshrate.FormattingEnabled = true; - resources.ApplyResources(this.cbFreshrate, "cbFreshrate"); - this.cbFreshrate.Name = "cbFreshrate"; - // // lbFreshrate // resources.ApplyResources(this.lbFreshrate, "lbFreshrate"); @@ -485,6 +484,7 @@ // // tabPageCoreType // + resources.ApplyResources(this.tabPageCoreType, "tabPageCoreType"); this.tabPageCoreType.Controls.Add(this.cmbCoreType6); this.tabPageCoreType.Controls.Add(this.labCoreType6); this.tabPageCoreType.Controls.Add(this.cmbCoreType5); @@ -497,15 +497,14 @@ this.tabPageCoreType.Controls.Add(this.labCoreType2); this.tabPageCoreType.Controls.Add(this.cmbCoreType1); this.tabPageCoreType.Controls.Add(this.labCoreType1); - resources.ApplyResources(this.tabPageCoreType, "tabPageCoreType"); this.tabPageCoreType.Name = "tabPageCoreType"; this.tabPageCoreType.UseVisualStyleBackColor = true; // // cmbCoreType6 // + resources.ApplyResources(this.cmbCoreType6, "cmbCoreType6"); this.cmbCoreType6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType6.FormattingEnabled = true; - resources.ApplyResources(this.cmbCoreType6, "cmbCoreType6"); this.cmbCoreType6.Name = "cmbCoreType6"; // // labCoreType6 @@ -515,9 +514,9 @@ // // cmbCoreType5 // + resources.ApplyResources(this.cmbCoreType5, "cmbCoreType5"); this.cmbCoreType5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType5.FormattingEnabled = true; - resources.ApplyResources(this.cmbCoreType5, "cmbCoreType5"); this.cmbCoreType5.Name = "cmbCoreType5"; // // labCoreType5 @@ -527,9 +526,9 @@ // // cmbCoreType4 // + resources.ApplyResources(this.cmbCoreType4, "cmbCoreType4"); this.cmbCoreType4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType4.FormattingEnabled = true; - resources.ApplyResources(this.cmbCoreType4, "cmbCoreType4"); this.cmbCoreType4.Name = "cmbCoreType4"; // // labCoreType4 @@ -539,9 +538,9 @@ // // cmbCoreType3 // + resources.ApplyResources(this.cmbCoreType3, "cmbCoreType3"); this.cmbCoreType3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType3.FormattingEnabled = true; - resources.ApplyResources(this.cmbCoreType3, "cmbCoreType3"); this.cmbCoreType3.Name = "cmbCoreType3"; // // labCoreType3 @@ -551,9 +550,9 @@ // // cmbCoreType2 // + resources.ApplyResources(this.cmbCoreType2, "cmbCoreType2"); this.cmbCoreType2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType2.FormattingEnabled = true; - resources.ApplyResources(this.cmbCoreType2, "cmbCoreType2"); this.cmbCoreType2.Name = "cmbCoreType2"; // // labCoreType2 @@ -563,9 +562,9 @@ // // cmbCoreType1 // + resources.ApplyResources(this.cmbCoreType1, "cmbCoreType1"); this.cmbCoreType1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbCoreType1.FormattingEnabled = true; - resources.ApplyResources(this.cmbCoreType1, "cmbCoreType1"); this.cmbCoreType1.Name = "cmbCoreType1"; // // labCoreType1 @@ -575,19 +574,19 @@ // // tabPage3 // - this.tabPage3.Controls.Add(this.groupBox2); resources.ApplyResources(this.tabPage3, "tabPage3"); + this.tabPage3.Controls.Add(this.groupBox2); this.tabPage3.Name = "tabPage3"; this.tabPage3.UseVisualStyleBackColor = true; // // groupBox2 // + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Controls.Add(this.label18); this.groupBox2.Controls.Add(this.cmbSystemProxyAdvancedProtocol); this.groupBox2.Controls.Add(this.label13); this.groupBox2.Controls.Add(this.label12); this.groupBox2.Controls.Add(this.txtsystemProxyExceptions); - resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // @@ -598,8 +597,8 @@ // // cmbSystemProxyAdvancedProtocol // - this.cmbSystemProxyAdvancedProtocol.FormattingEnabled = true; resources.ApplyResources(this.cmbSystemProxyAdvancedProtocol, "cmbSystemProxyAdvancedProtocol"); + this.cmbSystemProxyAdvancedProtocol.FormattingEnabled = true; this.cmbSystemProxyAdvancedProtocol.Name = "cmbSystemProxyAdvancedProtocol"; // // label13 @@ -619,9 +618,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 @@ -657,6 +656,7 @@ this.tabPage6.PerformLayout(); this.tabPage7.ResumeLayout(false); this.tabPage7.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numStatisticsFreshRate)).EndInit(); this.tabPageCoreType.ResumeLayout(false); this.tabPageCoreType.PerformLayout(); this.tabPage3.ResumeLayout(false); @@ -704,7 +704,6 @@ private System.Windows.Forms.CheckBox chkAllowLANConn; private System.Windows.Forms.CheckBox chksniffingEnabled; private System.Windows.Forms.CheckBox chkEnableStatistics; - private System.Windows.Forms.ComboBox cbFreshrate; private System.Windows.Forms.Label lbFreshrate; private System.Windows.Forms.CheckBox chkKeepOlderDedupl; private System.Windows.Forms.CheckBox chkdefAllowInsecure; @@ -746,5 +745,6 @@ private System.Windows.Forms.Label label17; private System.Windows.Forms.ComboBox cmbSystemProxyAdvancedProtocol; private System.Windows.Forms.Label label18; + private System.Windows.Forms.NumericUpDown numStatisticsFreshRate; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs index 2011a1d2..5d065166 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs @@ -19,7 +19,7 @@ namespace v2rayN.Forms private void OptionSettingForm_Load(object sender, EventArgs e) { cmbSystemProxyAdvancedProtocol.Items.AddRange(Global.IEProxyProtocols.ToArray()); - + InitBase(); InitKCP(); @@ -88,32 +88,9 @@ namespace v2rayN.Forms chkAutoRun.Checked = Utils.IsAutoRun(); chkEnableStatistics.Checked = config.enableStatistics; + numStatisticsFreshRate.Value = config.statisticsFreshRate; chkKeepOlderDedupl.Checked = config.keepOlderDedupl; - ComboItem[] cbSource = new ComboItem[] - { - new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = ResUI.QuickFresh}, - new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = ResUI.MediumFresh}, - new ComboItem{ID = (int)Global.StatisticsFreshRate.slow, Text = ResUI.SlowFresh}, - }; - cbFreshrate.DataSource = cbSource; - - cbFreshrate.DisplayMember = "Text"; - cbFreshrate.ValueMember = "ID"; - - switch (config.statisticsFreshRate) - { - case (int)Global.StatisticsFreshRate.quick: - cbFreshrate.SelectedItem = cbSource[0]; - break; - case (int)Global.StatisticsFreshRate.medium: - cbFreshrate.SelectedItem = cbSource[1]; - break; - case (int)Global.StatisticsFreshRate.slow: - cbFreshrate.SelectedItem = cbSource[2]; - break; - } - chkIgnoreGeoUpdateCore.Checked = config.ignoreGeoUpdateCore; chkEnableAutoAdjustMainLvColWidth.Checked = config.uiItem.enableAutoAdjustMainLvColWidth; chkEnableSecurityProtocolTls13.Checked = config.enableSecurityProtocolTls13; @@ -309,7 +286,8 @@ namespace v2rayN.Forms bool lastEnableStatistics = config.enableStatistics; config.enableStatistics = chkEnableStatistics.Checked; - config.statisticsFreshRate = (int)cbFreshrate.SelectedValue; + config.statisticsFreshRate = Convert.ToInt32(numStatisticsFreshRate.Value); + config.keepOlderDedupl = chkKeepOlderDedupl.Checked; config.ignoreGeoUpdateCore = chkIgnoreGeoUpdateCore.Checked; diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx index deaae1d2..d4682ccc 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx @@ -117,1082 +117,89 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage6 + - - 355, 16 - - - 75, 23 - - - - 7 - - - &Cancel - - - btnClose - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - True - - - - NoControl - - - 397, 65 - - - 59, 12 - - - 39 - - - Auth pass - - - label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - True - - - NoControl - - - 224, 65 - - - 59, 12 - - - 38 - - - Auth user - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - 496, 61 - - - 120, 21 - - - 37 - - - txtpass - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - 285, 61 - - - 97, 21 - - - 36 - - - txtuser - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 3 - - - True - - - NoControl - - - 15, 192 - - - 102, 16 - - - 35 - - - allowInsecure - - - chkdefAllowInsecure - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 4 - - - True - - - 15, 63 - - - 204, 16 - - - 29 - - - Allow connections from the LAN - - - chkAllowLANConn - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 5 - - - True - - - NoControl - - - 496, 27 - - - 120, 16 - - - 31 - - - Turn on Sniffing - - - chksniffingEnabled - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 6 - - - True - - - 15, 129 - - - 174, 16 - - - 20 - - - Turn on Mux Multiplexing - - - chkmuxEnabled - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 7 - - - False - - - socks - - - http - - - 285, 25 - - - 97, 20 - - - 12 - - - cmbprotocol - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 351, 211 groupBox1 - - 8 - - - True - - - 224, 29 - - - 53, 12 - - - 11 - - - protocol - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 9 - - - True - - - 397, 27 - - - 84, 16 - - - 10 - - - Enable UDP - - - chkudpEnabled - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 10 - - - True - - - 15, 160 - - - 126, 16 - - - 9 - - - Record local logs - - - chklogEnabled - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 11 - - - debug - - - info - - - warning - - - error - - - none - - - 257, 158 - - - 97, 20 - - + + 6 - - cmbloglevel - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 12 - - - True - - - 193, 162 - - - 59, 12 - - - 8 - - - Log level - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 13 - - - 124, 25 - - - 78, 21 - - - 3 - - - txtlocalPort - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 14 - - - True - - - 33, 29 - - - 89, 12 - - - 2 - Listening port - - label2 + + 8 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 317, 12 - - groupBox1 + + panel2 - - 15 + + tabPage7 - - Fill + + tabPage7 - - 3, 3 + + 355, 16 - - 722, 421 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + 97, 21 - - groupBox1 + + error - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 728, 427 - - - 0 - - - Core: basic settings - - - tabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - True - - - NoControl - - - 342, 17 - - - 0, 0, 0, 0 - - - 107, 12 - - - 40 - - - Support DnsObject - - - linkDnsObjectDoc - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 0 - - - 8, 41 - - - True - - - Vertical - - - 638, 356 - - - 39 - - - txtremoteDNS - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 1 - - - True - - - NoControl - - - 8, 17 - - - 281, 12 - - - 38 - - - Custom DNS (multiple, separated by commas (,)) - - - label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 2 - - - 4, 22 - - - 728, 427 - - - 4 - - - Core: DNS settings - - - tabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - True - - - 20, 143 - - - 84, 16 - - - 20 - - - congestion - - - chkKcpcongestion - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 0 - - - 345, 100 - - - 94, 21 - - - 15 - - - txtKcpwriteBufferSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 1 - - - True - - - 236, 104 - - - 95, 12 - - - 14 - - - writeBufferSize - - - label10 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 2 - - - 111, 100 - - - 94, 21 - - - 13 - - - txtKcpreadBufferSize - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 3 - - - True - - - 18, 104 - - - 89, 12 - - - 12 + + 15, 129 readBufferSize - - label11 + + + NoControl - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + chkudpEnabled - - tabPage6 + + 45 - - 4 + + txtpass - - 345, 62 + + 282, 23 - - 94, 21 - - - 11 - - - txtKcpdownlinkCapacity - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 5 - - - True - - - 236, 66 - - - 101, 12 - - - 10 + + info downlinkCapacity - - label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 6 - - - 111, 62 - - - 94, 21 - - - 9 - - - txtKcpuplinkCapacity - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 7 - - - True - - - 18, 66 - - - 89, 12 - - - 8 - - - uplinkCapacity - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 8 - - - 345, 24 - - - 94, 21 - - - 7 - - - txtKcptti - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 9 - - - True - - - 236, 28 - - - 23, 12 - - - 6 - - - tti - - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 10 - - - 111, 24 - - - 94, 21 - - - 5 - - - txtKcpmtu - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage6 - - - 11 - - - True - - - 18, 28 - - - 23, 12 - - - 4 - mtu - - label6 + + System.Windows.Forms.ComboBox, 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 - - - tabPage6 - - - 12 - - - 4, 22 - - - 3, 3, 3, 3 - - - 728, 427 - - - 2 - - - Core: KCP settings - - - tabPage6 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 2 - - - 351, 211 - - - 97, 21 - - - 45 - - - txttrayMenuServersLimit - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 0 - - - True - - - NoControl - - - 27, 215 - - - 263, 12 - - - 44 - - - Tray right-click menu servers display limit - - - label17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - + 1 - - 351, 184 - - - 97, 21 - - - 43 - - - txtautoUpdateSubInterval - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 2 - - - True - - - NoControl - - - 27, 188 - - - 305, 12 - - - 42 - - - Automatic update interval of subscriptions (hours) - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 3 - - - 15, 131 + + labCoreType4 506, 16 @@ -1200,961 +207,1954 @@ 41 - - Enable Security Protocol TLS v1.3 (subscription/update/speedtest) - - - chkEnableSecurityProtocolTls13 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 4 - - - True - - - NoControl - - - 15, 108 - - - 390, 16 - - - 40 - - - Automatically adjust column width after updating subscription - - - chkEnableAutoAdjustMainLvColWidth - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 5 - - - NoControl - - - 30, 376 - - - 282, 23 - - - 39 - - - Set Windows10 UWP Loopback - - - btnSetLoopback - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 6 - - - 351, 157 - - - 97, 21 - - - 38 - - - txtautoUpdateInterval - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 7 - - - True - - - NoControl - - - 27, 161 - - - 269, 12 - - - 37 - - - Automatic update interval of and Geo (hours) - - - label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 8 - - - True - - - NoControl - - - 15, 85 - - - 234, 16 - - + 36 - - Ignore Geo files when updating core - - - chkIgnoreGeoUpdateCore - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 9 - - - True - - - NoControl - - - 15, 62 - - - 198, 16 - - - 33 - - - Keep older when deduplication - - - chkKeepOlderDedupl - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 10 - - - 620, 37 - - - 58, 20 - - - 32 - - - cbFreshrate - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 11 - - - True - - - NoControl - - - 489, 41 - - - 125, 12 - - - 30 - - - Statistics freshrate - - - lbFreshrate - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 12 - - - True - - - NoControl - - - 15, 39 - - - 468, 16 - - - 29 - - - Enable Statistics (Realtime netspeed and traffic records. Require restart) - - - chkEnableStatistics - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 13 - - - True - - - 15, 16 - - - 246, 16 - - - 23 - - - Automatically start at system startup - - - chkAutoRun - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage7 - - - 14 - - - 4, 22 - - - 3, 3, 3, 3 - - - 728, 427 - - - 3 - - - v2rayN settings - - - tabPage7 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 3 - - - 117, 172 - 143, 20 - - 46 - - - cmbCoreType6 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 0 - - - True - - - NoControl - - - 45, 176 - - - 59, 12 - - - 47 - - - Core Type - - - labCoreType6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 1 - - - 117, 146 - - - 143, 20 - - - 44 - - - cmbCoreType5 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 2 - - - True - - - NoControl - - - 45, 150 - - - 59, 12 - - - 45 - - - Core Type - - - labCoreType5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 3 - - - 117, 120 - - - 143, 20 - - - 42 - - - cmbCoreType4 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 4 - - - True - - - NoControl - - - 45, 124 - - - 59, 12 - - - 43 - - - Core Type - - - labCoreType4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 5 - - - 117, 94 - - - 143, 20 - - - 40 - - - cmbCoreType3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 6 - - - True - - - NoControl - - - 45, 98 - - - 59, 12 - - - 41 - - - Core Type - - - labCoreType3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 7 - - - 117, 68 - - - 143, 20 - - - 38 - - - cmbCoreType2 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 8 - - - True - - - NoControl - - - 45, 72 - - - 59, 12 - - - 39 - - - Core Type - - - labCoreType2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 9 - - - 117, 42 - - - 143, 20 - - - 36 - - - cmbCoreType1 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - 10 - + + 120, 21 + + True - - NoControl - - - 45, 46 - - - 59, 12 - - - 37 - - - Core Type - - - labCoreType1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCoreType - - - 11 - - - 4, 22 - - - 3, 3, 3, 3 - - - 728, 427 - - - 6 - - - CoreType settings - - - tabPageCoreType - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 4 - - - True - - - NoControl - - - 8, 346 - - - 329, 12 - - - 45 - - - Advanced proxy settings, protocol selection (optional) - - - label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - 8, 371 - - - 638, 20 - - - 44 - - - cmbSystemProxyAdvancedProtocol - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - True - - - NoControl - - - 6, 283 - - - 107, 12 - - - 42 - - - Use semicolon (;) - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 2 - - - True - - - NoControl - - - 8, 28 - - - 317, 12 - - - 40 - - - Do not use proxy server for addresses beginning with - - - label12 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Log level + + + groupBox1 + + + panel1 + + + tabPage6 + + + 11 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 35 + + + 6 + + + 45, 150 + + + Enable UDP + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 15, 131 + + + tabPage7 + + + 8, 41 + + + 45, 46 + + + 94, 21 + + + 390, 16 + + + groupBox1 + + + 2 + + + tabPage7 + + + 285, 25 + + + 15, 16 + + + 179, 12 + + + 97, 21 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Statistics freshrate (second) + + + warning + + + 0 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + Keep older when deduplication + + + txtlocalPort + + + 84, 16 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + True + + + 15 + + + groupBox2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 193, 162 + + + 342, 17 + + + 95, 12 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 27, 188 + + + 8 + + + tabPage7 + + + 236, 66 + + + 1 + + + groupBox1 + + + 13 + + + 2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 15, 39 + + + 124, 25 + + + True + + + 11 + + + 0 + + + 9 + + + protocol + + + True + + + tabPage6 + + + 3, 3, 3, 3 + + + True + + + chkEnableStatistics + + + OptionSettingForm + + + 9 + + + 12 + + + label14 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + Record local logs + + + Automatically adjust column width after updating subscription + + + Auth user + + + 3, 3, 3, 3 + + + label15 + + + 43 + + + labCoreType3 + + + 5 + + + True + + + System.Windows.Forms.TabPage, 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 + + + 33, 29 + + + 11 + + + 117, 172 + + + Use semicolon (;) + + + 75, 23 + + + tabControl1 + + + tabPage2 + + + 12 + + + 3, 3, 3, 3 + + + groupBox1 + + + lbFreshrate + + + labCoreType1 + + + 44 + + + 10 + + + 9 + + + 14 + + + 4, 4, 4, 4 + + + True + + + NoControl + + + 4, 22 + + + Core Type + + + 736, 453 + + + 59, 12 + + + 15, 108 + + + True + + + 2 + + + True + + + 31 + + + 0 + + + 36 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + none + + + 7 + + + 45, 98 + + + label10 + + + 94, 21 + + + 4 + + + True + + + 78, 21 + + + 3 + + + txtsystemProxyExceptions + + + 236, 104 + + + 42 + + + True + + + label11 + + + 12 + + + True + + + chkEnableAutoAdjustMainLvColWidth + + + 0 + + + 7 + + + $this + + + btnSetLoopback + + + chkEnableSecurityProtocolTls13 + + + 10 + + + 15, 160 + + + 97, 20 + + + 143, 20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 23 + + + cmbloglevel + + + 496, 61 + + + label16 + + + 20 + + + v2rayN settings + + + groupBox1 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + tabPage7 + + + 4 + + + 120, 16 + + + groupBox1 + + + NoControl + + + cmbCoreType6 + + + True + + + 663, 37 + + + label17 + + + 97, 21 + + + v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + tabPageCoreType + + + tabPageCoreType + + + 496, 27 + + + linkDnsObjectDoc + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + cmbCoreType5 + + + tabPageCoreType + + + Do not use proxy server for addresses beginning with + + + tabPageCoreType + + + 0, 463 + + + 143, 20 + + + True + + + Bottom + + + tti + + + 468, 16 + + + Enable Security Protocol TLS v1.3 (subscription/update/speedtest) + + + 94, 21 + + + 0 + + + NoControl + + + groupBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + 6 + + groupBox2 3 - - 8, 52 - - - True - - - Vertical - - - 638, 219 - - - 41 - - - txtsystemProxyExceptions - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 4 - - - Fill - - - 0, 0 - - - 728, 427 - - - 42 - - - Exception - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 0 - - - 4, 22 - - - 728, 427 - - - 5 - - - System proxy settings - - - tabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 5 - - - Fill - - - 0, 10 - - - 736, 453 - - - 10 - - - tabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - 267, 16 - - - 75, 23 - - - 8 - - - &OK - - - btnOK - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 1 - - - Bottom - - - 0, 463 - - - 736, 60 - - - 11 - - - panel2 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - Top - - - 0, 0 - - - 736, 10 - - + 9 - - panel1 + + 94, 21 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - True - - - 6, 12 - - - 736, 523 - - - 4, 4, 4, 4 + + tabPage6 Settings - - OptionSettingForm + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + True + + 11 + + + 89, 12 + + + label12 + + + 0 + + + chkmuxEnabled + + + 0 + + + Automatic update interval of and Geo (hours) + + + label2 + + + 1 + + + Automatically start at system startup + + + groupBox1 + + + label6 + + + tabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 13 + + + label13 + + + 46 + + + 0 + + + tabControl1 + + + 111, 100 + + + 2 + + + 37 + + + label18 + + + 0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 7 + + + Automatic update interval of subscriptions (hours) + + + Custom DNS (multiple, separated by commas (,)) + + + 2 + + + 30, 376 + + + chklogEnabled + + + True + + + 345, 62 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 59, 12 + + + 4 + + + 5 + + + 8, 17 + + + 41 + + + 39 + + + 111, 24 + + + 97, 21 + + + &OK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + txtKcpmtu + + + 6 + + + Fill + + + 3, 3 + + + NoControl + + + 8, 52 + + + 4 + + + 102, 16 + + + cmbCoreType4 + + + groupBox2 + + + Fill + + + groupBox1 + + + 6 + + + 736, 523 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + txtKcpwriteBufferSize + + + 18, 28 + + + 62, 21 + + + 736, 10 + + + 236, 28 + + + groupBox2 + + + groupBox1 + + + NoControl + + + 8 + + + 75, 23 + + + 0 + + + 345, 100 + + + 39 + + + 3 + + + 15, 63 + + + Exception + + + cmbSystemProxyAdvancedProtocol + + + tabPage7 + + + 38 + + + chkIgnoreGeoUpdateCore + + + NoControl + + + chksniffingEnabled + + + tabPage7 + + + 5 + + + labCoreType6 + + + 198, 16 + + + numStatisticsFreshRate + + + 0, 0, 0, 0 + + + 15, 62 + + + 0, 10 + + + NoControl + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 42 + + + 397, 65 + + + tabPageCoreType + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 44 + + + tabPage7 + + + 53, 12 + + + 2 + + + tabPageCoreType + + + Core Type + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 5 + + + 728, 427 + + + labCoreType2 + + + 8 + + + NoControl + + + 8, 28 + + + 9 + + + 59, 12 + + + chkKeepOlderDedupl + + + 45 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage7 + + + 6, 12 + + + 84, 16 + + + 329, 12 + + + 1 + + + NoControl + + + label5 + + + 59, 12 + + + 728, 427 + + + Core Type + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 728, 427 + + + True + + + 479, 41 + + + tabControl1 + + + 1 + + + tabPage1 + + + 45, 176 + + + 10 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 9 + + + 3 + + + 351, 157 + + + 43 + + + 47 + + + 59, 12 + + + allowInsecure + + + 36 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 10 + + + tabPage7 + + + Core Type + + + 728, 427 + + + True + + + btnOK + + + True + + + 8 + + + cmbCoreType3 + + + 397, 27 + + + 42 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 41 + + + 42 + + + 45, 124 + + + tabPage7 + + + tabControl1 + + + 59, 12 + + + 10 + + + Core: basic settings + + + 6 + + + CoreType settings + + + 6 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 263, 12 + + + panel2 + + + tabPage7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + chkAutoRun + + + 143, 20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 15, 192 + + + tabPage2 + + + btnClose + + + 638, 356 + + + chkdefAllowInsecure + + + 1 + + + groupBox2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 638, 219 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 + + + tabPage3 + + + 40 + + + 143, 20 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtKcptti + + + 23, 12 + + + 3, 3, 3, 3 + + + 23, 12 + + + 4, 22 + + + True + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 30 + + + 285, 61 + + + 45, 72 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + writeBufferSize + + + 117, 146 + + + Ignore Geo files when updating core + + + 736, 60 + + + 39 + + + 38 + + + txtKcpdownlinkCapacity + + + 117, 42 + + + label4 + + + 29 + + + label8 + + + 257, 158 + + + NoControl + + + True + + + &Cancel + + + 15, 85 + + + 4, 22 + + + 351, 184 + + + NoControl + + + groupBox1 + + + chkAllowLANConn + + + txtautoUpdateSubInterval + + + tabPage7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 27, 215 + + + 89, 12 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 234, 16 + + + 89, 12 + + + 12 + + + Tray right-click menu servers display limit + + + congestion + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 107, 12 + + + groupBox1 + + + False + + + 97, 20 + + + 5 + + + 11 + + + tabPage6 + + + txtuser + + + tabControl1 + + + 107, 12 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 20 + + + 117, 120 + + + True + + + 143, 20 + + + 345, 24 + + + Top + + + 11 + + + True + + + NoControl + + + 4, 22 + + + NoControl + + + 8 + + + 59, 12 + + + 39 + + + 18, 66 + + + Allow connections from the LAN + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 18, 104 + + + Set Windows10 UWP Loopback + + + txtautoUpdateInterval + + + 246, 16 + + + tabPage1 + + + 2 + + + 94, 21 + + + Fill + + + True + + + 13 + + + txtKcpreadBufferSize + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 6 + + + Turn on Mux Multiplexing + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 22 + + + tabPageCoreType + + + groupBox1 + + + 7 + + + 94, 21 + + + Turn on Sniffing + + + socks + + + tabPageCoreType + + + 117, 94 + + + 14 + + + 29 + + + http + + + True + + + NoControl + + + Vertical + + + 8 + + + True + + + 37 + + + label1 + + + 5 + + + groupBox1 + + + 37 + + + $this + + + 728, 427 + + + 3 + + + label9 + + + True + + + tabPage7 + + + txttrayMenuServersLimit + + + Support DnsObject + + + True + + + 267, 16 + + + NoControl + + + txtKcpuplinkCapacity + + + 3 + + + tabPage6 + + + 40 + + + 174, 16 + + + 224, 29 + + + 40 + + + 722, 421 + + + 117, 68 + + + 4 + + + True + + + 224, 65 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Vertical + + + Core Type + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 22 + + + cmbCoreType2 + + + 8, 346 + + + 38 + + + 281, 12 + + + NoControl + + + 20, 143 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Core Type + + + 44 + + + True + + + System proxy settings + + + 15 + + + 126, 16 + + + cmbCoreType1 + + + label3 + + + 5 + + + tabPage6 + + + 2 + + + label7 + + + NoControl + + + tabPage6 + + + 59, 12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + txtremoteDNS + + + Auth pass + + + tabPage7 + + + 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 + + + 40 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 204, 16 + + + True + + + 12 + + + 47 + + + 2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Core: DNS settings + + + 45 + + + 59, 12 + + + 27, 161 + + + 0, 0 + + + Enable Statistics (Realtime netspeed and traffic records. Require restart) + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + debug + + + 7 + + + Core: KCP settings + + + tabControl1 + + + labCoreType5 + + + 111, 62 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 305, 12 + + + 38 + + + 1 + + + 4 + + + chkKcpcongestion + + + 1 + + + 0 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 33 + + + 7 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 101, 12 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 269, 12 + + + 728, 427 + + + NoControl + + + tabPageCoreType + + + tabPage6 + + + 728, 427 + + + System.Windows.Forms.Button, 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 + + + 638, 20 + + + tabPageCoreType + + + True + + + 6, 283 + + + 11 + + + cmbprotocol + + + 2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageCoreType + + + 4 + + + 3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage6 + + + tabPage2 + + + tabPageCoreType + + + NoControl + + + True + + + 9 + + + 0, 0 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 8, 371 + + + uplinkCapacity + + + 10 + + + 14 + + + tabControl1 + + + Advanced proxy settings, protocol selection (optional) + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + tabPage6 + + + 1 + + + 0 + + + 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 5f82648b..04e93138 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx @@ -121,123 +121,6 @@ 取消(&C) - - 654, 443 - - - Core:基础设置 - - - 654, 443 - - - Core:DNS设置 - - - 654, 443 - - - Core:KCP设置 - - - 248, 211 - - - 185, 12 - - - 托盘右键菜单服务器展示数量限制 - - - 248, 184 - - - 173, 12 - - - 自动更新订阅的间隔(单位小时) - - - 启用安全协议TLS v1.3 (订阅/检查更新/测速) - - - 204, 16 - - - 自动调整服务器列宽在更新订阅后 - - - 解除Windows10 UWP应用回环代理限制 - - - 248, 157 - - - 191, 12 - - - 自动更新Geo文件的间隔(单位小时) - - - 150, 16 - - - 更新Core时忽略Geo文件 - - - 156, 16 - - - 去重时保留序号较小的项 - - - 431, 37 - - - 339, 41 - - - 77, 12 - - - 统计刷新频率 - - - 300, 16 - - - 启用统计(实时网速显示和使用流量显示，需要重启) - - - 180, 16 - - - 开机自动启动(可能会不成功) - - - 654, 443 - - - v2rayN设置 - - - 654, 443 - - - Core类型设置 - - - 654, 443 - - - 系统代理设置 - - - 662, 469 - - - 648, 437 - 53, 12 @@ -325,6 +208,15 @@ 本地监听端口 + + 648, 437 + + + 654, 443 + + + Core:基础设置 + 161, 12 @@ -337,11 +229,110 @@ 自定义DNS(可多个,用逗号(,)隔开) - + 654, 443 - - 例外 + + Core:DNS设置 + + + 654, 443 + + + Core:KCP设置 + + + 472, 37 + + + 248, 211 + + + 185, 12 + + + 托盘右键菜单服务器展示数量限制 + + + 248, 184 + + + 173, 12 + + + 自动更新订阅的间隔(单位小时) + + + 启用安全协议TLS v1.3 (订阅/检查更新/测速) + + + 204, 16 + + + 自动调整服务器列宽在更新订阅后 + + + 解除Windows10 UWP应用回环代理限制 + + + 248, 157 + + + 191, 12 + + + 自动更新Geo文件的间隔(单位小时) + + + 150, 16 + + + 更新Core时忽略Geo文件 + + + 156, 16 + + + 去重时保留序号较小的项 + + + 339, 41 + + + 125, 12 + + + 统计刷新频率(单位秒) + + + 300, 16 + + + 启用统计(实时网速显示和使用流量显示，需要重启) + + + 180, 16 + + + 开机自动启动(可能会不成功) + + + 654, 443 + + + v2rayN设置 + + + 654, 443 + + + Core类型设置 + + + 173, 12 + + + 高级代理设置, 协议选择(可选) 95, 12 @@ -355,15 +346,30 @@ 对于下列字符开头的地址不使用代理服务器: + + 654, 443 + + + 例外 + + + 654, 443 + + + 系统代理设置 + + + 662, 469 + + + 确定(&O) + 0, 479 662, 60 - - 确定(&O) - 662, 10 @@ -373,7 +379,4 @@ 参数设置 - - 高级代理设置, 协议选择(可选) - \ No newline at end of file diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index a6bc8353..8de35296 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -191,12 +191,6 @@ namespace v2rayN /// public const string CustomIconName = "v2rayN.ico"; - public enum StatisticsFreshRate - { - quick = 1000, - medium = 2000, - slow = 3000 - } public const string StatisticLogOverall = "StatisticLogOverall.json"; public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*"; diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index d616a75c..9b51f78a 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -54,11 +54,9 @@ namespace v2rayN.Handler //Mux muxEnabled = false, - // 默认不开启统计 enableStatistics = false, - // 默认中等刷新率 - statisticsFreshRate = (int)Global.StatisticsFreshRate.medium, + statisticsFreshRate = 1, enableRoutingAdvanced = true }; @@ -158,7 +156,10 @@ namespace v2rayN.Handler { config.groupItem = new List(); } - + if (config.statisticsFreshRate > 100) + { + config.statisticsFreshRate = 1; + } if (config == null || config.vmess.Count <= 0 diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs index 6465db26..32242e3f 100644 --- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs +++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs @@ -127,7 +127,7 @@ namespace v2rayN.Handler } } } - Thread.Sleep(config_.statisticsFreshRate); + Thread.Sleep(1000 * config_.statisticsFreshRate); channel_.ConnectAsync(); } catch (Exception ex)