From 1a5eeb94012c367ad74d6600cbfc4de80d11834d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 9 Jan 2025 21:03:17 +0800
Subject: [PATCH 1/4] Adjust UI for desktop

---
 .../Views/BackupAndRestoreView.axaml          | 10 +++++--
 .../Views/CheckUpdateView.axaml               | 18 ++++++-------
 v2rayN/v2rayN.Desktop/Views/MsgView.axaml     |  4 +--
 .../Views/OptionSettingWindow.axaml           |  2 +-
 .../v2rayN.Desktop/Views/ProfilesView.axaml   |  2 +-
 .../Views/RoutingRuleDetailsWindow.axaml      |  4 +--
 .../Views/RoutingSettingWindow.axaml          | 27 ++++++-------------
 .../v2rayN.Desktop/Views/StatusBarView.axaml  |  2 +-
 v2rayN/v2rayN/Views/CheckUpdateView.xaml      |  1 -
 9 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
index ecd12276..6023ca89 100644
--- a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
@@ -10,6 +10,12 @@
     d:DesignWidth="800"
     x:DataType="vms:BackupAndRestoreViewModel"
     mc:Ignorable="d">
+    <UserControl.Styles>
+        <Style Selector="Button">
+            <Setter Property="MinWidth" Value="180" />
+        </Style>
+    </UserControl.Styles>
+
 
     <DockPanel Classes="Margin8">
         <DockPanel Classes="Margin8" DockPanel.Dock="Bottom">
@@ -23,7 +29,7 @@
             <Border
                 Margin="4"
                 VerticalAlignment="Center"
-                Theme="{StaticResource CardBorder}">
+                Theme="{DynamicResource CardBorder}">
 
                 <Grid
                     Classes="Margin8"
@@ -69,7 +75,7 @@
             <Border
                 Margin="4"
                 VerticalAlignment="Center"
-                Theme="{StaticResource CardBorder}">
+                Theme="{DynamicResource CardBorder}">
                 <Grid
                     Classes="Margin8"
                     ColumnDefinitions="300,200"
diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
index f3c6c50e..af6fda86 100644
--- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
@@ -35,7 +35,11 @@
                 Content="{x:Static resx:ResUI.menuCheckUpdate}" />
         </StackPanel>
 
-        <StackPanel>
+        <Border
+            Margin="4"
+            VerticalAlignment="Center"
+            Theme="{DynamicResource CardBorder}">
+
             <ListBox
                 x:Name="lstCheckUpdates"
                 BorderThickness="1"
@@ -47,12 +51,7 @@
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <Border
-                            Width="500"
-                            Height="80"
-                            Margin="-8"
-                            VerticalAlignment="Center"
-                            Theme="{StaticResource CardBorder}">
+                        <Panel Width="500" VerticalAlignment="Center">
                             <Grid ColumnDefinitions="1*,1*,3*" RowDefinitions="Auto">
                                 <ToggleSwitch
                                     x:Name="togAutoRefresh"
@@ -73,11 +72,10 @@
                                     Text="{Binding Remarks}"
                                     TextWrapping="WrapWithOverflow" />
                             </Grid>
-                        </Border>
+                        </Panel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ListBox>
-        </StackPanel>
+        </Border>
     </DockPanel>
-
 </UserControl>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
index 99dd5121..041c992a 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
@@ -65,7 +65,7 @@
                 Margin="8,0"
                 HorizontalAlignment="Left"
                 IsChecked="True"
-                Theme="{StaticResource SimpleToggleSwitch}" />
+                Theme="{DynamicResource SimpleToggleSwitch}" />
             <TextBlock
                 Margin="8,0"
                 VerticalAlignment="Center"
@@ -75,7 +75,7 @@
                 Margin="8,0"
                 HorizontalAlignment="Left"
                 IsChecked="True"
-                Theme="{StaticResource SimpleToggleSwitch}" />
+                Theme="{DynamicResource SimpleToggleSwitch}" />
         </WrapPanel>
         <TextBox
             Name="txtMsg"
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index 890e6702..ecb22925 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -114,7 +114,7 @@
                             Grid.ColumnSpan="2"
                             HorizontalAlignment="Left"
                             Classes="Margin8"
