mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-14 12:29:13 +00:00
Adjust UI
This commit is contained in:
parent
521dca33d5
commit
52d1eb1e2b
9 changed files with 152 additions and 126 deletions
9
v2rayN/ServiceLib/Resx/ResUI.Designer.cs
generated
9
v2rayN/ServiceLib/Resx/ResUI.Designer.cs
generated
|
@ -1563,6 +1563,15 @@ namespace ServiceLib.Resx {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Server List 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string menuServerList {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("menuServerList", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 Configurations 的本地化字符串。
|
/// 查找类似 Configurations 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -1551,4 +1551,7 @@
|
||||||
<data name="menuRemoveChildServer" xml:space="preserve">
|
<data name="menuRemoveChildServer" xml:space="preserve">
|
||||||
<value>Remove Child Configuration</value>
|
<value>Remove Child Configuration</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="menuServerList" xml:space="preserve">
|
||||||
|
<value>Server List</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
|
@ -1551,4 +1551,7 @@
|
||||||
<data name="menuRemoveChildServer" xml:space="preserve">
|
<data name="menuRemoveChildServer" xml:space="preserve">
|
||||||
<value>Remove Child Configuration</value>
|
<value>Remove Child Configuration</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="menuServerList" xml:space="preserve">
|
||||||
|
<value>Server List</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
|
@ -1551,4 +1551,7 @@
|
||||||
<data name="menuRemoveChildServer" xml:space="preserve">
|
<data name="menuRemoveChildServer" xml:space="preserve">
|
||||||
<value>Remove Child Configuration</value>
|
<value>Remove Child Configuration</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="menuServerList" xml:space="preserve">
|
||||||
|
<value>Server List</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
|
@ -1551,4 +1551,7 @@
|
||||||
<data name="menuRemoveChildServer" xml:space="preserve">
|
<data name="menuRemoveChildServer" xml:space="preserve">
|
||||||
<value>Remove Child Configuration</value>
|
<value>Remove Child Configuration</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="menuServerList" xml:space="preserve">
|
||||||
|
<value>Server List</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
|
@ -1548,4 +1548,7 @@
|
||||||
<data name="menuRemoveChildServer" xml:space="preserve">
|
<data name="menuRemoveChildServer" xml:space="preserve">
|
||||||
<value>删除子配置文件</value>
|
<value>删除子配置文件</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="menuServerList" xml:space="preserve">
|
||||||
|
<value>服务器列表</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
|
@ -1548,4 +1548,7 @@
|
||||||
<data name="menuRemoveChildServer" xml:space="preserve">
|
<data name="menuRemoveChildServer" xml:space="preserve">
|
||||||
<value>Remove Child Configuration</value>
|
<value>Remove Child Configuration</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="menuServerList" xml:space="preserve">
|
||||||
|
<value>Server List</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
|
@ -33,8 +33,7 @@
|
||||||
IsCancel="True" />
|
IsCancel="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<Grid DockPanel.Dock="Top" RowDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<Grid RowDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
@ -90,7 +89,9 @@
|
||||||
Margin="{StaticResource Margin4}" />
|
Margin="{StaticResource Margin4}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
<TabControl>
|
||||||
|
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
|
||||||
<DataGrid
|
<DataGrid
|
||||||
x:Name="lstChild"
|
x:Name="lstChild"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
@ -144,7 +145,7 @@
|
||||||
Header="{x:Static resx:ResUI.LvTLS}" />
|
Header="{x:Static resx:ResUI.LvTLS}" />
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
</Grid>
|
</TabItem>
|
||||||
</ScrollViewer>
|
</TabControl>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</Window>
|
</Window>
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
Width="900"
|
Width="900"
|
||||||
Height="700"
|
Height="700"
|
||||||
x:TypeArguments="vms:AddGroupServerViewModel"
|
x:TypeArguments="vms:AddGroupServerViewModel"
|
||||||
|
ResizeMode="CanResize"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
Style="{StaticResource WindowGlobal}"
|
Style="{StaticResource WindowGlobal}"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
|
@ -38,11 +39,7 @@
|
||||||
IsCancel="true"
|
IsCancel="true"
|
||||||
Style="{StaticResource DefButton}" />
|
Style="{StaticResource DefButton}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ScrollViewer
|
<Grid DockPanel.Dock="Top">
|
||||||
materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
|
|
||||||
HorizontalScrollBarVisibility="Auto"
|
|
||||||
VerticalScrollBarVisibility="Auto">
|
|
||||||
<Grid>
|
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
|
@ -135,10 +132,11 @@
|
||||||
Style="{StaticResource DefComboBox}" />
|
Style="{StaticResource DefComboBox}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
<TabControl>
|
||||||
|
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
|
||||||
<DataGrid
|
<DataGrid
|
||||||
x:Name="lstChild"
|
x:Name="lstChild"
|
||||||
Grid.Row="1"
|
|
||||||
AutoGenerateColumns="False"
|
AutoGenerateColumns="False"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CanUserAddRows="False"
|
CanUserAddRows="False"
|
||||||
|
@ -210,7 +208,7 @@
|
||||||
Header="{x:Static resx:ResUI.LvTLS}" />
|
Header="{x:Static resx:ResUI.LvTLS}" />
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
</Grid>
|
</TabItem>
|
||||||
</ScrollViewer>
|
</TabControl>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</base:WindowBase>
|
</base:WindowBase>
|
||||||
|
|
Loading…
Reference in a new issue