From 7a92d322d8d2cd3c5fbcb239100a7afe7f79a22e Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:42:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=20TextDialogWith?= =?UTF-8?q?TimerUserControl=20=E5=88=B0=20Dialogs=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E5=B9=B6=E7=BB=9F=E4=B8=80=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 TextDialogWithTimerUserControl 从 Views/UserControl/ 移至 Views/Dialogs/，重命名为 TextWithTimerDialogView - 将 TextDialogUserControl 重命名为 TextDialogView，统一 Dialogs 文件夹内的 *DialogView 命名约定 - 同步更新命名空间、x:Class、copyright 注释及 TaskQueueViewModel 中的引用 --- src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 4 ++-- ...tDialogUserControl.xaml => TextDialogView.xaml} | 2 +- ...gUserControl.xaml.cs => TextDialogView.xaml.cs} | 14 +++++++------- .../TextWithTimerDialogView.xaml} | 4 ++-- .../TextWithTimerDialogView.xaml.cs} | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) rename src/MaaWpfGui/Views/Dialogs/{TextDialogUserControl.xaml => TextDialogView.xaml} (96%) rename src/MaaWpfGui/Views/Dialogs/{TextDialogUserControl.xaml.cs => TextDialogView.xaml.cs} (77%) rename src/MaaWpfGui/Views/{UserControl/TextDialogWithTimerUserControl.xaml => Dialogs/TextWithTimerDialogView.xaml} (93%) rename src/MaaWpfGui/Views/{UserControl/TextDialogWithTimerUserControl.xaml.cs => Dialogs/TextWithTimerDialogView.xaml.cs} (75%) diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index bbef761196..0bc5ccab07 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -982,7 +982,7 @@ public class TaskQueueViewModel : Screen { var canceled = false; var delay = TimeSpan.FromSeconds(seconds); - var dialogUserControl = new Views.UserControl.TextDialogWithTimerUserControl( + var dialogUserControl = new Views.Dialogs.TextWithTimerDialogView( content, tipContent, buttonContent, @@ -1400,7 +1400,7 @@ public class TaskQueueViewModel : Screen var taskType = ConfigFactory.CurrentConfig.TaskQueue[taskItem.Index].TaskType; var currentName = taskItem.Name.Replace("\r", string.Empty).Replace("\n", string.Empty); - var dialog = new Views.Dialogs.TextDialogUserControl( + var dialog = new Views.Dialogs.TextDialogView( LocalizationHelper.GetString("RenameTask") + $" {taskItem.Index + 1}-{LocalizationHelper.GetString(taskType.ToString())}", LocalizationHelper.GetString("RenameTaskPrompt"), currentName) { diff --git a/src/MaaWpfGui/Views/Dialogs/TextDialogUserControl.xaml b/src/MaaWpfGui/Views/Dialogs/TextDialogView.xaml similarity index 96% rename from src/MaaWpfGui/Views/Dialogs/TextDialogUserControl.xaml rename to src/MaaWpfGui/Views/Dialogs/TextDialogView.xaml index 7d7ece6cda..20b7343e2c 100644 --- a/src/MaaWpfGui/Views/Dialogs/TextDialogUserControl.xaml +++ b/src/MaaWpfGui/Views/Dialogs/TextDialogView.xaml @@ -1,5 +1,5 @@ +// // Part of the MaaWpfGui project, maintained by the MaaAssistantArknights team (Maa Team) // Copyright (C) 2021-2025 MaaAssistantArknights Contributors // @@ -18,9 +18,9 @@ using System.Windows; namespace MaaWpfGui.Views.Dialogs; /// -/// TextDialogUserControl.xaml 的交互逻辑 +/// TextDialogView.xaml 的交互逻辑 /// -public partial class TextDialogUserControl +public partial class TextDialogView { /// /// 获取输入的文本 @@ -28,21 +28,21 @@ public partial class TextDialogUserControl public string InputText { get; private set; } = string.Empty; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public TextDialogUserControl() + public TextDialogView() { InitializeComponent(); Loaded += OnLoaded; } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// 标题 /// 提示文本 /// 默认文本 - public TextDialogUserControl(string title, string prompt, string defaultText = "") + public TextDialogView(string title, string prompt, string defaultText = "") { InitializeComponent(); Title = title; diff --git a/src/MaaWpfGui/Views/UserControl/TextDialogWithTimerUserControl.xaml b/src/MaaWpfGui/Views/Dialogs/TextWithTimerDialogView.xaml similarity index 93% rename from src/MaaWpfGui/Views/UserControl/TextDialogWithTimerUserControl.xaml rename to src/MaaWpfGui/Views/Dialogs/TextWithTimerDialogView.xaml index 7d298363f0..3e72120202 100644 --- a/src/MaaWpfGui/Views/UserControl/TextDialogWithTimerUserControl.xaml +++ b/src/MaaWpfGui/Views/Dialogs/TextWithTimerDialogView.xaml @@ -1,10 +1,10 @@ +// // Part of the MaaWpfGui project, maintained by the MaaAssistantArknights team (Maa Team) // Copyright (C) 2021-2025 MaaAssistantArknights Contributors // @@ -16,21 +16,21 @@ using System.Windows; using System.Windows.Controls.Primitives; using HandyControl.Tools; -namespace MaaWpfGui.Views.UserControl; +namespace MaaWpfGui.Views.Dialogs; /// -/// TextDialogWithTimerUserControl.xaml 的交互逻辑 +/// TextWithTimerDialogView.xaml 的交互逻辑 /// -public partial class TextDialogWithTimerUserControl : System.Windows.Controls.Border +public partial class TextWithTimerDialogView : System.Windows.Controls.Border { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// 主要内容 /// 提示内容 /// 按钮内容 /// 倒计时 - public TextDialogWithTimerUserControl(string content, string tipContent, string buttonContent, double milliseconds) + public TextWithTimerDialogView(string content, string tipContent, string buttonContent, double milliseconds) { InitializeComponent();