Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-11-05 06:52:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update UI and localization for policy group

Browse source
This commit is contained in:
2dust 2025-11-02 16:24:57 +08:00
parent ab6a6b879e
commit 11c203ad19
9 changed files with 149 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
v2rayN/ServiceLib/Resx/ResUI.Designer.cs generated
View file

@ -19,7 +19,7 @@ namespace ServiceLib.Resx {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class ResUI { public class ResUI {
@ -1663,7 +1663,7 @@ namespace ServiceLib.Resx {
} }
/// <summary> /// <summary>
/// 查找类似 Server List 的本地化字符串。 /// 查找类似 Configuration List 的本地化字符串。
/// </summary> /// </summary>
public static string menuServerList { public static string menuServerList {
get { get {

2
v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
View file

@ -1537,7 +1537,7 @@
<value>Remove Child Configuration</value> <value>Remove Child Configuration</value>
</data> </data>
<data name="menuServerList" xml:space="preserve"> <data name="menuServerList" xml:space="preserve">
<value>Server List</value> <value>Configuration List</value>
</data> </data>
<data name="TbFallback" xml:space="preserve"> <data name="TbFallback" xml:space="preserve">
<value>Fallback</value> <value>Fallback</value>

2
v2rayN/ServiceLib/Resx/ResUI.hu.resx
View file

@ -1537,7 +1537,7 @@
<value>Remove Child Configuration</value> <value>Remove Child Configuration</value>
</data> </data>
<data name="menuServerList" xml:space="preserve"> <data name="menuServerList" xml:space="preserve">
<value>Server List</value> <value>Configuration List</value>
</data> </data>
<data name="TbFallback" xml:space="preserve"> <data name="TbFallback" xml:space="preserve">
<value>Fallback</value> <value>Fallback</value>

2
v2rayN/ServiceLib/Resx/ResUI.resx
View file

@ -1537,7 +1537,7 @@
<value>Remove Child Configuration</value> <value>Remove Child Configuration</value>
</data> </data>
<data name="menuServerList" xml:space="preserve"> <data name="menuServerList" xml:space="preserve">
<value>Server List</value> <value>Configuration List</value>
</data> </data>
<data name="TbFallback" xml:space="preserve"> <data name="TbFallback" xml:space="preserve">
<value>Fallback</value> <value>Fallback</value>

2
v2rayN/ServiceLib/Resx/ResUI.ru.resx
View file

@ -1537,7 +1537,7 @@
<value>Remove Child Configuration</value> <value>Remove Child Configuration</value>
</data> </data>
<data name="menuServerList" xml:space="preserve"> <data name="menuServerList" xml:space="preserve">
<value>Server List</value> <value>Configuration List</value>
</data> </data>
<data name="TbFallback" xml:space="preserve"> <data name="TbFallback" xml:space="preserve">
<value>Fallback</value> <value>Fallback</value>

6
v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
View file

@ -1528,13 +1528,13 @@
<value>添加链式代理</value> <value>添加链式代理</value>
</data> </data>
<data name="menuAddChildServer" xml:space="preserve"> <data name="menuAddChildServer" xml:space="preserve">
<value>添加子项</value> <value>添加子配置</value>
</data> </data>
<data name="menuRemoveChildServer" xml:space="preserve"> <data name="menuRemoveChildServer" xml:space="preserve">
<value>删除子项</value> <value>删除子配置</value>
</data> </data>
<data name="menuServerList" xml:space="preserve"> <data name="menuServerList" xml:space="preserve">
<value>子项列表</value> <value>子配置项</value>
</data> </data>
<data name="TbFallback" xml:space="preserve"> <data name="TbFallback" xml:space="preserve">
<value>故障转移</value> <value>故障转移</value>

6
v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
View file

@ -1528,13 +1528,13 @@
<value>添加鏈式代理</value> <value>添加鏈式代理</value>
</data> </data>
<data name="menuAddChildServer" xml:space="preserve"> <data name="menuAddChildServer" xml:space="preserve">
<value>添加子項</value> <value>添加子配置</value>
</data> </data>
<data name="menuRemoveChildServer" xml:space="preserve"> <data name="menuRemoveChildServer" xml:space="preserve">
<value>刪除子項</value> <value>刪除子配置</value>
</data> </data>
<data name="menuServerList" xml:space="preserve"> <data name="menuServerList" xml:space="preserve">
<value>子項清單</value> <value>子配置項</value>
</data> </data>
<data name="TbFallback" xml:space="preserve"> <data name="TbFallback" xml:space="preserve">
<value>容錯移轉</value> <value>容錯移轉</value>

27
v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
View file

@ -33,12 +33,11 @@
IsCancel="True" /> IsCancel="True" />
</StackPanel> </StackPanel>
<Grid DockPanel.Dock="Top" RowDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
<Grid <Grid
Grid.Row="0" Grid.Row="0"
ColumnDefinitions="180,Auto,Auto" ColumnDefinitions="180,Auto,Auto"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"> DockPanel.Dock="Top"
RowDefinitions="Auto,Auto,Auto,Auto">
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
@ -88,42 +87,52 @@
Width="200" Width="200"
Margin="{StaticResource Margin4}" /> Margin="{StaticResource Margin4}" />
</Grid> </Grid>
</Grid>
<TabControl DockPanel.Dock="Top">
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
<Grid
Margin="{StaticResource Margin8}"
ColumnDefinitions="180,Auto,Auto"
RowDefinitions="Auto,Auto,Auto">
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resx:ResUI.menuSubscription}" /> Text="{x:Static resx:ResUI.menuSubscription}" />
<ComboBox <ComboBox
x:Name="cmbSubChildItems" x:Name="cmbSubChildItems"
Grid.Row="4" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
DisplayMemberBinding="{Binding Remarks}" DisplayMemberBinding="{Binding Remarks}"
ItemsSource="{Binding SubItems}" /> ItemsSource="{Binding SubItems}" />
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="0"
Grid.Column="2" Grid.Column="2"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" /> Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" />
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resx:ResUI.LvFilter}" /> Text="{x:Static resx:ResUI.LvFilter}" />
<TextBox <TextBox
x:Name="txtFilter" x:Name="txtFilter"
Grid.Row="5" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</Grid> </Grid>
</Grid> </TabItem>
</TabControl>
<TabControl> <TabControl>
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}"> <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
<DataGrid <DataGrid

33
v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
View file

@ -39,6 +39,7 @@
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</StackPanel> </StackPanel>
<Grid DockPanel.Dock="Top"> <Grid DockPanel.Dock="Top">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@ -48,8 +49,6 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0"> <Grid Grid.Row="0">
@ -132,9 +131,25 @@
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbPolicyGroupType}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbPolicyGroupType}"
Style="{StaticResource DefComboBox}" /> Style="{StaticResource DefComboBox}" />
</Grid> </Grid>
</Grid>
</Grid>
<TabControl DockPanel.Dock="Top">
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
<Grid Margin="{StaticResource Margin8}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="180" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -142,14 +157,14 @@
Text="{x:Static resx:ResUI.menuSubscription}" /> Text="{x:Static resx:ResUI.menuSubscription}" />
<ComboBox <ComboBox
x:Name="cmbSubChildItems" x:Name="cmbSubChildItems"
Grid.Row="4" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
DisplayMemberPath="Remarks" DisplayMemberPath="Remarks"
Style="{StaticResource DefComboBox}" /> Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="0"
Grid.Column="2" Grid.Column="2"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -157,7 +172,7 @@
Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" /> Text="{x:Static resx:ResUI.TbPolicyGroupSubChildTip}" />
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -165,14 +180,16 @@
Text="{x:Static resx:ResUI.LvFilter}" /> Text="{x:Static resx:ResUI.LvFilter}" />
<TextBox <TextBox
x:Name="txtFilter" x:Name="txtFilter"
Grid.Row="5" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}" /> Style="{StaticResource DefTextBox}" />
</Grid> </Grid>
</Grid> </TabItem>
</TabControl>
<TabControl> <TabControl>
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}"> <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
<DataGrid <DataGrid