optimized UI
This commit is contained in:
@@ -89,6 +89,12 @@
|
||||
TargetType="{x:Type ContextMenu}">
|
||||
<Setter Property="FontSize" Value="12" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="DefComboBox"
|
||||
BasedOn="{StaticResource MaterialDesignComboBox}"
|
||||
TargetType="{x:Type ComboBox}">
|
||||
<Setter Property="FontSize" Value="10" />
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
|
||||
</Application.Resources>
|
||||
|
||||
2
clashN/clashN/Resx/ResUI.Designer.cs
generated
2
clashN/clashN/Resx/ResUI.Designer.cs
generated
@@ -1322,7 +1322,7 @@ namespace clashN.Resx {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Enable Ipv6 的本地化字符串。
|
||||
/// 查找类似 Enable IPv6 的本地化字符串。
|
||||
/// </summary>
|
||||
public static string TbSettingsIpv6 {
|
||||
get {
|
||||
|
||||
@@ -530,7 +530,7 @@
|
||||
<value>Http Port</value>
|
||||
</data>
|
||||
<data name="TbSettingsIpv6" xml:space="preserve">
|
||||
<value>Enable Ipv6</value>
|
||||
<value>Enable IPv6</value>
|
||||
</data>
|
||||
<data name="TbSettingsLanguage" xml:space="preserve">
|
||||
<value>Language(restart)</value>
|
||||
|
||||
@@ -530,7 +530,7 @@
|
||||
<value>本地http监听端口</value>
|
||||
</data>
|
||||
<data name="TbSettingsIpv6" xml:space="preserve">
|
||||
<value>启用Ipv6</value>
|
||||
<value>启用IPv6</value>
|
||||
</data>
|
||||
<data name="TbSettingsLanguage" xml:space="preserve">
|
||||
<value>语言(需重启)</value>
|
||||
|
||||
@@ -34,7 +34,8 @@
|
||||
<ComboBox
|
||||
x:Name="cmbSorting"
|
||||
Width="100"
|
||||
Margin="8">
|
||||
Margin="8"
|
||||
Style="{StaticResource DefComboBox}">
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingUpSpeed}" />
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDownSpeed}" />
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingUpTraffic}" />
|
||||
|
||||
@@ -12,9 +12,12 @@
|
||||
d:DesignWidth="800"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<Grid>
|
||||
<DockPanel>
|
||||
<GroupBox FontSize="10" Header="{x:Static resx:ResUI.TbMsgTitle}">
|
||||
<DockPanel Margin="2">
|
||||
<TextBlock
|
||||
DockPanel.Dock="Top"
|
||||
Foreground="{DynamicResource PrimaryHueLightBrush}"
|
||||
Style="{StaticResource ListItemTitle}"
|
||||
Text="{x:Static resx:ResUI.TbMsgTitle}" />
|
||||
<TextBox
|
||||
Name="txtMsg"
|
||||
BorderThickness="0"
|
||||
@@ -23,8 +26,7 @@
|
||||
IsReadOnly="True"
|
||||
TextWrapping="Wrap"
|
||||
VerticalScrollBarVisibility="Visible" />
|
||||
</GroupBox>
|
||||
|
||||
|
||||
</DockPanel>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
<ComboBox
|
||||
x:Name="cmbSystemProxy"
|
||||
Width="110"
|
||||
Margin="8">
|
||||
Margin="8"
|
||||
Style="{StaticResource DefComboBox}">
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
|
||||
@@ -49,7 +50,8 @@
|
||||
<ComboBox
|
||||
x:Name="cmbRulemode"
|
||||
Width="80"
|
||||
Margin="8">
|
||||
Margin="8"
|
||||
Style="{StaticResource DefComboBox}">
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.menuModeRule}" />
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.menuModeGlobal}" />
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.menuModeDirect}" />
|
||||
@@ -63,7 +65,8 @@
|
||||
<ComboBox
|
||||
x:Name="cmbSorting"
|
||||
Width="60"
|
||||
Margin="8">
|
||||
Margin="8"
|
||||
Style="{StaticResource DefComboBox}">
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDelay}" />
|
||||
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingName}" />
|
||||
</ComboBox>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
<ComboBox
|
||||
x:Name="cmbSwatches"
|
||||
Width="100"
|
||||
DisplayMemberPath="Name" />
|
||||
DisplayMemberPath="Name"
|
||||
Style="{StaticResource DefComboBox}" />
|
||||
<Separator />
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
@@ -45,7 +46,8 @@
|
||||
<ComboBox
|
||||
x:Name="cmbCurrentLanguage"
|
||||
Width="100"
|
||||
materialDesign:HintAssist.Hint="Language" />
|
||||
materialDesign:HintAssist.Hint="Language"
|
||||
Style="{StaticResource DefComboBox}" />
|
||||
|
||||
</ToolBar>
|
||||
</ToolBarTray>
|
||||
|
||||
Reference in New Issue
Block a user