重构
This commit is contained in:
@@ -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}">
|
||||
|
||||
2
SpineViewer/Resources/Skins/dark.xaml
Normal file
2
SpineViewer/Resources/Skins/dark.xaml
Normal file
@@ -0,0 +1,2 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
Source="pack://application:,,,/HandyControl;component/Themes/SkinDark.xaml"/>
|
||||
2
SpineViewer/Resources/Skins/light.xaml
Normal file
2
SpineViewer/Resources/Skins/light.xaml
Normal file
@@ -0,0 +1,2 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
|
||||
2
SpineViewer/Resources/Skins/violet.xaml
Normal file
2
SpineViewer/Resources/Skins/violet.xaml
Normal file
@@ -0,0 +1,2 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
Source="pack://application:,,,/HandyControl;component/Themes/SkinViolet.xaml"/>
|
||||
5
SpineViewer/Resources/Theme.xaml
Normal file
5
SpineViewer/Resources/Theme.xaml
Normal file
@@ -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>
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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}">
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
Reference in New Issue
Block a user