up 6.55

https://github.com/2dust/v2rayN/issues/5467

v2rayN/ProtosLib/ProtosLib.csproj

@@ -9,9 +9,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.63.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.64.0">
+		<PackageReference Include="Google.Protobuf" Version="3.27.3" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.65.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/v2rayN/App.xaml

@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
@@ -62,11 +62,9 @@
             </Style>
             <Style TargetType="{x:Type TextElement}">
                 <Setter Property="FontWeight" Value="Regular" />
-                <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
             </Style>
             <Style TargetType="{x:Type TextBlock}">
                 <Setter Property="FontWeight" Value="Regular" />
-                <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
             </Style>
             <Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}">
                 <Setter Property="Margin" Value="2" />

v2rayN/v2rayN/Global.cs

@@ -179,7 +179,7 @@ namespace v2rayN
         public static readonly List<string> DomainDNSAddress = ["223.5.5.5", "223.6.6.6", "localhost"];
         public static readonly List<string> SingboxDomainDNSAddress = ["223.5.5.5", "223.6.6.6", "dhcp://auto"];
         public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
-        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h2,h3", "h2,http/1.1", "" };
+        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,h2,http/1.1",  "" };
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
         public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs

@@ -389,16 +389,25 @@ namespace v2rayN.Handler.CoreConfig
                     return -1;
                 }
 
-                var txtFile = File.ReadAllText(addressFileName);
-                var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(txtFile);
-                if (singboxConfig == null)
+                if (node.address == Global.CoreMultipleLoadConfigFileName)
                 {
-                    msg = ResUI.FailedConversionConfiguration;
-                    return -1;
+                    var txtFile = File.ReadAllText(addressFileName);
+                    var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(txtFile);
+                    if (singboxConfig == null)
+                    {
+                        File.Copy(addressFileName, fileName);
+                    }
+                    else
+                    {
+                        GenInbounds(singboxConfig);
+                        GenExperimental(singboxConfig);
+                        JsonUtils.ToFile(singboxConfig, fileName, false);
+                    }
+                }
+                else
+                {
+                    File.Copy(addressFileName, fileName);
                 }