-                            SelectionMode="Multiple"
+                            SelectionMode="Multiple,Toggle"
                             Theme="{DynamicResource CardCheckGroupListBox}" />
 
                         <TextBlock
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
index 2985c633..f007f4fe 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -165,7 +165,7 @@
                                         Classes="Solid Red"
                                         Content="{x:Static resx:ResUI.TipActiveServer}"
                                         IsVisible="{Binding IsActive}"
-                                        Theme="{StaticResource TagLabel}" />
+                                        Theme="{DynamicResource TagLabel}" />
                                     <TextBlock
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
index 62cdd0bf..fa515eb6 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
@@ -94,7 +94,7 @@
                 Grid.Column="1"
                 HorizontalAlignment="Left"
                 Classes="Margin8"
-                SelectionMode="Multiple"
+                SelectionMode="Multiple,Toggle"
                 Theme="{DynamicResource CardCheckGroupListBox}" />
 
             <TextBlock
@@ -108,7 +108,7 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Classes="Margin8"
-                SelectionMode="Multiple"
+                SelectionMode="Multiple,Toggle"
                 Theme="{DynamicResource CardCheckGroupListBox}" />
             <TextBlock
                 Grid.Row="4"
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
index a14f25d8..2915a913 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
@@ -18,40 +18,29 @@
         <StackPanel
             Classes="Margin8"
             DockPanel.Dock="Top"
-            Orientation="Horizontal">
+            Orientation="Horizontal"
+            Spacing="4">
             <Menu>
                 <MenuItem x:Name="menuRoutingAdvancedAdd2" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
                 <MenuItem x:Name="menuRoutingAdvancedImportRules2" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
             </Menu>
 
-            <TextBlock Margin="8,0,0,0" VerticalAlignment="Center">
+            <TextBlock VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
                 </HyperlinkButton>
             </TextBlock>
-            <ComboBox
-                x:Name="cmbdomainStrategy"
-                Width="110"
-                Margin="8,0,0,0" />
+            <ComboBox x:Name="cmbdomainStrategy" Width="110" />
             <Separator />
-            <TextBlock
-                Margin="8,0,0,0"
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Width="60"
-                Margin="8,0,0,0" />
+            <TextBlock VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbdomainMatcher}" />
+            <ComboBox x:Name="cmbdomainMatcher" Width="60" />
             <Separator />
-            <TextBlock Margin="8,0,0,0" VerticalAlignment="Center">
+            <TextBlock VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 </HyperlinkButton>
             </TextBlock>
-            <ComboBox
-                x:Name="cmbdomainStrategy4Singbox"
-                Width="100"
-                Margin="8,0,0,0" />
+            <ComboBox x:Name="cmbdomainStrategy4Singbox" Width="100" />
         </StackPanel>
 
         <StackPanel
diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
index af3a3545..7898b670 100644
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
@@ -45,7 +45,7 @@
                         x:Name="togEnableTun"
                         HorizontalAlignment="Center"
                         Classes="Margin8"
-                        Theme="{StaticResource SimpleToggleSwitch}" />
+                        Theme="{DynamicResource SimpleToggleSwitch}" />
                 </StackPanel>
 
                 <StackPanel
diff --git a/v2rayN/v2rayN/Views/CheckUpdateView.xaml b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
index 887a9644..b619f72b 100644
--- a/v2rayN/v2rayN/Views/CheckUpdateView.xaml
+++ b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
@@ -64,7 +64,6 @@
                     <DataTemplate>
                         <Border
                             Width="500"
-                            Height="50"
                             Margin="{StaticResource Margin8}"
                             Padding="0"
                             VerticalAlignment="Center">

From baf90cfbdd1bbe4048b40cbb04b69e73133894d0 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:00:00 +0800
Subject: [PATCH 2/4] Sing-box cache file specified path

https://github.com/2dust/v2rayN/issues/6460
---
 .../ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index e4268916..26708d79 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1259,7 +1259,8 @@ namespace ServiceLib.Services.CoreConfig
                 singboxConfig.experimental ??= new Experimental4Sbox();
                 singboxConfig.experimental.cache_file = new CacheFile4Sbox()
                 {
-                    enabled = true
+                    enabled = true,
+                    path = Utils.GetConfigPath("cache.db")
                 };
             }
 

