Optimization and improvement, tray, etc.

https://github.com/2dust/v2rayN/pull/8083

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3651,6 +3651,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 If the system does not have a tray function, please do not enable it 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsHide2TrayWhenCloseTip {
+            get {
+                return ResourceManager.GetString("TbSettingsHide2TrayWhenCloseTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Hysteria Max bandwidth (Up/Down) 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1593,4 +1593,7 @@
   <data name="NotSupportProtocol" xml:space="preserve">
     <value>Not support protocol '{0}'.</value>
   </data>
+  <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
+    <value>If the system does not have a tray function, please do not enable it</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1593,4 +1593,7 @@
   <data name="NotSupportProtocol" xml:space="preserve">
     <value>Not support protocol '{0}'.</value>
   </data>
+  <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
+    <value>If the system does not have a tray function, please do not enable it</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1593,4 +1593,7 @@
   <data name="NotSupportProtocol" xml:space="preserve">
     <value>Not support protocol '{0}'.</value>
   </data>
+  <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
+    <value>If the system does not have a tray function, please do not enable it</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1593,4 +1593,7 @@
   <data name="NotSupportProtocol" xml:space="preserve">
     <value>Not support protocol '{0}'.</value>
   </data>
+  <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
+    <value>If the system does not have a tray function, please do not enable it</value>
+  </data>
 </root>

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

@@ -1590,4 +1590,7 @@
   <data name="NotSupportProtocol" xml:space="preserve">
     <value>不支持协议 '{0}'。</value>
   </data>
+  <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
+    <value>如果系统没有托盘功能，请不要开启</value>
+  </data>
 </root>

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

@@ -1590,4 +1590,7 @@
   <data name="NotSupportProtocol" xml:space="preserve">
     <value>Not support protocol '{0}'.</value>
   </data>
+  <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
+    <value>如果系統沒有托盤功能，請不要開啟</value>
+  </data>
 </root>

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -274,7 +274,6 @@ public class MainWindowViewModel : MyReactiveObject
 
         BlReloadEnabled = true;
         await Reload();
-        // await AutoHideStartup();
     }
 
     #endregion Init
@@ -576,17 +575,6 @@ public class MainWindowViewModel : MyReactiveObject
         await CoreManager.Instance.LoadCore(node);
     }
 
-    /*
-    private async Task AutoHideStartup()
-    {
-        if (_config.UiItem.AutoHideStartup)
-        {
-            AppEvents.ShowHideWindowRequested.Publish(false);
-        }
-        await Task.CompletedTask;
-    }
-    */
-
     #endregion core job
 
     #region Presets

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

@@ -412,7 +412,10 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
 
     public void ShowHideWindow(bool? blShow)
     {
-        var bl = blShow ?? (!_config.UiItem.ShowInTaskbar ^ (WindowState == WindowState.Minimized));
+        var bl = blShow ??
+                    Utils.IsLinux()
+                    ? (!_config.UiItem.ShowInTaskbar ^ (WindowState == WindowState.Minimized))
+                    : !_config.UiItem.ShowInTaskbar;
         if (bl)
         {
             this.Show();
@@ -446,8 +449,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         base.OnLoaded(sender, e);
         if (_config.UiItem.AutoHideStartup)
         {
-            this.ShowHideWindow(false);
+            ShowHideWindow(false);
-            _config.UiItem.ShowInTaskbar = true;
         }
         RestoreUI();
     }

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -355,14 +355,15 @@
                             Grid.Column="1"
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
-                        <!--
                         <TextBlock
+                            x:Name="tbAutoRunTip"
                             Grid.Row="1"
                             Grid.Column="2"
-                            VerticalAlignment="Center"
                             Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSettingsStartBootTip}"
-                            TextWrapping="Wrap" />-->
+                            TextWrapping="Wrap" />
+
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
@@ -467,6 +468,13 @@
                             Grid.Column="1"
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
+                        <TextBlock
+                            x:Name="labHide2TrayWhenCloseTip"
+                            Grid.Row="9"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSettingsHide2TrayWhenCloseTip}" />
 
                         <TextBlock
                             Grid.Row="11"

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -131,19 +131,25 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
 
             labHide2TrayWhenClose.IsVisible = false;
             togHide2TrayWhenClose.IsVisible = false;
+            labHide2TrayWhenCloseTip.IsVisible = false;
         }
         else if (Utils.IsLinux())
         {
             txbSettingsExceptionTip.IsVisible = false;
             panSystemProxyAdvanced.IsVisible = false;
+
+            tbAutoRunTip.IsVisible = false;
         }
         else if (Utils.IsOSX())
         {
             txbSettingsExceptionTip.IsVisible = false;
             panSystemProxyAdvanced.IsVisible = false;
 
+            tbAutoRunTip.IsVisible = false;
+
             labHide2TrayWhenClose.IsVisible = false;
             togHide2TrayWhenClose.IsVisible = false;
+            labHide2TrayWhenCloseTip.IsVisible = false;
         }
     }