-
-                GenExperimental(singboxConfig);
-                JsonUtils.ToFile(singboxConfig, fileName, false);
 
                 //check again
                 if (!File.Exists(fileName))

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -996,6 +996,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Auto column width adjustment 的本地化字符串。
+        /// </summary>
+        public static string menuProfileAutofitColumnWidth {
+            get {
+                return ResourceManager.GetString("menuProfileAutofitColumnWidth", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Promotion 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -1261,4 +1261,7 @@
   <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
     <value>Outbound DNS address</value>
   </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>Auto column width adjustment</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx

@@ -1258,4 +1258,7 @@
   <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
     <value>Outbound域名解析地址</value>
   </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>自动调整列宽</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx

@@ -1138,4 +1138,7 @@
   <data name="menuOpenTheFileLocation" xml:space="preserve">
     <value>打開儲存所在的位置</value>
   </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>自動調整列寬</value>
+  </data>
 </root>

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -1,7 +1,4 @@
-using DynamicData;
 using DynamicData.Binding;
-using MaterialDesignColors;
-using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -30,7 +27,6 @@ namespace v2rayN.ViewModels
         private CoreHandler _coreHandler;
         private static Config _config;
         private NoticeHandler? _noticeHandler;
-        private readonly PaletteHelper _paletteHelper = new();
         private Action<EViewAction> _updateView;
         private bool _showInTaskbar;
 
@@ -165,24 +161,6 @@ namespace v2rayN.ViewModels
         [Reactive]
         public bool EnableTun { get; set; }
 
-        [Reactive]
-        public bool ColorModeDark { get; set; }
-
-        private IObservableCollection<Swatch> _swatches = new ObservableCollectionExtended<Swatch>();
-        public IObservableCollection<Swatch> Swatches => _swatches;
-
-        [Reactive]
-        public Swatch SelectedSwatch { get; set; }
-
-        [Reactive]
-        public int CurrentFontSize { get; set; }
-
-        [Reactive]
-        public bool FollowSystemTheme { get; set; }
-
-        [Reactive]
-        public string CurrentLanguage { get; set; }
-
         [Reactive]
         public bool ShowClashUI { get; set; }
 
@@ -219,8 +197,6 @@ namespace v2rayN.ViewModels
             }
 
             Init();
-            BindingUI();
-            RestoreUI();
 
             #region WhenAnyValue && ReactiveCommand
 
@@ -824,33 +800,6 @@ namespace v2rayN.ViewModels
             catch { }
         }
 
-        //private void ImportOldGuiConfig()
-        //{
-        //    if (UI.OpenFileDialog(out string fileName,
-        //        "guiNConfig|*.json|All|*.*") != true)
-        //    {
-        //        return;
-        //    }
-        //    if (Utils.IsNullOrEmpty(fileName))
-        //    {
-        //        return;
-        //    }
-
-        //    var ret = ConfigHandler.ImportOldGuiConfig(_config, fileName);
-        //    if (ret == 0)
-        //    {
-        //        RefreshRoutingsMenu();
-        //        InitSubscriptionView();
-        //        RefreshServers();
-        //        Reload();
-        //        _noticeHandler?.Enqueue(ResUI.OperationSuccess);
-        //    }
-        //    else
-        //    {
-        //        _noticeHandler?.Enqueue(ResUI.OperationFailed);
-        //    }
-        //}
-
         #endregion Setting
 
         #region CheckUpdate
@@ -1078,7 +1027,6 @@ namespace v2rayN.ViewModels
             var bl = blShow ?? !_showInTaskbar;
             if (bl)
             {
-                //Application.Current.MainWindow.ShowInTaskbar = true;
                 Application.Current.MainWindow.Show();
                 if (Application.Current.MainWindow.WindowState == WindowState.Minimized)
                 {
@@ -1090,134 +1038,11 @@ namespace v2rayN.ViewModels
             else
             {
                 Application.Current.MainWindow.Hide();
-                //Application.Current.MainWindow.ShowInTaskbar = false;
-                //IntPtr windowHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
-                //Utile.RegWriteValue(Global.MyRegPath, Utile.WindowHwndKey, Convert.ToString((long)windowHandle));
             }
             _showInTaskbar = bl;
             _config.uiItem.showInTaskbar = _showInTaskbar;
         }
 
-        private void RestoreUI()
-        {
-            if (FollowSystemTheme)
-            {
-                ModifyTheme(!Utils.IsLightTheme());
-            }
-            else
-            {
-                ModifyTheme(_config.uiItem.colorModeDark);
-            }
-
-            if (!_config.uiItem.colorPrimaryName.IsNullOrEmpty())
-            {
-                var swatch = new SwatchesProvider().Swatches.FirstOrDefault(t => t.Name == _config.uiItem.colorPrimaryName);
-                if (swatch != null
-                   && swatch.ExemplarHue != null
-                   && swatch.ExemplarHue?.Color != null)
-                {
-                    ChangePrimaryColor(swatch.ExemplarHue.Color);
-                }
-            }
-        }
-
-        private void BindingUI()
-        {
-            ColorModeDark = _config.uiItem.colorModeDark;
-            FollowSystemTheme = _config.uiItem.followSystemTheme;
-            _swatches.AddRange(new SwatchesProvider().Swatches);
-            if (!_config.uiItem.colorPrimaryName.IsNullOrEmpty())
-            {
-                SelectedSwatch = _swatches.FirstOrDefault(t => t.Name == _config.uiItem.colorPrimaryName);
-            }
-            CurrentFontSize = _config.uiItem.currentFontSize;
-            CurrentLanguage = _config.uiItem.currentLanguage;
-
-            this.WhenAnyValue(
-                  x => x.ColorModeDark,
-                  y => y == true)
-                      .Subscribe(c =>
-                      {
-                          if (_config.uiItem.colorModeDark != ColorModeDark)
-                          {
-                              _config.uiItem.colorModeDark = ColorModeDark;
-                              ModifyTheme(ColorModeDark);
-                              ConfigHandler.SaveConfig(_config);
-                          }
-                      });
-
-            this.WhenAnyValue(x => x.FollowSystemTheme,
-                y => y == true)
-                    .Subscribe(c =>
-                    {
-                        if (_config.uiItem.followSystemTheme != FollowSystemTheme)
-                        {
-                            _config.uiItem.followSystemTheme = FollowSystemTheme;
-                            ConfigHandler.SaveConfig(_config);
-                            if (FollowSystemTheme)
-                            {
-                                ModifyTheme(!Utils.IsLightTheme());
-                            }
-                            else
-                            {
-                                ModifyTheme(ColorModeDark);
-                            }
-                        }
-                    });
-
-            this.WhenAnyValue(
-              x => x.SelectedSwatch,
-              y => y != null && !y.Name.IsNullOrEmpty())
-                 .Subscribe(c =>
-                 {
-                     if (SelectedSwatch == null
-                     || SelectedSwatch.Name.IsNullOrEmpty()
-                     || SelectedSwatch.ExemplarHue == null
-                     || SelectedSwatch.ExemplarHue?.Color == null)
-                     {
-                         return;
-                     }
-                     if (_config.uiItem.colorPrimaryName != SelectedSwatch?.Name)
-                     {
-                         _config.uiItem.colorPrimaryName = SelectedSwatch?.Name;
-                         ChangePrimaryColor(SelectedSwatch.ExemplarHue.Color);
-                         ConfigHandler.SaveConfig(_config);
-                     }
-                 });
-
-            this.WhenAnyValue(
-               x => x.CurrentFontSize,
-               y => y > 0)
-                  .Subscribe(c =>
-                  {
-                      if (CurrentFontSize >= Global.MinFontSize)
-                      {
-                          _config.uiItem.currentFontSize = CurrentFontSize;
-                          double size = (long)CurrentFontSize;
-                          Application.Current.Resources["StdFontSize"] = size;
-                          Application.Current.Resources["StdFontSize1"] = size + 1;
-                          Application.Current.Resources["StdFontSize2"] = size + 2;
-                          Application.Current.Resources["StdFontSizeMsg"] = size - 1;
-                          Application.Current.Resources["StdFontSize-1"] = size - 1;
-
-                          ConfigHandler.SaveConfig(_config);
-                      }
-                  });
-
-            this.WhenAnyValue(
-             x => x.CurrentLanguage,
-             y => y != null && !y.IsNullOrEmpty())
-                .Subscribe(c =>
-                {
-                    if (!Utils.IsNullOrEmpty(CurrentLanguage))
-                    {
-                        _config.uiItem.currentLanguage = CurrentLanguage;
-                        Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
-                        ConfigHandler.SaveConfig(_config);
-                    }
-                });
-        }
-
         public void InboundDisplayStaus()
         {
             StringBuilder sb = new();
@@ -1254,27 +1079,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-        public void ModifyTheme(bool isDarkTheme)
-        {
-            var theme = _paletteHelper.GetTheme();
-
-            theme.SetBaseTheme(isDarkTheme ? BaseTheme.Dark : BaseTheme.Light);
-            _paletteHelper.SetTheme(theme);
-
-            Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
-        }
-
-        public void ChangePrimaryColor(System.Windows.Media.Color color)
-        {
-            var theme = _paletteHelper.GetTheme();
-
-            theme.PrimaryLight = new ColorPair(color.Lighten());
-            theme.PrimaryMid = new ColorPair(color);
-            theme.PrimaryDark = new ColorPair(color.Darken());
-
-            _paletteHelper.SetTheme(theme);
-        }
-
         private void AutoHideStartup()
         {
             if (_config.uiItem.autoHideStartup)

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -268,7 +268,8 @@ namespace v2rayN.ViewModels
             var needReboot = (EnableStatistics != _config.guiItem.enableStatistics
                             || EnableDragDropSort != _config.uiItem.enableDragDropSort
                             || EnableHWA != _config.guiItem.enableHWA
-                            || CurrentFontFamily != _config.uiItem.currentFontFamily);
+                            || CurrentFontFamily != _config.uiItem.currentFontFamily
+                            || MainGirdOrientation != (int)_config.uiItem.mainGirdOrientation);
 
             //if (Utile.IsNullOrEmpty(Kcpmtu.ToString()) || !Utile.IsNumeric(Kcpmtu.ToString())
             //       || Utile.IsNullOrEmpty(Kcptti.ToString()) || !Utile.IsNumeric(Kcptti.ToString())

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -0,0 +1,193 @@
+using DynamicData;
+using DynamicData.Binding;
+using MaterialDesignColors;
+using MaterialDesignColors.ColorManipulation;
+using MaterialDesignThemes.Wpf;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+using Splat;
+using System.Reactive.Linq;
+using System.Windows;
+using v2rayN.Handler;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.ViewModels
+{
+    public class ThemeSettingViewModel : ReactiveObject
+    {
+        private static Config _config;
+        private NoticeHandler? _noticeHandler;
+        private readonly PaletteHelper _paletteHelper = new();
+
+        [Reactive]
+        public bool ColorModeDark { get; set; }
+
+        private IObservableCollection<Swatch> _swatches = new ObservableCollectionExtended<Swatch>();
+        public IObservableCollection<Swatch> Swatches => _swatches;
+
+        [Reactive]
+        public Swatch SelectedSwatch { get; set; }
+
+        [Reactive]
+        public int CurrentFontSize { get; set; }
+
+        [Reactive]
+        public bool FollowSystemTheme { get; set; }
+
+        [Reactive]
+        public string CurrentLanguage { get; set; }
+
+        public ThemeSettingViewModel()
+        {
+            _config = LazyConfig.Instance.GetConfig();
+            _noticeHandler = Locator.Current.GetService<NoticeHandler>();
+            MainFormHandler.Instance.RegisterSystemColorSet(_config, Application.Current.MainWindow, (bool bl) => { ModifyTheme(bl); });
+
+            BindingUI();
+            RestoreUI();
+        }
+
+        private void RestoreUI()
+        {
+            if (FollowSystemTheme)
+            {
+                ModifyTheme(!Utils.IsLightTheme());
+            }
+            else
+            {
+                ModifyTheme(_config.uiItem.colorModeDark);
+            }
+
+            if (!_config.uiItem.colorPrimaryName.IsNullOrEmpty())
+            {
+                var swatch = new SwatchesProvider().Swatches.FirstOrDefault(t => t.Name == _config.uiItem.colorPrimaryName);
+                if (swatch != null
+                   && swatch.ExemplarHue != null
+                   && swatch.ExemplarHue?.Color != null)
+                {
+                    ChangePrimaryColor(swatch.ExemplarHue.Color);
+                }
+            }
+        }
+
+        private void BindingUI()
+        {
+            ColorModeDark = _config.uiItem.colorModeDark;
+            FollowSystemTheme = _config.uiItem.followSystemTheme;
+            _swatches.AddRange(new SwatchesProvider().Swatches);
+            if (!_config.uiItem.colorPrimaryName.IsNullOrEmpty())
+            {
+                SelectedSwatch = _swatches.FirstOrDefault(t => t.Name == _config.uiItem.colorPrimaryName);
+            }
+            CurrentFontSize = _config.uiItem.currentFontSize;
+            CurrentLanguage = _config.uiItem.currentLanguage;
+
+            this.WhenAnyValue(
+                  x => x.ColorModeDark,
+                  y => y == true)
+                      .Subscribe(c =>
+                      {
+                          if (_config.uiItem.colorModeDark != ColorModeDark)
+                          {
+                              _config.uiItem.colorModeDark = ColorModeDark;
+                              ModifyTheme(ColorModeDark);
+                              ConfigHandler.SaveConfig(_config);
+                          }
+                      });
+
+            this.WhenAnyValue(x => x.FollowSystemTheme,
+                y => y == true)
+                    .Subscribe(c =>
+                    {
+                        if (_config.uiItem.followSystemTheme != FollowSystemTheme)
+                        {
+                            _config.uiItem.followSystemTheme = FollowSystemTheme;
+                            ConfigHandler.SaveConfig(_config);
+                            if (FollowSystemTheme)
+                            {
+                                ModifyTheme(!Utils.IsLightTheme());
+                            }
+                            else
+                            {
+                                ModifyTheme(ColorModeDark);
+                            }
+                        }
+                    });
+
+            this.WhenAnyValue(
+              x => x.SelectedSwatch,
+              y => y != null && !y.Name.IsNullOrEmpty())
+                 .Subscribe(c =>
+                 {
+                     if (SelectedSwatch == null
+                     || SelectedSwatch.Name.IsNullOrEmpty()
+                     || SelectedSwatch.ExemplarHue == null
+                     || SelectedSwatch.ExemplarHue?.Color == null)
+                     {
+                         return;
+                     }
+                     if (_config.uiItem.colorPrimaryName != SelectedSwatch?.Name)
+                     {
+                         _config.uiItem.colorPrimaryName = SelectedSwatch?.Name;
+                         ChangePrimaryColor(SelectedSwatch.ExemplarHue.Color);
+                         ConfigHandler.SaveConfig(_config);
+                     }
+                 });
+
+            this.WhenAnyValue(
+               x => x.CurrentFontSize,
+               y => y > 0)
+                  .Subscribe(c =>
+                  {
+                      if (CurrentFontSize >= Global.MinFontSize)
+                      {
+                          _config.uiItem.currentFontSize = CurrentFontSize;
+                          double size = (long)CurrentFontSize;
+                          Application.Current.Resources["StdFontSize"] = size;
+                          Application.Current.Resources["StdFontSize1"] = size + 1;
+                          Application.Current.Resources["StdFontSize2"] = size + 2;
+                          Application.Current.Resources["StdFontSizeMsg"] = size - 1;
+                          Application.Current.Resources["StdFontSize-1"] = size - 1;
+
+                          ConfigHandler.SaveConfig(_config);
+                      }
+                  });
+
+            this.WhenAnyValue(
+             x => x.CurrentLanguage,
+             y => y != null && !y.IsNullOrEmpty())
+                .Subscribe(c =>
+                {
+                    if (!Utils.IsNullOrEmpty(CurrentLanguage) && _config.uiItem.currentLanguage != CurrentLanguage)
+                    {
+                        _config.uiItem.currentLanguage = CurrentLanguage;
+                        Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
+                        ConfigHandler.SaveConfig(_config);
+                        _noticeHandler?.Enqueue(ResUI.NeedRebootTips);
+                    }
+                });
+        }
+
+        public void ModifyTheme(bool isDarkTheme)
+        {
+            var theme = _paletteHelper.GetTheme();
+
+            theme.SetBaseTheme(isDarkTheme ? BaseTheme.Dark : BaseTheme.Light);
+            _paletteHelper.SetTheme(theme);
+
+            Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
+        }
+
+        public void ChangePrimaryColor(System.Windows.Media.Color color)
+        {
+            var theme = _paletteHelper.GetTheme();
+
+            theme.PrimaryLight = new ColorPair(color.Lighten());
+            theme.PrimaryMid = new ColorPair(color);
+            theme.PrimaryDark = new ColorPair(color.Darken());
+
+            _paletteHelper.SetTheme(theme);
+        }
+    }
+}

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

@@ -43,7 +43,8 @@
                 Width="24"
                 Height="24"
                 Margin="8,0"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                ToolTip="{x:Static resx:ResUI.menuConnectionCloseAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Close" />
             </Button>
 

v2rayN/v2rayN/Views/ClashProxiesView.xaml

@@ -61,7 +61,8 @@
                 Width="24"
                 Height="24"
                 Margin="8,0"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                ToolTip="{x:Static resx:ResUI.menuProxiesReload}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Reload" />
             </Button>
 
@@ -70,7 +71,8 @@
                 Width="24"
                 Height="24"
                 Margin="8,0"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                ToolTip="{x:Static resx:ResUI.menuProxiesDelaytest}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="LightningBolt" />
             </Button>
 

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -301,88 +301,7 @@
                             HorizontalAlignment="Right"
                             StaysOpen="True"
                             Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
-                            <StackPanel Margin="8">
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource ToolbarTextBlock}"
-                                        Text="{x:Static resx:ResUI.TbSettingsColorMode}" />
-                                    <ToggleButton
-                                        x:Name="togDarkMode"
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Margin="8" />
-
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource ToolbarTextBlock}"
-                                        Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
-                                    <ToggleButton
-                                        x:Name="followSystemTheme"
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Margin="8" />
-
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource ToolbarTextBlock}"
-                                        Text="{x:Static resx:ResUI.TbSettingsColor}" />
-                                    <ComboBox
-                                        x:Name="cmbSwatches"
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Width="100"
-                                        Margin="8"
-                                        DisplayMemberPath="Name"
-                                        Style="{StaticResource DefComboBox}" />
-
-                                    <TextBlock
-                                        Grid.Row="3"
-                                        Grid.Column="0"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource ToolbarTextBlock}"
-                                        Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
-                                    <ComboBox
-                                        x:Name="cmbCurrentFontSize"
-                                        Grid.Row="3"
-                                        Grid.Column="1"
-                                        Width="100"
-                                        Margin="8"
-                                        Style="{StaticResource DefComboBox}" />
-
-                                    <TextBlock
-                                        Grid.Row="4"
-                                        Grid.Column="0"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource ToolbarTextBlock}"
-                                        Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
-                                    <ComboBox
-                                        x:Name="cmbCurrentLanguage"
-                                        Grid.Row="4"
-                                        Grid.Column="1"
-                                        Width="100"
-                                        Margin="8"
-                                        materialDesign:HintAssist.Hint="Language"
-                                        Style="{StaticResource DefComboBox}" />
-                                </Grid>
-                            </StackPanel>
+                            <ContentControl x:Name="pbTheme" />
                         </materialDesign:PopupBox>
                     </ToolBar>
                 </ToolBarTray>

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
-using ReactiveUI;
+using MaterialDesignThemes.Wpf;
+using ReactiveUI;
 using Splat;
 using System.ComponentModel;
 using System.Reactive.Disposables;
