初始化 SystemSettingsPage

2024-08-30 18:42:36 +00:00 · 2023-12-24 22:26:37 +08:00 · 2023-12-24 22:26:37 +08:00 · 9b019d55fb
commit 9b019d55fb
parent 248fc14df1
8 changed files with 267 additions and 263 deletions
--- a/VPet.Solution/App.xaml
+++ b/VPet.Solution/App.xaml
@ -6,8 +6,8 @@
  <Application.Resources>
    <ResourceDictionary>
      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
        <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
        <ResourceDictionary Source="Converters.xaml" />
        <ResourceDictionary Source="Templates.xaml" />
        <ResourceDictionary Source="Styles.xaml" />
--- a/VPet.Solution/NativeStyles.xaml
+++ b/VPet.Solution/NativeStyles.xaml
@ -3,8 +3,8 @@
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
    <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
    <ResourceDictionary Source="Converters.xaml" />
    <ResourceDictionary Source="Templates.xaml" />
    <ResourceDictionary Source="Styles.xaml" />
--- a/VPet.Solution/Styles.xaml
+++ b/VPet.Solution/Styles.xaml
@ -2,8 +2,11 @@
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:pu="https://opensource.panuon.com/wpf-ui">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
+  </ResourceDictionary.MergedDictionaries>
  <Style
-    x:Key="AddButton"
+    x:Key="Button_Add"
    BasedOn="{StaticResource {x:Type Button}}"
    TargetType="Button">
    <Setter Property="Background" Value="{StaticResource DARKPrimary}" />
@ -50,9 +53,10 @@
    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
  </Style>
  <Style
-    x:Key="TextBlock_Center"
+    x:Key="TextBlock_BaseStyle"
    BasedOn="{StaticResource {x:Type TextBlock}}"
    TargetType="TextBlock">
+    <Setter Property="Margin" Value="10,5,10,5" />
    <Setter Property="VerticalAlignment" Value="Center" />
    <Setter Property="HorizontalAlignment" Value="Center" />
    <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
@ -134,6 +138,7 @@
    <Setter Property="pu:MenuItemHelper.CheckedBackground" Value="{DynamicResource CheckedColor}" />-->
  </Style>
  <Style x:Key="Switch_BaseStyle" TargetType="pu:Switch">
+    <Setter Property="HorizontalAlignment" Value="Left" />
    <Setter Property="Margin" Value="10,5,10,5" />
    <Setter Property="Background" Value="{x:Null}" />
    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryDark}" />
@ -162,7 +167,10 @@
    <Setter Property="FontWeight" Value="Bold" />
    <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDarker}" />
  </Style>
-  <Style x:Key="Button_BaseStyle" TargetType="Button">
+  <Style
+    x:Key="Button_BaseStyle"
+    BasedOn="{StaticResource {x:Type Button}}"
+    TargetType="Button">
    <Setter Property="Margin" Value="10,5,10,5" />
    <Setter Property="Padding" Value="10,5,10,5" />
    <Setter Property="HorizontalAlignment" Value="Center" />
--- a/VPet.Solution/Utils/ElementHelper.cs
+++ b/VPet.Solution/Utils/ElementHelper.cs
@ -192,9 +192,7 @@ public static class ElementHelper
            var topParent = element.FindTopParentOnVisualTree();
            var groups = _uniformMinWidthGroups[topParent];
            var group = groups[groupName];
-            var maxWidthElement = group.Elements.First(
-                i => i.ActualWidth == group.Elements.Max(e => e.ActualWidth)
-            );
+            var maxWidthElement = group.Elements.MaxBy(i => i.ActualWidth);
            if (maxWidthElement is null)
                return;

--- a/VPet.Solution/Utils/Expansions.cs
+++ b/VPet.Solution/Utils/Expansions.cs
@ -27,6 +27,29 @@ public static class Extensions
        return source.IndexOf(value, comparisonType) >= 0;
    }