From 127858d5822ef8eabad9f8e4432b719f5756ebf1 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:23:03 +0800
Subject: [PATCH 3/4] Adjust UI for desktop

---
 .../Views/BackupAndRestoreView.axaml          | 23 ++++---
 .../Views/BackupAndRestoreView.axaml.cs       |  7 +-
 .../Views/CheckUpdateView.axaml               |  3 +-
 .../Views/ClashProxiesView.axaml              | 28 ++++----
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml  | 65 ++-----------------
 .../Views/ProfilesView.axaml.cs               |  7 +-
 v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml  |  3 -
 .../v2rayN.Desktop/Views/QrcodeView.axaml.cs  |  5 ++
 8 files changed, 54 insertions(+), 87 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
index 6023ca89..d61dae8a 100644
--- a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
@@ -5,10 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
-    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    x:DataType="vms:BackupAndRestoreViewModel"
     mc:Ignorable="d">
     <UserControl.Styles>
         <Style Selector="Button">
@@ -55,7 +53,10 @@
                         Classes="Margin8"
                         Content="{x:Static resx:ResUI.menuLocalBackup}" />
 
-                    <Separator Grid.Row="2" Grid.ColumnSpan="2" />
+                    <Separator
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2" />
 
                     <TextBlock
                         Grid.Row="3"
@@ -80,12 +81,11 @@
                     Classes="Margin8"
                     ColumnDefinitions="300,200"
                     RowDefinitions="Auto,Auto,Auto,Auto,Auto">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Classes="Margin8"
-                            Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
+                    <StackPanel
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Orientation="Horizontal">
+                        <TextBlock Classes="Margin8" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
 
                         <Button
                             Width="30"
@@ -190,7 +190,10 @@
                         Classes="Margin8"
                         Content="{x:Static resx:ResUI.menuRemoteBackup}" />
 