@@ -32,16 +33,6 @@ namespace v2rayN.Views
             ViewModel = new MainWindowViewModel(MainSnackbar.MessageQueue, null);
             Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
-            for (int i = Global.MinFontSize; i <= Global.MinFontSize + 8; i++)
-            {
-                cmbCurrentFontSize.Items.Add(i.ToString());
-            }
-
-            Global.Languages.ForEach(it =>
-            {
-                cmbCurrentLanguage.Items.Add(it);
-            });
-
             this.WhenActivated(disposables =>
             {
                 //servers
@@ -130,14 +121,6 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SelectedRouting, v => v.cmbRoutings2.SelectedItem).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.BlRouting, v => v.cmbRoutings2.Visibility).DisposeWith(disposables);
 
-                //UI
-                this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.followSystemTheme.IsChecked).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.Swatches, v => v.cmbSwatches.ItemsSource).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SelectedSwatch, v => v.cmbSwatches.SelectedItem).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CurrentLanguage, v => v.cmbCurrentLanguage.Text).DisposeWith(disposables);
-
                 if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Horizontal)
                 {
                     gridMain.Visibility = Visibility.Visible;
@@ -169,8 +152,6 @@ namespace v2rayN.Views
                 RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
             }
 
-            MainFormHandler.Instance.RegisterSystemColorSet(_config, this, (bool bl) => { ViewModel?.ModifyTheme(bl); });
-
             if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Horizontal)
             {
                 tabProfiles.Content ??= new ProfilesView();
@@ -192,6 +173,7 @@ namespace v2rayN.Views
                 tabClashProxies2.Content ??= new ClashProxiesView();
                 tabClashConnections2.Content ??= new ClashConnectionsView();
             }