+    public static TSource MaxBy<TSource, TKey>(
+        this IEnumerable<TSource> source,
+        Func<TSource, TKey> keySelector
+    )
+    {
+        using IEnumerator<TSource> e = source.GetEnumerator();
+        if (e.MoveNext() is false)
+            return default;
+        TSource value = e.Current;
+        TKey key = keySelector(value);
+        while (e.MoveNext())
+        {
+            TSource nextValue = e.Current;
+            TKey nextKey = keySelector(nextValue);
+            if (Comparer<TKey>.Default.Compare(nextKey, key) > 0)
+            {
+                key = nextKey;
+                value = nextValue;
+            }
+        }
+        return value;
+    }
+
    //public static string GetSourceFile(this BitmapImage image)
    //{
    //    return ((FileStream)image.StreamSource).Name;
--- a/VPet.Solution/Views/GraphicsSettingsPage.xaml
+++ b/VPet.Solution/Views/GraphicsSettingsPage.xaml
@ -14,15 +14,14 @@
  d:DesignHeight="450"
  d:DesignWidth="800"
  mc:Ignorable="d">
-
  <Grid>
    <Grid>
      <Grid.ColumnDefinitions>
        <ColumnDefinition MinWidth="300" />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" MinWidth="100" />
+        <!--<ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" MinWidth="100" />-->
      </Grid.ColumnDefinitions>
-      <ScrollViewer>
+      <ScrollViewer VerticalScrollBarVisibility="Auto">
        <StackPanel>
          <Grid MinHeight="40">
            <Grid.ColumnDefinitions>
@ -32,6 +31,7 @@
              <ColumnDefinition />
            </Grid.ColumnDefinitions>
            <Label
+              HorizontalContentAlignment="Left"
              h:ElementHelper.UniformMinWidthGroup="A"
              Content="{ll:Str '置于顶层'}"
              Style="{DynamicResource Label_BaseStyle}" />
@ -66,6 +66,7 @@
              <ColumnDefinition />
            </Grid.ColumnDefinitions>
            <Label
+              HorizontalContentAlignment="Left"
              h:ElementHelper.UniformMinWidthGroup="A"
              Content="Language"
              Style="{DynamicResource Label_BaseStyle}" />
@ -115,13 +116,16 @@
              LargeChange=".1"
              Maximum="3"
              Minimum="0.5"
-              SmallChange=".05"
+              SmallChange="0.05"
              Style="{DynamicResource StandardSliderStyle}"
              TickFrequency="0.05"
              Value="1" />
            <pu:NumberInput
              Grid.Column="2"
              Foreground="{DynamicResource DARKPrimaryDarker}"
+              Interval="0.1"
+              Maximum="3"
+              Minimum="0.5"
              Style="{DynamicResource NumberInput_BaseStyle}"
              Value="{Binding Value, ElementName=Slider_Zoom}" />
          </Grid>
@ -153,6 +157,9 @@
              Value="1000" />
            <pu:NumberInput
              Grid.Column="2"
+              Interval="10"
+              Maximum="1920"
+              Minimum="200"
              Style="{DynamicResource NumberInput_BaseStyle}"
              ToolTip="{ll:Str '桌宠图形渲染的分辨率,越高图形越清晰\&#13;但是高分辨率会占用更多内存\&#13;重启后生效'}"
              Value="{Binding Value, ElementName=Slider_Resolution}" />
@ -210,7 +217,7 @@
              Grid.Column="1"
              d:Checked="StartPlace_Checked"
              d:Unchecked="StartPlace_Checked"
-              Content="{ll:Str 退出位置}"
+              Content="{ll:Str 保存为退出位置}"
              IsChecked="True"
              Style="{DynamicResource Switch_BaseStyle}"
              ToolTip="{ll:Str 游戏退出位置为下次桌宠启动出现的位置}" />
@ -342,5 +349,26 @@
        </StackPanel>
      </ScrollViewer>
    </Grid>
+    <!--<Grid Grid.Column="1">
+        <TextBox
+          x:Name="tb_seach_menu"
+          Margin="3,6,6,0"
+          VerticalAlignment="Top"
+          d:TextChanged="tb_seach_menu_textchange"
+          pu:TextBoxHelper.Watermark="{ll:Str 搜索设置}"
+          FontSize="16"
+          Style="{DynamicResource StandardTextBoxStyle}" />
+        <ListBox
+          x:Name="ListMenu"
+          Margin="3,40,6,3"
+          pu:ListBoxHelper.CornerRadius="5"
+          pu:ListBoxHelper.ItemsHoverBackground="{DynamicResource Primary}"
+          pu:ListBoxHelper.ItemsSelectedBackground="{DynamicResource SecondaryLight}"
+          Background="{DynamicResource SecondaryLighter}"
+          BorderBrush="{DynamicResource Primary}"
+          BorderThickness="2"
+          ScrollViewer.HorizontalScrollBarVisibility="Auto"
+          ScrollViewer.VerticalScrollBarVisibility="Auto" />
+      </Grid>-->
  </Grid>
 </Page>
