Merge e45c1ddb36 into 4d2eb324f1

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

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -46,11 +46,13 @@
 
         public bool InitApp()
         {
-            _config = ConfigHandler.LoadConfig();
+            Logging.Setup();
-            if (_config == null)
+            var config = ConfigHandler.LoadConfig();
+            if (config == null)
             {
                 return false;
             }
+            _config = config;
             Thread.CurrentThread.CurrentUICulture = new(_config.UiItem.CurrentLanguage);
 
             //Under Win10
@@ -70,10 +72,9 @@
 
         public bool InitComponents()
         {
-            Logging.Setup();
-            Logging.LoggingEnabled(_config.GuiItem.EnableLog);
             Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.SaveLog($"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
+            Logging.LoggingEnabled(_config.GuiItem.EnableLog);
             Logging.ClearLogs();
 
             return true;

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -31,9 +31,17 @@ public partial class App : Application
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             AppHandler.Instance.InitComponents();
-
+            desktop.ShutdownMode = Avalonia.Controls.ShutdownMode.OnExplicitShutdown;
             desktop.Exit += OnExit;
-            desktop.MainWindow = new MainWindow();
+            var mainWindow = new MainWindow();
+            if (!AppHandler.Instance.Config.UiItem.AutoHideStartup)
+            {
+                desktop.MainWindow = mainWindow;
+            }
+            else
+            {
+                desktop.MainWindow = null;
+            }
         }
 
         base.OnFrameworkInitializationCompleted();

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -41,7 +41,34 @@ namespace v2rayN.Desktop.Views
             ViewModel = new MainWindowViewModel(UpdateViewHandler);
             Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
-            //WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
+            switch (_config.UiItem.MainGirdOrientation)
+            {
+                case EGirdOrientation.Horizontal:
+                    tabProfiles.Content ??= new ProfilesView(this);
+                    tabMsgView.Content ??= new MsgView();
+                    tabClashProxies.Content ??= new ClashProxiesView();
+                    tabClashConnections.Content ??= new ClashConnectionsView();
+                    gridMain.IsVisible = true;
+                    break;
+
+                case EGirdOrientation.Vertical:
+                    tabProfiles1.Content ??= new ProfilesView(this);
+                    tabMsgView1.Content ??= new MsgView();
+                    tabClashProxies1.Content ??= new ClashProxiesView();
+                    tabClashConnections1.Content ??= new ClashConnectionsView();
+                    gridMain1.IsVisible = true;
+                    break;
+
+                case EGirdOrientation.Tab:
+                default:
+                    tabProfiles2.Content ??= new ProfilesView(this);
+                    tabMsgView2.Content ??= new MsgView();
+                    tabClashProxies2.Content ??= new ClashProxiesView();
+                    tabClashConnections2.Content ??= new ClashConnectionsView();
+                    gridMain2.IsVisible = true;
+                    break;
+            }
+            conTheme.Content ??= new ThemeSettingView();
 
             this.WhenActivated(disposables =>
             {
@@ -84,7 +111,6 @@ namespace v2rayN.Desktop.Views
                 switch (_config.UiItem.MainGirdOrientation)
                 {
                     case EGirdOrientation.Horizontal:
-                        gridMain.IsVisible = true;
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView.IsVisible).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies.IsVisible).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections.IsVisible).DisposeWith(disposables);
@@ -92,7 +118,6 @@ namespace v2rayN.Desktop.Views
                         break;
 
                     case EGirdOrientation.Vertical:
-                        gridMain1.IsVisible = true;
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView1.IsVisible).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies1.IsVisible).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections1.IsVisible).DisposeWith(disposables);
@@ -101,7 +126,6 @@ namespace v2rayN.Desktop.Views
 
                     case EGirdOrientation.Tab:
                     default:
-                        gridMain2.IsVisible = true;
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies2.IsVisible).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections2.IsVisible).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
@@ -128,35 +152,10 @@ namespace v2rayN.Desktop.Views
                 menuGlobalHotkeySetting.IsVisible = false;
             }
             menuAddServerViaScan.IsVisible = false;
