From c53c4577891797a8dbb796f4c4c3c162b718b8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com>
Date: Tue, 9 May 2023 21:46:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BAToolTip=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E6=8C=87=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Res/Localizations/en-us.xaml    |  1 +
 src/MaaWpfGui/Res/Localizations/ja-jp.xaml    |  1 +
 src/MaaWpfGui/Res/Localizations/ko-kr.xaml    |  1 +
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml    |  1 +
 src/MaaWpfGui/Res/Localizations/zh-tw.xaml    |  1 +
 src/MaaWpfGui/Views/UI/TaskQueueView.xaml     |  3 +-
 .../Views/UserControl/GuideUserControl.xaml   | 29 +++++++++++++++----
 7 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 7cd3b8e54d..529864d8ce 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -28,6 +28,7 @@
     <system:String x:Key="PrevGuide">Prev</system:String>
     <system:String x:Key="NextGuide">Next</system:String>
     <system:String x:Key="DoneGuide">Done</system:String>
+    <system:String x:Key="ToolTipGuide">Prompt appears when hovered↓→</system:String>
     <system:String x:Key="TaskGuide">↑Task</system:String>
     <system:String x:Key="OftenUsedGuide">↓Often Used</system:String>
     <system:String x:Key="SometimesUsedGuide">Sometimes Used↑</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 6a49f9eef6..2ae93199d1 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -28,6 +28,7 @@
     <system:String x:Key="PrevGuide">前へ</system:String>
     <system:String x:Key="NextGuide">次へ</system:String>
     <system:String x:Key="DoneGuide">完了</system:String>
+    <system:String x:Key="ToolTipGuide">マウスを乗せるとヒントあり↓→</system:String>
     <system:String x:Key="TaskGuide">↑タスク</system:String>
     <system:String x:Key="OftenUsedGuide">↓よく使われる</system:String>
     <system:String x:Key="SometimesUsedGuide">あまり使われていない↑</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index e3fbbc1c3a..1df34dfca8 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -28,6 +28,7 @@
     <system:String x:Key="PrevGuide">이전 단계</system:String>
     <system:String x:Key="NextGuide">다음 단계</system:String>
     <system:String x:Key="DoneGuide">완료</system:String>
+    <system:String x:Key="ToolTipGuide">호버에 힌트가 있습니다↓→</system:String>
     <system:String x:Key="TaskGuide">↑태스크</system:String>
     <system:String x:Key="OftenUsedGuide">↓자주 사용하는</system:String>
     <system:String x:Key="SometimesUsedGuide">흔하지 않게 사용되는↑</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 24ee0b4216..355b0c3e1d 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -28,6 +28,7 @@
     <system:String x:Key="PrevGuide">上一步</system:String>
     <system:String x:Key="NextGuide">下一步</system:String>
     <system:String x:Key="DoneGuide">完成</system:String>
+    <system:String x:Key="ToolTipGuide">鼠标放上去有提示哦↓→</system:String>
     <system:String x:Key="TaskGuide">↑任务</system:String>
     <system:String x:Key="OftenUsedGuide">↓常用的</system:String>
     <system:String x:Key="SometimesUsedGuide">不常用的↑</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 3bee4a9770..a6b78b445e 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -27,6 +27,7 @@
     <system:String x:Key="PrevGuide">上一步</system:String>
     <system:String x:Key="NextGuide">下一步</system:String>
     <system:String x:Key="DoneGuide">完成</system:String>
+    <system:String x:Key="ToolTipGuide">鼠標放上去有提示哦↓→</system:String>
     <system:String x:Key="TaskGuide">↑任務</system:String>
     <system:String x:Key="OftenUsedGuide">↓常用的</system:String>
     <system:String x:Key="SometimesUsedGuide">不常用的↑</system:String>
diff --git a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
index 6ff686a8f0..517635f28d 100644
--- a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
+++ b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
@@ -85,7 +85,8 @@
                                             Foreground="{DynamicResource SecondaryTextBrush}"
                                             GroupName="TaskSettings"
                                             IsChecked="{Binding EnableSetting}"
-                                            Style="{DynamicResource RadioGroupItemSingle}" />
+                                            Style="{DynamicResource RadioGroupItemSingle}"
+                                            ToolTip="{DynamicResource TaskSettings}" />
                                     </hc:ButtonGroup>
                                 </StackPanel>
                             </DataTemplate>
diff --git a/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
index cb20b5bdcc..061d6ef0cb 100644
--- a/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
@@ -143,21 +143,39 @@
                     </hc:TransitioningContentControl>
 
                     <hc:TransitioningContentControl
-                        Width="240"
-                        Height="260"
+                        Width="230"
+                        Height="270"
                         TransitionMode="{Binding GuideTransitionMode}"
                         Visibility="{c:Binding 'GuideStepIndex == 3'}">
-                        <hc:RelativePanel Margin="10">
+                        <hc:RelativePanel>
+                            <TextBlock
+                                Name="ToolTipGuide"
+                                Margin="0,10"
+                                Text="{DynamicResource ToolTipGuide}" />
+                            <Border
+                                Name="PerformBattlesGuide"
+                                Margin="5"
+                                Padding="5"
+                                hc:RelativePanel.RightOf="{Binding ElementName=ToolTipGuide}"
+                                BorderBrush="{DynamicResource BorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="4">
+                                <TextBlock Text="{DynamicResource PerformBattles}" ToolTip="{DynamicResource CheckBoxesNotSaved}" />
+                            </Border>
                             <Border
                                 Name="Task"
                                 Padding="5,0,0,0"
+                                hc:RelativePanel.Below="{Binding ElementName=ToolTipGuide}"
                                 BorderBrush="{DynamicResource BorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="4">
                                 <StackPanel Orientation="Horizontal">
                                     <!--<maa:TextBlock  Text="{Binding ID}" />
                             <maa:TextBlock  Text=". " />-->
-                                    <CheckBox Width="180" Content="{DynamicResource Combat}" />
+                                    <CheckBox
+                                        Width="180"
+                                        Content="{DynamicResource Combat}"
+                                        ToolTip="{DynamicResource LabelSequenceTip}" />
                                     <hc:ButtonGroup>
                                         <RadioButton
                                             hc:IconElement.Geometry="{StaticResource ConfigGeometry}"
@@ -166,7 +184,8 @@
                                             Background="Transparent"
                                             BorderThickness="0"
                                             Foreground="{DynamicResource SecondaryTextBrush}"
-                                            Style="{DynamicResource RadioGroupItemSingle}" />
+                                            Style="{DynamicResource RadioGroupItemSingle}"
+                                            ToolTip="{DynamicResource TaskSettings}" />
                                     </hc:ButtonGroup>
                                 </StackPanel>
                             </Border>