--- a/VPet.Solution/Views/MainWindow.xaml
+++ b/VPet.Solution/Views/MainWindow.xaml
@ -12,6 +12,8 @@
  Title="{ll:Str 'VPET 问题解决工具'}"
  Width="800"
  Height="450"
+  MinWidth="400"
+  MinHeight="200"
  d:DataContext="{d:DesignInstance Type=vm:MainWindowVM}"
  mc:Ignorable="d">
  <Grid>
--- a/VPet.Solution/Views/SystemSettingsPage.xaml
+++ b/VPet.Solution/Views/SystemSettingsPage.xaml
@ -3,6 +3,7 @@
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:h="clr-namespace:HKW.WPF.Helpers"
  xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF"
  xmlns:local="clr-namespace:VPet.Solution.Views"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -14,32 +15,33 @@
  d:DesignHeight="450"
  d:DesignWidth="800"
  mc:Ignorable="d">
-
  <Grid>
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
      <StackPanel>
-        <TextBlock
-          HorizontalAlignment="Left"
-          VerticalAlignment="Top"
-          Background="{x:Null}"
-          TextWrapping="Wrap">
-          <Run
-            FontSize="18"
-            FontWeight="Bold"
-            Text="{ll:Str 自动保存频率}" /><LineBreak />
-          <Run Text="{ll:Str 在指定时间后自动保存游戏数据}" />
-        </TextBlock>
-        <ComboBox
-          x:Name="CBAutoSave"
-          Width="200"
-          Margin="10,5,0,0"
-          HorizontalAlignment="Left"
-          VerticalAlignment="Top"
-          d:SelectionChanged="CBAutoSave_SelectionChanged"
-          FontSize="16"
-          SelectedIndex="3"
-          Style="{DynamicResource StandardComboBoxStyle}">
-          <ComboBoxItem Content="{ll:Str 关闭自动保存}">
+        <Grid MinHeight="40">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <Label
+            HorizontalContentAlignment="Left"
+            h:ElementHelper.UniformMinWidthGroup="A"
+            Content="{ll:Str 自动保存频率}"
+            Style="{DynamicResource Label_BaseStyle}"
+            ToolTip="{ll:Str 在指定时间后自动保存游戏数据}" />
+          <TextBlock
+            Grid.Column="1"
+            Style="{DynamicResource TextBlock_BaseStyle}"
+            Text="{ll:Str 每次间隔}" />
+          <ComboBox
+            x:Name="CBAutoSave"
+            Grid.Column="2"
+            d:SelectionChanged="CBAutoSave_SelectionChanged"
+            SelectedIndex="3"
+            Style="{DynamicResource ComboBox_BaseStyle}">
+            <!--<ComboBoxItem Content="{ll:Str 关闭自动保存}">
            <ComboBoxItem.Tag>
              <sys:Int32>-1</sys:Int32>
            </ComboBoxItem.Tag>
@ -73,21 +75,37 @@
            <ComboBoxItem.Tag>
              <sys:Int32>60</sys:Int32>
            </ComboBoxItem.Tag>
