add all servers group

pull/2148/head
2dust 2022-03-15 20:32:14 +08:00
parent 1f0a77bde2
commit c2af982272
4 changed files with 28 additions and 12 deletions

View File

@ -201,7 +201,10 @@ namespace v2rayN.Forms
/// </summary> /// </summary>
private void RefreshServers() 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); ConfigHandler.SetDefaultServer(config, lstVmess);
RefreshServersView(); RefreshServersView();
@ -469,6 +472,11 @@ namespace v2rayN.Forms
{ {
tabGroup.TabPages.Clear(); 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) foreach (var item in config.groupItem)
{ {
var tabPage2 = new TabPage($" {item.remarks} "); var tabPage2 = new TabPage($" {item.remarks} ");
@ -476,12 +484,7 @@ namespace v2rayN.Forms
tabGroup.TabPages.Add(tabPage2); tabGroup.TabPages.Add(tabPage2);
} }
string title = $" {UIRes.I18N("UngroupedServers")} "; tabGroup.SelectedIndex = 0;
var tabPage = new TabPage(title);
tabPage.Name = "Ungrouped";
tabGroup.TabPages.Add(tabPage);
tabGroup.SelectedIndex = tabGroup.TabPages.Count - 1;
} }
private void tabGroup_SelectedIndexChanged(object sender, EventArgs e) private void tabGroup_SelectedIndexChanged(object sender, EventArgs e)
@ -491,10 +494,8 @@ namespace v2rayN.Forms
return; return;
} }
groupId = string.Empty; groupId = string.Empty;
if (tabGroup.SelectedIndex < config.groupItem.Count) //groupId = tabGroup.TabPages[tabGroup.SelectedIndex].Name;
{ groupId = tabGroup.SelectedTab.Name;
groupId = config.groupItem[tabGroup.SelectedIndex].id;
}
RefreshServers(); RefreshServers();
} }

View File

@ -69,6 +69,15 @@ namespace v2rayN.Resx {
} }
} }
/// <summary>
/// 查找类似 All servers 的本地化字符串。
/// </summary>
internal static string AllGroupServers {
get {
return ResourceManager.GetString("AllGroupServers", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Batch export subscription to clipboard successfully 的本地化字符串。 /// 查找类似 Batch export subscription to clipboard successfully 的本地化字符串。
/// </summary> /// </summary>

View File

@ -448,4 +448,7 @@
<data name="UngroupedServers" xml:space="preserve"> <data name="UngroupedServers" xml:space="preserve">
<value>Ungrouped</value> <value>Ungrouped</value>
</data> </data>
<data name="AllGroupServers" xml:space="preserve">
<value>All servers</value>
</data>
</root> </root>

View File

@ -448,4 +448,7 @@
<data name="UngroupedServers" xml:space="preserve"> <data name="UngroupedServers" xml:space="preserve">
<value>未分组服务器</value> <value>未分组服务器</value>
</data> </data>
<data name="AllGroupServers" xml:space="preserve">
<value>所有服务器</value>
</data>
</root> </root>