Add font size and font family select

84348658 · Feb 14, 2023 · 9ef371e · 9ef371e
1 parent cc0ddbb
commit 9ef371e
Show file tree

Hide file tree

Showing 22 changed files with 346 additions and 67 deletions.
diff --git a/clashN/clashN/App.xaml b/clashN/clashN/App.xaml
@@ -8,14 +8,18 @@
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
-        <ResourceDictionary>
+        <ResourceDictionary xmlns:system="clr-namespace:System;assembly=mscorlib">
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme
                     BaseTheme="Dark"
                     PrimaryColor="DeepPurple"
                     SecondaryColor="Lime" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <system:Double x:Key="StdFontSize1">11</system:Double>
+            <system:Double x:Key="StdFontSize2">12</system:Double>
+            <system:Double x:Key="StdFontSize3">13</system:Double>
+            <system:Double x:Key="StdFontSize4">14</system:Double>
             <Style
                 x:Key="MyMaterialDesignNavigationRailTabItem"
                 BasedOn="{StaticResource MaterialDesignNavigationRailTabItem}"
@@ -26,37 +30,37 @@
                 x:Key="ModuleTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="16" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize4}" />
             </Style>
             <Style
                 x:Key="TabItemTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="14" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize4}" />
             </Style>
             <Style
                 x:Key="ListItemTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize3}" />
             </Style>
             <Style
                 x:Key="ListItemSubTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
             </Style>
             <Style
                 x:Key="ListItemSubTitle2"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="11" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
             </Style>
             <Style
                 x:Key="ToolbarItem"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
             </Style>
             <Style TargetType="{x:Type TextElement}">
                 <Setter Property="FontWeight" Value="Regular" />
@@ -82,29 +86,47 @@
                 x:Key="ListItemCheckBox"
                 BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"
                 TargetType="{x:Type CheckBox}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
             </Style>
             <Style x:Key="ListItemChip" TargetType="{x:Type materialDesign:Chip}">
-                <Setter Property="FontSize" Value="11" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
             </Style>
             <Style
                 x:Key="DefButton"
                 BasedOn="{StaticResource MaterialDesignRaisedButton}"
                 TargetType="{x:Type ButtonBase}">
-                <Setter Property="FontSize" Value="14" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize3}" />
             </Style>
             <Style
                 x:Key="DefMenu"
                 BasedOn="{StaticResource MaterialDesignContextMenu}"
                 TargetType="{x:Type ContextMenu}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize3}" />
                 <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
             <Style
                 x:Key="DefComboBox"
                 BasedOn="{StaticResource MaterialDesignComboBox}"
                 TargetType="{x:Type ComboBox}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
+            </Style>
+            <Style
+                x:Key="DefTextBox"
+                BasedOn="{StaticResource MaterialDesignTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
+            </Style>
+            <Style
+                x:Key="MyOutlinedTextBox"
+                BasedOn="{StaticResource MaterialDesignOutlinedTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
+            </Style>
+            <Style
+                x:Key="DefDataGrid"
+                BasedOn="{StaticResource MaterialDesignDataGrid}"
+                TargetType="{x:Type DataGrid}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
             </Style>
         </ResourceDictionary>
 

diff --git a/clashN/clashN/App.xaml.cs b/clashN/clashN/App.xaml.cs
@@ -1,4 +1,6 @@
-using clashN.Tool;
+using clashN.Handler;
+using clashN.Mode;
+using clashN.Tool;
 using System.Windows;
 using System.Windows.Threading;
 