-          </ComboBoxItem>
-        </ComboBox>
-        <TextBlock
-          Margin="0,6,0,0"
-          HorizontalAlignment="Left"
-          VerticalAlignment="Top"
-          Background="{x:Null}"
-          TextWrapping="Wrap">
-          <Run
-            FontSize="18"
-            FontWeight="Bold"
-            Text="{ll:Str 从备份中还原}" /><LineBreak />
-          <Run Text="{ll:Str '虚拟桌宠模拟器在每次保存的时候都会备份上次储存的存档, 当原始存档丢失,受损或误操作时, 就可以还原他们'}" />
-        </TextBlock>
-        <Grid Margin="0,5,0,0">
+          </ComboBoxItem>-->
+          </ComboBox>
+          <TextBlock
+            Grid.Column="3"
+            Style="{DynamicResource TextBlock_BaseStyle}"
+            Text="{ll:Str 分钟}" />
+        </Grid>
+        <Grid MinHeight="40">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+          </Grid.ColumnDefinitions>
+          <Label
+            HorizontalContentAlignment="Left"
+            h:ElementHelper.UniformMinWidthGroup="A"
+            Content="{ll:Str 备份设置}"
+            Style="{DynamicResource Label_BaseStyle}" />
+          <TextBlock
+            Grid.Column="1"
+            Style="{DynamicResource TextBlock_BaseStyle}"
+            Text="{ll:Str 备份数量}" />
+          <pu:NumberInput
+            x:Name="numBackupSaveMaxNum"
+            Grid.Column="2"
+            d:ValueChanged="numBackupSaveMaxNum_ValueChanged"
+            Minimum="1"
+            Style="{DynamicResource NumberInput_BaseStyle}"
+            Value="20" />
+        </Grid>
+        <!--<Grid Margin="0,5,0,0">
          <Grid.RowDefinitions>
            <RowDefinition Height="35" />
            <RowDefinition Height="35" />
@ -99,19 +117,17 @@
            <ColumnDefinition Width="1*" />
          </Grid.ColumnDefinitions>
          <TextBlock
-            Grid.Row="0"
-            VerticalAlignment="Center"
-            Text="{ll:Str 备份数量}" />
-          <pu:NumberInput
-            x:Name="numBackupSaveMaxNum"
-            Grid.Column="2"
-            Margin="0,1,0,1"
-            d:ValueChanged="numBackupSaveMaxNum_ValueChanged"
-            BorderBrush="{DynamicResource PrimaryDarker}"
-            BorderThickness="1.5"
-            CornerRadius="4"
-            Minimum="1"
-            Value="20" />
+            Margin="0,6,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="{x:Null}"
+            TextWrapping="Wrap">
+            <Run
+              FontSize="18"
+              FontWeight="Bold"
+              Text="{ll:Str 从备份中还原}" /><LineBreak />
+            <Run Text="{ll:Str '虚拟桌宠模拟器在每次保存的时候都会备份上次储存的存档, 当原始存档丢失,受损或误操作时, 就可以还原他们'}" />
+          </TextBlock>
          <TextBlock
            Grid.Row="1"
            VerticalAlignment="Center"
@ -135,21 +151,70 @@
            FontSize="16"
            SelectedIndex="3"
            Style="{DynamicResource StandardComboBoxStyle}" />
+        </Grid>-->
+        <Grid MinHeight="40">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+          </Grid.ColumnDefinitions>
+          <Label
+            HorizontalContentAlignment="Left"
+            h:ElementHelper.UniformMinWidthGroup="A"
+            Content="{ll:Str 聊天设置}"
+            Style="{DynamicResource Label_BaseStyle}" />
+          <Grid Grid.Column="1">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition />
+              <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <RadioButton
+              x:Name="RBCGPTUseLB"
+              d:Checked="CGPType_Checked"
+              Content="{ll:Str '使用桌宠选项式\&#13;聊天功能'}"
+              GroupName="cgpttype"
+              IsChecked="True"
+              Style="{DynamicResource StandardRadioButtonStyle}"
+              ToolTip="{ll:Str 支持MOD与创意工坊添加聊天内容}" />
+            <RadioButton
+              x:Name="RBCGPTClose"
+              Grid.Column="1"
+              d:Checked="CGPType_Checked"
+              Content="{ll:Str '关闭聊天框'}"
+              GroupName="cgpttype"
+              Style="{DynamicResource StandardRadioButtonStyle}" />
+            <Grid Grid.Row="1" Grid.ColumnSpan="2">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <RadioButton
+                x:Name="RBCGPTDIY"
+                d:Checked="CGPType_Checked"
+                Content="{ll:Str '自定义聊天接口'}"
+                GroupName="cgpttype"
+                Style="{DynamicResource StandardRadioButtonStyle}" />
+              <ComboBox
+                x:Name="cbChatAPISelect"
+                Grid.Column="1"
+                d:SelectionChanged="cbChatAPISelect_SelectionChanged"
+                Style="{DynamicResource ComboBox_BaseStyle}" />
+              <Button
+                x:Name="BtnCGPTReSet"
+                Grid.Column="2"
+                d:Click="ChatGPT_Reset_Click"
+                Background="{DynamicResource SecondaryLight}"
+                Content="{ll:Str 初始化桌宠聊天程序}"
+                Style="{DynamicResource Button_BaseStyle}" />
+            </Grid>
+          </Grid>
        </Grid>
