From 2ab79afa02b2e0d0c6f131ad0ceba93229c52de0 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Thu, 11 Sep 2025 13:49:10 +0800
Subject: [PATCH] Adjust UI

---
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      |   9 ++
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |   3 +
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |   3 +
 v2rayN/ServiceLib/Resx/ResUI.resx             |   3 +
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |   3 +
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |   3 +
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |   3 +
 .../Views/AddGroupServerWindow.axaml          |  99 ++++++------
 v2rayN/v2rayN/Views/AddGroupServerWindow.xaml | 152 +++++++++---------
 9 files changed, 152 insertions(+), 126 deletions(-)

diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 2c3a9fee..ed9ff30e 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -1563,6 +1563,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Server List 的本地化字符串。
+        /// </summary>
+        public static string menuServerList {
+            get {
+                return ResourceManager.GetString("menuServerList", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Configurations 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index afd80366..298c6985 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1551,4 +1551,7 @@
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>Remove Child Configuration</value>
   </data>
+  <data name="menuServerList" xml:space="preserve">
+    <value>Server List</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index a3c8117d..2cf7079f 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1551,4 +1551,7 @@
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>Remove Child Configuration</value>
   </data>
+  <data name="menuServerList" xml:space="preserve">
+    <value>Server List</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index dc8bb099..1797529a 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1551,4 +1551,7 @@
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>Remove Child Configuration</value>
   </data>
+  <data name="menuServerList" xml:space="preserve">
+    <value>Server List</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 1ab61fe4..e8e49b1c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1551,4 +1551,7 @@
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>Remove Child Configuration</value>
   </data>
+  <data name="menuServerList" xml:space="preserve">
+    <value>Server List</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index a60e4491..b5e33956 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1548,4 +1548,7 @@
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>删除子配置文件</value>
   </data>
+  <data name="menuServerList" xml:space="preserve">
+    <value>服务器列表</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 6e29a259..bf538e1a 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1548,4 +1548,7 @@
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>Remove Child Configuration</value>
   </data>
+  <data name="menuServerList" xml:space="preserve">
+    <value>Server List</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
index 836db47f..e24fa67c 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
@@ -33,64 +33,65 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-            <Grid RowDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+        <Grid DockPanel.Dock="Top" RowDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+
+            <Grid
+                Grid.Row="0"
+                ColumnDefinitions="180,Auto,Auto"
+                RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    Text="{x:Static resx:ResUI.menuServers}" />
+
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbRemarks}" />
+                <TextBox
+                    x:Name="txtRemarks"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Width="400"
+                    Margin="{StaticResource Margin4}" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbCoreType}" />
+                <ComboBox
+                    x:Name="cmbCoreType"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Width="200"
+                    Margin="{StaticResource Margin4}" />
 
                 <Grid
-                    Grid.Row="0"
-                    ColumnDefinitions="180,Auto,Auto"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+                    x:Name="gridPolicyGroup"
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3"
+                    ColumnDefinitions="180,Auto,Auto">
                     <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        Text="{x:Static resx:ResUI.menuServers}" />
-
-                    <TextBlock
-                        Grid.Row="1"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbRemarks}" />
-                    <TextBox
-                        x:Name="txtRemarks"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Width="400"
-                        Margin="{StaticResource Margin4}" />
-
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbCoreType}" />
+                        Text="{x:Static resx:ResUI.TbPolicyGroupType}" />
                     <ComboBox
-                        x:Name="cmbCoreType"
-                        Grid.Row="2"
+                        x:Name="cmbPolicyGroupType"
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}" />
-
-                    <Grid
-                        x:Name="gridPolicyGroup"
-                        Grid.Row="3"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="3"
-                        ColumnDefinitions="180,Auto,Auto">
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbPolicyGroupType}" />
-                        <ComboBox
-                            x:Name="cmbPolicyGroupType"
-                            Grid.Column="1"
-                            Width="200"
-                            Margin="{StaticResource Margin4}" />
-                    </Grid>
                 </Grid>
-
+            </Grid>
+        </Grid>
+        <TabControl>
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
                 <DataGrid
                     x:Name="lstChild"
                     Grid.Row="1"
@@ -144,7 +145,7 @@
                             Header="{x:Static resx:ResUI.LvTLS}" />
                     </DataGrid.Columns>
                 </DataGrid>
-            </Grid>
-        </ScrollViewer>
+            </TabItem>
+        </TabControl>
     </DockPanel>
 </Window>
diff --git a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
index 41428b3b..56fb7211 100644
--- a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
@@ -13,6 +13,7 @@
     Width="900"
     Height="700"
     x:TypeArguments="vms:AddGroupServerViewModel"
+    ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
     WindowStartupLocation="CenterScreen"
@@ -38,107 +39,104 @@
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
-        <ScrollViewer
-            materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
-            HorizontalScrollBarVisibility="Auto"
-            VerticalScrollBarVisibility="Auto">
-            <Grid>
+        <Grid DockPanel.Dock="Top">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="180" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
-                <Grid Grid.Row="0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    Style="{StaticResource ModuleTitle}"
+                    Text="{x:Static resx:ResUI.menuServers}" />
+
+
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbRemarks}" />
+                <TextBox
+                    x:Name="txtRemarks"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Width="400"
+                    Margin="{StaticResource Margin4}"
+                    Style="{StaticResource DefTextBox}" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbCoreType}" />
+                <ComboBox
+                    x:Name="cmbCoreType"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Width="200"
+                    Margin="{StaticResource Margin4}"
+                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbCoreType}"
+                    Style="{StaticResource DefComboBox}" />
+
+                <Grid
+                    x:Name="gridPolicyGroup"
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="3">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-
                     <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        Style="{StaticResource ModuleTitle}"
-                        Text="{x:Static resx:ResUI.menuServers}" />
-
-
-                    <TextBlock
-                        Grid.Row="1"
+                        Grid.Row="3"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbRemarks}" />
-                    <TextBox
-                        x:Name="txtRemarks"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Width="400"
-                        Margin="{StaticResource Margin4}"
-                        Style="{StaticResource DefTextBox}" />
-
-                    <TextBlock
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbCoreType}" />
+                        Text="{x:Static resx:ResUI.TbPolicyGroupType}" />
                     <ComboBox
-                        x:Name="cmbCoreType"
-                        Grid.Row="2"
+                        x:Name="cmbPolicyGroupType"
+                        Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}"
-                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbCoreType}"
+                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbPolicyGroupType}"
                         Style="{StaticResource DefComboBox}" />
-
-                    <Grid
-                        x:Name="gridPolicyGroup"
-                        Grid.Row="3"
-                        Grid.Column="0"
-                        Grid.ColumnSpan="3">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="180" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Center"
-                            Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbPolicyGroupType}" />
-                        <ComboBox
-                            x:Name="cmbPolicyGroupType"
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            Width="200"
-                            Margin="{StaticResource Margin4}"
-                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbPolicyGroupType}"
-                            Style="{StaticResource DefComboBox}" />
-                    </Grid>
                 </Grid>
-
+            </Grid>
+        </Grid>
+        <TabControl>
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
                 <DataGrid
                     x:Name="lstChild"
-                    Grid.Row="1"
                     AutoGenerateColumns="False"
                     BorderThickness="1"
                     CanUserAddRows="False"
@@ -210,7 +208,7 @@
                             Header="{x:Static resx:ResUI.LvTLS}" />
                     </DataGrid.Columns>
                 </DataGrid>
-            </Grid>
-        </ScrollViewer>
+            </TabItem>
+        </TabControl>
     </DockPanel>
 </base:WindowBase>