Improved Style for Desktop version

This commit is contained in:
2dust
2024-09-16 18:21:30 +08:00
parent 885f193a00
commit aa829a66ea
12 changed files with 486 additions and 498 deletions
+35 -34
View File
@@ -17,7 +17,7 @@
<DockPanel Classes="Margin8">
<StackPanel
HorizontalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@@ -60,14 +60,14 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.menuSubscription}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvRemarks}" />
<TextBox
@@ -75,53 +75,53 @@
Grid.Row="1"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
TextWrapping="Wrap" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvUrl}" />
<TextBox
x:Name="txtUrl"
Grid.Row="2"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
TextWrapping="Wrap"
ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvEnabled}" />
<DockPanel
Grid.Row="3"
Grid.Column="1"
Classes="Margin4">
Classes="Margin8">
<ToggleSwitch
x:Name="togEnable"
HorizontalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
DockPanel.Dock="Left" />
<TextBox
x:Name="txtAutoUpdateInterval"
Width="200"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
DockPanel.Dock="Right"
ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
</DockPanel>
@@ -129,21 +129,21 @@
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvFilter}" />
<TextBox
x:Name="txtFilter"
Grid.Row="5"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin4"
ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
Classes="Margin8"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Grid.Row="6"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvConvertTarget}" />
<ComboBox
x:Name="cmbConvertTarget"
@@ -151,29 +151,29 @@
Grid.Column="1"
Width="200"
VerticalAlignment=" "
Classes="Margin4"
Classes="Margin8"
ToolTip.Tip="{x:Static resx:ResUI.LvConvertTargetTip}" />
<TextBlock
Grid.Row="7"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvUserAgent}" />
<TextBox
x:Name="txtUserAgent"
Grid.Row="7"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
TextWrapping="Wrap"
ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Grid.Row="8"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvSort}" />
<TextBox
x:Name="txtSort"
@@ -181,42 +181,42 @@
Grid.Column="1"
Width="100"
HorizontalAlignment="Left"
Classes="Margin4" />
Classes="Margin8" />
<TextBlock
Grid.Row="9"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvPrevProfile}" />
<TextBox
x:Name="txtPrevProfile"
Grid.Row="9"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin4"
ToolTip.Tip="{x:Static resx:ResUI.LvPrevProfileTip}" />
Classes="Margin8"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
<TextBlock
Grid.Row="10"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvNextProfile}" />
<TextBox
x:Name="txtNextProfile"
Grid.Row="10"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin4"
ToolTip.Tip="{x:Static resx:ResUI.LvPrevProfileTip}" />
Classes="Margin8"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
<TextBlock
Grid.Row="11"
Grid.Column="0"
Margin="4"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPreSocksPort4Sub}" />
<TextBox
x:Name="txtPreSocksPort"
@@ -225,15 +225,16 @@
Width="200"
Margin="4"
HorizontalAlignment="Left"
Classes="Margin4"
ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}" />
Classes="Margin8"
ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}"
Watermark="{x:Static resx:ResUI.TipPreSocksPort}" />
<TextBlock
Grid.Row="12"
Grid.Column="0"
Grid.ColumnSpan="2"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvMoreUrl}" />
<TextBox
x:Name="txtMoreUrl"
@@ -245,7 +246,7 @@
Classes="TextArea Margin4"
MinLines="4"
TextWrapping="Wrap"
ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
</Grid>
</ScrollViewer>
</DockPanel>