Routing rule display

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -77,12 +77,8 @@
             this.menuMsgBoxAddRoutingRule = new System.Windows.Forms.ToolStripMenuItem();
             this.menuMsgBoxFilter = new System.Windows.Forms.ToolStripMenuItem();
             this.ssMain = new System.Windows.Forms.StatusStrip();
-            this.toolSslSocksPortLab = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslSocksPort = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslInboundInfo = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolSslBlank1 = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslHttpPortLab = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslHttpPort = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslBlank2 = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolSslServerSpeed = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolSslBlank4 = new System.Windows.Forms.ToolStripStatusLabel();
             this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
@@ -133,6 +129,8 @@
             this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbClose = new System.Windows.Forms.ToolStripButton();
+            this.toolSslRoutingRule = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank2 = new System.Windows.Forms.ToolStripStatusLabel();
             ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
             this.scMain.Panel1.SuspendLayout();
             this.scMain.Panel2.SuspendLayout();
@@ -221,6 +219,7 @@
             this.menuExport2ShareUrl,
             this.menuExport2SubContent});
             this.cmsLv.Name = "cmsLv";
+            this.cmsLv.OwnerItem = this.tsbServer;
             resources.ApplyResources(this.cmsLv, "cmsLv");
             // 
             // menuAddVmessServer
@@ -501,11 +500,9 @@
             // 
             this.ssMain.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolSslSocksPortLab,
-            this.toolSslSocksPort,
+            this.toolSslInboundInfo,
             this.toolSslBlank1,
-            this.toolSslHttpPortLab,
-            this.toolSslHttpPort,
+            this.toolSslRoutingRule,
             this.toolSslBlank2,
             this.toolSslServerSpeed,
             this.toolSslBlank4});
@@ -513,15 +510,10 @@
             this.ssMain.Name = "ssMain";
             this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
             // 
-            // toolSslSocksPortLab
+            // toolSslInboundInfo
             // 
-            resources.ApplyResources(this.toolSslSocksPortLab, "toolSslSocksPortLab");
-            this.toolSslSocksPortLab.Name = "toolSslSocksPortLab";
-            // 
-            // toolSslSocksPort
-            // 
-            this.toolSslSocksPort.Name = "toolSslSocksPort";
-            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
+            this.toolSslInboundInfo.Name = "toolSslInboundInfo";
+            resources.ApplyResources(this.toolSslInboundInfo, "toolSslInboundInfo");
             // 
             // toolSslBlank1
             // 
@@ -529,22 +521,6 @@
             this.toolSslBlank1.Name = "toolSslBlank1";
             this.toolSslBlank1.Spring = true;
             // 
-            // toolSslHttpPortLab
-            // 
-            resources.ApplyResources(this.toolSslHttpPortLab, "toolSslHttpPortLab");
-            this.toolSslHttpPortLab.Name = "toolSslHttpPortLab";
-            // 
-            // toolSslHttpPort
-            // 
-            this.toolSslHttpPort.Name = "toolSslHttpPort";
-            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
-            // 
-            // toolSslBlank2
-            // 
-            resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2");
-            this.toolSslBlank2.Name = "toolSslBlank2";
-            this.toolSslBlank2.Spring = true;
-            // 
             // toolSslServerSpeed
             // 
             resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed");
@@ -889,6 +865,17 @@
             this.tsbClose.Name = "tsbClose";
             this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
             // 
+            // toolSslRoutingRule
+            // 
+            this.toolSslRoutingRule.Name = "toolSslRoutingRule";
+            resources.ApplyResources(this.toolSslRoutingRule, "toolSslRoutingRule");
+            // 
+            // toolSslBlank2
+            // 
+            this.toolSslBlank2.Name = "toolSslBlank2";
+            resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2");
+            this.toolSslBlank2.Spring = true;
+            // 
             // MainForm
             // 
             resources.ApplyResources(this, "$this");
@@ -994,12 +981,7 @@
         private System.Windows.Forms.ToolStripButton tsbPromotion;
         private System.Windows.Forms.ToolStripMenuItem menuAddSocksServer;
         private System.Windows.Forms.StatusStrip ssMain;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslSocksPort;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPort;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
         private System.Windows.Forms.ToolStripStatusLabel toolSslBlank1;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslSocksPortLab;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPortLab;
         private System.Windows.Forms.ToolStripStatusLabel toolSslServerSpeed;
         private System.Windows.Forms.ToolStripStatusLabel toolSslBlank4;
         private System.Windows.Forms.ToolStripMenuItem menuRemoveDuplicateServer;
@@ -1032,6 +1014,9 @@
         private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateGeoIP;
         private System.Windows.Forms.SplitContainer splitContainer1;
         private System.Windows.Forms.ToolStripMenuItem menuMsgBoxFilter;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslInboundInfo;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslRoutingRule;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
     }
 }
 

v2rayN/v2rayN/Forms/MainForm.cs

@@ -41,7 +41,12 @@ namespace v2rayN.Forms
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            ConfigHandler.LoadConfig(ref config);
+            if (ConfigHandler.LoadConfig(ref config) != 0)
+            {
+                UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
+                Environment.Exit(0);
+                return;
+            }
             ConfigHandler.InitBuiltinRouting(ref config);
             MainFormHandler.Instance.BackupGuiNConfig(config, true);
             v2rayHandler = new V2rayHandler();
