From c2af982272e65a1f2cd9fef22d143586b29351dc Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 15 Mar 2022 20:32:14 +0800
Subject: [PATCH] add all servers group

---
 v2rayN/v2rayN/Forms/MainForm.cs       | 25 +++++++++++++------------
 v2rayN/v2rayN/Resx/ResUI.Designer.cs  |  9 +++++++++
 v2rayN/v2rayN/Resx/ResUI.resx         |  3 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx |  3 +++
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 85f43a9a..7a1fa555 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -201,7 +201,10 @@ namespace v2rayN.Forms
         /// </summary>
         private void RefreshServers()
         {
-            lstVmess = config.vmess.Where(it => it.groupId == groupId).OrderBy(it => it.sort).ToList();
+            lstVmess = config.vmess
+                .Where(it => Utils.IsNullOrEmpty(groupId) ? true : it.groupId == groupId)
+                .OrderBy(it => it.sort)
+                .ToList();
 
             ConfigHandler.SetDefaultServer(config, lstVmess);
             RefreshServersView();
@@ -469,6 +472,11 @@ namespace v2rayN.Forms
         {
             tabGroup.TabPages.Clear();
 
+            string title = $"  {UIRes.I18N("AllGroupServers")}   ";
+            var tabPage = new TabPage(title);
+            tabPage.Name = "";
+            tabGroup.TabPages.Add(tabPage);
+
             foreach (var item in config.groupItem)
             {
                 var tabPage2 = new TabPage($"   {item.remarks}   ");
@@ -476,12 +484,7 @@ namespace v2rayN.Forms
                 tabGroup.TabPages.Add(tabPage2);
             }
 
-            string title = $"  {UIRes.I18N("UngroupedServers")}   ";
-            var tabPage = new TabPage(title);
-            tabPage.Name = "Ungrouped";
-            tabGroup.TabPages.Add(tabPage);
-
-            tabGroup.SelectedIndex = tabGroup.TabPages.Count - 1;
+            tabGroup.SelectedIndex = 0;
         }
 
         private void tabGroup_SelectedIndexChanged(object sender, EventArgs e)
@@ -491,11 +494,9 @@ namespace v2rayN.Forms
                 return;
             }
             groupId = string.Empty;
-            if (tabGroup.SelectedIndex < config.groupItem.Count)
-            {
-                groupId = config.groupItem[tabGroup.SelectedIndex].id;
-            }
-
+            //groupId = tabGroup.TabPages[tabGroup.SelectedIndex].Name;
+            groupId = tabGroup.SelectedTab.Name;
+            
             RefreshServers();
         }
         #endregion
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index cdb60dff..d2eaae06 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -69,6 +69,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 All servers 的本地化字符串。
+        /// </summary>
+        internal static string AllGroupServers {
+            get {
+                return ResourceManager.GetString("AllGroupServers", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Batch export subscription to clipboard successfully 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 81897dae..563b7092 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -448,4 +448,7 @@
   <data name="UngroupedServers" xml:space="preserve">
     <value>Ungrouped</value>
   </data>
+  <data name="AllGroupServers" xml:space="preserve">
+    <value>All servers</value>
+  </data>
 </root>
\ 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 e0fc1b08..fe9c7606 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -448,4 +448,7 @@
   <data name="UngroupedServers" xml:space="preserve">
     <value>未分组服务器</value>
   </data>
+  <data name="AllGroupServers" xml:space="preserve">
+    <value>所有服务器</value>
+  </data>
 </root>
\ No newline at end of file