@@ -10,7 +12,7 @@ namespace clashN
     public partial class App : Application
     {
         public static EventWaitHandle ProgramStarted;
-
+        private static Config _config;
         public App()
         {
             // Locator.CurrentMutable.RegisterViewsForViewModels(Assembly.GetCallingAssembly());
@@ -46,12 +48,24 @@ protected override void OnStartup(StartupEventArgs e)
             Utils.SaveLog($"clashN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
+            Init();
+
             string lang = Utils.RegReadValue(Global.MyRegPath, Global.MyRegKeyLanguage, Global.Languages[0]);
             Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(lang);
 
             base.OnStartup(e);
         }
 
+        private void Init()
+        {
+            if (ConfigHandler.LoadConfig(ref _config) != 0)
+            {
+                UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
+                Application.Current.Shutdown();
+                Environment.Exit(0);
+                return;
+            }
+        }
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
             Utils.SaveLog("App_DispatcherUnhandledException", e.Exception);

diff --git a/clashN/clashN/Converters/MaterialDesignFonts.cs b/clashN/clashN/Converters/MaterialDesignFonts.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using clashN.Handler;
 using System.Windows.Media;
 
 namespace clashN.Converters
@@ -10,8 +9,22 @@ public class MaterialDesignFonts
 
         static MaterialDesignFonts()
         {
-            var fontPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Resources\Fonts\");
-            MyFont = new FontFamily(new Uri($"file:///{fontPath}"), "./#Source Han Sans CN");
+            try
+            {
+                var fontFamily = LazyConfig.Instance.GetConfig().uiItem.currentFontFamily;
+                if (!string.IsNullOrEmpty(fontFamily))
+                {
+                    var fontPath = Utils.GetFontsPath();
+                    MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");
+                }
+            }
+            catch
+            {
+            }
+            if (MyFont is null)
+            {
+                MyFont = new FontFamily("Microsoft YaHei");
+            }
         }
     }
 }
diff --git a/clashN/clashN/Global.cs b/clashN/clashN/Global.cs
@@ -87,6 +87,7 @@ class Global
         /// Icon
         /// </summary>
         public const string CustomIconName = "clashN.ico";
+        public const int MinFontSize = 10;
 
 
         public const string StatisticLogOverall = "StatisticLogOverall.json";
@@ -108,7 +109,7 @@ class Global
 
         public static readonly List<string> proxyVehicleType = new List<string> { "file", "http" };
 
-        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en","fa-IR" };
+        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en", "fa-IR" };
 
         public static readonly List<string> LogLevel = new List<string> { "debug", "info", "warning", "error", "silent" };
 

diff --git a/clashN/clashN/Mode/Config.cs b/clashN/clashN/Mode/Config.cs
@@ -197,6 +197,14 @@ public class UIItem
 
         public bool colorModeDark { get; set; }
         public string? colorPrimaryName { get; set; }
+        public string currentFontFamily { get; set; }
+        public int currentFontSize { get; set; }
+
+        public int proxiesSorting { get; set; }
+        public bool proxiesAutoRefresh { get; set; }
+
+        public int connectionsSorting { get; set; }
+        public bool connectionsAutoRefresh { get; set; }
 
     }
 

diff --git a/clashN/clashN/Resources/Fonts/SourceHanSansCN-Regular.ttf b/clashN/clashN/Resources/Fonts/SourceHanSansCN-Regular.ttf
diff --git a/clashN/clashN/Resx/ResUI.Designer.cs b/clashN/clashN/Resx/ResUI.Designer.cs
diff --git a/clashN/clashN/Resx/ResUI.resx b/clashN/clashN/Resx/ResUI.resx
@@ -664,4 +664,13 @@
   <data name="TbSortingType" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="TbSettingsFontFamily" xml:space="preserve">
+    <value>FontFamily(Require restart)</value>
+  </data>
+  <data name="TbSettingsFontFamilyTip" xml:space="preserve">
+    <value>Copy the font TTF file to the directory guiFonts, restart the settings</value>
+  </data>
+  <data name="TbSettingsFontSize" xml:space="preserve">
+    <value>FontSize</value>
+  </data>
 </root>
diff --git a/clashN/clashN/Resx/ResUI.zh-Hans.resx b/clashN/clashN/Resx/ResUI.zh-Hans.resx
@@ -667,4 +667,13 @@
   <data name="TbSortingType" xml:space="preserve">
     <value>类型</value>
   </data>
+  <data name="TbSettingsFontFamily" xml:space="preserve">
+    <value>当前字体(需重启)</value>
+  </data>
+  <data name="TbSettingsFontFamilyTip" xml:space="preserve">
+    <value>拷贝字体TTF文件到目录guiFonts，重启</value>
+  </data>
+  <data name="TbSettingsFontSize" xml:space="preserve">
+    <value>字体大小</value>
+  </data>
 </root>
diff --git a/clashN/clashN/Tool/Utils.cs b/clashN/clashN/Tool/Utils.cs
@@ -1112,6 +1112,22 @@ public static string GetBinPath(string filename, ECoreType? coreType = null)
             }
             return Path.Combine(_tempPath, filename);
         }