@@ -347,8 +352,8 @@ namespace v2rayN.Forms
 
         private void DisplayToolStatus()
         {
-            toolSslSocksPort.Text = $"{Global.Loopback}:{config.inbound[0].localPort}";
-            toolSslHttpPort.Text = $"{Global.Loopback}:{Global.httpPort}";
+            toolSslInboundInfo.Text = $"{Global.InboundSocks} {Global.Loopback}:{config.inbound[0].localPort} | "
+             + $"{ Global.InboundHttp} { Global.Loopback}:{Global.httpPort}";
 
             notifyMain.Icon = MainFormHandler.Instance.GetNotifyIcon(config, this.Icon);
         }
@@ -573,24 +578,18 @@ namespace v2rayN.Forms
             {
                 return;
             }
-            for (int k = lvSelecteds.Count - 1; k >= 0; k--)
-            {
-                ConfigHandler.RemoveServer(ref config, lvSelecteds[k]);
-            }
+
+            ConfigHandler.RemoveServer(ref config, lvSelecteds);
+
             RefreshServers();
             LoadV2ray();
-
         }
 
         private void menuRemoveDuplicateServer_Click(object sender, EventArgs e)
         {
-            Utils.DedupServerList(config.vmess, out List<VmessItem> servers, config.keepOlderDedupl);
             int oldCount = config.vmess.Count;
-            int newCount = servers.Count;
-            if (servers != null)
-            {
-                config.vmess = servers;
-            }
+            ConfigHandler.DedupServerList(ref config);
+            int newCount = config.vmess.Count;
             RefreshServers();
             LoadV2ray();
             UI.Show(string.Format(UIRes.I18N("RemoveDuplicateServerResult"), oldCount, newCount));
@@ -1390,6 +1389,7 @@ namespace v2rayN.Forms
             menuRoutings.Visible = config.enableRoutingAdvanced;
             if (!config.enableRoutingAdvanced)
             {
+                toolSslRoutingRule.Text = string.Empty;
                 return;
             }
 
@@ -1412,6 +1412,7 @@ namespace v2rayN.Forms
                 if (config.routingIndex.Equals(k))
                 {
                     ts.Checked = true;
+                    toolSslRoutingRule.Text = item.remarks;
                 }
                 ts.Click += new EventHandler(ts_Routing_Click);
                 lst.Add(ts);

v2rayN/v2rayN/Forms/MainForm.resx

@@ -302,6 +302,18 @@
   <data name="menuExport2SubContent.Text" xml:space="preserve">
     <value>Export subscription (base64) share to clipboard</value>
   </data>
+  <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>64, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>Servers</value>
+  </data>
+  <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
     <value>356, 622</value>
   </data>
@@ -428,18 +440,6 @@
   <data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 53</value>
-  </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>Servers</value>
-  </data>
-  <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
   <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
@@ -566,41 +566,23 @@
   <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>228, 18</value>
   </metadata>
-  <data name="toolSslSocksPortLab.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 8pt</value>
+  <data name="toolSslInboundInfo.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 21</value>
   </data>
-  <data name="toolSslSocksPortLab.Size" type="System.Drawing.Size, System.Drawing">
-    <value>52, 21</value>
-  </data>
-  <data name="toolSslSocksPortLab.Text" xml:space="preserve">
-    <value>SOCKS5:</value>
-  </data>
-  <data name="toolSslSocksPort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 21</value>
+  <data name="toolSslInboundInfo.Text" xml:space="preserve">
+    <value>InboundInfo</value>
   </data>
   <data name="toolSslBlank1.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 8pt</value>
   </data>
   <data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>279, 21</value>
+    <value>285, 21</value>
   </data>
-  <data name="toolSslHttpPortLab.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 8pt</value>
-  </data>
-  <data name="toolSslHttpPortLab.Size" type="System.Drawing.Size, System.Drawing">
-    <value>39, 21</value>
-  </data>
-  <data name="toolSslHttpPortLab.Text" xml:space="preserve">
-    <value>HTTP:</value>
-  </data>
-  <data name="toolSslHttpPort.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="toolSslRoutingRule.Size" type="System.Drawing.Size, System.Drawing">
     <value>0, 21</value>
   </data>
-  <data name="toolSslBlank2.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 8pt</value>
-  </data>
   <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>279, 21</value>
+    <value>285, 21</value>
   </data>
   <data name="toolSslServerSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -831,13 +813,13 @@
     <value>6, 56</value>
   </data>
   <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
+    <value>125, 22</value>
   </data>
   <data name="tsbSubSetting.Text" xml:space="preserve">
     <value>Settings</value>
   </data>
   <data name="tsbSubUpdate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
+    <value>125, 22</value>
   </data>
   <data name="tsbSubUpdate.Text" xml:space="preserve">
     <value>Updates</value>
@@ -1319,16 +1301,10 @@
   <data name="&gt;&gt;menuMsgBoxFilter.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="&gt;&gt;toolSslSocksPortLab.Name" xml:space="preserve">
-    <value>toolSslSocksPortLab</value>
+  <data name="&gt;&gt;toolSslInboundInfo.Name" xml:space="preserve">
+    <value>toolSslInboundInfo</value>
   </data>
-  <data name="&gt;&gt;toolSslSocksPortLab.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;toolSslSocksPort.Name" xml:space="preserve">
-    <value>toolSslSocksPort</value>
-  </data>
-  <data name="&gt;&gt;toolSslSocksPort.Type" xml:space="preserve">
+  <data name="&gt;&gt;toolSslInboundInfo.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;toolSslBlank1.Name" xml:space="preserve">
@@ -1337,24 +1313,6 @@
   <data name="&gt;&gt;toolSslBlank1.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;toolSslHttpPortLab.Name" xml:space="preserve">
-    <value>toolSslHttpPortLab</value>
-  </data>
-  <data name="&gt;&gt;toolSslHttpPortLab.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;toolSslHttpPort.Name" xml:space="preserve">
-    <value>toolSslHttpPort</value>
-  </data>
-  <data name="&gt;&gt;toolSslHttpPort.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;toolSslBlank2.Name" xml:space="preserve">
-    <value>toolSslBlank2</value>
-  </data>
-  <data name="&gt;&gt;toolSslBlank2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;toolSslServerSpeed.Name" xml:space="preserve">
     <value>toolSslServerSpeed</value>
   </data>
@@ -1637,6 +1595,18 @@
   <data name="&gt;&gt;tsbClose.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;toolSslRoutingRule.Name" xml:space="preserve">
+    <value>toolSslRoutingRule</value>
+  </data>
+  <data name="&gt;&gt;toolSslRoutingRule.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolSslBlank2.Name" xml:space="preserve">
+    <value>toolSslBlank2</value>
+  </data>
+  <data name="&gt;&gt;toolSslBlank2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>MainForm</value>
   </data>

v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs

@@ -101,33 +101,32 @@
             // 
             // btnClose
             // 
-            resources.ApplyResources(this.btnClose, "btnClose");
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            resources.ApplyResources(this.btnClose, "btnClose");
             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.tabPage3);
