up4.2

2dust · Dec 30, 2020 · 9dc8cba · 9dc8cba
1 parent 03c4954
commit 9dc8cba
Show file tree

Hide file tree

Showing 45 changed files with 2,874 additions and 9,538 deletions.
diff --git a/v2rayN/v2rayN/Base/ListViewFlickerFree.cs b/v2rayN/v2rayN/Base/ListViewFlickerFree.cs
@@ -46,5 +46,7 @@ public void AutoResizeColumns()
             }
             catch { }
         }
+
+
     }
 }
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.resx b/v2rayN/v2rayN/Forms/AddServerForm.resx
@@ -1318,7 +1318,7 @@
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>114</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 12</value>

diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -223,11 +223,7 @@ private void RefreshServersView()
                 }
 
                 VmessItem item = config.vmess[k];
-
-                void _addSubItem(ListViewItem i, string name, string text)
-                {
-                    i.SubItems.Add(new ListViewItem.ListViewSubItem() { Name = name, Text = text });
-                }
+
                 bool stats = statistics != null && statistics.Enable;
                 if (stats)
                 {
@@ -241,20 +237,20 @@ void _addSubItem(ListViewItem i, string name, string text)
                     }
                 }
                 ListViewItem lvItem = new ListViewItem(def);
-                _addSubItem(lvItem, EServerColName.configType.ToString(), ((EConfigType)item.configType).ToString());
-                _addSubItem(lvItem, EServerColName.remarks.ToString(), item.remarks);
-                _addSubItem(lvItem, EServerColName.address.ToString(), item.address);
-                _addSubItem(lvItem, EServerColName.port.ToString(), item.port.ToString());
-                _addSubItem(lvItem, EServerColName.security.ToString(), item.security);
-                _addSubItem(lvItem, EServerColName.network.ToString(), item.network);
-                _addSubItem(lvItem, EServerColName.subRemarks.ToString(), item.getSubRemarks(config));
-                _addSubItem(lvItem, EServerColName.testResult.ToString(), item.testResult);
+                Utils.AddSubItem(lvItem, EServerColName.configType.ToString(), ((EConfigType)item.configType).ToString());
+                Utils.AddSubItem(lvItem, EServerColName.remarks.ToString(), item.remarks);
+                Utils.AddSubItem(lvItem, EServerColName.address.ToString(), item.address);
+                Utils.AddSubItem(lvItem, EServerColName.port.ToString(), item.port.ToString());
+                Utils.AddSubItem(lvItem, EServerColName.security.ToString(), item.security);
+                Utils.AddSubItem(lvItem, EServerColName.network.ToString(), item.network);
+                Utils.AddSubItem(lvItem, EServerColName.subRemarks.ToString(), item.getSubRemarks(config));
+                Utils.AddSubItem(lvItem, EServerColName.testResult.ToString(), item.testResult);
                 if (stats)
                 {
-                    _addSubItem(lvItem, EServerColName.todayDown.ToString(), todayDown);
-                    _addSubItem(lvItem, EServerColName.todayUp.ToString(), todayUp);
-                    _addSubItem(lvItem, EServerColName.totalDown.ToString(), totalDown);
-                    _addSubItem(lvItem, EServerColName.totalUp.ToString(), totalUp);
+                    Utils.AddSubItem(lvItem, EServerColName.todayDown.ToString(), todayDown);
+                    Utils.AddSubItem(lvItem, EServerColName.todayUp.ToString(), todayUp);
+                    Utils.AddSubItem(lvItem, EServerColName.totalDown.ToString(), totalDown);
+                    Utils.AddSubItem(lvItem, EServerColName.totalUp.ToString(), totalUp);
                 }
 
                 if (k % 2 == 1) // 隔行着色
@@ -1138,17 +1134,15 @@ private void menuSelectAll_Click(object sender, EventArgs e)
         #endregion
 
         #region 系统代理相关
-
-
+        private void menuKeepClear_Click(object sender, EventArgs e)
+        {
+            SetListenerType(ESysProxyType.ForcedClear);
+        }
         private void menuGlobal_Click(object sender, EventArgs e)
         {
             SetListenerType(ESysProxyType.ForcedChange);
         }
 
