From 97ea1c7a9e75d54233a1e409dd5061ff9dbf5161 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 3 Aug 2024 15:59:00 +0800
Subject: [PATCH] Add toolTip

---
 v2rayN/v2rayN/Resx/ResUI.Designer.cs               | 9 +++++++++
 v2rayN/v2rayN/Resx/ResUI.resx                      | 3 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx              | 3 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx              | 3 +++
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs    | 3 ++-
 v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs | 3 ++-
 v2rayN/v2rayN/Views/ClashConnectionsView.xaml      | 3 ++-
 v2rayN/v2rayN/Views/ClashProxiesView.xaml          | 6 ++++--
 v2rayN/v2rayN/Views/MsgView.xaml                   | 6 ++++--
 v2rayN/v2rayN/Views/ProfilesView.xaml              | 9 ++++++---
 10 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 697ebb690f..025f9ab555 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -996,6 +996,15 @@ public static string menuOptionSetting {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Auto column width adjustment 的本地化字符串。
+        /// </summary>
+        public static string menuProfileAutofitColumnWidth {
+            get {
+                return ResourceManager.GetString("menuProfileAutofitColumnWidth", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Promotion 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 6159aa68c9..ed56bf04dd 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/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>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 20879c75c8..85835b859a 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/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>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index bbda0508aa..18aa6d585a 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/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>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 23da4a0c93..c98f26ccc0 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1209,11 +1209,12 @@ private void BindingUI()
              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);
                     }
                 });
         }
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index b8f7e62906..95a9387c62 100644
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -268,7 +268,8 @@ private void SaveSetting()
             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())
diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
index 2b8dd9251a..6f22085014 100644
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/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>
 
diff --git a/v2rayN/v2rayN/Views/ClashProxiesView.xaml b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
index 62d77bf900..4dac1c81f8 100644
--- a/v2rayN/v2rayN/Views/ClashProxiesView.xaml
+++ b/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>
 
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index 2f8cfd45cd..005fb82427 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/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
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayN/v2rayN/Views/ProfilesView.xaml
index df91f26de4..817e1835c7 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml
+++ b/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