+            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             // 
             // tabPage1
             // 
-            resources.ApplyResources(this.tabPage1, "tabPage1");
             this.tabPage1.Controls.Add(this.groupBox1);
+            resources.ApplyResources(this.tabPage1, "tabPage1");
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // groupBox1
             // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.chkdefAllowInsecure);
             this.groupBox1.Controls.Add(this.chksniffingEnabled2);
             this.groupBox1.Controls.Add(this.chksniffingEnabled);
@@ -145,6 +144,7 @@
             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;
             // 
@@ -187,12 +187,12 @@
             // 
             // cmbprotocol2
             // 
-            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbprotocol2.FormattingEnabled = true;
             this.cmbprotocol2.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol2.Items"),
             resources.GetString("cmbprotocol2.Items1")});
+            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.Name = "cmbprotocol2";
             // 
             // label3
@@ -207,8 +207,8 @@
             // 
             // cmbprotocol
             // 
-            resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
             this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
             this.cmbprotocol.FormattingEnabled = true;
             this.cmbprotocol.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol.Items"),
@@ -234,7 +234,6 @@
             // 
             // cmbloglevel
             // 
-            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbloglevel.FormattingEnabled = true;
             this.cmbloglevel.Items.AddRange(new object[] {
@@ -243,6 +242,7 @@
             resources.GetString("cmbloglevel.Items2"),
             resources.GetString("cmbloglevel.Items3"),
             resources.GetString("cmbloglevel.Items4")});
+            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.Name = "cmbloglevel";
             // 
             // label5
@@ -262,10 +262,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;
             // 
@@ -288,7 +288,6 @@
             // 
             // tabPage6
             // 
-            resources.ApplyResources(this.tabPage6, "tabPage6");
             this.tabPage6.Controls.Add(this.chkKcpcongestion);
             this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
             this.tabPage6.Controls.Add(this.label10);
@@ -302,6 +301,7 @@
             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;
             // 
@@ -373,7 +373,6 @@
             // 
             // tabPage7
             // 
-            resources.ApplyResources(this.tabPage7, "tabPage7");
             this.tabPage7.Controls.Add(this.txtautoUpdateInterval);
             this.tabPage7.Controls.Add(this.label15);
             this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore);
@@ -385,6 +384,7 @@
             this.tabPage7.Controls.Add(this.chkEnableStatistics);
             this.tabPage7.Controls.Add(this.chkAllowLANConn);
             this.tabPage7.Controls.Add(this.chkAutoRun);
+            resources.ApplyResources(this.tabPage7, "tabPage7");
             this.tabPage7.Name = "tabPage7";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
@@ -406,12 +406,12 @@
             // 
             // cmbCoreType
             // 
-            resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
             this.cmbCoreType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbCoreType.FormattingEnabled = true;
             this.cmbCoreType.Items.AddRange(new object[] {
             resources.GetString("cmbCoreType.Items"),
             resources.GetString("cmbCoreType.Items1")});
+            resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
             this.cmbCoreType.Name = "cmbCoreType";
             // 
             // label4
@@ -427,9 +427,9 @@
             // 
             // cbFreshrate
             // 
-            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
             this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbFreshrate.FormattingEnabled = true;
+            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
             this.cbFreshrate.Name = "cbFreshrate";
             // 
             // lbFreshrate
@@ -457,17 +457,17 @@
             // 
             // tabPage3
             // 
-            resources.ApplyResources(this.tabPage3, "tabPage3");
             this.tabPage3.Controls.Add(this.groupBox2);
+            resources.ApplyResources(this.tabPage3, "tabPage3");
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.UseVisualStyleBackColor = true;
             // 
             // groupBox2
             // 
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             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;
             // 
@@ -488,9 +488,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

v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx

@@ -121,90 +121,15 @@
     <value>取消(&amp;C)</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>662, 469</value>
+  </data>
   <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
     <value>654, 443</value>
   </data>
   <data name="tabPage1.Text" xml:space="preserve">
     <value>  Core:基础设置  </value>
   </data>
