From 8b622050fa3cebb6b2cd8a9536c9b95b2be2d472 Mon Sep 17 00:00:00 2001
From: ww-rm <ww-rm@qq.com>
Date: Fri, 3 Oct 2025 19:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SpineViewer/App.xaml                                 |  6 +++---
 SpineViewer/Resources/Skins/dark.xaml                |  2 ++
 SpineViewer/Resources/Skins/light.xaml               |  2 ++
 SpineViewer/Resources/Skins/violet.xaml              |  2 ++
 SpineViewer/Resources/Theme.xaml                     |  5 +++++
 SpineViewer/Views/AboutDialog.xaml                   |  2 +-
 SpineViewer/Views/DiagnosticsDialog.xaml             |  2 +-
 .../ExporterDialogs/CustomFFmpegExporterDialog.xaml  |  2 +-
 .../ExporterDialogs/FFmpegVideoExporterDialog.xaml   |  2 +-
 .../Views/ExporterDialogs/FrameExporterDialog.xaml   |  2 +-
 .../ExporterDialogs/FrameSequenceExporterDialog.xaml |  2 +-
 SpineViewer/Views/MainWindow.xaml                    | 12 ++++++------
 SpineViewer/Views/PreferenceDialog.xaml              |  2 +-
 SpineViewer/Views/ProgressDialog.xaml                |  4 ++--
 14 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 SpineViewer/Resources/Skins/dark.xaml
 create mode 100644 SpineViewer/Resources/Skins/light.xaml
 create mode 100644 SpineViewer/Resources/Skins/violet.xaml
 create mode 100644 SpineViewer/Resources/Theme.xaml

diff --git a/SpineViewer/App.xaml b/SpineViewer/App.xaml
index 8ad5e3f..a8ce080 100644
--- a/SpineViewer/App.xaml
+++ b/SpineViewer/App.xaml
@@ -8,14 +8,14 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDark.xaml"/>
+                <ResourceDictionary Source="/Resources/Skins/Light.xaml"/>
+                <ResourceDictionary Source="/Resources/Theme.xaml"/>
                 <ResourceDictionary Source="/Resources/Geometries.xaml"/>
                 <ResourceDictionary Source="/Resources/Strings/zh.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style x:Key="MyToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToggleButtonSwitch}">
-                <Setter Property="hc:VisualElement.HighlightBrush" Value="{StaticResource DarkSuccessBrush}"/>
+                <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource DarkSuccessBrush}"/>
             </Style>
 
             <Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource ListBoxBaseStyle}">
diff --git a/SpineViewer/Resources/Skins/dark.xaml b/SpineViewer/Resources/Skins/dark.xaml
new file mode 100644
index 0000000..4a72ce5
--- /dev/null
+++ b/SpineViewer/Resources/Skins/dark.xaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    Source="pack://application:,,,/HandyControl;component/Themes/SkinDark.xaml"/>
diff --git a/SpineViewer/Resources/Skins/light.xaml b/SpineViewer/Resources/Skins/light.xaml
new file mode 100644
index 0000000..7ef5d2d
--- /dev/null
+++ b/SpineViewer/Resources/Skins/light.xaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
diff --git a/SpineViewer/Resources/Skins/violet.xaml b/SpineViewer/Resources/Skins/violet.xaml
new file mode 100644
index 0000000..1a0d963
--- /dev/null
+++ b/SpineViewer/Resources/Skins/violet.xaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    Source="pack://application:,,,/HandyControl;component/Themes/SkinViolet.xaml"/>
diff --git a/SpineViewer/Resources/Theme.xaml b/SpineViewer/Resources/Theme.xaml
new file mode 100644
index 0000000..ed1bc87
--- /dev/null
+++ b/SpineViewer/Resources/Theme.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/SpineViewer/Views/AboutDialog.xaml b/SpineViewer/Views/AboutDialog.xaml
index 393cbe6..d11fcd2 100644
--- a/SpineViewer/Views/AboutDialog.xaml
+++ b/SpineViewer/Views/AboutDialog.xaml
@@ -8,7 +8,7 @@
         d:DataContext="{d:DesignInstance Type=viewmodels:AboutDialogViewModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_Abount}"
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Height="300"
         Width="500"
         ShowInTaskbar="False"
diff --git a/SpineViewer/Views/DiagnosticsDialog.xaml b/SpineViewer/Views/DiagnosticsDialog.xaml
index 04a60e8..ea046ad 100644
--- a/SpineViewer/Views/DiagnosticsDialog.xaml
+++ b/SpineViewer/Views/DiagnosticsDialog.xaml
@@ -8,7 +8,7 @@
         d:DataContext="{d:DesignInstance Type=viewmodels:DiagnosticsDialogViewModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_Diagnostics}"
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Height="450" 
         Width="800"    
         ShowInTaskbar="False"
diff --git a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
index 12fd91e..84329b6 100644
--- a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
@@ -10,7 +10,7 @@
         d:DataContext="{d:DesignInstance Type=exporters:CustomFFmpegExporterViewModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_CustomFFmpegExporterTitle}"
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Width="450"
         Height="800"
         ShowInTaskbar="False"
diff --git a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
index 5628be4..fffca07 100644
--- a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
@@ -10,7 +10,7 @@
         d:DataContext="{d:DesignInstance Type=vmexp:FFmpegVideoExporterViewModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_FFmpegVideoExporterTitle}"
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Width="450"
         Height="750"
         ShowInTaskbar="False"