+            pbTheme.Content ??= new ThemeSettingView();
 
             RestoreUI();
             AddHelpMenuItem();

v2rayN/v2rayN/Views/MsgView.xaml

@@ -31,7 +31,8 @@
                 Height="24"
                 Margin="8,0"
                 Click="menuMsgViewCopyAll_Click"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                ToolTip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentCopy" />
             </Button>
             <Button
@@ -40,7 +41,8 @@
                 Height="24"
                 Margin="8,0"
                 Click="menuMsgViewClear_Click"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                ToolTip="{x:Static resx:ResUI.menuMsgViewClear}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Delete" />
             </Button>
             <TextBlock

v2rayN/v2rayN/Views/ProfilesView.xaml

@@ -39,7 +39,8 @@
                     Width="30"
                     Height="30"
                     Margin="4,0"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                    ToolTip="{x:Static resx:ResUI.menuSubEdit}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
                 </Button>
                 <Button
@@ -47,7 +48,8 @@
                     Width="30"
                     Height="30"
                     Margin="4,0"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                    ToolTip="{x:Static resx:ResUI.menuSubAdd}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
                 </Button>
 
@@ -56,7 +58,8 @@
                     Width="30"
                     Height="30"
                     Margin="20,0"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                    ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
                 </Button>
                 <TextBox