-  <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage2.Text" xml:space="preserve">
-    <value>  Core:DNS设置  </value>
-  </data>
-  <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage6.Text" xml:space="preserve">
-    <value>  Core:KCP设置  </value>
-  </data>
-  <data name="txtautoUpdateInterval.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 156</value>
-  </data>
-  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>191, 12</value>
-  </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>自动更新Geo文件的间隔(单位分钟)</value>
-  </data>
-  <data name="chkIgnoreGeoUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 16</value>
-  </data>
-  <data name="chkIgnoreGeoUpdateCore.Text" xml:space="preserve">
-    <value>更新Core时忽略Geo文件</value>
-  </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>Core类型</value>
-  </data>
-  <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>156, 16</value>
-  </data>
-  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
-    <value>去重时保留序号较小的项</value>
-  </data>
-  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 12</value>
-  </data>
-  <data name="lbFreshrate.Text" xml:space="preserve">
-    <value>统计刷新频率</value>
-  </data>
-  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
-    <value>372, 16</value>
-  </data>
-  <data name="chkEnableStatistics.Text" xml:space="preserve">
-    <value>启用统计(实时网速显示和使用流量显示，需要重启v2rayN客户端)</value>
-  </data>
-  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 16</value>
-  </data>
-  <data name="chkAllowLANConn.Text" xml:space="preserve">
-    <value>允许来自局域网的连接</value>
-  </data>
-  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 16</value>
-  </data>
-  <data name="chkAutoRun.Text" xml:space="preserve">
-    <value>开机自动启动(可能会不成功)</value>
-  </data>
-  <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage7.Text" xml:space="preserve">
-    <value>  v2rayN设置  </value>
-  </data>
-  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage3.Text" xml:space="preserve">
-    <value>  系统代理设置  </value>
-  </data>
-  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>662, 469</value>
-  </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>648, 437</value>
   </data>
@@ -280,6 +205,12 @@
   <data name="label2.Text" xml:space="preserve">
     <value>本地监听端口</value>
   </data>
+  <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage2.Text" xml:space="preserve">
+    <value>  Core:DNS设置  </value>
+  </data>
   <data name="linkDnsObjectDoc.Size" type="System.Drawing.Size, System.Drawing">
     <value>161, 12</value>
   </data>
@@ -292,6 +223,75 @@
   <data name="label14.Text" xml:space="preserve">
     <value>自定义DNS(可多个,用逗号(,)隔开)</value>
   </data>
+  <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage6.Text" xml:space="preserve">
+    <value>  Core:KCP设置  </value>
+  </data>
+  <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage7.Text" xml:space="preserve">
+    <value>  v2rayN设置  </value>
+  </data>
+  <data name="txtautoUpdateInterval.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 156</value>
+  </data>
+  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>191, 12</value>
+  </data>
+  <data name="label15.Text" xml:space="preserve">
+    <value>自动更新Geo文件的间隔(单位小时)</value>
+  </data>
+  <data name="chkIgnoreGeoUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 16</value>
+  </data>
+  <data name="chkIgnoreGeoUpdateCore.Text" xml:space="preserve">
+    <value>更新Core时忽略Geo文件</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>Core类型</value>
+  </data>
+  <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 16</value>
+  </data>
+  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
+    <value>去重时保留序号较小的项</value>
+  </data>
+  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="lbFreshrate.Text" xml:space="preserve">
+    <value>统计刷新频率</value>
+  </data>
+  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>372, 16</value>
+  </data>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计(实时网速显示和使用流量显示，需要重启v2rayN客户端)</value>
+  </data>
+  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
+    <value>144, 16</value>
+  </data>
+  <data name="chkAllowLANConn.Text" xml:space="preserve">
+    <value>允许来自局域网的连接</value>
+  </data>
+  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 16</value>
+  </data>
+  <data name="chkAutoRun.Text" xml:space="preserve">
+    <value>开机自动启动(可能会不成功)</value>
+  </data>
+  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage3.Text" xml:space="preserve">
+    <value>  系统代理设置  </value>
+  </data>
   <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
     <value>654, 443</value>
   </data>

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.Designer.cs

@@ -34,6 +34,10 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.label5 = new System.Windows.Forms.Label();
+            this.btnBrowse = new System.Windows.Forms.Button();
+            this.txtCustomIcon = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.txtUrl = new System.Windows.Forms.TextBox();
             this.label3 = new System.Windows.Forms.Label();
@@ -68,17 +72,17 @@
             // 
             // 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);
             // 
             // 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
@@ -90,14 +94,40 @@
             // 
             // panel1
             // 
+            resources.ApplyResources(this.panel1, "panel1");
+            this.panel1.Controls.Add(this.label5);
+            this.panel1.Controls.Add(this.btnBrowse);
+            this.panel1.Controls.Add(this.txtCustomIcon);
+            this.panel1.Controls.Add(this.label4);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.txtUrl);
             this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.txtRemarks);
             this.panel1.Controls.Add(this.label2);
-            resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
+            // label5
+            // 
+            resources.ApplyResources(this.label5, "label5");
+            this.label5.Name = "label5";
+            // 
+            // btnBrowse
+            // 
+            resources.ApplyResources(this.btnBrowse, "btnBrowse");
+            this.btnBrowse.Name = "btnBrowse";
+            this.btnBrowse.UseVisualStyleBackColor = true;
+            this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
+            // 
+            // txtCustomIcon
+            // 
+            resources.ApplyResources(this.txtCustomIcon, "txtCustomIcon");
+            this.txtCustomIcon.Name = "txtCustomIcon";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
             // label1
             // 
             resources.ApplyResources(this.label1, "label1");