-
-        <TextBlock
-          Margin="0,5,0,0"
-          HorizontalAlignment="Left"
-          VerticalAlignment="Top"
-          Background="{x:Null}"
-          TextWrapping="Wrap">
-          <Run
-            FontSize="18"
-            FontWeight="Bold"
-            Text="{ll:Str 聊天设置}" /><LineBreak />
-          <Run Text="{ll:Str 聊天框等相关设置}" />
-        </TextBlock>
-        <Grid>
+        <!--<Grid>
          <Grid.ColumnDefinitions>
            <ColumnDefinition Width="Auto" />
            <ColumnDefinition Width="15" />
@ -177,204 +242,84 @@
              <RowDefinition Height="Auto" />
              <RowDefinition Height="Auto" />
            </Grid.RowDefinitions>
-            <!--<RadioButton x:Name="RBCGPTUseAPI" Grid.Column="1" Checked="CGPType_Checked"
+        -->
+        <!--<RadioButton x:Name="RBCGPTUseAPI" Grid.Column="1" Checked="CGPType_Checked"
                        Content="{ll:Str '使用从ChatGPT\&#13;申请的的API'}" GroupName="cgpttype"
                        Style="{DynamicResource StandardRadioButtonStyle}"
                        ToolTip="{ll:Str 需要去OpenAI官网申请}" />-->
-            <RadioButton
-              x:Name="RBCGPTUseLB"
-              d:Checked="CGPType_Checked"
-              Content="{ll:Str '使用桌宠选项式\&#13;聊天功能'}"
-              GroupName="cgpttype"
-              IsChecked="True"
-              Style="{DynamicResource StandardRadioButtonStyle}"
-              ToolTip="{ll:Str 支持MOD与创意工坊添加聊天内容}" />
-            <RadioButton
-              x:Name="RBCGPTClose"
-              Grid.Column="1"
-              d:Checked="CGPType_Checked"
-              Content="{ll:Str '关闭聊天框'}"
-              GroupName="cgpttype"
-              Style="{DynamicResource StandardRadioButtonStyle}" />
-            <RadioButton
-              x:Name="RBCGPTDIY"
-              Grid.Row="1"
-              Grid.ColumnSpan="2"
-              d:Checked="CGPType_Checked"
-              GroupName="cgpttype"
-              Style="{DynamicResource StandardRadioButtonStyle}">
-              <Grid Width="{Binding ActualWidth, ElementName=RBCGPTDIY}">
-                <Grid.RowDefinitions>
-                  <RowDefinition />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="40" />
-                </Grid.ColumnDefinitions>
-                <Label Background="{x:Null}" Content="{ll:Str '自定义聊天接口'}" />
-                <ComboBox
-                  x:Name="cbChatAPISelect"
-                  Grid.Row="1"
-                  Grid.Column="0"
-                  d:SelectionChanged="cbChatAPISelect_SelectionChanged"
-                  Style="{DynamicResource StandardComboBoxStyle}" />
-              </Grid>
-            </RadioButton>
+        <!--
          </Grid>
