From cd55db0cf539662bc51544de04df82c8ed303592 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Mon, 6 Feb 2023 00:14:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=89=80=E5=9C=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml    |  4 +-
 src/MaaWpfGui/Res/Localizations/zh-tw.xaml    |  2 +-
 .../UserControl/GUISettingsUserControl.xaml   | 23 ---------
 .../PenguinReportSettingsUserControl.xaml     | 50 +++++++++++++++++--
 4 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index bf6c1c9ed1..a7c4e8a52d 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -103,8 +103,6 @@
     <system:String x:Key="AlgorithmFinish">演算结束</system:String>
     <system:String x:Key="AlgorithmBadge">繁荣证章</system:String>
     <system:String x:Key="AlgorithmConstructionPoint">建造点数</system:String>
-    
-
 
     <system:String x:Key="NotSelected">不选择</system:String>
     <system:String x:Key="Official">官服</system:String>
@@ -221,7 +219,7 @@
     <system:String x:Key="SystemNotification">重要信息弹出系统通知</system:String>
     <system:String x:Key="UseAlternateStage">使用备选关卡</system:String>
     <system:String x:Key="UseRemainingSanityStage">使用剩余理智</system:String>
-    <system:String x:Key="HideUnavailableStage">关卡选择隐藏当日不开放关卡</system:String>
+    <system:String x:Key="HideUnavailableStage">隐藏当日不开放关卡</system:String>
     <system:String x:Key="MainViewButtonFeature">主界面可选择按钮功能</system:String>
     <system:String x:Key="CustomStageCode">手动输入关卡名</system:String>
     <system:String x:Key="CustomStageCodeTip" xml:space="preserve">支持大部分主线关卡名与原列表的关卡名（如4-10、AP-5、H10-1-Hard）&#x0a;可在关卡结尾输入&quot;Normal/Hard&quot;表示需要切换标准与磨难难度</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 60846f91bd..da12c0cc6a 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -172,7 +172,7 @@
     <system:String x:Key="MinimizeToTray">最小化時隱藏至托盤</system:String>
     <system:String x:Key="SystemNotification">重要訊息彈出系統通知</system:String>
     <system:String x:Key="UseAlternateStage">使用備選關卡</system:String>
-    <system:String x:Key="HideUnavailableStage">關卡選擇隱藏當日不開放關卡</system:String>
+    <system:String x:Key="HideUnavailableStage">隱藏當日不開放關卡</system:String>
     <system:String x:Key="MainViewButtonFeature">主介面可選擇按鈕功能</system:String>
     <system:String x:Key="CustomStageCode">手動輸入關卡代名</system:String>
     <system:String x:Key="CustomStageCodeTip" xml:space="preserve">支持大部分主線關卡名與原列表的關卡名（如4-10、AP-5、H10-1-Hard）&#x0a;可在關卡結尾輸入&quot;Normal/Hard&quot;表示需要切換標準與磨難難度</system:String>
diff --git a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
index 4ad277d8de..47546fd738 100644
--- a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
@@ -28,29 +28,6 @@
                 HorizontalAlignment="Left"
                 Content="{DynamicResource SystemNotification}"
                 IsChecked="{Binding UseNotify}" />
-            <CheckBox
-                Margin="10"
-                HorizontalAlignment="Left"
-                Content="{DynamicResource CustomStageCode}"
-                IsChecked="{Binding CustomStageCode}"
-                ToolTip="{DynamicResource CustomStageCodeTip}" />
-            <CheckBox
-                Margin="10"
-                HorizontalAlignment="Left"
-                Content="{DynamicResource UseAlternateStage}"
-                IsChecked="{Binding UseAlternateStage}"
-                IsEnabled="{c:Binding !CustomStageCode}" />
-            <CheckBox
-                Margin="10"
-                HorizontalAlignment="Left"
-                Content="{DynamicResource UseRemainingSanityStage}"
-                IsChecked="{Binding UseRemainingSanityStage}" />
-            <CheckBox
-                Margin="10"
-                HorizontalAlignment="Left"
-                Content="{DynamicResource HideUnavailableStage}"
-                IsChecked="{Binding HideUnavailableStage}"
-                IsEnabled="{c:Binding !CustomStageCode}" />
         </StackPanel>
         <StackPanel
             HorizontalAlignment="Center"
diff --git a/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml
index 19b2aeeb2e..5ad3b1acb2 100644
--- a/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml
@@ -2,6 +2,7 @@
     x:Class="MaaWpfGui.PenguinReportSettingsUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -15,12 +16,51 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <CheckBox
-            Margin="10"
+        <StackPanel
+            Grid.Row="0"
             HorizontalAlignment="Center"
-            Content="{DynamicResource DrGrandet}"
-            IsChecked="{Binding IsDrGrandet}"
-            ToolTip="{DynamicResource DrGrandetTip}" />
+            VerticalAlignment="Center"
+            Orientation="Horizontal">
+            <StackPanel
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Vertical">
+                <CheckBox
+                    Margin="10"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource DrGrandet}"
+                    IsChecked="{Binding IsDrGrandet}"
+                    ToolTip="{DynamicResource DrGrandetTip}" />
+                <CheckBox
+                    Margin="10"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource CustomStageCode}"
+                    IsChecked="{Binding CustomStageCode}"
+                    ToolTip="{DynamicResource CustomStageCodeTip}" />
+                <CheckBox
+                    Margin="10"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource UseAlternateStage}"
+                    IsChecked="{Binding UseAlternateStage}"
+                    IsEnabled="{c:Binding !CustomStageCode}" />
+            </StackPanel>
+            <StackPanel
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Vertical">
+                <CheckBox
+                    Margin="10"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource UseRemainingSanityStage}"
+                    IsChecked="{Binding UseRemainingSanityStage}" />
+                <CheckBox
+                    Margin="10"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource HideUnavailableStage}"
+                    IsChecked="{Binding HideUnavailableStage}"
+                    IsEnabled="{c:Binding !CustomStageCode}" />
+            </StackPanel>
+        </StackPanel>
         <StackPanel
             Grid.Row="1"
             HorizontalAlignment="Center"