From 6a9b72c477cdde1be9656d3041540573a577fa31 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Fri, 4 Apr 2025 17:24:51 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8F=8D=E8=BD=AC=E5=8F=B3=E9=94=AE?=
=?UTF-8?q?=E6=95=88=E6=9E=9C=E6=97=B6=E6=9B=B4=E6=96=B0=20tooltip=20?=
=?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=8F=90=E7=A4=BA?=
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 +
.../Settings/GuiSettingsUserControlModel.cs | 2 ++
src/MaaWpfGui/Views/UI/TaskQueueView.xaml | 19 +++++++++++++++++--
7 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 506bb71d00..43e42edb58 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -225,6 +225,7 @@
The label sequence can be dragged
This option is effective once
This option only takes effect once when right-clicked
+ This option only skips once when right-clicked
This feature does not automatically navigate to the stage
Startup Update Check
Scheduled Update Check
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 72523033be..fbf2b79421 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -225,6 +225,7 @@
タブの順番はドラッグ可能です
このオプションは一度有効です
このオプションは、右クリックで選択した時のみ一度だけ有効です
+ このオプションは、右クリックで選択した時のみ一度だけスキップします
このオプションは、対応するステージに自動的に移動するものではありません
起動時の更新チェック
定期的な更新チェック
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 867c035fc6..40d08a0349 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -225,6 +225,7 @@
드래그하여 작업 순서를 변경할 수 있습니다
이 옵션은 한 번만 유효합니다
이 옵션은 우클릭 시 한 번만 적용됩니다
+ 이 옵션은 우클릭 시 한 번만 건너뜁니다
해당 스테이지로 자동 이동하지 않습니다
시작 시 업데이트 확인
일정 시간마다 업데이트 확인
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 315cb098d6..42efc2fc88 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -225,6 +225,7 @@
标签顺序可拖动
该选项仅生效一次
该选项右键选中时仅生效一次
+ 该选项右键选中时仅跳过一次
该选项不会自动导航至对应关卡
启动时检查更新
定时检查更新
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 2731f0903f..809ecc9ee9 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -225,6 +225,7 @@
標籤順序可拖動
該選項僅生效一次
該選項右鍵選中時僅生效一次
+ 該選項右鍵選中時僅跳過一次
該選項不會自動導航至對應關卡
啟動時檢查更新
定時檢查更新
diff --git a/src/MaaWpfGui/ViewModels/UserControl/Settings/GuiSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/Settings/GuiSettingsUserControlModel.cs
index effe03a067..47bbc019ae 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/Settings/GuiSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/Settings/GuiSettingsUserControlModel.cs
@@ -150,6 +150,7 @@ public class GuiSettingsUserControlModel : PropertyChangedBase
set
{
ConfigFactory.Root.GUI.UseNotify = value;
+ NotifyOfPropertyChange();
if (value)
{
ToastNotification.ShowDirect("Test test");
@@ -163,6 +164,7 @@ public class GuiSettingsUserControlModel : PropertyChangedBase
set
{
ConfigFactory.Root.GUI.MainTasksInvertNullFunction = value;
+ NotifyOfPropertyChange();
}
}
diff --git a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
index 87b7ae6860..5ffcae13fd 100644
--- a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
+++ b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
@@ -11,6 +11,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:properties="clr-namespace:MaaWpfGui.Styles.Properties"
xmlns:s="https://github.com/canton7/Stylet"
+ xmlns:setting="clr-namespace:MaaWpfGui.ViewModels.UI"
xmlns:taskQueue="clr-namespace:MaaWpfGui.Views.UserControl.TaskQueue"
xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
xmlns:userControl="clr-namespace:MaaWpfGui.Views.UserControl"
@@ -74,8 +75,22 @@
IsChecked="{Binding IsCheckedWithNull}"
IsHitTestVisible="{Binding ElementName=TaskList, Path=DataContext.Idle}"
MouseRightButtonUp="{s:Action ToggleCheckBoxNullOnRightClick,
- Target={x:Type helper:CheckBoxHelper}}"
- ToolTip="{DynamicResource CheckBoxesNotSavedAsNull}" />
+ Target={x:Type helper:CheckBoxHelper}}">
+
+
+
+
+
+
+
+