-          <Button
-            x:Name="BtnCGPTReSet"
-            Grid.Row="1"
-            Grid.Column="2"
-            Margin="4"
-            Padding="1"
-            d:Click="ChatGPT_Reset_Click"
-            pu:ButtonHelper.CornerRadius="4"
-            Background="{DynamicResource SecondaryLight}"
-            Content="{ll:Str 初始化桌宠聊天程序}" />
-        </Grid>
-        <TextBlock
-          Margin="0,5,0,0"
-          HorizontalAlignment="Left"
-          VerticalAlignment="Top"
-          Background="{x:Null}"
-          TextWrapping="Wrap">
-          <Run
-            FontSize="18"
-            FontWeight="Bold"
-            Text="{ll:Str 游戏操作}" />
-        </TextBlock>
-        <Button
-          Grid.Row="1"
-          Grid.Column="2"
-          Margin="4"
-          Padding="1"
-          d:Click="save_click"
-          pu:ButtonHelper.CornerRadius="4"
-          Background="{DynamicResource SecondaryLight}"
-          Content="{ll:Str 保存游戏}"
-          ToolTip="{ll:Str '手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存'}" />
-        <Button
-          Grid.Row="1"
-          Grid.Column="2"
-          Margin="4"
-          Padding="1"
-          d:Click="restart_click"
-          pu:ButtonHelper.CornerRadius="4"
-          Background="{DynamicResource SecondaryLight}"
-          Content="{ll:Str 重新开始}"
-          ToolTip="{ll:Str '重新开始新游戏,重置统计等信息\&#13;对于想要获得脱离超模从而获得成就非常有帮助'}" />
-        <Button
-          x:Name="btn_cleancache"
-          Grid.Row="1"
-          Grid.Column="2"
-          Margin="4"
-          Padding="1"
-          d:Click="cleancache_click"
-          pu:ButtonHelper.CornerRadius="4"
-          Background="{DynamicResource SecondaryLight}"
-          Content="{ll:Str 清理缓存}"
-          ToolTip="{ll:Str '清理缓存的动画,声音文件'}" />
-        <Button
-          Grid.Row="1"
-          Grid.Column="2"
-          Margin="4"
-          Padding="1"
-          d:Click="cleancache_click"
-          pu:ButtonHelper.CornerRadius="4"
-          Background="{DynamicResource SecondaryLight}"
-          Content="{ll:Str 清理缓存}"
-          ToolTip="{ll:Str '清理缓存的动画,声音文件'}" />
-        <TextBlock
-          Margin="0,5,0,0"
-          HorizontalAlignment="Left"
-          VerticalAlignment="Top"
-          Background="{x:Null}"
-          TextWrapping="Wrap">
-          <Run
-            FontSize="18"
-            FontWeight="Bold"
-            Text="{ll:Str 桌宠多开}" /> <LineBreak />
-          <Run Text="{ll:Str '支持多开多个桌宠, 这些桌宠将会有独立的设置与存档\&#13;如果画师能够足够勤奋,未来可以看到这些多开的桌宠之间的互动'}" />
-        </TextBlock>
-        <Grid Margin="0,5,0,0">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="35" />
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
+        </Grid>-->
+        <!--<Grid MinHeight="40">
          <Grid.ColumnDefinitions>
            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="15" />
-            <ColumnDefinition Width="3*" />
-            <ColumnDefinition Width="1*" />
+            <ColumnDefinition />
+            <ColumnDefinition />
+            <ColumnDefinition />
          </Grid.ColumnDefinitions>
-          <TextBlock
-            Grid.Row="0"
-            VerticalAlignment="Center"
-            Text="{ll:Str 新建多开}" />
+          <Label HorizontalContentAlignment="Left"  h:ElementHelper.UniformMinWidthGroup="A" Content="{ll:Str 游戏操作}" Style="{DynamicResource Label_BaseStyle}" />
+          <Button
+            Grid.Column="1"
+            d:Click="save_click"
+            Content="{ll:Str 保存游戏}"
+            Style="{DynamicResource Button_BaseStyle}"
+            ToolTip="{ll:Str '手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存'}" />
          <Button
-            Grid.Row="0"
-            Grid.Column="3"
-            Margin="5"
-            Padding="1"
-            d:Click="btn_mutinew_click"
-            pu:ButtonHelper.CornerRadius="4"
-            Background="{DynamicResource SecondaryLight}"
-            Content="{ll:Str 新建}"
-            ToolTip="{ll:Str 新建一个多开}" />
-          <TextBox
-            x:Name="TBNew"
            Grid.Column="2"