@@ -125,8 +155,8 @@
             // 
             // lvRoutings
             // 
-            this.lvRoutings.ContextMenuStrip = this.cmsLv;
             resources.ApplyResources(this.lvRoutings, "lvRoutings");
+            this.lvRoutings.ContextMenuStrip = this.cmsLv;
             this.lvRoutings.FullRowSelect = true;
             this.lvRoutings.GridLines = true;
             this.lvRoutings.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -142,6 +172,7 @@
             // 
             // cmsLv
             // 
+            resources.ApplyResources(this.cmsLv, "cmsLv");
             this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuAdd,
@@ -155,114 +186,113 @@
             this.menuMoveBottom});
             this.cmsLv.Name = "cmsLv";
             this.cmsLv.OwnerItem = this.MenuItem1;
-            resources.ApplyResources(this.cmsLv, "cmsLv");
             // 
             // menuAdd
             // 
-            this.menuAdd.Name = "menuAdd";
             resources.ApplyResources(this.menuAdd, "menuAdd");
+            this.menuAdd.Name = "menuAdd";
             this.menuAdd.Click += new System.EventHandler(this.menuAdd_Click);
             // 
             // menuRemove
             // 
-            this.menuRemove.Name = "menuRemove";
             resources.ApplyResources(this.menuRemove, "menuRemove");
+            this.menuRemove.Name = "menuRemove";
             this.menuRemove.Click += new System.EventHandler(this.menuRemove_Click);
             // 
             // menuSelectAll
             // 
-            this.menuSelectAll.Name = "menuSelectAll";
             resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
+            this.menuSelectAll.Name = "menuSelectAll";
             this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
             // 
             // menuExportSelectedRules
             // 
-            this.menuExportSelectedRules.Name = "menuExportSelectedRules";
             resources.ApplyResources(this.menuExportSelectedRules, "menuExportSelectedRules");
+            this.menuExportSelectedRules.Name = "menuExportSelectedRules";
             this.menuExportSelectedRules.Click += new System.EventHandler(this.menuExportSelectedRules_Click);
             // 
             // toolStripSeparator3
             // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
             resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
             // 
             // menuMoveTop
             // 
-            this.menuMoveTop.Name = "menuMoveTop";
             resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
+            this.menuMoveTop.Name = "menuMoveTop";
             this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click);
             // 
             // menuMoveUp
             // 
-            this.menuMoveUp.Name = "menuMoveUp";
             resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
+            this.menuMoveUp.Name = "menuMoveUp";
             this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click);
             // 
             // menuMoveDown
             // 
-            this.menuMoveDown.Name = "menuMoveDown";
             resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
+            this.menuMoveDown.Name = "menuMoveDown";
             this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click);
             // 
             // menuMoveBottom
             // 
-            this.menuMoveBottom.Name = "menuMoveBottom";
             resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
+            this.menuMoveBottom.Name = "menuMoveBottom";
             this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
             // 
             // MenuItem1
             // 
+            resources.ApplyResources(this.MenuItem1, "MenuItem1");
             this.MenuItem1.DropDown = this.cmsLv;
             this.MenuItem1.Name = "MenuItem1";
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
             // 
             // tabControl2
             // 
-            this.tabControl2.Controls.Add(this.tabPage2);
             resources.ApplyResources(this.tabControl2, "tabControl2");
+            this.tabControl2.Controls.Add(this.tabPage2);
             this.tabControl2.Name = "tabControl2";
             this.tabControl2.SelectedIndex = 0;
             // 
             // tabPage2
             // 
-            this.tabPage2.Controls.Add(this.lvRoutings);
             resources.ApplyResources(this.tabPage2, "tabPage2");
+            this.tabPage2.Controls.Add(this.lvRoutings);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
             // menuServer
             // 
+            resources.ApplyResources(this.menuServer, "menuServer");
             this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.MenuItem1,
             this.toolStripMenuItem1});
-            resources.ApplyResources(this.menuServer, "menuServer");
             this.menuServer.Name = "menuServer";
             // 
             // toolStripMenuItem1
             // 
+            resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
             this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuImportRulesFromFile,
             this.menuImportRulesFromClipboard,
             this.menuImportRulesFromUrl});
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
             // 
             // menuImportRulesFromFile
             // 
-            this.menuImportRulesFromFile.Name = "menuImportRulesFromFile";
             resources.ApplyResources(this.menuImportRulesFromFile, "menuImportRulesFromFile");
+            this.menuImportRulesFromFile.Name = "menuImportRulesFromFile";
             this.menuImportRulesFromFile.Click += new System.EventHandler(this.menuImportRulesFromFile_Click);
             // 
             // menuImportRulesFromClipboard
             // 
-            this.menuImportRulesFromClipboard.Name = "menuImportRulesFromClipboard";
             resources.ApplyResources(this.menuImportRulesFromClipboard, "menuImportRulesFromClipboard");
+            this.menuImportRulesFromClipboard.Name = "menuImportRulesFromClipboard";
             this.menuImportRulesFromClipboard.Click += new System.EventHandler(this.menuImportRulesFromClipboard_Click);
             // 
             // menuImportRulesFromUrl
             // 
-            this.menuImportRulesFromUrl.Name = "menuImportRulesFromUrl";
             resources.ApplyResources(this.menuImportRulesFromUrl, "menuImportRulesFromUrl");
+            this.menuImportRulesFromUrl.Name = "menuImportRulesFromUrl";
             this.menuImportRulesFromUrl.Click += new System.EventHandler(this.menuImportRulesFromUrl_Click);
             // 
             // RoutingRuleSettingForm
