fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 为ToolTip加上指引

Browse Source
This commit is contained in:
枫雨
2023-05-09 21:46:26 +08:00
parent 46d1575246
commit c53c457789
7 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MaaWpfGui/Res/Localizations/en-us.xaml
View File

@@ -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>

1
src/MaaWpfGui/Res/Localizations/ja-jp.xaml
View File

@@ -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>

1
src/MaaWpfGui/Res/Localizations/ko-kr.xaml
View File

@@ -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>

1
src/MaaWpfGui/Res/Localizations/zh-cn.xaml
View File

@@ -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>

1
src/MaaWpfGui/Res/Localizations/zh-tw.xaml
View File

@@ -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>

3
src/MaaWpfGui/Views/UI/TaskQueueView.xaml
View File

@@ -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>

29
src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
View File

@@ -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>