v2rayN/v2rayN/Views/ThemeSettingView.xaml

@@ -0,0 +1,97 @@
+<reactiveui:ReactiveUserControl
+    x:Class="v2rayN.Views.ThemeSettingView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:resx="clr-namespace:v2rayN.Resx"
+    xmlns:vms="clr-namespace:v2rayN.ViewModels"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:TypeArguments="vms:ThemeSettingViewModel"
+    mc:Ignorable="d">
+    <StackPanel Margin="8">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbSettingsColorMode}" />
+            <ToggleButton
+                x:Name="togDarkMode"
+                Grid.Row="0"
+                Grid.Column="1"
+                Margin="8" />
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
+            <ToggleButton
+                x:Name="followSystemTheme"
+                Grid.Row="1"
+                Grid.Column="1"
+                Margin="8" />
+
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbSettingsColor}" />
+            <ComboBox
+                x:Name="cmbSwatches"
+                Grid.Row="2"
+                Grid.Column="1"
+                Width="100"
+                Margin="8"
+                DisplayMemberPath="Name"
+                Style="{StaticResource DefComboBox}" />
+
+            <TextBlock
+                Grid.Row="3"
+                Grid.Column="0"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
+            <ComboBox
+                x:Name="cmbCurrentFontSize"
+                Grid.Row="3"
+                Grid.Column="1"
+                Width="100"
+                Margin="8"
+                Style="{StaticResource DefComboBox}" />
+
+            <TextBlock
+                Grid.Row="4"
+                Grid.Column="0"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
+            <ComboBox
+                x:Name="cmbCurrentLanguage"
+                Grid.Row="4"
+                Grid.Column="1"
+                Width="100"
+                Margin="8"
+                Style="{StaticResource DefComboBox}" />
+        </Grid>
+    </StackPanel>
+</reactiveui:ReactiveUserControl>