@@ -319,5 +349,9 @@
         private System.Windows.Forms.TextBox txtUrl;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox txtCustomIcon;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Button btnBrowse;
+        private System.Windows.Forms.Label label5;
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs

@@ -38,6 +38,7 @@ namespace v2rayN.Forms
 
             txtRemarks.Text = routingItem.remarks ?? string.Empty;
             txtUrl.Text = routingItem.url ?? string.Empty;
+            txtCustomIcon.Text = routingItem.customIcon ?? string.Empty;
 
             InitRoutingsView();
             RefreshRoutingsView();
@@ -93,6 +94,7 @@ namespace v2rayN.Forms
         {
             routingItem.remarks = txtRemarks.Text.Trim();
             routingItem.url = txtUrl.Text.Trim();
+            routingItem.customIcon = txtCustomIcon.Text.Trim();
 
             if (ConfigHandler.AddRoutingItem(ref config, routingItem, EditIndex) == 0)
             {
@@ -108,6 +110,14 @@ namespace v2rayN.Forms
         {
             this.DialogResult = DialogResult.Cancel;
         }
+        private void btnBrowse_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog openFileDialog1 = new OpenFileDialog();
+            openFileDialog1.Filter = "PNG|*.png";
+            openFileDialog1.ShowDialog();
+            txtCustomIcon.Text = openFileDialog1.FileName;
+
+        }
 
         private void lvRoutings_DoubleClick(object sender, EventArgs e)
         {
@@ -340,8 +350,9 @@ namespace v2rayN.Forms
             return ConfigHandler.AddBatchRoutingRules(ref routingItem, clipboardData, blReplace);
         }
 
+
+
         #endregion
-
-
+               
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.zh-Hans.resx

@@ -120,16 +120,31 @@
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 613</value>
+    <value>0, 501</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>785, 60</value>
   </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>785, 147</value>
+  </data>
+  <data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
+    <value>670, 104</value>
+  </data>
+  <data name="txtCustomIcon.Location" type="System.Drawing.Point, System.Drawing">
+    <value>101, 105</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>自定义图标</value>
+  </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>29, 12</value>
   </data>
@@ -154,9 +169,6 @@
   <data name="label2.Text" xml:space="preserve">
     <value>别名</value>
   </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>785, 109</value>
-  </data>
   <data name="menuAdd.Size" type="System.Drawing.Size, System.Drawing">
     <value>196, 22</value>
   </data>
@@ -235,19 +247,28 @@
 </value>
   </data>
   <data name="lvRoutings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>771, 447</value>
+    <value>771, 297</value>
+  </data>
+  <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 172</value>
+  </data>
+  <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>785, 329</value>
   </data>
   <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>777, 453</value>
+    <value>777, 303</value>
   </data>
   <data name="tabPage2.Text" xml:space="preserve">
     <value>规则列表</value>
   </data>
-  <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 134</value>
+  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>785, 25</value>
   </data>
-  <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>785, 479</value>
+  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 21</value>
+  </data>
+  <data name="toolStripMenuItem1.Text" xml:space="preserve">
+    <value>导入规则</value>
   </data>
   <data name="menuImportRulesFromFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>189, 22</value>
@@ -267,17 +288,8 @@
   <data name="menuImportRulesFromUrl.Text" xml:space="preserve">
     <value>从订阅Url中导入规则</value>
   </data>
-  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>68, 21</value>
-  </data>
-  <data name="toolStripMenuItem1.Text" xml:space="preserve">
-    <value>导入规则</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>785, 25</value>
-  </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>785, 673</value>
+    <value>785, 561</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>规则集设置</value>

v2rayN/v2rayN/Forms/RoutingSettingForm.cs

@@ -147,6 +147,7 @@ namespace v2rayN.Forms
             lvRoutings.Columns.Add(UIRes.I18N("LvAlias"), 200);
             lvRoutings.Columns.Add(UIRes.I18N("LvCount"), 60);
             lvRoutings.Columns.Add(UIRes.I18N("LvUrl"), 240);
+            lvRoutings.Columns.Add(UIRes.I18N("LvCustomIcon"), 240);
 
             lvRoutings.EndUpdate();
         }
@@ -174,6 +175,7 @@ namespace v2rayN.Forms
                 Utils.AddSubItem(lvItem, "remarks", item.remarks);
                 Utils.AddSubItem(lvItem, "count", item.rules.Count.ToString());
                 Utils.AddSubItem(lvItem, "url", item.url);
+                Utils.AddSubItem(lvItem, "customIcon", item.customIcon);
 
                 if (lvItem != null) lvRoutings.Items.Add(lvItem);
             }

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -32,6 +32,15 @@ namespace v2rayN.Handler
                 //转成Json
                 config = Utils.FromJson<Config>(result);
             }
