v2rayN/ServiceLib/Enums/EMsgCommand.cs

@@ -6,7 +6,6 @@
         SendMsgView,
         SendSnackMsg,
         RefreshProfiles,
-        StopSpeedtest,
+        StopSpeedtest
-        AppExit
     }
 }

v2rayN/ServiceLib/Global.cs

@@ -196,7 +196,7 @@
         public static readonly List<string> SingboxDomainStrategy4Out = new() { "ipv4_only", "prefer_ipv4", "prefer_ipv6", "ipv6_only", "" };
         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", "hu" };
+        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", "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", "socks2" };

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.3.1</Version>
+	<Version>7.3.0</Version>
   </PropertyGroup>
  
 	<ItemGroup>
@@ -60,9 +60,6 @@
 	    <SubType>Designer</SubType>
 	    <Generator>PublicResXFileCodeGenerator</Generator>
 	  </EmbeddedResource>
-	  <EmbeddedResource Update="Resx\ResUI.hu.resx">
-	    <Generator>PublicResXFileCodeGenerator</Generator>
-	  </EmbeddedResource>
 	  <EmbeddedResource Update="Resx\ResUI.resx">
 	    <SubType>Designer</SubType>
 	    <LastGenOutput>ResUI.Designer.cs</LastGenOutput>

v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs

@@ -10,7 +10,7 @@ namespace ServiceLib.Services.Statistics
         private ClientWebSocket? webSocket;
         private Action<ServerSpeedItem>? _updateFunc;
         private string Url => $"ws://{Global.Loopback}:{AppHandler.Instance.StatePort2}/traffic";
-
+        
         public StatisticsSingboxService(Config config, Action<ServerSpeedItem> updateFunc)
         {
             _config = config;

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -160,9 +160,9 @@ namespace ServiceLib.ViewModels
             var configDirZipTemp = Utils.GetTempPath($"v2rayN_{DateTime.Now:yyyyMMddHHmmss}");
             var configDirTemp = Path.Combine(configDirZipTemp, _guiConfigs);
 
-            FileManager.CopyDirectory(configDir, configDirTemp, false, "cache.db");
+            await Task.Run(() => FileManager.CopyDirectory(configDir, configDirTemp, false, "cache.db"));
-            var ret = FileManager.CreateFromDirectory(configDirZipTemp, fileName);
+            var ret = await Task.Run(() => FileManager.CreateFromDirectory(configDirZipTemp, fileName));
-            Directory.Delete(configDirZipTemp, true);
+            await Task.Run(() => Directory.Delete(configDirZipTemp, true));
             return ret;
         }
     }

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -283,7 +283,6 @@ namespace ServiceLib.ViewModels
             try
             {
                 Logging.SaveLog("MyAppExitAsync Begin");
-                MessageBus.Current.SendMessage("", EMsgCommand.AppExit.ToString());
 
                 await ConfigHandler.SaveConfig(_config);
                 await SysProxyHandler.UpdateSysProxy(_config, true);

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -459,7 +459,7 @@ namespace ServiceLib.ViewModels
                 if (_config.Inbound.First().NewPort4LAN)
                 {
                     StringBuilder sb2 = new();
-                    sb2.Append($"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks2)}]");
+                    sb2.Append($"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks2)}]");                    
                     InboundLanDisplay = $"{ResUI.LabLAN}:{sb2}";
                 }
                 else

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

@@ -152,11 +152,10 @@ namespace v2rayN.Desktop.Views
                 menuGlobalHotkeySetting.IsVisible = false;
             }
             menuAddServerViaScan.IsVisible = false;
-
+            
             RestoreUI();
             AddHelpMenuItem();
             //WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
-            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         #region Event
@@ -442,7 +441,7 @@ namespace v2rayN.Desktop.Views
             }
         }
 
-        private void StorageUI(string? n = null)
+        private void StorageUI()
         {
             _config.UiItem.MainWidth = Utils.ToInt(this.Width);
             _config.UiItem.MainHeight = Utils.ToInt(this.Height);
@@ -457,6 +456,7 @@ namespace v2rayN.Desktop.Views
                 _config.UiItem.MainGirdHeight1 = Math.Ceiling(gridMain1.RowDefinitions[0].ActualHeight + 0.1);
                 _config.UiItem.MainGirdHeight2 = Math.Ceiling(gridMain1.RowDefinitions[2].ActualHeight + 0.1);
             }
+            ConfigHandler.SaveConfig(_config);
         }
 
         private void AddHelpMenuItem()

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -56,23 +56,28 @@
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button.Content>
                 </Button>
-
+                <SplitButton
-                <Button
                     x:Name="btnAutofitColumnWidth"
-                    Width="30"
+                    Width="54"
                     Height="30"
