From 07599a99087f2f1feb1dd1ef489f2e2550a1c6d5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 6 Oct 2022 10:49:31 +0800
Subject: [PATCH] optimized UI

---
 clashN/clashN/App.xaml                   |  6 +++++
 clashN/clashN/Resx/ResUI.Designer.cs     |  2 +-
 clashN/clashN/Resx/ResUI.resx            |  2 +-
 clashN/clashN/Resx/ResUI.zh-Hans.resx    |  2 +-
 clashN/clashN/Views/ConnectionsView.xaml |  3 ++-
 clashN/clashN/Views/MsgView.xaml         | 30 +++++++++++++-----------
 clashN/clashN/Views/ProxiesView.xaml     |  9 ++++---
 clashN/clashN/Views/SettingsView.xaml    |  6 +++--
 8 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/clashN/clashN/App.xaml b/clashN/clashN/App.xaml
index 33339f3..4c376bb 100644
--- a/clashN/clashN/App.xaml
+++ b/clashN/clashN/App.xaml
@@ -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>
diff --git a/clashN/clashN/Resx/ResUI.Designer.cs b/clashN/clashN/Resx/ResUI.Designer.cs
index 6edcfe7..2128154 100644
--- a/clashN/clashN/Resx/ResUI.Designer.cs
+++ b/clashN/clashN/Resx/ResUI.Designer.cs
@@ -1322,7 +1322,7 @@ namespace clashN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Enable Ipv6 的本地化字符串。
+        ///   查找类似 Enable IPv6 的本地化字符串。
         /// </summary>
         public static string TbSettingsIpv6 {
             get {
diff --git a/clashN/clashN/Resx/ResUI.resx b/clashN/clashN/Resx/ResUI.resx
index 03acd8c..018b0ce 100644
--- a/clashN/clashN/Resx/ResUI.resx
+++ b/clashN/clashN/Resx/ResUI.resx
@@ -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>
diff --git a/clashN/clashN/Resx/ResUI.zh-Hans.resx b/clashN/clashN/Resx/ResUI.zh-Hans.resx
index 07b26c7..c4159e4 100644
--- a/clashN/clashN/Resx/ResUI.zh-Hans.resx
+++ b/clashN/clashN/Resx/ResUI.zh-Hans.resx
@@ -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>
diff --git a/clashN/clashN/Views/ConnectionsView.xaml b/clashN/clashN/Views/ConnectionsView.xaml
index 4a0116c..59c928b 100644
--- a/clashN/clashN/Views/ConnectionsView.xaml
+++ b/clashN/clashN/Views/ConnectionsView.xaml
@@ -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}" />
diff --git a/clashN/clashN/Views/MsgView.xaml b/clashN/clashN/Views/MsgView.xaml
index 0cb4c76..68824f3 100644
--- a/clashN/clashN/Views/MsgView.xaml
+++ b/clashN/clashN/Views/MsgView.xaml
@@ -12,19 +12,21 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
 
-    <Grid>
-        <DockPanel>
-            <GroupBox FontSize="10" Header="{x:Static resx:ResUI.TbMsgTitle}">
-                <TextBox
-                    Name="txtMsg"
-                    BorderThickness="0"
-                    FontSize="9"
-                    HorizontalScrollBarVisibility="Auto"
-                    IsReadOnly="True"
-                    TextWrapping="Wrap"
-                    VerticalScrollBarVisibility="Visible" />
-            </GroupBox>
+    <DockPanel Margin="2">
+        <TextBlock
+            DockPanel.Dock="Top"
+            Foreground="{DynamicResource PrimaryHueLightBrush}"
+            Style="{StaticResource ListItemTitle}"
+            Text="{x:Static resx:ResUI.TbMsgTitle}" />
+        <TextBox
+            Name="txtMsg"
+            BorderThickness="0"
+            FontSize="9"
+            HorizontalScrollBarVisibility="Auto"
+            IsReadOnly="True"
+            TextWrapping="Wrap"
+            VerticalScrollBarVisibility="Visible" />
 
-        </DockPanel>
-    </Grid>
+
+    </DockPanel>
 </UserControl>
diff --git a/clashN/clashN/Views/ProxiesView.xaml b/clashN/clashN/Views/ProxiesView.xaml
index 506696f..fc9c6dc 100644
--- a/clashN/clashN/Views/ProxiesView.xaml
+++ b/clashN/clashN/Views/ProxiesView.xaml
@@ -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>
diff --git a/clashN/clashN/Views/SettingsView.xaml b/clashN/clashN/Views/SettingsView.xaml
index 7a5d0f9..aef04bd 100644
--- a/clashN/clashN/Views/SettingsView.xaml
+++ b/clashN/clashN/Views/SettingsView.xaml
@@ -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>