Routing rule display

Routing rule add custom icon
Update AssemblyInfo.cs
2021-12-02 19:39:02 +08:00 · 2021-12-02 18:04:22 +08:00 · 2021-12-02 16:48:15 +08:00 · 2021-12-02 16:47:35 +08:00 · 2021-12-02 16:05:54 +08:00
16 changed files with 857 additions and 674 deletions
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/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;
    }
 }

--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -352,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);
        }
@@ -587,13 +587,9 @@ namespace v2rayN.Forms

        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));
@@ -1393,6 +1389,7 @@ namespace v2rayN.Forms
            menuRoutings.Visible = config.enableRoutingAdvanced;
            if (!config.enableRoutingAdvanced)
            {
+                toolSslRoutingRule.Text = string.Empty;
                return;
            }

@@ -1415,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);
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/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>
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.Designer.cs
+++ b/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;
    }
 }
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
+++ b/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
-
-
+               
    }
 }
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.resx
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.zh-Hans.resx
+++ b/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>
--- a/v2rayN/v2rayN/Forms/RoutingSettingForm.cs
+++ b/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);
            }
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -987,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
--- a/v2rayN/v2rayN/Handler/MainFormHandler.cs
+++ b/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());

--- a/v2rayN/v2rayN/Mode/RoutingItem.cs
+++ b/v2rayN/v2rayN/Mode/RoutingItem.cs
@@ -27,6 +27,9 @@ namespace v2rayN.Mode
        {
            get; set;
        }
-
+        public string customIcon
+        {
+            get; set;
+        }
    }
 }
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/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.24")]
+[assembly: AssemblyFileVersion("4.25")]
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/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>
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/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>
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/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>
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -348,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)
        {
Author	SHA1	Message	Date
2dust	4fc0738dad	Routing rule display	2021-12-02 19:39:02 +08:00
2dust	fe29771870	Routing rule add custom icon	2021-12-02 18:04:22 +08:00
2dust	19be43d2d9	Update AssemblyInfo.cs	2021-12-02 16:48:15 +08:00
2dust	cb01809093	Optimize Duplicate Server	2021-12-02 16:47:35 +08:00
2dust	1138d660b2	Routing rule add custom icon	2021-12-02 16:05:54 +08:00