-
+            
-            switch (_config.UiItem.MainGirdOrientation)
-            {
-                case EGirdOrientation.Horizontal:
-                    tabProfiles.Content ??= new ProfilesView(this);
-                    tabMsgView.Content ??= new MsgView();
-                    tabClashProxies.Content ??= new ClashProxiesView();
-                    tabClashConnections.Content ??= new ClashConnectionsView();
-                    break;
-
-                case EGirdOrientation.Vertical:
-                    tabProfiles1.Content ??= new ProfilesView(this);
-                    tabMsgView1.Content ??= new MsgView();
-                    tabClashProxies1.Content ??= new ClashProxiesView();
-                    tabClashConnections1.Content ??= new ClashConnectionsView();
-                    break;
-
-                case EGirdOrientation.Tab:
-                default:
-                    tabProfiles2.Content ??= new ProfilesView(this);
-                    tabMsgView2.Content ??= new MsgView();
-                    tabClashProxies2.Content ??= new ClashProxiesView();
-                    tabClashConnections2.Content ??= new ClashConnectionsView();
-                    break;
-            }
-            conTheme.Content ??= new ThemeSettingView();
-
             RestoreUI();
             AddHelpMenuItem();
+            //WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
         }
 
         #region Event
@@ -397,6 +396,10 @@ namespace v2rayN.Desktop.Views
             if (bl)
             {
                 this.Show();
+                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                {
+                    desktop.MainWindow = this;
+                }
                 if (this.WindowState == WindowState.Minimized)
                 {
                     this.WindowState = WindowState.Normal;

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

@@ -7,7 +7,7 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
-    Width="960"
+    Width="1000"
     Height="700"
     x:DataType="vms:RoutingRuleSettingViewModel"
     ShowInTaskbar="False"
@@ -237,11 +237,11 @@
                             Binding="{Binding Network}"
                             Header="network" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Domains}"
                             Header="domain" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Ips}"
                             Header="ip" />
                     </DataGrid.Columns>

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -7,7 +7,7 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingSetting}"
-    Width="990"
+    Width="1000"
     Height="700"
     x:DataType="vms:RoutingSettingViewModel"
     ShowInTaskbar="False"
@@ -109,7 +109,7 @@
                         <DataGrid.Columns>
                             <DataGridCheckBoxColumn Width="40" Binding="{Binding IsActive}" />
                             <DataGridTextColumn
-                                Width="250"
+                                Width="*"
                                 Binding="{Binding Remarks}"
                                 Header="{x:Static resx:ResUI.LvRemarks}" />
                             <DataGridTextColumn
@@ -121,7 +121,7 @@
                                 Binding="{Binding Sort}"
                                 Header="{x:Static resx:ResUI.LvSort}" />
                             <DataGridTextColumn
-                                Width="300"
+                                Width="*"
                                 Binding="{Binding Url}"
                                 Header="{x:Static resx:ResUI.LvUrl}" />
                             <DataGridTextColumn

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -77,9 +77,13 @@ namespace v2rayN.Desktop.Views
         {
             if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                desktop.MainWindow.Icon = AvaUtils.GetAppIcon(_config.SystemProxyItem.SysProxyType);
+                var icon = AvaUtils.GetAppIcon(_config.SystemProxyItem.SysProxyType);
+                if (desktop.MainWindow != null)
+                {
+                    desktop.MainWindow.Icon = icon;
+                }
                 var iconslist = TrayIcon.GetIcons(Application.Current);
-                iconslist[0].Icon = desktop.MainWindow.Icon;
+                iconslist[0].Icon = icon;
                 TrayIcon.SetIcons(Application.Current, iconslist);
             }
         }

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -8,9 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
     Width="700"
-    Height="600"
+    Height="650"
-    d:DesignHeight="600"
-    d:DesignWidth="800"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml

@@ -8,10 +8,8 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
-    Width="800"
+    Width="1000"
-    Height="600"
+    Height="700"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
     x:DataType="vms:SubSettingViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
@@ -49,7 +47,7 @@
                 </DataGrid.KeyBindings>
                 <DataGrid.Columns>
                     <DataGridTextColumn
-                        Width="120"
+                        Width="*"
                         Binding="{Binding Remarks}"
                         Header="{x:Static resx:ResUI.LvRemarks}" />
                     <DataGridTextColumn

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -40,7 +40,6 @@ namespace v2rayN.Views
             ViewModel = new MainWindowViewModel(UpdateViewHandler);
             Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
