From d7dc0dff507dfae720ae1665af40acf3640c02b7 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Tue, 12 Apr 2022 14:49:57 +0800 Subject: [PATCH] Adjusting the tray server display --- v2rayN/v2rayN/Forms/MainForm.Designer.cs | 11 ----- v2rayN/v2rayN/Forms/MainForm.cs | 62 ++++++++---------------- v2rayN/v2rayN/Forms/MainForm.resx | 20 +------- v2rayN/v2rayN/Resx/ResUI.Designer.cs | 9 ++++ v2rayN/v2rayN/Resx/ResUI.resx | 3 ++ v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx | 3 ++ 6 files changed, 35 insertions(+), 73 deletions(-) diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index 846d1ea9..dec8f338 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/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; diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index c62c5956..7be1edfb 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/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++) - { - 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; + menuServers.DropDownItems.Add(new ToolStripMenuItem(ResUI.TooManyServersTip)); + return; } - else + + List lst = new List(); + for (int k = 0; k < lstVmess.Count; k++) { - List lst = new List(); - for (int k = 0; k < lstVmess.Count; k++) + VmessItem item = lstVmess[k]; + string name = item.GetSummary(); + + ToolStripMenuItem ts = new ToolStripMenuItem(name) { - VmessItem item = lstVmess[k]; - string name = item.GetSummary(); - - ToolStripMenuItem ts = new ToolStripMenuItem(name) - { - Tag = k - }; - if (config.IsActiveNode(item)) - { - ts.Checked = true; - } - ts.Click += new EventHandler(ts_Click); - lst.Add(ts); + Tag = k + }; + if (config.IsActiveNode(item)) + { + ts.Checked = true; } - menuServers.DropDownItems.AddRange(lst.ToArray()); - menuServers.Visible = true; + ts.Click += new EventHandler(ts_Click); + lst.Add(ts); } - } - - private void MenuServers2_SelectedIndexChanged(object sender, EventArgs e) - { - SetDefaultServer(((ToolStripComboBox)sender).SelectedIndex); + menuServers.DropDownItems.AddRange(lst.ToArray()); + menuServers.Visible = true; } private void ts_Click(object sender, EventArgs e) diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index d952d26b..4e86cc37 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -767,18 +767,6 @@ Server - - Standard - - - 50 - - - 200, 25 - - - Server - 274, 6 @@ -816,7 +804,7 @@ Exit - 278, 221 + 278, 192 cmsMain @@ -1433,12 +1421,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuServers2 - - - System.Windows.Forms.ToolStripComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - toolStripSeparator13 diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index f3fcaace..f437c794 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -961,6 +961,15 @@ namespace v2rayN.Resx { } } + /// + /// 查找类似 Too many servers, please open the main interface 的本地化字符串。 + /// + internal static string TooManyServersTip { + get { + return ResourceManager.GetString("TooManyServersTip", resourceCulture); + } + } + /// /// 查找类似 *tcp camouflage type 的本地化字符串。 /// diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 9a4c256f..26122beb 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -460,4 +460,7 @@ Speed Test... + + Too many servers, please open the main interface + \ No newline at end of file diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index 38e342e9..aa5b8dd2 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -460,4 +460,7 @@ 测速中... + + 服务器太多，请打开主界面操作 + \ No newline at end of file