+        public static string GetFontsPath(string filename = "")
+        {
+            string _tempPath = Path.Combine(StartupPath(), "guiFonts");
+            if (!Directory.Exists(_tempPath))
+            {
+                Directory.CreateDirectory(_tempPath);
+            }
+            if (string.IsNullOrEmpty(filename))
+            {
+                return _tempPath;
+            }
+            else
+            {
+                return Path.Combine(_tempPath, filename);
+            }
+        }
         #endregion
 
         #region Log

diff --git a/clashN/clashN/ViewModels/ConnectionsViewModel.cs b/clashN/clashN/ViewModels/ConnectionsViewModel.cs
@@ -37,6 +37,10 @@ public ConnectionsViewModel()
             _noticeHandler = Locator.Current.GetService<NoticeHandler>();
             _config = LazyConfig.Instance.GetConfig();
 
+            AutoRefreshInterval = 10;
+            SortingSelected = _config.uiItem.connectionsSorting;
+            AutoRefresh = _config.uiItem.connectionsAutoRefresh;
+
             var canEditRemove = this.WhenAnyValue(
              x => x.SelectedSource,
              selectedSource => selectedSource != null && !selectedSource.id.IsNullOrEmpty());
@@ -46,6 +50,11 @@ public ConnectionsViewModel()
               y => y != null && y >= 0)
                   .Subscribe(c => DoSortingSelected(c));
 
+            this.WhenAnyValue(
+               x => x.AutoRefresh,
+               y => y == true)
+                   .Subscribe(c => { _config.uiItem.connectionsAutoRefresh = AutoRefresh; });
+
             ConnectionCloseCmd = ReactiveCommand.Create(() =>
             {
                 ClashConnectionClose(false);
@@ -56,10 +65,6 @@ public ConnectionsViewModel()
                 ClashConnectionClose(true);
             });
 
-            AutoRefreshInterval = 10;
-            SortingSelected = 4;
-            AutoRefresh = true;
-
             Init();
         }
 
@@ -69,6 +74,10 @@ void DoSortingSelected(bool c)
             {
                 return;
             }
+            if (SortingSelected != _config.uiItem.connectionsSorting)
+            {
+                _config.uiItem.connectionsSorting = SortingSelected;
+            }
 
             GetClashConnections();
         }
@@ -128,7 +137,7 @@ private void RefreshConnections(List<ConnectionItem> connections)
                 model.id = item.id;
                 model.network = item.metadata.network;
                 model.type = item.metadata.type;
-                model.host = $"{item.metadata.host}:{item.metadata.destinationPort}";
+                model.host = $"{(item.metadata.host.IsNullOrEmpty() ? item.metadata.destinationIP : item.metadata.host)}:{item.metadata.destinationPort}";
                 var sp = (dtNow - item.start);
                 model.time = sp.TotalSeconds < 0 ? 1 : sp.TotalSeconds;
                 model.upload = item.upload;

diff --git a/clashN/clashN/ViewModels/MainWindowViewModel.cs b/clashN/clashN/ViewModels/MainWindowViewModel.cs
@@ -92,6 +92,8 @@ public class MainWindowViewModel : ReactiveObject
 
         public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue)
         {
+            _config = LazyConfig.Instance.GetConfig();
+
             Locator.CurrentMutable.RegisterLazySingleton(() => new NoticeHandler(snackbarMessageQueue), typeof(NoticeHandler));
             _noticeHandler = Locator.Current.GetService<NoticeHandler>();
 
@@ -264,12 +266,8 @@ private void OnHotkeyHandler(object sender, HotkeyEventArgs e)
 
         private void Init()
         {
-            if (ConfigHandler.LoadConfig(ref _config) != 0)
-            {
-                UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
-                Environment.Exit(0);
-                return;
-            }
+
+
             MainFormHandler.Instance.BackupGuiNConfig(_config, true);
             MainFormHandler.Instance.InitRegister(_config);
 
@@ -293,7 +291,7 @@ private void UpdateHandler(bool notify, string msg)
         {
             if (notify)
             {
-                _noticeHandler?.Enqueue(msg); 
+                _noticeHandler?.Enqueue(msg);
                 _noticeHandler?.SendMessage(msg);
             }
             else