+            else
+            {            
+                if (File.Exists(Utils.GetPath(configRes)))
+                {
+                    Utils.SaveLog("LoadConfig Exception");
+                    return -1;
+                }
+            }
+
             if (config == null)
             {
                 config = new Config
@@ -227,19 +236,27 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int RemoveServer(ref Config config, int index)
+        public static int RemoveServer(ref Config config, List<int> indexs)
         {
-            if (index < 0 || index > config.vmess.Count - 1)
+            var itemId = config.getItemId();
+
+            for (int k = indexs.Count - 1; k >= 0; k--)
             {
-                return -1;
+                var index = indexs[k];
+                if (index < 0 || index > config.vmess.Count - 1)
+                {
+                    continue;
+                }
+
+                config.vmess.RemoveAt(index);
             }
 
-            //删除
-            config.vmess.RemoveAt(index);
-
-
-            //移除的是活动的
-            if (config.index.Equals(index))
+            var index_ = config.vmess.FindIndex(it => it.getItemId() == itemId);
+            if (index_ >= 0)
+            {
+                config.index = index_;
+            }
+            else
             {
                 if (config.vmess.Count > 0)
                 {
@@ -249,13 +266,8 @@ namespace v2rayN.Handler
                 {
                     config.index = -1;
                 }
-                Global.reloadV2ray = true;
-            }
-            else if (index < config.index)//移除活动之前的
-            {
-                config.index--;
-                Global.reloadV2ray = true;
             }
+            Global.reloadV2ray = true;
 
             ToJsonFile(config);
 
@@ -975,6 +987,63 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        public static int DedupServerList(ref Config config)
+        {
+            var itemId = config.getItemId();
+            
+            List<Mode.VmessItem> source = config.vmess;
+            bool keepOlder = config.keepOlderDedupl;
+
+            List<Mode.VmessItem> list = new List<Mode.VmessItem>();
+            if (!keepOlder) source.Reverse(); // Remove the early items first
+
+            bool _isAdded(Mode.VmessItem o, Mode.VmessItem n)
+            {
+                return o.configVersion == n.configVersion &&
+                    o.configType == n.configType &&
+                    o.address == n.address &&
+                    o.port == n.port &&
+                    o.id == n.id &&
+                    o.alterId == n.alterId &&
+                    o.security == n.security &&
+                    o.network == n.network &&
+                    o.headerType == n.headerType &&
+                    o.requestHost == n.requestHost &&
+                    o.path == n.path &&
+                    o.streamSecurity == n.streamSecurity;
+                // skip (will remove) different remarks
+            }
+            foreach (Mode.VmessItem item in source)
+            {
+                if (!list.Exists(i => _isAdded(i, item)))
+                {
+                    list.Add(item);
+                }
+            }
+            if (!keepOlder) list.Reverse();
+            config.vmess = list;
+
+            var index_ = config.vmess.FindIndex(it => it.getItemId() == itemId);
+            if (index_ >= 0)
+            {
+                config.index = index_;
+            }
+            else
+            {
+                if (config.vmess.Count > 0)
+                {
+                    config.index = 0;
+                }
+                else
+                {
+                    config.index = -1;
+                }
+            }
+            Global.reloadV2ray = true;
+
+            return 0;
+        }
+
         #endregion
 
         #region UI

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -62,7 +62,7 @@ namespace v2rayN.Handler
             }
             return ws;
         }
-
+        
         void ws_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
         {
             if (UpdateCompleted != null)
@@ -108,7 +108,7 @@ namespace v2rayN.Handler
                     if (e.Error == null
                         || Utils.IsNullOrEmpty(e.Error.ToString()))
                     {
-
+                        ((WebClientEx)sender).Dispose();
                         TimeSpan ts = (DateTime.Now - totalDatetime);
                         string speed = string.Format("{0} M/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.0"));
                         UpdateCompleted(this, new ResultEventArgs(true, speed.PadLeft(8, ' ')));
@@ -189,5 +189,34 @@ namespace v2rayN.Handler
             }
         }
 
+        public WebClientEx DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout)
+        {
+            WebClientEx ws = new WebClientEx();
+            try
+            {
+                Utils.SetSecurityProtocol();
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading")));
+
+                progressPercentage = -1;
+                totalBytesToReceive = 0;
+
+                DownloadTimeout = downloadTimeout;
+                if (webProxy != null)
+                {
+                    ws.Proxy = webProxy;
+                }
+
+                ws.DownloadProgressChanged += ws_DownloadProgressChanged;
+                ws.DownloadDataCompleted += ws_DownloadFileCompleted;
+                ws.DownloadDataAsync(new Uri(url));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+            }
+            return ws;
+        }
     }
 }

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -50,9 +51,23 @@ namespace v2rayN.Handler
                 Graphics graphics = Graphics.FromImage(bitmap);
                 SolidBrush drawBrush = new SolidBrush(color);
 
-                graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
-                int zoom = 16;
-                graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
+                var customIcon = false;
+                if (config.enableRoutingAdvanced)
+                {
+                    var item = config.routings[config.routingIndex];
+                    if (!Utils.IsNullOrEmpty(item.customIcon) && File.Exists(item.customIcon))
+                    {
+                        graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));
+                        graphics.DrawImage(new Bitmap(item.customIcon), 0, 0);
+                        customIcon = true;
+                    }
+                }
+                if (!customIcon)
+                {
+                    graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
+                    int zoom = 16;
+                    graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
+                }
 
                 Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
 
@@ -242,7 +257,7 @@ namespace v2rayN.Handler
                         Utils.SaveLog("geoip" + msg);
                 });
 
-                Thread.Sleep(60000 * config.autoUpdateInterval);
+                Thread.Sleep(1000 * 3600 * config.autoUpdateInterval);
             }
         }
     }

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -220,11 +220,12 @@ namespace v2rayN.Handler
                 int httpPort = _config.GetLocalPort("speedtest");
 
                 WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
-                var ws = downloadHandle2.DownloadFileAsync(url, webProxy, timeout - 2);
+                var ws = downloadHandle2.DownloadDataAsync(url, webProxy, timeout - 2);
 
                 Thread.Sleep(1000 * timeout);
 
                 ws.CancelAsync();