-        private void menuKeepClear_Click(object sender, EventArgs e)
-        {
-            SetListenerType(ESysProxyType.ForcedClear);
-        }
         private void menuKeepNothing_Click(object sender, EventArgs e)
         {
             SetListenerType(ESysProxyType.Unchanged);

diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -226,7 +226,7 @@
     <value>tsbCheckUpdateN</value>
   </data>
   <data name="menuKeepNothing.Text" xml:space="preserve">
-    <value>Only open Http proxy and do nothing</value>
+    <value>Do not change system proxy</value>
   </data>
   <data name="&gt;&gt;menuMoveBottom.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -585,7 +585,7 @@
     <value>265, 142</value>
   </data>
   <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
-    <value>411, 22</value>
+    <value>262, 22</value>
   </data>
   <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1103,7 +1103,7 @@
     <value>Magenta</value>
   </data>
   <data name="menuKeepClear.Size" type="System.Drawing.Size, System.Drawing">
-    <value>411, 22</value>
+    <value>262, 22</value>
   </data>
   <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
     <value>355, 22</value>
@@ -1148,7 +1148,7 @@
     <value>Vertical</value>
   </data>
   <data name="menuKeepNothing.Size" type="System.Drawing.Size, System.Drawing">
-    <value>411, 22</value>
+    <value>262, 22</value>
   </data>
   <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
     <value>355, 22</value>
@@ -1174,6 +1174,9 @@
   <data name="&gt;&gt;menuServers.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="menuKeepClear.Text" xml:space="preserve">
+    <value>Clear system proxy</value>
+  </data>
   <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing">
     <value>355, 22</value>
   </data>
@@ -1217,7 +1220,7 @@
     <value>notifyMain</value>
   </data>
   <data name="menuGlobal.Text" xml:space="preserve">
-    <value>Open Http proxy and set the system proxy (global mode)</value>
+    <value>Set system proxy (global mode)</value>
   </data>
   <data name="&gt;&gt;tsbQRCodeSwitch.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -1415,9 +1418,6 @@
   <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>228, 18</value>
   </metadata>
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>zh-Hans</value>
-  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -312,23 +312,23 @@
         ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
   </data>
-  <data name="menuKeepNothing.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="menuKeepClear.Size" type="System.Drawing.Size, System.Drawing">
     <value>228, 22</value>
   </data>
-  <data name="menuKeepNothing.Text" xml:space="preserve">
-    <value>不改变系统代理</value>
+  <data name="menuKeepClear.Text" xml:space="preserve">
+    <value>清除系统代理</value>
   </data>
   <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
     <value>228, 22</value>
   </data>
   <data name="menuGlobal.Text" xml:space="preserve">
     <value>自动配置系统代理(全局模式)</value>
   </data>
-  <data name="menuKeepClear.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="menuKeepNothing.Size" type="System.Drawing.Size, System.Drawing">
     <value>228, 22</value>
   </data>
-  <data name="menuKeepClear.Text" xml:space="preserve">
-    <value>清除系统代理</value>
+  <data name="menuKeepNothing.Text" xml:space="preserve">
+    <value>不改变系统代理</value>
   </data>
   <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
@@ -441,19 +441,19 @@
     <value>  重启服务  </value>
   </data>
   <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
+    <value>135, 22</value>
   </data>
   <data name="tsbCheckUpdateN.Text" xml:space="preserve">
     <value>v2rayN</value>
   </data>
   <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
+    <value>135, 22</value>
   </data>
   <data name="tsbCheckUpdateCore.Text" xml:space="preserve">
     <value>v2fly-Core</value>
   </data>
   <data name="tsbCheckUpdateXrayCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
+    <value>135, 22</value>
   </data>
   <data name="tsbCheckUpdateXrayCore.Text" xml:space="preserve">
     <value>Xray-Core</value>
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,5 +46,7 @@ public void AutoResizeColumns() @@
                 }
                 catch { }
             }
         }
     }