Adjust some style

pull/3568/head
2dust 2023-03-25 17:50:32 +08:00
parent 6213f86f81
commit 4e73b3ae28
10 changed files with 18 additions and 17 deletions

View File

@ -867,7 +867,7 @@ namespace v2rayN
string location = GetExePath(); string location = GetExePath();
if (blFull) if (blFull)
{ {
return string.Format("v2rayN - V{0} - {1}-Test", return string.Format("v2rayN - V{0} - {1}",
FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(), FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
File.GetLastWriteTime(location).ToString("yyyy/MM/dd")); File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
} }

View File

@ -176,7 +176,7 @@
<Grid <Grid
Grid.Row="1" Grid.Row="1"
Margin="16" Margin="8"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />

View File

@ -10,8 +10,8 @@
xmlns:resx="clr-namespace:v2rayN.Resx" xmlns:resx="clr-namespace:v2rayN.Resx"
xmlns:vms="clr-namespace:v2rayN.ViewModels" xmlns:vms="clr-namespace:v2rayN.ViewModels"
Title="{x:Static resx:ResUI.menuServers}" Title="{x:Static resx:ResUI.menuServers}"
Width="800" Width="820"
Height="830" Height="820"
x:TypeArguments="vms:AddServerViewModel" x:TypeArguments="vms:AddServerViewModel"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}" FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@ -742,7 +742,7 @@
<Grid <Grid
Grid.Row="9" Grid.Row="9"
Margin="16" Margin="8"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />

View File

@ -150,7 +150,7 @@
<Grid <Grid
Grid.Row="2" Grid.Row="2"
Margin="16" Margin="8"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="150" /> <ColumnDefinition Width="150" />

View File

@ -15,8 +15,8 @@
Title="v2rayN" Title="v2rayN"
Width="900" Width="900"
Height="700" Height="700"
MinWidth="800" MinWidth="900"
MinHeight="600" MinHeight="700"
x:TypeArguments="vms:MainWindowViewModel" x:TypeArguments="vms:MainWindowViewModel"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}" FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@ -837,9 +837,10 @@
Height="Auto" Height="Auto"
Background="{DynamicResource MaterialDesignLightBackground}" Background="{DynamicResource MaterialDesignLightBackground}"
BorderBrush="{DynamicResource MaterialDesignDarkBackground}" BorderBrush="{DynamicResource MaterialDesignDarkBackground}"
BorderThickness="1"> BorderThickness="0"
CornerRadius="4">
<TextBlock <TextBlock
Margin="2" Margin="8"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{DynamicResource MaterialDesignDarkBackground}" Foreground="{DynamicResource MaterialDesignDarkBackground}"

View File

@ -23,7 +23,7 @@
TextOptions.TextRenderingMode="Auto" TextOptions.TextRenderingMode="Auto"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
mc:Ignorable="d"> mc:Ignorable="d">
<DockPanel Margin="16"> <DockPanel Margin="8">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom"> <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />
@ -760,7 +760,7 @@
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbSettingsEnableHWA}"/> Text="{x:Static resx:ResUI.TbSettingsEnableHWA}" />
<ToggleButton <ToggleButton
x:Name="togEnableHWA" x:Name="togEnableHWA"
Grid.Row="18" Grid.Row="18"

View File

@ -134,7 +134,7 @@
</Grid> </Grid>
<Grid <Grid
Margin="16" Margin="8"
HorizontalAlignment="Center" HorizontalAlignment="Center"
DockPanel.Dock="Bottom"> DockPanel.Dock="Bottom">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

View File

@ -73,7 +73,7 @@
</ToolBarTray> </ToolBarTray>
<Grid <Grid
Margin="16" Margin="8"
HorizontalAlignment="Center" HorizontalAlignment="Center"
DockPanel.Dock="Bottom"> DockPanel.Dock="Bottom">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

View File

@ -114,7 +114,7 @@
</ToolBarTray> </ToolBarTray>
<Grid <Grid
Margin="16" Margin="8"
HorizontalAlignment="Center" HorizontalAlignment="Center"
DockPanel.Dock="Bottom"> DockPanel.Dock="Bottom">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

View File

@ -162,7 +162,7 @@
</Grid> </Grid>
<Grid <Grid
Grid.Row="1" Grid.Row="1"
Margin="16" Margin="8"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />