From eb111d0f0e2fa126fe8d001c3cd8a954130190ac Mon Sep 17 00:00:00 2001 From: Constrat <56174894+Constrat@users.noreply.github.com> Date: Wed, 7 Aug 2024 00:17:32 +0200 Subject: [PATCH] refactor: combined AskRestartToApplySettings methods through parameter --- .../ViewModels/UI/SettingsViewModel.cs | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 5bb31e12c5..cab228981a 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -1349,14 +1349,7 @@ namespace MaaWpfGui.ViewModels.UI Instances.TaskQueueViewModel.UpdateStageList(true); Instances.TaskQueueViewModel.UpdateDatePrompt(); Instances.AsstProxy.LoadResource(); - if (_clientType is "YoStarEN") - { - AskRestartToApplySettingsYoStarEN(); - } - else - { - AskRestartToApplySettings(); - } + AskRestartToApplySettings(_clientType is "YoStarEN"); } } @@ -4979,32 +4972,19 @@ namespace MaaWpfGui.ViewModels.UI #endregion SettingsGuide /// - /// 要求用户重启以应用设置 + /// Requires the user to restart to apply settings. /// - private void AskRestartToApplySettings() + /// Whether to include the YostarEN resolution tip. + private static void AskRestartToApplySettings(bool isYostarEN = false) { - var result = MessageBoxHelper.Show( - LocalizationHelper.GetString("PromptRestartForSettingsChange"), - LocalizationHelper.GetString("Tip"), - MessageBoxButton.OKCancel, - MessageBoxImage.Question); - if (result == MessageBoxResult.OK) - { - Bootstrapper.ShutdownAndRestartWithoutArgs(); - } - } + var resolutionTip = isYostarEN ? "\n" + LocalizationHelper.GetString("SwitchResolutionTip") : string.Empty; - /// - /// Remembers the user to set 1920x1080 for YoStarEN. - /// - private static void AskRestartToApplySettingsYoStarEN() - { var result = MessageBoxHelper.Show( - LocalizationHelper.GetString("PromptRestartForSettingsChange") + "\n" + - LocalizationHelper.GetString("SwitchResolutionTip"), + LocalizationHelper.GetString("PromptRestartForSettingsChange") + resolutionTip, LocalizationHelper.GetString("Tip"), MessageBoxButton.OKCancel, MessageBoxImage.Question); + if (result == MessageBoxResult.OK) { Bootstrapper.ShutdownAndRestartWithoutArgs();