From 46f4709fb766b9ec68ec6806600964584cb959ab Mon Sep 17 00:00:00 2001
From: Hakoyu <Hakoyu@outlook.com>
Date: Sat, 28 Oct 2023 20:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet.ModMaker/Models/ModMakeHistory.cs        |  2 +-
 VPet.ModMaker/Styles.xaml                     |  4 +++
 .../ModEdit/ClickTextEdit/ClickTextPage.xaml  |  5 +++-
 .../Views/ModEdit/FoodEdit/FoodPage.xaml      |  5 +++-
 .../ModEdit/LowTextEdit/LowTextPage.xaml      |  5 +++-
 .../SelectTextEdit/SelectTextPage.xaml        |  5 +++-
 .../Views/ModEdit/WorkEdit/WorkPage.xaml      | 14 ++++-----
 VPet.ModMaker/Views/ModMakerWindow.xaml       | 29 ++++++++++++-------
 VPet.ModMaker/Views/ModMakerWindow.xaml.cs    |  3 +-
 9 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/VPet.ModMaker/Models/ModMakeHistory.cs b/VPet.ModMaker/Models/ModMakeHistory.cs
index 7d4dfe4..1e06102 100644
--- a/VPet.ModMaker/Models/ModMakeHistory.cs
+++ b/VPet.ModMaker/Models/ModMakeHistory.cs
@@ -55,5 +55,5 @@ public class ModMakeHistory
     /// 最后编辑时间
     /// </summary>
     [Line(ignoreCase: true)]
-    public DateTime LastTime { get; set; }
+    public DateTime LastTime { get; set; } = DateTime.Now;
 }
diff --git a/VPet.ModMaker/Styles.xaml b/VPet.ModMaker/Styles.xaml
index f50a7f4..48cfcc4 100644
--- a/VPet.ModMaker/Styles.xaml
+++ b/VPet.ModMaker/Styles.xaml
@@ -27,4 +27,8 @@
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Top" />
   </Style>
+  <Style x:Key="WindowXStyle" TargetType="pu:WindowX">
+    <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
+    <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
+  </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml
index 114ef51..7e5be1c 100644
--- a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml
+++ b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml
@@ -18,7 +18,10 @@
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
-    <TextBox pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}" Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
+    <TextBox
+      pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}"
+      Style="{DynamicResource StandardTextBoxStyle}"
+      Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
     <DataGrid
       Grid.Row="1"
       d:ItemsSource="{d:SampleData ItemCount=5}"
diff --git a/VPet.ModMaker/Views/ModEdit/FoodEdit/FoodPage.xaml b/VPet.ModMaker/Views/ModEdit/FoodEdit/FoodPage.xaml
index 6d766a5..21f5ae0 100644
--- a/VPet.ModMaker/Views/ModEdit/FoodEdit/FoodPage.xaml
+++ b/VPet.ModMaker/Views/ModEdit/FoodEdit/FoodPage.xaml
@@ -18,7 +18,10 @@
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
-    <TextBox pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}" Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
+    <TextBox
+      pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}"
+      Style="{DynamicResource StandardTextBoxStyle}"
+      Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
     <DataGrid
       Grid.Row="1"
       d:ItemsSource="{d:SampleData ItemCount=5}"
diff --git a/VPet.ModMaker/Views/ModEdit/LowTextEdit/LowTextPage.xaml b/VPet.ModMaker/Views/ModEdit/LowTextEdit/LowTextPage.xaml
index 6d75095..7851600 100644
--- a/VPet.ModMaker/Views/ModEdit/LowTextEdit/LowTextPage.xaml
+++ b/VPet.ModMaker/Views/ModEdit/LowTextEdit/LowTextPage.xaml
@@ -18,7 +18,10 @@
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
-    <TextBox pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}" Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
+    <TextBox
+      pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}"
+      Style="{DynamicResource StandardTextBoxStyle}"
+      Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
     <DataGrid
       x:Name="DataGrid_LowText"
       Grid.Row="1"
diff --git a/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml b/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml
index a1aa0b7..7f9f1b7 100644
--- a/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml
+++ b/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml
@@ -18,7 +18,10 @@
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
-    <TextBox pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}" Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
+    <TextBox
+      pu:TextBoxHelper.Watermark="{ll:Str 搜索Id}"
+      Style="{DynamicResource StandardTextBoxStyle}"
+      Text="{Binding Search.Value, UpdateSourceTrigger=PropertyChanged}" />
     <DataGrid
       Grid.Row="1"
       d:ItemsSource="{d:SampleData ItemCount=5}"
diff --git a/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkPage.xaml b/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkPage.xaml
index 1034802..67a9ae5 100644
--- a/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkPage.xaml
+++ b/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkPage.xaml
@@ -13,10 +13,10 @@
   d:DesignHeight="450"
   d:DesignWidth="800"
   mc:Ignorable="d">