+                ws.Dispose();
 
                 Thread.Sleep(1000 * 2);
             }

v2rayN/v2rayN/Mode/RoutingItem.cs

@@ -27,6 +27,9 @@ namespace v2rayN.Mode
         {
             get; set;
         }
-
+        public string customIcon
+        {
+            get; set;
+        }
     }
 }

v2rayN/v2rayN/Properties/AssemblyInfo.cs

@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("4.22")]
+[assembly: AssemblyFileVersion("4.25")]

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -330,6 +330,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Custom Icon 的本地化字符串。
+        /// </summary>
+        internal static string LvCustomIcon {
+            get {
+                return ResourceManager.GetString("LvCustomIcon", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Security 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -394,4 +394,7 @@
   <data name="MsgInformationTitle" xml:space="preserve">
     <value>Informations (Filter : {0})</value>
   </data>
+  <data name="LvCustomIcon" xml:space="preserve">
+    <value>Custom Icon</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx

@@ -394,4 +394,7 @@
   <data name="MsgInformationTitle" xml:space="preserve">
     <value>信息 (过滤器 : {0})</value>
   </data>
+  <data name="LvCustomIcon" xml:space="preserve">
+    <value>自定义图标</value>
+  </data>
 </root>

v2rayN/v2rayN/Tool/Utils.cs

@@ -47,8 +47,9 @@ namespace v2rayN
                     result = reader.ReadToEnd();
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -69,8 +70,9 @@ namespace v2rayN
                     result = reader.ReadToEnd();
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -108,8 +110,9 @@ namespace v2rayN
                                            Formatting.Indented,
                                            new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -141,8 +144,9 @@ namespace v2rayN
                 }
                 result = 0;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 result = -1;
             }
             return result;
@@ -155,8 +159,10 @@ namespace v2rayN
                 JObject obj = JObject.Parse(strJson);
                 return obj;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
+
                 return null;
             }
         }
@@ -182,8 +188,9 @@ namespace v2rayN
                     return string.Join(",", lst.ToArray());
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -199,8 +206,9 @@ namespace v2rayN
                 str = str.Replace(Environment.NewLine, "");
                 return new List<string>(str.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return new List<string>();
             }
         }
@@ -265,8 +273,9 @@ namespace v2rayN
             {
                 return Convert.ToInt32(obj);
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return 0;
             }
         }
@@ -277,8 +286,9 @@ namespace v2rayN
             {
                 return (obj == null ? string.Empty : obj.ToString());
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -338,37 +348,7 @@ namespace v2rayN
             return $"{string.Format("{0:f1}", result)} {unit}";
         }
 
-        public static void DedupServerList(List<Mode.VmessItem> source, out List<Mode.VmessItem> result, bool keepOlder)
-        {
-            List<Mode.VmessItem> list = new List<Mode.VmessItem>();
-            if (!keepOlder) source.Reverse(); // Remove the early items first
-
-            bool _isAdded(Mode.VmessItem o, Mode.VmessItem n)
-            {
-                return o.configVersion == n.configVersion &&
-                    o.configType == n.configType &&
-                    o.address == n.address &&
-                    o.port == n.port &&
-                    o.id == n.id &&
-                    o.alterId == n.alterId &&
-                    o.security == n.security &&
-                    o.network == n.network &&
-                    o.headerType == n.headerType &&
-                    o.requestHost == n.requestHost &&
-                    o.path == n.path &&
-                    o.streamSecurity == n.streamSecurity;
-                // skip (will remove) different remarks
-            }
-            foreach (Mode.VmessItem item in source)
-            {
-                if (!list.Exists(i => _isAdded(i, item)))
-                {
-                    list.Add(item);
-                }
-            }
-            if (!keepOlder) list.Reverse();
-            result = list;
-        }
+        
 
         public static string UrlEncode(string url)
         {
@@ -395,8 +375,9 @@ namespace v2rayN
                 int var1 = ToInt(oText);
                 return true;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -538,8 +519,9 @@ namespace v2rayN
                 string exePath = GetExePath();
                 RegWriteValue(autoRunRegPath, autoRunName, run ? $"\"{exePath}\"" : "");
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
         }
 
@@ -558,8 +540,9 @@ namespace v2rayN
                     return true;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return false;
         }
@@ -608,8 +591,9 @@ namespace v2rayN
                     return value;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             finally
             {
@@ -633,8 +617,9 @@ namespace v2rayN
                     regKey?.SetValue(name, value);
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             finally
             {
@@ -674,8 +659,9 @@ namespace v2rayN
                     }
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return -1;
             }
             return roundtripTime;
@@ -697,8 +683,9 @@ namespace v2rayN
                         lstIPAddress.Add(ipa.ToString());
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return lstIPAddress;
         }
@@ -729,8 +716,9 @@ namespace v2rayN
                         FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
                         File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -773,8 +761,9 @@ namespace v2rayN
                 }
                 return strData;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return strData;
         }
@@ -804,8 +793,9 @@ namespace v2rayN
             {
                 return Guid.NewGuid().ToString("D");
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return string.Empty;
         }
@@ -823,8 +813,9 @@ namespace v2rayN
                 //WindowsBuiltInRole可以枚举出很多权限，例如系统用户、User、Guest等等
                 return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -963,7 +954,10 @@ namespace v2rayN
                     }
                 }
             }
-            catch { }
+            catch (Exception ex)
+            {
+                SaveLog(ex.Message, ex);
+            }
             return string.Empty;
         }