up 6.54

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

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

@@ -393,12 +393,16 @@ namespace v2rayN.Handler.CoreConfig
                 var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(txtFile);
                 if (singboxConfig == null)
                 {
-                    msg = ResUI.FailedConversionConfiguration;
-                    return -1;
+                    //msg = ResUI.FailedConversionConfiguration;
+                    //return -1;
+                    File.Copy(addressFileName, fileName);
+                }
+                else
+                {
+                    GenInbounds(singboxConfig);
+                    GenExperimental(singboxConfig);
+                    JsonUtils.ToFile(singboxConfig, fileName, false);
                 }
-
-                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

@@ -1209,11 +1209,12 @@ namespace v2rayN.ViewModels
              y => y != null && !y.IsNullOrEmpty())
                 .Subscribe(c =>
                 {
-                    if (!Utils.IsNullOrEmpty(CurrentLanguage))
+                    if (!Utils.IsNullOrEmpty(CurrentLanguage) && _config.uiItem.currentLanguage != CurrentLanguage)
                     {
                         _config.uiItem.currentLanguage = CurrentLanguage;
                         Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
                         ConfigHandler.SaveConfig(_config);
+                        _noticeHandler?.Enqueue(ResUI.NeedRebootTips);
                     }
                 });
         }

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/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/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
@@ -75,7 +78,6 @@
                 BorderThickness="1"
                 CanUserAddRows="False"
                 CanUserResizeRows="False"
-                CanUserSortColumns="False"
                 EnableRowVirtualization="True"
                 Focusable="True"
                 GridLinesVisibility="All"

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.54</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>