-    <Page.Resources>
-        <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
-    </Page.Resources>
-    <Grid>
+  <Page.Resources>
+    <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
+  </Page.Resources>
+  <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
@@ -39,14 +39,14 @@
         </TextBox.Style>
       </TextBox>
       <ComboBox
-          MinWidth="150"
         x:Name="ComboBox_Pet"
         Grid.Column="1"
+        MinWidth="150"
         pu:ComboBoxHelper.Watermark="{ll:Str 选择宠物}"
         DisplayMemberPath="Id.Value"
         ItemsSource="{Binding Pets}"
-                    Style="{DynamicResource StandardComboBoxStyle}"
-        SelectedItem="{Binding CurrentPet.Value}">
+        SelectedItem="{Binding CurrentPet.Value}"
+        Style="{DynamicResource StandardComboBoxStyle}">
         <ComboBox.ItemContainerStyle>
           <Style BasedOn="{StaticResource {x:Type ComboBoxItem}}" TargetType="ComboBoxItem">
             <Setter Property="ToolTip" Value="{Binding CurrentI18nData.Value.Name.Value}" />
diff --git a/VPet.ModMaker/Views/ModMakerWindow.xaml b/VPet.ModMaker/Views/ModMakerWindow.xaml
index 3c3f871..92c9aca 100644
--- a/VPet.ModMaker/Views/ModMakerWindow.xaml
+++ b/VPet.ModMaker/Views/ModMakerWindow.xaml
@@ -1,4 +1,4 @@
-<Window
+<pu:WindowX
   x:Class="VPet.ModMaker.Views.ModMakerWindow"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,12 +13,13 @@
   Height="450"
   d:DataContext="{d:DesignInstance Type=vm:ModMakerWindowVM}"
   FontSize="16"
+  Style="{DynamicResource WindowXStyle}"
   WindowStartupLocation="CenterScreen"
   mc:Ignorable="d">
-    <Window.Resources>
-        <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
-    </Window.Resources>
-    <Grid>
+  <Window.Resources>
+    <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
+  </Window.Resources>
+  <Grid>
     <Grid.ColumnDefinitions>
       <ColumnDefinition />
       <ColumnDefinition Width="Auto" />
@@ -35,17 +36,21 @@
           <ColumnDefinition />
           <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <TextBox pu:TextBoxHelper.Watermark="{ll:Str 最近的内容}" Text="{Binding HistoriesSearchText.Value}" />
+        <TextBox
+          pu:TextBoxHelper.Watermark="{ll:Str 最近的内容}"
+          Style="{DynamicResource StandardTextBoxStyle}"
+          Text="{Binding HistoriesSearchText.Value}" />
         <Button
           Grid.Column="1"
           Command="{Binding ClearHistoriesCommand}"
-          Content="{ll:Str 清空历史}" />
+          Content="{ll:Str 清空历史}"
+          Style="{StaticResource ThemedButtonStyle}" />
       </Grid>
       <ListBox
         Grid.Row="2"
         d:ItemsSource="{d:SampleData ItemCount=5}"
         ItemsSource="{Binding ShowHistories.Value}"
-        Style="{StaticResource SideMenuListBoxStyle}">
+        Style="{DynamicResource SideMenuListBoxStyle}">
         <ListBox.ItemContainerStyle>
           <Style BasedOn="{StaticResource {x:Type ListBoxItem}}" TargetType="ListBoxItem">
             <Setter Property="Height" Value="64" />
@@ -110,12 +115,14 @@
         <Button
           x:Name="Button_CreateNewMod"
           Command="{Binding CreateNewModCommand}"
-          Content="{ll:Str 创建新的模组}" />
+          Content="{ll:Str 创建新的模组}"
+          Style="{DynamicResource ThemedButtonStyle}" />
         <Button
           x:Name="Button_OpenFromFile"
           Command="{Binding LoadModFromFileCommand}"
-          Content="{ll:Str 从文件中载入}" />
+          Content="{ll:Str 从文件中载入}"
+          Style="{DynamicResource ThemedButtonStyle}" />
       </StackPanel>
     </Grid>
   </Grid>
-</Window>
+</pu:WindowX>
diff --git a/VPet.ModMaker/Views/ModMakerWindow.xaml.cs b/VPet.ModMaker/Views/ModMakerWindow.xaml.cs
index 9d8d99c..aa4c214 100644
--- a/VPet.ModMaker/Views/ModMakerWindow.xaml.cs
+++ b/VPet.ModMaker/Views/ModMakerWindow.xaml.cs
@@ -1,5 +1,6 @@
 using LinePutScript;
 using LinePutScript.Localization.WPF;
+using Panuon.WPF.UI;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -26,7 +27,7 @@ namespace VPet.ModMaker.Views;
 /// <summary>
 /// winModMaker.xaml 的交互逻辑
 /// </summary>
-public partial class ModMakerWindow : Window
+public partial class ModMakerWindow : WindowX
 {
     public ModMakerWindowVM ViewModel => (ModMakerWindowVM)DataContext;
     public ModEditWindow ModEditWindow { get; set; }