-                    Margin="4,0"
+                    Margin="20,0"
-                    Classes="Success"
+                    Padding="2"
-                    Theme="{DynamicResource BorderlessButton}"
+                    Classes="Tertiary"
+                    Theme="{DynamicResource BorderlessSplitButton}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
-                    <Button.Content>
+                    <SplitButton.Content>
                         <PathIcon
                             Width="24"
                             Height="24"
                             Data="{StaticResource building_fit}"
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                    </Button.Content>
+                    </SplitButton.Content>
-                </Button>
+                    <SplitButton.Flyout>
+                        <MenuFlyout>
+                            <MenuItem Name="menuStorageUI" Header="{x:Static resx:ResUI.menuStorageUI}" />
+                        </MenuFlyout>
+                    </SplitButton.Flyout>
+                </SplitButton>
 
                 <TextBox
                     x:Name="txtServerFilter"

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -27,6 +27,7 @@ namespace v2rayN.Desktop.Views
             menuSelectAll.Click += menuSelectAll_Click;
             btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
             txtServerFilter.KeyDown += TxtServerFilter_KeyDown;
+            menuStorageUI.Click += MenuStorageUI_Click;
             lstProfiles.KeyDown += LstProfiles_KeyDown;
             lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
             lstProfiles.DoubleTapped += LstProfiles_DoubleTapped;
@@ -90,7 +91,6 @@ namespace v2rayN.Desktop.Views
 
             RestoreUI();
             ViewModel?.RefreshServers();
-            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
@@ -323,7 +323,12 @@ namespace v2rayN.Desktop.Views
                 ViewModel?.RefreshServers();
             }
         }
-         
+
+        private void MenuStorageUI_Click(object? sender, RoutedEventArgs e)
+        {
+            StorageUI();
+        }
+
         //#endregion Event
 
         //#region UI
@@ -363,7 +368,7 @@ namespace v2rayN.Desktop.Views
             }
         }
 
-        private void StorageUI(string? n = null)
+        private void StorageUI()
         {
             List<ColumnItem> lvColumnItem = new();
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -381,6 +386,7 @@ namespace v2rayN.Desktop.Views
                 });
             }
             _config.UiItem.MainColumnItem = lvColumnItem;
+            ConfigHandler.SaveConfig(_config);
         }
 
         //#endregion UI

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

@@ -51,7 +51,6 @@ namespace v2rayN.Views
         {
             AutofitColumnWidth();
         }
-
         private void AutofitColumnWidth()
         {
             foreach (var it in lstConnections.Columns)

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -26,6 +26,7 @@ namespace v2rayN.Views
             _config = AppHandler.Instance.Config;
             ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
 
+            Application.Current.Exit += Current_Exit;
             App.Current.SessionEnding += Current_SessionEnding;
             this.Closing += MainWindow_Closing;
             this.PreviewKeyDown += MainWindow_PreviewKeyDown;
@@ -141,7 +142,6 @@ namespace v2rayN.Views
             RestoreUI();
             AddHelpMenuItem();
             WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
-            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         #region Event
@@ -265,6 +265,11 @@ namespace v2rayN.Views
             ShowHideWindow(false);
         }
 
+        private void Current_Exit(object sender, ExitEventArgs e)
+        {
+            StorageUI();
+        }
+
         private async void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e)
         {
             Logging.SaveLog("Current_SessionEnding");
@@ -397,7 +402,7 @@ namespace v2rayN.Views
             }
         }
 
-        private void StorageUI(string? n = null)
+        private void StorageUI()
         {
             _config.UiItem.MainWidth = Utils.ToInt(this.Width);
             _config.UiItem.MainHeight = Utils.ToInt(this.Height);

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -1,7 +1,6 @@
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using Splat;
-using System;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
@@ -25,6 +24,7 @@ namespace v2rayN.Views
 
             _config = AppHandler.Instance.Config;
 
+            Application.Current.Exit += Current_Exit;
             btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
             txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
             lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
@@ -90,11 +90,15 @@ namespace v2rayN.Views
 
             RestoreUI();
             ViewModel?.RefreshServers();
-            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         #region Event
 
+        private void Current_Exit(object sender, ExitEventArgs e)
+        {
+            StorageUI();
+        }
+
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
         {
             switch (action)
@@ -352,7 +356,7 @@ namespace v2rayN.Views
             }
         }
 
-        private void StorageUI(string? n = null)
+        private void StorageUI()
         {
             List<ColumnItem> lvColumnItem = new();
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -366,6 +370,7 @@ namespace v2rayN.Views
                 });
             }
             _config.UiItem.MainColumnItem = lvColumnItem;
+            ConfigHandler.SaveConfig(_config);
         }
 
         #endregion UI