v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs

@@ -0,0 +1,41 @@
+using ReactiveUI;
+using Splat;
+using System.Reactive.Disposables;
+using System.Windows.Input;
+using v2rayN.Handler;
+using v2rayN.ViewModels;
+
+namespace v2rayN.Views
+{
+    /// <summary>
+    /// ThemeSettingView.xaml
+    /// </summary>
+    public partial class ThemeSettingView
+    {
+        public ThemeSettingView()
+        {
+            InitializeComponent();
+            ViewModel = new ThemeSettingViewModel();
+
+            for (int i = Global.MinFontSize; i <= Global.MinFontSize + 8; i++)
+            {
+                cmbCurrentFontSize.Items.Add(i.ToString());
+            }
+
+            Global.Languages.ForEach(it =>
+            {
+                cmbCurrentLanguage.Items.Add(it);
+            });
+
+            this.WhenActivated(disposables =>
+            {
+                this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.followSystemTheme.IsChecked).DisposeWith(disposables);
+                this.OneWayBind(ViewModel, vm => vm.Swatches, v => v.cmbSwatches.ItemsSource).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSwatch, v => v.cmbSwatches.SelectedItem).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentLanguage, v => v.cmbCurrentLanguage.Text).DisposeWith(disposables);
+            });        
+        }
+    }
+}

v2rayN/v2rayN/v2rayN.csproj

@@ -10,7 +10,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
-		<FileVersion>6.53</FileVersion>
+		<FileVersion>6.55</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>