From b9435a4b01afb6c09db876911004614b6435ecc4 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Wed, 23 Feb 2022 17:31:32 +0800 Subject: [PATCH] Automatically adjust column width after updating subscription --- v2rayN/v2rayN/Forms/MainForm.cs | 7 + .../Forms/OptionSettingForm.Designer.cs | 9 + v2rayN/v2rayN/Forms/OptionSettingForm.cs | 2 + v2rayN/v2rayN/Forms/OptionSettingForm.resx | 827 +++++++++--------- .../Forms/OptionSettingForm.zh-Hans.resx | 66 +- v2rayN/v2rayN/Handler/ConfigHandler.cs | 5 +- v2rayN/v2rayN/Mode/Config.cs | 5 +- 7 files changed, 492 insertions(+), 429 deletions(-) diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 2b3b7b31..575f05f5 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -1385,6 +1385,13 @@ namespace v2rayN.Forms if (success) { RefreshServers(); + if (config.uiItem.enableAutoAdjustMainLvColWidth) + { + foreach (ColumnHeader it in lvServers.Columns) + { + it.Width = -2; + } + } } }; diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs index 756d19fa..e5c94c06 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs @@ -69,6 +69,7 @@ this.txtKcpmtu = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.tabPage7 = new System.Windows.Forms.TabPage(); + this.chkEnableAutoAdjustMainLvColWidth = new System.Windows.Forms.CheckBox(); this.btnSetLoopback = new System.Windows.Forms.Button(); this.txtautoUpdateInterval = new System.Windows.Forms.TextBox(); this.label15 = new System.Windows.Forms.Label(); @@ -375,6 +376,7 @@ // tabPage7 // resources.ApplyResources(this.tabPage7, "tabPage7"); + this.tabPage7.Controls.Add(this.chkEnableAutoAdjustMainLvColWidth); this.tabPage7.Controls.Add(this.btnSetLoopback); this.tabPage7.Controls.Add(this.txtautoUpdateInterval); this.tabPage7.Controls.Add(this.label15); @@ -390,6 +392,12 @@ this.tabPage7.Name = "tabPage7"; this.tabPage7.UseVisualStyleBackColor = true; // + // chkEnableAutoAdjustMainLvColWidth + // + resources.ApplyResources(this.chkEnableAutoAdjustMainLvColWidth, "chkEnableAutoAdjustMainLvColWidth"); + this.chkEnableAutoAdjustMainLvColWidth.Name = "chkEnableAutoAdjustMainLvColWidth"; + this.chkEnableAutoAdjustMainLvColWidth.UseVisualStyleBackColor = true; + // // btnSetLoopback // resources.ApplyResources(this.btnSetLoopback, "btnSetLoopback"); @@ -605,5 +613,6 @@ private System.Windows.Forms.TextBox txtautoUpdateInterval; private System.Windows.Forms.Label label15; private System.Windows.Forms.Button btnSetLoopback; + private System.Windows.Forms.CheckBox chkEnableAutoAdjustMainLvColWidth; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs index 2bb2bded..97a3aa56 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs @@ -125,6 +125,7 @@ namespace v2rayN.Forms chkIgnoreGeoUpdateCore.Checked = config.ignoreGeoUpdateCore; cmbCoreType.SelectedIndex = (int)config.coreType; txtautoUpdateInterval.Text = config.autoUpdateInterval.ToString(); + chkEnableAutoAdjustMainLvColWidth.Checked = config.uiItem.enableAutoAdjustMainLvColWidth; } private void btnOK_Click(object sender, EventArgs e) { @@ -308,6 +309,7 @@ namespace v2rayN.Forms config.ignoreGeoUpdateCore = chkIgnoreGeoUpdateCore.Checked; config.coreType = (ECoreType)cmbCoreType.SelectedIndex; config.autoUpdateInterval = Utils.ToInt(txtautoUpdateInterval.Text); + config.uiItem.enableAutoAdjustMainLvColWidth = chkEnableAutoAdjustMainLvColWidth.Checked; return 0; } diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx index 8b025db3..f8510aaf 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx @@ -127,16 +127,16 @@ 11 - - - 107, 12 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Keep older when deduplication - - 5 + + 2 + 6, 283 @@ -146,11 +146,11 @@ tabPage7 - - 12 + + 4 - - 4, 22 + + 0 txtKcpwriteBufferSize @@ -159,10 +159,10 @@ groupBox1 - 8 + 9 - - False + + tti 14 @@ -173,12 +173,12 @@ tabControl1 + + label10 + groupBox1 - - 5 - 9 @@ -191,14 +191,14 @@ txtautoUpdateInterval - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 662, 523 35 - - 111, 24 + + 1 468, 60 @@ -216,8 +216,11 @@ 14 - - tabPage3 + + 40 + + + 12 5 @@ -243,39 +246,42 @@ 40 - - cmbloglevel - True 120, 16 + + label13 + True - - tti + + 234, 16 - - tabPage6 + + 4, 22 - - tabPage6 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 1 7 - - tabPage7 + + 33 12 + + 662, 60 + label7 @@ -291,9 +297,6 @@ 648, 421 - - NoControl - 206, 64 @@ -303,6 +306,9 @@ tabPage6 + + 654, 427 + 39 @@ -327,8 +333,8 @@ &Cancel - - label10 + + 111, 62 654, 427 @@ -336,29 +342,29 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 654, 427 - - - NoControl + + groupBox1 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Settings + + 662, 10 + + + True + + + 15, 189 15, 132 - - txtKcpreadBufferSize - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + label4 42 @@ -372,8 +378,8 @@ 12 - - $this + + True label11 @@ -384,12 +390,12 @@ True - - tabPage6 - 0, 10 + + 58, 20 + Support DnsObject @@ -399,33 +405,39 @@ False - - tabControl1 + + groupBox1 - - $this + + NoControl 3 + + 11 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NoControl - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage7 0 - - tabPage6 + + 19 Fill + + 576, 16 + 18 @@ -435,12 +447,18 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 15, 40 + congestion NoControl + + panel2 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -450,8 +468,8 @@ 89, 12 - - NoControl + + info 0 @@ -462,8 +480,11 @@ v2rayN settings - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 16 + + + groupBox1 10 @@ -471,9 +492,6 @@ 32 - - label6 - 6, 12 @@ -489,8 +507,8 @@ 8 - - txtKcpdownlinkCapacity + + True 198, 16 @@ -498,17 +516,20 @@ Automatically start at system startup - - label14 + + 654, 427 1 + + 4, 4, 4, 4 + txtKcptti - - 2 + + Vertical Turn on Sniffing @@ -525,17 +546,14 @@ 3, 3, 3, 3 - - 97, 20 - 3 System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 662, 453 + + True 33, 29 @@ -543,12 +561,15 @@ 325, 130 - - 468, 27 + + 124, 60 78, 21 + + Log level + tabControl1 @@ -567,8 +588,8 @@ tabPage2 - - panel2 + + 4 Statistics freshrate @@ -579,6 +600,9 @@ 89, 12 + + btnOK + 18, 66 @@ -591,14 +615,17 @@ True - - 4, 4, 4, 4 + + tabPage6 + + + tabPage6 tabPage6 - - 37 + + 5 Turn on Sniffing @@ -606,9 +633,6 @@ groupBox1 - - 345, 100 - 18, 28 @@ -621,8 +645,8 @@ 20 - - 10 + + 29 System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -639,6 +663,9 @@ label12 + + 4, 22 + Core Type @@ -664,7 +691,7 @@ groupBox1 - 3 + 4 18, 104 @@ -672,27 +699,24 @@ tabPage2 + + mtu + 282, 23 socks - - 36 + + tabPage1 - - 576, 16 + + System.Windows.Forms.GroupBox, 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 - - groupBox1 - - - True - panel1 @@ -702,20 +726,17 @@ 53, 12 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 13 label8 - - 0 + + 468, 27 - - label13 + + 236, 28 chkAutoRun @@ -726,14 +747,20 @@ 345, 62 - - 15, 16 + + 11 + + + 15, 129 chkudpEnabled - 4 + 5 + + + Allow connections from the LAN True @@ -741,8 +768,8 @@ 8, 17 - - tabPage1 + + label9 tabPage7 @@ -765,17 +792,20 @@ 15 - - True + + 6 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + + + tabPage6 txtlocalPort - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabControl1 tabPage7 @@ -783,11 +813,11 @@ tabPage7 - - 19 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 22 + + 125, 12 tabPage6 @@ -804,26 +834,17 @@ protocol - - 84, 16 - - - Turn on Mux Multiplexing - True 23, 12 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 638, 356 - - True + + socks 3, 3 @@ -831,16 +852,13 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - chkAllowLANConn - - True + + 84, 16 - + tabControl1 @@ -849,44 +867,50 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15, 40 + + True 1 - - tabPage6 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 10 369, 62 + + 161, 84 + 9 System proxy settings - + + groupBox1 + + + 10 + + NoControl - - 654, 427 - - - chkEnableStatistics - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 4 - - 2 + + 355, 16 - - 4 + + 53, 12 193, 162 @@ -894,8 +918,11 @@ btnSetLoopback - - 124, 60 + + 369, 27 + + + 1 System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -915,12 +942,12 @@ 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 - 9 + + 8 + 0 @@ -928,7 +955,10 @@ 101, 12 - 9 + 10 + + + tabPage7 12 @@ -945,6 +975,21 @@ Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client) + + NoControl + + + 107, 12 + + + 204, 16 + + + 662, 453 + + + $this + 4 @@ -954,17 +999,23 @@ Fill + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 41 + + tabPage3 + 257, 60 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - tabControl1 + + 94, 21 True @@ -981,14 +1032,14 @@ chkKeepOlderDedupl - - 15, 129 + + True 16 - - 10 + + True True @@ -1011,6 +1062,9 @@ tabPage2 + + tabControl1 + 30, 376 @@ -1032,8 +1086,11 @@ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False + + Automatically adjust column width after updating subscription + + + 15, 160 Vertical @@ -1041,8 +1098,8 @@ 38 - - 33 + + Automatic update interval of Geo(hours) 4, 22 @@ -1059,11 +1116,11 @@ Core: KCP settings - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10 - - 29 + + tabPage6 error @@ -1071,38 +1128,32 @@ True - - groupBox1 - 59, 12 - - NoControl - - - groupBox1 + + 38 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 654, 427 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 + + downlinkCapacity 120, 16 - - 662, 10 + + 75, 23 txtlocalPort2 - - True + + 2 246, 16 @@ -1110,8 +1161,8 @@ True - - tabPage2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 654, 427 @@ -1119,38 +1170,29 @@ 42 - - 10 + + 15, 108 False - - Custom DNS (multiple, separated by commas (,)) - 206, 29 - - 15, 160 - - - downlinkCapacity + + 2 chkudpEnabled2 - - info - chkIgnoreGeoUpdateCore - - Allow connections from the LAN + + chkEnableAutoAdjustMainLvColWidth - - 161, 84 + + tabPage1 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1158,6 +1200,9 @@ tabPage6 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 2 @@ -1173,9 +1218,6 @@ 8 - - 35 - linkDnsObjectDoc @@ -1185,53 +1227,50 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage7 - - - 6 + + txtKcpreadBufferSize none - - Log level + + groupBox1 - - tabControl1 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 638, 219 + + Fill - - 6 + + protocol - - OptionSettingForm + + 4, 22 - - 2 + + 15 - - 239, 12 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 15, 64 - - 111, 62 - - 11 + 12 groupBox2 - - 58, 20 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 5 + + + $this 13 @@ -1242,6 +1281,12 @@ 0 + + 3 + + + chkEnableStatistics + 8, 52 @@ -1269,17 +1314,14 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 355, 16 + + 638, 219 23, 12 - - 11 - - - 4 + + 654, 427 8 @@ -1287,35 +1329,38 @@ Exception + + 37 + + + tabControl1 + + + 345, 100 + NoControl - - Use semicolon (;) - - - groupBox1 - - - 94, 21 - - - 1 - True 10 + + NoControl + 17 + + 23 + 94, 21 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 0 @@ -1323,14 +1368,20 @@ 0, 463 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage7 - - tabPage1 + + groupBox1 - - 97, 20 + + 3 + + + Do not use proxy server for addresses beginning with + + + 8 http @@ -1338,8 +1389,11 @@ 0 - - mtu + + Use semicolon (;) + + + 97, 20 tabPage6 @@ -1362,8 +1416,8 @@ &OK - - 10 + + 94, 21 1 @@ -1374,8 +1428,8 @@ txtKcpuplinkCapacity - - 23 + + tabPage2 chklogEnabled @@ -1392,44 +1446,41 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 325, 156 - groupBox2 4, 22 + + $this + 40 - - Automatic update interval of Geo(hours) + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + True + + groupBox1 - - 4, 22 - - - socks - NoControl 6 - - protocol + + 236, 66 tabPage7 - - $this + + 15, 16 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1437,8 +1488,11 @@ True + + 36 + - 6 + 7 8 @@ -1458,110 +1512,104 @@ 3 - - 1 + + writeBufferSize 11 - - True + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 89, 12 - - 16 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 31 - - 369, 27 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill - - + groupBox1 + + Core: DNS settings + groupBox1 32 - - 38 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Core: DNS settings + + NoControl 345, 24 + + tabPage7 + cbFreshrate + + OptionSettingForm + 236, 104 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 204, 16 + + NoControl System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 234, 16 - 94, 21 - - 75, 23 - - - writeBufferSize - - - System.Windows.Forms.CheckBox, 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 8, 41 - - uplinkCapacity - 0, 0, 0, 0 - - 662, 523 + + uplinkCapacity - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtKcpdownlinkCapacity - - NoControl + + Bottom - - Vertical + + 35 6 - - 7 + + 0 + + + Settings + + + 6 3, 3, 3, 3 @@ -1575,14 +1623,14 @@ label5 - - label4 - 15, 192 - - btnOK + + tabPage6 + + + False debug @@ -1602,26 +1650,20 @@ False - - 15, 108 - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 253, 134 - - 342, 17 - 0, 0 Enable UDP - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 390, 16 3, 3, 3, 3 @@ -1629,20 +1671,20 @@ groupBox1 - - 15 - 126, 16 267, 16 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 75, 23 - - Do not use proxy server for addresses beginning with + + 239, 12 groupBox1 @@ -1656,20 +1698,17 @@ 9 - - 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox1 - - 0 + + 342, 17 - - 94, 21 - - - 3 + + 97, 20 3 @@ -1677,11 +1716,11 @@ 30, 162 - - 236, 28 + + Custom DNS (multiple, separated by commas (,)) - - Bottom + + 654, 427 11 @@ -1692,11 +1731,8 @@ 0 - - groupBox1 - - - 125, 12 + + NoControl panel2 @@ -1710,17 +1746,17 @@ 2 - - True + + Turn on Mux Multiplexing - - 654, 427 + + cmbloglevel - - tabPage7 + + label6 - - 236, 66 + + 111, 24 NoControl @@ -1731,22 +1767,19 @@ NoControl - - label9 - - - 5 - True - - 662, 60 + + 325, 156 - - 53, 12 + + label14 True + + zh-Hans + \ 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 a8f26810..d4dc2f22 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx @@ -121,18 +121,6 @@ 取消(&C) - - 662, 469 - - - 654, 443 - - - Core:基础设置 - - - 648, 437 - 324, 16 @@ -205,11 +193,14 @@ 本地监听端口 - + + 648, 437 + + 654, 443 - - Core:DNS设置 + + Core:基础设置 161, 12 @@ -223,17 +214,23 @@ 自定义DNS(可多个,用逗号(,)隔开) + + 654, 443 + + + Core:DNS设置 + 654, 443 Core:KCP设置 - - 654, 443 + + 204, 16 - - v2rayN设置 + + 自动调整服务器列宽在更新订阅后 解除Windows10 UWP应用回环代理限制 @@ -289,17 +286,11 @@ 开机自动启动(可能会不成功) - + 654, 443 - - 系统代理设置 - - - 654, 443 - - - 例外 + + v2rayN设置 95, 12 @@ -313,12 +304,27 @@ 对于下列字符开头的地址不使用代理服务器: - - 0, 479 + + 654, 443 + + + 例外 + + + 654, 443 + + + 系统代理设置 + + + 662, 469 确定(&O) + + 0, 479 + 662, 539 diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 440aec2e..0fd71c75 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -121,7 +121,10 @@ namespace v2rayN.Handler } if (config.uiItem == null) { - config.uiItem = new UIItem(); + config.uiItem = new UIItem() + { + enableAutoAdjustMainLvColWidth = true + }; } if (config.uiItem.mainLvColWidth == null) { diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index 754e59dc..505a6101 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -770,7 +770,10 @@ namespace v2rayN.Mode [Serializable] public class UIItem { - + public bool enableAutoAdjustMainLvColWidth + { + get; set; + } public System.Drawing.Size mainSize {