-                    <Separator Grid.Row="2" Grid.ColumnSpan="3" />
+                    <Separator
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2" />
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
diff --git a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs
index 9098c09f..8ae9b75e 100644
--- a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs
@@ -9,7 +9,12 @@ namespace v2rayN.Desktop.Views
 {
     public partial class BackupAndRestoreView : ReactiveUserControl<BackupAndRestoreViewModel>
     {
-        private Window _window;
+        private Window? _window;
+
+        public BackupAndRestoreView()
+        {
+            InitializeComponent();
+        }
 
         public BackupAndRestoreView(Window window)
         {
diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
index af6fda86..407a7d9c 100644
--- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
@@ -43,7 +43,8 @@
             <ListBox
                 x:Name="lstCheckUpdates"
                 BorderThickness="1"
-                ItemsSource="{Binding CheckUpdateModels}">
+                ItemsSource="{Binding CheckUpdateModels}"
+                Theme="{StaticResource ButtonRadioGroupListBox}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel Orientation="Vertical" />
diff --git a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
index c260f4ce..98a1d3a6 100644
--- a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
@@ -95,7 +95,8 @@
             <ListBox
                 x:Name="lstProxyGroups"
                 DockPanel.Dock="Left"
-                ItemsSource="{Binding ProxyGroups}">
+                ItemsSource="{Binding ProxyGroups}"
+                Theme="{StaticResource ButtonRadioGroupListBox}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel Orientation="Vertical" />
@@ -105,24 +106,25 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="-6"
+                            Margin="-8,-4"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
-                            <DockPanel>
-                                <Grid Classes="Margin8" RowDefinitions="1*,8,1*">
-                                    <DockPanel Grid.Row="0">
-                                        <TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
-                                        <TextBlock Text="{Binding Name}" />
-                                    </DockPanel>
-                                    <TextBlock Grid.Row="2" Text="{Binding Now}" />
-                                </Grid>
-                            </DockPanel>
+                            <Grid Classes="Margin8" RowDefinitions="1*,8,1*">
+                                <DockPanel Grid.Row="0">
+                                    <TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
+                                    <TextBlock Text="{Binding Name}" />
+                                </DockPanel>
+                                <TextBlock Grid.Row="2" Text="{Binding Now}" />
+                            </Grid>
                         </Border>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ListBox>
 
-            <ListBox x:Name="lstProxyDetails" ItemsSource="{Binding ProxyDetails}">
+            <ListBox
+                x:Name="lstProxyDetails"
+                ItemsSource="{Binding ProxyDetails}"
+                Theme="{StaticResource ButtonRadioGroupListBox}">
                 <ItemsControl.ContextMenu>
                     <ContextMenu>
                         <MenuItem x:Name="menuProxiesDelaytestPart" Header="{x:Static resx:ResUI.menuProxiesDelaytestPart}" />
@@ -138,7 +140,7 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="-6"
+                            Margin="-12,-4"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
                             <DockPanel>
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
index 35f558aa..05943ec0 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
@@ -150,71 +150,20 @@
                         x:Name="tabMain1"
                         Grid.Row="2"
                         TabStripPlacement="Left">
-                        <TabItem x:Name="tabMsgView1">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashProxies1">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashConnections1">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
+                        <TabItem x:Name="tabMsgView1" Header="{x:Static resx:ResUI.MsgInformationTitle}" />
+                        <TabItem x:Name="tabClashProxies1" Header="{x:Static resx:ResUI.TbProxies}" />
+                        <TabItem x:Name="tabClashConnections1" Header="{x:Static resx:ResUI.TbConnections}" />
                     </TabControl>
                 </Grid>
                 <Grid x:Name="gridMain2" IsVisible="False">
                     <TabControl x:Name="tabMain2" TabStripPlacement="Left">
-                        <TabItem x:Name="tabProfiles2">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.menuServers}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabMsgView2">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.MsgInformationTitle}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashProxies2">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbProxies}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
-                        <TabItem x:Name="tabClashConnections2">
-                            <TabItem.Header>
-                                <StackPanel>
-
-                                    <TextBlock HorizontalAlignment="Center" Text="{x:Static resx:ResUI.TbConnections}" />
-                                </StackPanel>
-                            </TabItem.Header>
-                        </TabItem>
+                        <TabItem x:Name="tabProfiles2" Header="{x:Static resx:ResUI.menuServers}" />
+                        <TabItem x:Name="tabMsgView2" Header="{x:Static resx:ResUI.MsgInformationTitle}" />
+                        <TabItem x:Name="tabClashProxies2" Header="{x:Static resx:ResUI.TbProxies}" />
+                        <TabItem x:Name="tabClashConnections2" Header="{x:Static resx:ResUI.TbConnections}" />
                     </TabControl>
                 </Grid>
-
             </Grid>
-
         </DockPanel>
     </dialogHost:DialogHost>
 </Window>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 4f66d926..07d2733e 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -15,7 +15,12 @@ namespace v2rayN.Desktop.Views
     public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
     {
         private static Config _config;
-        private Window _window;
+        private Window? _window;
+
+        public ProfilesView()
+        {
+            InitializeComponent();
+        }
 
         public ProfilesView(Window window)
         {
diff --git a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml
index 1a0e150f..d6a6f70f 100644
--- a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml
@@ -4,12 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     d:DesignHeight="480"
     d:DesignWidth="400"
     mc:Ignorable="d">
     <Grid Margin="30" RowDefinitions="Auto,Auto">
-
         <Image
             Name="imgQrcode"
             Width="300"
@@ -24,6 +22,5 @@
             IsReadOnly="True"
             MaxLines="1" />
 
-
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
index dc7273be..93c0aaec 100644
--- a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
@@ -5,6 +5,11 @@ namespace v2rayN.Desktop.Views
 {
     public partial class QrcodeView : UserControl
     {
+        public QrcodeView()
+        {
+            InitializeComponent();
+        }
+
         public QrcodeView(string? url)
         {
             InitializeComponent();

From edbd168dcf3f6b78235a40e41026bd0b4054b8f9 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:53:06 +0800
Subject: [PATCH 4/4] Add theme options for desktop

---
 v2rayN/ServiceLib/Enums/ETheme.cs             | 13 +++++++
 v2rayN/ServiceLib/Models/ConfigItems.cs       |  1 +
 v2rayN/ServiceLib/Resx/ResUI.Designer.cs      |  9 +++++
 v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx       |  5 ++-
 v2rayN/ServiceLib/Resx/ResUI.hu.resx          |  3 ++
 v2rayN/ServiceLib/Resx/ResUI.resx             |  3 ++
 v2rayN/ServiceLib/Resx/ResUI.ru.resx          |  3 ++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx     |  3 ++
 v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx     |  3 ++
 .../ViewModels/ThemeSettingViewModel.cs       | 35 +++++++++----------
 .../Views/ThemeSettingView.axaml              | 31 ++++++++--------
 .../Views/ThemeSettingView.axaml.cs           |  8 +++--
 12 files changed, 80 insertions(+), 37 deletions(-)
 create mode 100644 v2rayN/ServiceLib/Enums/ETheme.cs

diff --git a/v2rayN/ServiceLib/Enums/ETheme.cs b/v2rayN/ServiceLib/Enums/ETheme.cs
new file mode 100644
index 00000000..7701ae8f
--- /dev/null
+++ b/v2rayN/ServiceLib/Enums/ETheme.cs
@@ -0,0 +1,13 @@
+namespace ServiceLib.Enums
+{
+    public enum ETheme
+    {
+        FollowSystem,
+        Dark,
+        Light,
+        Aquatic,
+        Desert,
+        Dusk,
+        NightSky
+    }
+}
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
index f7642df3..41d34606 100644
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -105,6 +105,7 @@
         public bool ColorModeDark { get; set; }
         public bool FollowSystemTheme { get; set; }
         public string? ColorPrimaryName { get; set; }
+        public string? CurrentTheme { get; set; }
         public string CurrentLanguage { get; set; }
         public string CurrentFontFamily { get; set; }
         public int CurrentFontSize { get; set; }
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index abe53603..4cc375a8 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -3463,6 +3463,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Theme 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTheme {
+            get {
+                return ResourceManager.GetString("TbSettingsTheme", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable Security Protocol TLS v1.3 (subscription/update) 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index e9c4a62b..20f52b3e 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks:پورت محلی، socks2: پورت دوم محلی، socks3: پورت LAN</value>
   </data>
-</root>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 053efb6a..a66ddedb 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 82b27147..1152a657 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index 326bf5d3..325e431c 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1402,4 +1402,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>Theme</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 6807b6de..45dfaca1 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1399,4 +1399,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks：本地端口，socks2：第二个本地端口，socks3：局域网端口</value>
   </data>
+  <data name="TbSettingsTheme" 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 27d7207b..ff22b92d 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1400,4 +1400,7 @@
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
     <value>socks：本地端口，socks2：第二個本地端口，socks3：區域網路端口</value>
   </data>
+  <data name="TbSettingsTheme" xml:space="preserve">
+    <value>主題</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
index d0854a2f..afdf78c2 100644
--- a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
@@ -6,14 +6,14 @@ using Avalonia.Media;
 using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Semi.Avalonia;
 using System.Reactive.Linq;
 
 namespace v2rayN.Desktop.ViewModels
 {
     public class ThemeSettingViewModel : MyReactiveObject
     {
-        [Reactive] public bool ColorModeDark { get; set; }
-        [Reactive] public bool FollowSystemTheme { get; set; }
+        [Reactive] public string CurrentTheme { get; set; }
 
         [Reactive] public int CurrentFontSize { get; set; }
 
@@ -36,28 +36,16 @@ namespace v2rayN.Desktop.ViewModels
 
         private void BindingUI()
         {
-            ColorModeDark = _config.UiItem.ColorModeDark;
-            FollowSystemTheme = _config.UiItem.FollowSystemTheme;
+            CurrentTheme = _config.UiItem.CurrentTheme;
             CurrentFontSize = _config.UiItem.CurrentFontSize;
             CurrentLanguage = _config.UiItem.CurrentLanguage;
 
-            this.WhenAnyValue(x => x.ColorModeDark)
+            this.WhenAnyValue(x => x.CurrentTheme)
                 .Subscribe(c =>
                 {
-                    if (_config.UiItem.ColorModeDark != ColorModeDark)
+                    if (_config.UiItem.CurrentTheme != CurrentTheme)
                     {
-                        _config.UiItem.ColorModeDark = ColorModeDark;
-                        ModifyTheme();
-                        ConfigHandler.SaveConfig(_config);
-                    }
-                });
-            this.WhenAnyValue(x => x.FollowSystemTheme,
-                    y => y == true)
-                .Subscribe(c =>
-                {
-                    if (_config.UiItem.FollowSystemTheme != FollowSystemTheme)
-                    {
-                        _config.UiItem.FollowSystemTheme = FollowSystemTheme;
+                        _config.UiItem.CurrentTheme = CurrentTheme;
                         ModifyTheme();
                         ConfigHandler.SaveConfig(_config);
                     }
@@ -96,7 +84,16 @@ namespace v2rayN.Desktop.ViewModels
             var app = Application.Current;
             if (app is not null)
             {
-                app.RequestedThemeVariant = FollowSystemTheme ? ThemeVariant.Default : (ColorModeDark ? ThemeVariant.Dark : ThemeVariant.Light);
+                app.RequestedThemeVariant = CurrentTheme switch
+                {
+                    nameof(ETheme.Dark) => ThemeVariant.Dark,
+                    nameof(ETheme.Light) => ThemeVariant.Light,
+                    nameof(ETheme.Aquatic) => SemiTheme.Aquatic,
+                    nameof(ETheme.Desert) => SemiTheme.Desert,
+                    nameof(ETheme.Dusk) => SemiTheme.Dusk,
+                    nameof(ETheme.NightSky) => SemiTheme.NightSky,
+                    _ => ThemeVariant.Default,
+                };
             }
         }
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
index 61c4a778..39f5fffc 100644
--- a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
@@ -10,6 +10,15 @@
     d:DesignWidth="800"
     x:DataType="vms:ThemeSettingViewModel"
     mc:Ignorable="d">
+    <UserControl.Styles>
+        <Style Selector="TextBlock">
+            <Setter Property="Width" Value="100" />
+        </Style>
+        <Style Selector="ComboBox">
+            <Setter Property="Width" Value="150" />
+        </Style>
+    </UserControl.Styles>
+
     <Button
         Width="30"
         Height="30"
@@ -27,40 +36,32 @@
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsColorMode}" />
-                        <ToggleSwitch x:Name="togDarkMode" Classes="Margin8" />
+                            Text="{x:Static resx:ResUI.TbSettingsTheme}" />
+                        <ComboBox
+                            x:Name="cmbCurrentTheme"
+                            HorizontalAlignment="Center"
+                            Classes="Margin8" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
-                            VerticalAlignment="Center"
-                            Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
-                        <ToggleSwitch x:Name="togFollowSystemTheme" Classes="Margin8" />
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
                         <ComboBox
                             x:Name="cmbCurrentFontSize"
-                            Width="100"
+                            HorizontalAlignment="Center"
                             Classes="Margin8" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
                         <ComboBox
                             x:Name="cmbCurrentLanguage"
-                            Width="100"
+                            HorizontalAlignment="Center"
                             Classes="Margin8" />
                     </StackPanel>
                 </StackPanel>
diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs
index efdf1403..601b0958 100644
--- a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs
@@ -16,6 +16,11 @@ namespace v2rayN.Desktop.Views
             InitializeComponent();
             ViewModel = new ThemeSettingViewModel();
 
+            foreach (ETheme it in Enum.GetValues(typeof(ETheme)))
+            {
+                cmbCurrentTheme.Items.Add(it.ToString());
+            }
+
             for (int i = Global.MinFontSize; i <= Global.MinFontSize + 10; i++)
             {
                 cmbCurrentFontSize.Items.Add(i);
@@ -28,8 +33,7 @@ namespace v2rayN.Desktop.Views
 
             this.WhenActivated(disposables =>
             {
-                this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.togFollowSystemTheme.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentTheme, v => v.cmbCurrentTheme.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentLanguage, v => v.cmbCurrentLanguage.SelectedValue).DisposeWith(disposables);
             });