From 90ba80436d94f34095bbb4b89af2876cac6eb041 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:25:09 +0800
Subject: [PATCH] Improved UI for Desktop version

---
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs        |  9 +++++++++
 v2rayN/ServiceLib/Resx/ResUI.resx               |  3 +++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx       |  3 +++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx       |  3 +++
 .../v2rayN.Desktop/Views/CheckUpdateView.axaml  |  5 ++++-
 v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml  | 17 +++++++++++------
 .../v2rayN.Desktop/Views/ProfilesView.axaml.cs  |  9 ++++++---
 .../v2rayN.Desktop/Views/ThemeSettingView.axaml | 11 ++++++++---
 8 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index a93c5491..9a0f92e6 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -1473,6 +1473,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Save Interface Layout 的本地化字符串。
+        /// </summary>
+        public static string menuStorageUI {
+            get {
+                return ResourceManager.GetString("menuStorageUI", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Add 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 2f27bf35..8e4c65fb 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1324,4 +1324,7 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>Active</value>    
   </data>
+  <data name="menuStorageUI" xml:space="preserve">
+    <value>Save Interface Layout</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 8e632e25..f1557ed9 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1321,4 +1321,7 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>活动</value>
   </data>
+  <data name="menuStorageUI" xml:space="preserve">
+    <value>保存界面布局</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 516a61f1..870dca42 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1201,4 +1201,7 @@
   <data name="TipActiveServer" xml:space="preserve">
     <value>活動</value>
   </data>
+  <data name="menuStorageUI" xml:space="preserve">
+    <value>儲存介面佈局</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
index a5bcda43..2beaec94 100644
--- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
@@ -10,7 +10,10 @@
     d:DesignWidth="800"
     x:DataType="vms:CheckUpdateViewModel"
     mc:Ignorable="d">
-    <Button Classes="Tertiary">
+    <Button
+        Classes="Tertiary"
+        FontWeight="Regular"
+        Theme="{DynamicResource BorderlessButton}">
         <Button.Content>
             <TextBlock Text="{x:Static resx:ResUI.menuCheckUpdate}" />
         </Button.Content>
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
index 93599aa8..d5c78b8e 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -54,21 +54,26 @@
                             Source="/Assets/add.png" />
                     </Button.Content>
                 </Button>
-                <Button
+                <SplitButton
                     x:Name="btnAutofitColumnWidth"
-                    Width="30"
+                    Width="54"
                     Height="30"
                     Margin="20,0"
                     Classes="Success"
-                    Theme="{DynamicResource SolidButton}"
+                    Theme="{DynamicResource SolidSplitButton}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
-                    <Button.Content>
+                    <SplitButton.Content>
                         <Image
                             Width="20"
                             Height="20"
                             Source="/Assets/fit.png" />
-                    </Button.Content>
-                </Button>
+                    </SplitButton.Content>
+                    <SplitButton.Flyout>
+                        <MenuFlyout>
+                            <MenuItem Name="menuStorageUI" Header="{x:Static resx:ResUI.menuStorageUI}" />
+                        </MenuFlyout>
+                    </SplitButton.Flyout>
+                </SplitButton>
 
                 <TextBox
                     x:Name="txtServerFilter"
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index ed9a34d7..d2ae87b2 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/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;
@@ -195,8 +196,7 @@ namespace v2rayN.Desktop.Views
             else
             {
                 ViewModel?.EditServerAsync(EConfigType.Custom);
-            }
-            StorageUI();
+            }            
         }
 
         private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
@@ -304,7 +304,6 @@ namespace v2rayN.Desktop.Views
             {
                 it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
             }
-            StorageUI();
         }
 
         private void TxtServerFilter_KeyDown(object? sender, KeyEventArgs e)
@@ -314,6 +313,10 @@ namespace v2rayN.Desktop.Views
                 ViewModel?.RefreshServers();
             }
         }
+        private void MenuStorageUI_Click(object? sender, RoutedEventArgs e)
+        {
+            StorageUI();
+        }
 
         //#endregion Event
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
index 812a519d..fd6e9a0b 100644
--- a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
@@ -10,12 +10,17 @@
     d:DesignWidth="800"
     x:DataType="vms:ThemeSettingViewModel"
     mc:Ignorable="d">
-    <Button Width="30" Height="30">
+    <Button
+        Width="30"
+        Height="30"
+        Margin="10,0"
+        Theme="{DynamicResource BorderlessButton}">
         <Button.Content>
-            <Image
+            <PathIcon
                 Width="20"
                 Height="20"
-                Source="/Assets/more.png" />
+                Data="M511.9,276.3c43.8,0 79.2,-35.5 79.2,-79.2 0,-43.8 -35.5,-79.2 -79.2,-79.2 -43.8,0 -79.2,35.5 -79.2,79.2 0,43.8 35.5,79.2 79.2,79.2zM511.9,434.8c-43.8,0 -79.2,35.5 -79.2,79.2 0,43.8 35.5,79.2 79.2,79.2 43.8,0 79.2,-35.5 79.2,-79.2 0,-43.8 -35.5,-79.2 -79.2,-79.2zM511.9,751.8c-43.8,0 -79.2,35.4 -79.2,79.2 0,43.8 35.5,79.2 79.2,79.2 43.8,0 79.2,-35.5 79.2,-79.2 0,-43.8 -35.5,-79.2 -79.2,-79.2z"
+                Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Button.Content>
         <Button.Flyout>
             <Flyout>