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();