From cb001afb0285bcdabc713c3ef55a4d3e708ea483 Mon Sep 17 00:00:00 2001 From: DHR60 Date: Sat, 28 Feb 2026 16:26:39 +0800 Subject: [PATCH] Relax group type restrictions --- .../v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs | 9 +-------- v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs | 4 ++-- v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs | 9 +-------- v2rayN/v2rayN/Views/SubEditWindow.xaml.cs | 4 ++-- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs index 142f9d6b..2f24b197 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs @@ -147,14 +147,7 @@ public partial class AddGroupServerWindow : WindowBase private async void MenuAddChild_Click(object? sender, RoutedEventArgs e) { var selectWindow = new ProfilesSelectWindow(); - if (ViewModel?.SelectedSource?.ConfigType == EConfigType.PolicyGroup) - { - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true); - } - else - { - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom, EConfigType.PolicyGroup, EConfigType.ProxyChain }, exclude: true); - } + selectWindow.SetConfigTypeFilter([EConfigType.Custom], exclude: true); selectWindow.AllowMultiSelect(true); var result = await selectWindow.ShowDialog(this); if (result == true) diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs index 9d749ba8..2d7358d0 100644 --- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs @@ -59,7 +59,7 @@ public partial class SubEditWindow : WindowBase private async void BtnSelectPrevProfile_Click(object? sender, RoutedEventArgs e) { var selectWindow = new ProfilesSelectWindow(); - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom, EConfigType.PolicyGroup, EConfigType.ProxyChain }, exclude: true); + selectWindow.SetConfigTypeFilter([EConfigType.Custom], exclude: true); var result = await selectWindow.ShowDialog(this); if (result == true) { @@ -74,7 +74,7 @@ public partial class SubEditWindow : WindowBase private async void BtnSelectNextProfile_Click(object? sender, RoutedEventArgs e) { var selectWindow = new ProfilesSelectWindow(); - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom, EConfigType.PolicyGroup, EConfigType.ProxyChain }, exclude: true); + selectWindow.SetConfigTypeFilter([EConfigType.Custom], exclude: true); var result = await selectWindow.ShowDialog(this); if (result == true) { diff --git a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs index 4b1642d2..9c98fb06 100644 --- a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs @@ -127,14 +127,7 @@ public partial class AddGroupServerWindow private async void MenuAddChild_Click(object sender, RoutedEventArgs e) { var selectWindow = new ProfilesSelectWindow(); - if (ViewModel?.SelectedSource?.ConfigType == EConfigType.PolicyGroup) - { - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true); - } - else - { - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom, EConfigType.PolicyGroup, EConfigType.ProxyChain }, exclude: true); - } + selectWindow.SetConfigTypeFilter([EConfigType.Custom], exclude: true); selectWindow.AllowMultiSelect(true); if (selectWindow.ShowDialog() == true) { diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs index d1451a9c..6323034a 100644 --- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs @@ -53,7 +53,7 @@ public partial class SubEditWindow private async void BtnSelectPrevProfile_Click(object sender, RoutedEventArgs e) { var selectWindow = new ProfilesSelectWindow(); - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom, EConfigType.PolicyGroup, EConfigType.ProxyChain }, exclude: true); + selectWindow.SetConfigTypeFilter([EConfigType.Custom], exclude: true); if (selectWindow.ShowDialog() == true) { var profile = await selectWindow.ProfileItem; @@ -67,7 +67,7 @@ public partial class SubEditWindow private async void BtnSelectNextProfile_Click(object sender, RoutedEventArgs e) { var selectWindow = new ProfilesSelectWindow(); - selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom, EConfigType.PolicyGroup, EConfigType.ProxyChain }, exclude: true); + selectWindow.SetConfigTypeFilter([EConfigType.Custom], exclude: true); if (selectWindow.ShowDialog() == true) { var profile = await selectWindow.ProfileItem;