-            WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
             switch (_config.UiItem.MainGirdOrientation)
             {
                 case EGirdOrientation.Horizontal:
@@ -48,6 +47,7 @@ namespace v2rayN.Views
                     tabMsgView.Content ??= new MsgView();
                     tabClashProxies.Content ??= new ClashProxiesView();
                     tabClashConnections.Content ??= new ClashConnectionsView();
+                    gridMain.Visibility = Visibility.Visible;
                     break;
 
                 case EGirdOrientation.Vertical:
@@ -55,6 +55,7 @@ namespace v2rayN.Views
                     tabMsgView1.Content ??= new MsgView();
                     tabClashProxies1.Content ??= new ClashProxiesView();
                     tabClashConnections1.Content ??= new ClashConnectionsView();
+                    gridMain1.Visibility = Visibility.Visible;
                     break;
 
                 case EGirdOrientation.Tab:
@@ -63,6 +64,7 @@ namespace v2rayN.Views
                     tabMsgView2.Content ??= new MsgView();
                     tabClashProxies2.Content ??= new ClashProxiesView();
                     tabClashConnections2.Content ??= new ClashConnectionsView();
+                    gridMain2.Visibility = Visibility.Visible;
                     break;
             }
             pbTheme.Content ??= new ThemeSettingView();
@@ -108,7 +110,6 @@ namespace v2rayN.Views
                 switch (_config.UiItem.MainGirdOrientation)
                 {
                     case EGirdOrientation.Horizontal:
-                        gridMain.Visibility = Visibility.Visible;
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView.Visibility).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies.Visibility).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections.Visibility).DisposeWith(disposables);
@@ -116,7 +117,6 @@ namespace v2rayN.Views
                         break;
 
                     case EGirdOrientation.Vertical:
-                        gridMain1.Visibility = Visibility.Visible;
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView1.Visibility).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies1.Visibility).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections1.Visibility).DisposeWith(disposables);
@@ -125,7 +125,6 @@ namespace v2rayN.Views
 
                     case EGirdOrientation.Tab:
                     default:
-                        gridMain2.Visibility = Visibility.Visible;
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies2.Visibility).DisposeWith(disposables);
                         this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections2.Visibility).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
@@ -142,6 +141,7 @@ namespace v2rayN.Views
 
             RestoreUI();
             AddHelpMenuItem();
+            WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
         }
 
         #region Event

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -1,17 +1,18 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
-    Width="960"
+    Width="1000"
     Height="700"
     x:TypeArguments="vms:RoutingRuleSettingViewModel"
+    ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
     WindowStartupLocation="CenterScreen"
@@ -321,11 +322,11 @@
                             Binding="{Binding Network}"
                             Header="network" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Domains}"
                             Header="domain" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Ips}"
                             Header="ip" />
                     </DataGrid.Columns>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -9,9 +9,10 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingSetting}"
-    Width="990"
+    Width="1000"
     Height="700"
     x:TypeArguments="vms:RoutingSettingViewModel"
+    ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
     WindowStartupLocation="CenterScreen"
@@ -174,7 +175,7 @@
                         </DataGrid.Resources>
                         <DataGrid.Columns>
                             <DataGridTextColumn
-                                Width="250"
+                                Width="*"
                                 Binding="{Binding Remarks}"
                                 Header="{x:Static resx:ResUI.LvRemarks}" />
                             <DataGridTextColumn
@@ -186,7 +187,7 @@
                                 Binding="{Binding Sort}"
                                 Header="{x:Static resx:ResUI.LvSort}" />
                             <DataGridTextColumn
-                                Width="300"
+                                Width="*"
                                 Binding="{Binding Url}"
                                 Header="{x:Static resx:ResUI.LvUrl}" />
                             <DataGridTextColumn

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -1,16 +1,16 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
     Width="700"
-    Height="600"
+    Height="650"
     x:TypeArguments="vms:SubEditViewModel"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -9,9 +9,10 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
-    Width="800"
+    Width="1000"
-    Height="600"
+    Height="700"
     x:TypeArguments="vms:SubSettingViewModel"
+    ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
     WindowStartupLocation="CenterScreen"
@@ -92,7 +93,7 @@
                 Style="{StaticResource DefDataGrid}">
                 <DataGrid.Columns>
                     <DataGridTextColumn
-                        Width="120"
+                        Width="*"
                         Binding="{Binding Remarks}"
                         Header="{x:Static resx:ResUI.LvRemarks}" />
                     <DataGridTextColumn