diff --git a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
index 12ca688..b90a980 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
@@ -10,7 +10,7 @@
         d:DataContext="{d:DesignInstance Type=vmexp:FrameExporterViewModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_FrameExporterTitle}" 
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Width="450"
         Height="480"
         ShowInTaskbar="False"
diff --git a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
index 2bfedd0..991f513 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
@@ -10,7 +10,7 @@
         d:DataContext="{d:DesignInstance Type=vmexp:FrameSequenceExporterViewModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_FrameSequenceExporterTitle}"
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Width="450"
         Height="550"
         ShowInTaskbar="False"
diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml
index 1936bb0..656894b 100644
--- a/SpineViewer/Views/MainWindow.xaml
+++ b/SpineViewer/Views/MainWindow.xaml
@@ -21,7 +21,7 @@
 
     <Window.Resources>
         <Style TargetType="{x:Type GridSplitter}">
-            <Setter Property="Background" Value="{StaticResource SecondaryBorderBrush}"/>
+            <Setter Property="Background" Value="{DynamicResource SecondaryBorderBrush}"/>
             <Setter Property="ShowsPreview" Value="False"/>
             <Style.Triggers>
                 <Trigger Property="ResizeDirection" Value="Columns">
@@ -716,7 +716,7 @@
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="Auto"/>
                                             </Grid.ColumnDefinitions>
-                                            <hc:TextBox hc:InfoElement.Placeholder="{StaticResource Str_Filter}"
+                                            <hc:TextBox hc:InfoElement.Placeholder="{DynamicResource Str_Filter}"
                                                         Text="{Binding FilterString, UpdateSourceTrigger=PropertyChanged}"/>
                                             <Button Grid.Column="1" 
                                                     hc:IconElement.Geometry="{StaticResource Geo_Folder}" 
@@ -760,7 +760,7 @@
                                                     <MenuItem Header="{DynamicResource Str_GeneratePreviewForSelected}"
                                                               Command="{Binding Cmd_GeneratePreviews}"
                                                               CommandParameter="{Binding PlacementTarget.SelectedItems, RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}}"/>
-                                                    <MenuItem Header="{StaticResource Str_DeletePreviewsForSelected}"
+                                                    <MenuItem Header="{DynamicResource Str_DeletePreviewsForSelected}"
                                                               Command="{Binding Cmd_DeletePreviews}"
                                                               CommandParameter="{Binding PlacementTarget.SelectedItems, RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}}"/>
                                                 </ContextMenu>
@@ -804,7 +804,7 @@
                                                  IsReadOnly="True"/>
 
                                         <!-- 预览图 -->
-                                        <Border Grid.Row="2" Grid.ColumnSpan="2" Background="#a0a0a0">
+                                        <Border Grid.Row="2" Grid.ColumnSpan="2" Background="{DynamicResource DarkDefaultBrush}">
                                             <Image Source="{Binding PreviewImage, Mode=OneWay}" Stretch="Uniform"/>
                                         </Border>
                                     </Grid>
@@ -1011,7 +1011,7 @@
                                 </Grid.RowDefinitions>
 
                                 <!-- 预览画面容器 -->
-                                <Border Grid.Row="0" x:Name="_renderPanelContainer" Background="{StaticResource SecondaryRegionBrush}">
+                                <Border Grid.Row="0" x:Name="_renderPanelContainer" Background="{DynamicResource SecondaryRegionBrush}">
                                     <SFMLRenderer:SFMLRenderPanel x:Name="_renderPanel"/>
                                 </Border>
 
@@ -1023,7 +1023,7 @@
                                             DataContext="{Binding SFMLRendererViewModel}"
                                             Grid.Row="1" 
                                             Grid.IsSharedSizeScope="True"
-                                            Background="{StaticResource RegionBrush}">
+                                            Background="{DynamicResource RegionBrush}">
                                         <WrapPanel HorizontalAlignment="Center">
                                             <WrapPanel.Resources>
                                                 <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ButtonDefault}">
diff --git a/SpineViewer/Views/PreferenceDialog.xaml b/SpineViewer/Views/PreferenceDialog.xaml
index 19625ec..9853e40 100644
--- a/SpineViewer/Views/PreferenceDialog.xaml
+++ b/SpineViewer/Views/PreferenceDialog.xaml
@@ -10,7 +10,7 @@
         d:DataContext="{d:DesignInstance Type=models:PreferenceModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_Preference}"
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Height="650" 
         Width="600"    
         ShowInTaskbar="False"
diff --git a/SpineViewer/Views/ProgressDialog.xaml b/SpineViewer/Views/ProgressDialog.xaml
index a0188d3..bd633ca 100644
--- a/SpineViewer/Views/ProgressDialog.xaml
+++ b/SpineViewer/Views/ProgressDialog.xaml
@@ -9,7 +9,7 @@
         d:DataContext="{d:DesignInstance Type=vm:ProgressDialogViewModel}"
         mc:Ignorable="d"
         Title="{Binding Title}"
-        Background="{StaticResource RegionBrush}"
+        Background="{DynamicResource RegionBrush}"
         Width="550"
         Height="250"
         ResizeMode="NoResize" 
@@ -30,7 +30,7 @@
                      VerticalAlignment="Center" 
                      Margin="20 5"/>
         <Button Grid.Row="2" 
-                Content="{StaticResource Str_Cancel}"
+                Content="{DynamicResource Str_Cancel}"
                 Command="{Binding Cmd_Cancel}"
                 Width="100" 
                 Margin="15"/>