-            Margin="0,1,0,1"
-            d:TextChanged="TextBoxPetName_TextChanged"
-            pu:TextBoxHelper.Watermark="{ll:Str '新开的存档名称,一旦新建,则无法修改'}"
-            FontSize="16"
-            Style="{DynamicResource StandardTextBoxStyle}"
-            ToolTip="{ll:Str '新开的存档名称,一旦新建,则无法修改'}" />
-          <TextBlock
-            Grid.Row="1"
-            Margin="0,8,0,0"
-            VerticalAlignment="Top"
-            Text="{ll:Str 打开}" />
-          <Button
-            Grid.Row="1"
-            Grid.Column="3"
-            Height="25"
-            Margin="5"
-            Padding="1"
-            VerticalAlignment="Top"
-            d:Click="btn_muti_open_click"
+            d:Click="restart_click"
            pu:ButtonHelper.CornerRadius="4"
-            Background="{DynamicResource SecondaryLight}"
-            Content="{ll:Str 打开}"
+            Content="{ll:Str 重新开始}"
+            Style="{DynamicResource Button_BaseStyle}"
+            ToolTip="{ll:Str '重新开始新游戏,重置统计等信息\&#13;对于想要获得脱离超模从而获得成就非常有帮助'}" />
+          <Button
+            x:Name="btn_cleancache"
+            Grid.Column="3"
+            d:Click="cleancache_click"
+            pu:ButtonHelper.CornerRadius="4"
+            Content="{ll:Str 清理缓存}"
+            Style="{DynamicResource Button_BaseStyle}"
+            ToolTip="{ll:Str '清理缓存的动画,声音文件'}" />
+        </Grid>-->
+        <!--<Grid MinHeight="40">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <Label HorizontalContentAlignment="Left"
+            h:ElementHelper.UniformMinWidthGroup="A"
+            Content="{ll:Str 桌宠多开}"
+            Style="{DynamicResource Label_BaseStyle}"
+            ToolTip="{ll:Str '支持多开多个桌宠, 这些桌宠将会有独立的设置与存档\&#13;如果画师能够足够勤奋,未来可以看到这些多开的桌宠之间的互动'}" />
+        -->
+        <!--  新建要弹个窗写入存档名称  -->
+        <!--
+          <Button
+            Grid.Column="1"
+            d:Click="btn_mutinew_click"
+            Content="{ll:Str 新建存档}"
+            Style="{DynamicResource Button_BaseStyle}"
+            ToolTip="{ll:Str 新建多开存档}" />
+          <Button
+            Grid.Column="2"
+            d:Click="btn_muti_open_click"
+            Content="{ll:Str 打开存档}"
+            Style="{DynamicResource Button_BaseStyle}"
            ToolTip="{ll:Str 打开当前选择的多开存档}" />
+        -->
+        <!--  存档列表, 或许应该用个大一点的  -->
+        <!--
+          <ComboBox Grid.Column="3" Style="{DynamicResource ComboBox_BaseStyle}" />
          <Button
            x:Name="btn_mutidel"
-            Grid.Row="1"
-            Grid.Column="3"
-            Height="25"
-            Margin="5"
-            Padding="1"
-            VerticalAlignment="Bottom"
+            Grid.Column="4"
            d:Click="btn_mutidel_Click"
-            pu:ButtonHelper.CornerRadius="4"
-            Background="{DynamicResource SecondaryLight}"
-            Content="{ll:Str 删除}"
+            Content="{ll:Str 删除存档}"
+            Style="{DynamicResource Button_BaseStyle}"
            ToolTip="{ll:Str 删除当前选择的多开存档}" />
-          <ListBox
-            x:Name="LBHave"
-            Grid.Row="1"
-            Grid.Column="2"
-            MinHeight="66"
-            Margin="1,2,1,2"
-            pu:ListBoxHelper.CornerRadius="4"
-            pu:ListBoxHelper.ItemsHoverBackground="{DynamicResource Primary}"
-            pu:ListBoxHelper.ItemsSelectedBackground="{DynamicResource DARKPrimary}"
-            pu:ListBoxHelper.ItemsSelectedForeground="{DynamicResource DARKPrimaryText}"
-            BorderBrush="{DynamicResource DARKPrimary}"
-            BorderThickness="2" />
-
-        </Grid>
+        </Grid>-->
      </StackPanel>
    </ScrollViewer>
  </Grid>