Adjusting the tray server display

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -94,7 +94,6 @@
             this.menuKeepNothing = new System.Windows.Forms.ToolStripMenuItem();
             this.menuRoutings = new System.Windows.Forms.ToolStripMenuItem();
             this.menuServers = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuServers2 = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
             this.menuAddServers2 = new System.Windows.Forms.ToolStripMenuItem();
             this.menuScanScreen2 = new System.Windows.Forms.ToolStripMenuItem();
@@ -585,7 +584,6 @@
             this.menuSysAgentMode,
             this.menuRoutings,
             this.menuServers,
-            this.menuServers2,
             this.toolStripSeparator13,
             this.menuAddServers2,
             this.menuScanScreen2,
@@ -635,14 +633,6 @@
             this.menuServers.Name = "menuServers";
             resources.ApplyResources(this.menuServers, "menuServers");
             // 
-            // menuServers2
-            // 
-            this.menuServers2.BackColor = System.Drawing.SystemColors.Window;
-            this.menuServers2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.menuServers2.DropDownWidth = 500;
-            resources.ApplyResources(this.menuServers2, "menuServers2");
-            this.menuServers2.Name = "menuServers2";
-            // 
             // toolStripSeparator13
             // 
             this.toolStripSeparator13.Name = "toolStripSeparator13";
@@ -1069,7 +1059,6 @@
         private System.Windows.Forms.ToolStripStatusLabel toolSslInboundInfo;
         private System.Windows.Forms.ToolStripStatusLabel toolSslRoutingRule;
         private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
-        private System.Windows.Forms.ToolStripComboBox menuServers2;
         private System.Windows.Forms.ToolStripMenuItem tsbSubUpdateViaProxy;
         private System.Windows.Forms.ToolStripMenuItem menuUpdateSubViaProxy;
         private System.Windows.Forms.ToolStripMenuItem menuMsgBoxClear;

v2rayN/v2rayN/Forms/MainForm.cs

@@ -347,56 +347,32 @@ namespace v2rayN.Forms
         private void RefreshServersMenu()
         {
             menuServers.DropDownItems.Clear();
-            menuServers2.SelectedIndexChanged -= MenuServers2_SelectedIndexChanged;
-            menuServers2.Items.Clear();
-            menuServers.Visible = false;
-            menuServers2.Visible = false;
 
-            if (lstVmess.Count > 20)
+            if (lstVmess.Count > 30)
             {
-                for (int k = 0; k < lstVmess.Count; k++)
+                menuServers.DropDownItems.Add(new ToolStripMenuItem(ResUI.TooManyServersTip));
-                {
+                return;
-                    VmessItem item = lstVmess[k];
-                    string name = item.GetSummary();
-
-                    if (config.IsActiveNode(item))
-                    {
-                        name = $"√ {name}";
-                    }
-                    menuServers2.Items.Add(name);
-
-                }
-                menuServers2.SelectedIndex = lstVmess.FindIndex(it => it.indexId == config.indexId);
-                menuServers2.SelectedIndexChanged += MenuServers2_SelectedIndexChanged;
-                menuServers2.Visible = true;
             }
-            else
+
+            List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
+            for (int k = 0; k < lstVmess.Count; k++)
             {
-                List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
+                VmessItem item = lstVmess[k];
-                for (int k = 0; k < lstVmess.Count; k++)
+                string name = item.GetSummary();
+
+                ToolStripMenuItem ts = new ToolStripMenuItem(name)
                 {
-                    VmessItem item = lstVmess[k];
+                    Tag = k
-                    string name = item.GetSummary();
+                };
-
+                if (config.IsActiveNode(item))
-                    ToolStripMenuItem ts = new ToolStripMenuItem(name)
+                {
-                    {
+                    ts.Checked = true;
-                        Tag = k
-                    };
-                    if (config.IsActiveNode(item))
-                    {
-                        ts.Checked = true;
-                    }
-                    ts.Click += new EventHandler(ts_Click);
-                    lst.Add(ts);
                 }
-                menuServers.DropDownItems.AddRange(lst.ToArray());
+                ts.Click += new EventHandler(ts_Click);
-                menuServers.Visible = true;
+                lst.Add(ts);
             }
-        }
+            menuServers.DropDownItems.AddRange(lst.ToArray());
-
+            menuServers.Visible = true;
-        private void MenuServers2_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetDefaultServer(((ToolStripComboBox)sender).SelectedIndex);
         }
 
         private void ts_Click(object sender, EventArgs e)

v2rayN/v2rayN/Forms/MainForm.resx

@@ -767,18 +767,6 @@
   <data name="menuServers.Text" xml:space="preserve">
     <value>Server</value>
   </data>
-  <data name="menuServers2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
-    <value>Standard</value>
-  </data>
-  <data name="menuServers2.MaxDropDownItems" type="System.Int32, mscorlib">
-    <value>50</value>
-  </data>
-  <data name="menuServers2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 25</value>
-  </data>
-  <data name="menuServers2.ToolTipText" xml:space="preserve">
-    <value>Server</value>
-  </data>
   <data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
     <value>274, 6</value>
   </data>
@@ -816,7 +804,7 @@
     <value>Exit</value>
   </data>
   <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 221</value>
+    <value>278, 192</value>
   </data>
   <data name="&gt;&gt;cmsMain.Name" xml:space="preserve">
     <value>cmsMain</value>
@@ -1433,12 +1421,6 @@
   <data name="&gt;&gt;menuServers.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;menuServers2.Name" xml:space="preserve">
-    <value>menuServers2</value>
-  </data>
-  <data name="&gt;&gt;menuServers2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;toolStripSeparator13.Name" xml:space="preserve">
     <value>toolStripSeparator13</value>
   </data>

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -961,6 +961,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Too many servers, please open the main interface 的本地化字符串。
+        /// </summary>
+        internal static string TooManyServersTip {
+            get {
+                return ResourceManager.GetString("TooManyServersTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 *tcp camouflage type 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -460,4 +460,7 @@
   <data name="Speedtesting" xml:space="preserve">
     <value>Speed Test...</value>
   </data>
+  <data name="TooManyServersTip" xml:space="preserve">
+    <value>Too many servers, please open the main interface</value>
+  </data>
 </root>

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

@@ -460,4 +460,7 @@
   <data name="Speedtesting" xml:space="preserve">
     <value>测速中...</value>
   </data>
+  <data name="TooManyServersTip" xml:space="preserve">
+    <value>服务器太多，请打开主界面操作</value>
+  </data>
 </root>