From f91cb96ffa9f30ca1a86cf6feb8bbe10fd3e5a1c Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:50:37 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Models/ResourceUpdater.cs | 4 +- src/MaaWpfGui/Res/Localizations/en-us.xaml | 2 +- src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 2 +- src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 2 +- src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 2 +- src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 2 +- .../ViewModels/UI/SettingsViewModel.cs | 30 +-- .../UserControl/TimerSettingsUserControl.xaml | 2 +- .../VersionUpdateSettingsUserControl.xaml | 236 +++++++++--------- 9 files changed, 145 insertions(+), 137 deletions(-) diff --git a/src/MaaWpfGui/Models/ResourceUpdater.cs b/src/MaaWpfGui/Models/ResourceUpdater.cs index 0efad40164..12f3790551 100644 --- a/src/MaaWpfGui/Models/ResourceUpdater.cs +++ b/src/MaaWpfGui/Models/ResourceUpdater.cs @@ -102,7 +102,7 @@ namespace MaaWpfGui.Models private static async Task GetResourceApiAsync() { - string mirror = ConfigurationHelper.GetValue(ConfigurationKeys.ResourceApi, MaaUrls.MaaResourceApi); + string mirror = ConfigurationHelper.GetGlobalValue(ConfigurationKeys.ResourceApi, MaaUrls.MaaResourceApi); if (mirror != MaaUrls.MaaResourceApi && await IsMirrorAccessibleAsync(mirror)) { return mirror; @@ -132,7 +132,7 @@ namespace MaaWpfGui.Models if (mirror != MaaUrls.MaaResourceApi) { - ConfigurationHelper.SetValue(ConfigurationKeys.ResourceApi, mirror); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.ResourceApi, mirror); } return mirror; diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 25007cd72f..cd49c0cfdc 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -232,7 +232,7 @@ Custom config Restart and switch configuration two minutes in advance Timer - This option page is for global config + This option page is for global config Configuration Config Add diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index a6833465f2..e27fb8d284 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -232,7 +232,7 @@ カスタム構成オプション 2分前に再起動して設定を切り替えます タイマー - このオプション ページはグローバル設定用です + このオプション ページはグローバル設定用です 構成を切り替える 構成名 追加 diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 951e300268..f2eae65897 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -232,7 +232,7 @@ 사용자 지정 구성 옵션 2분 전에 재시작하여 설정을 전환합니다 타이머 - 이 옵션 페이지는 전역 구성용입니다 + 이 옵션 페이지는 전역 구성용입니다 구성 전환 구성 이름 추가 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index 3aede93062..1ed9b1ac7c 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -232,7 +232,7 @@ 自定义配置选择 将提前两分钟重启并切换配置 定时 - 此选项页为全局配置 + 此选项页为全局配置 切换配置 配置名称 添加 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 2c51f3853c..d2c7f897b2 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -228,7 +228,7 @@ 自定義配置選擇 將提前兩分鐘重開並切換配置 定時 - 此選項頁為全局配置 + 此選項頁為全局配置 切換配置 配置名稱 新增 diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 4d87ac5942..9a35cc7009 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -110,7 +110,7 @@ namespace MaaWpfGui.ViewModels.UI LocalizationHelper.GetString("UiSettings"), LocalizationHelper.GetString("ExternalNotificationSettings"), LocalizationHelper.GetString("HotKeySettings"), - LocalizationHelper.GetString("UpdateSettings"), + LocalizationHelper.GetString("UpdateSettings")+LocalizationHelper.GetString("UpdateSettings"), LocalizationHelper.GetString("AboutUs"), ]; @@ -3319,7 +3319,7 @@ namespace MaaWpfGui.ViewModels.UI private UpdateVersionType _versionType = (UpdateVersionType)Enum.Parse( typeof(UpdateVersionType), - ConfigurationHelper.GetValue(ConfigurationKeys.VersionType, UpdateVersionType.Stable.ToString())); + ConfigurationHelper.GetGlobalValue(ConfigurationKeys.VersionType, UpdateVersionType.Stable.ToString())); /// /// Gets or sets the type of version to update. @@ -3331,7 +3331,7 @@ namespace MaaWpfGui.ViewModels.UI if (_versionType == UpdateVersionType.Nightly && !_allowNightlyUpdates) { SetAndNotify(ref _versionType, UpdateVersionType.Beta); - ConfigurationHelper.SetValue(ConfigurationKeys.VersionType, UpdateVersionType.Beta.ToString()); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.VersionType, UpdateVersionType.Beta.ToString()); } return _versionType; @@ -3339,7 +3339,7 @@ namespace MaaWpfGui.ViewModels.UI set { SetAndNotify(ref _versionType, value); - ConfigurationHelper.SetValue(ConfigurationKeys.VersionType, value.ToString()); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.VersionType, value.ToString()); } } @@ -3358,7 +3358,7 @@ namespace MaaWpfGui.ViewModels.UI get => AllVersionTypeList.Where(v => _allowNightlyUpdates || v.Value != UpdateVersionType.Nightly).ToList(); } - private readonly bool _allowNightlyUpdates = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.AllowNightlyUpdates, bool.FalseString)); + private readonly bool _allowNightlyUpdates = Convert.ToBoolean(ConfigurationHelper.GetGlobalValue(ConfigurationKeys.AllowNightlyUpdates, bool.FalseString)); /// /// Gets a value indicating whether to update nightly. @@ -3376,7 +3376,7 @@ namespace MaaWpfGui.ViewModels.UI get => _versionType == UpdateVersionType.Beta; } - private bool _updateCheck = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.UpdateCheck, bool.TrueString)); + private bool _updateCheck = Convert.ToBoolean(ConfigurationHelper.GetGlobalValue(ConfigurationKeys.UpdateCheck, bool.TrueString)); /// /// Gets or sets a value indicating whether to check update. @@ -3387,11 +3387,11 @@ namespace MaaWpfGui.ViewModels.UI set { SetAndNotify(ref _updateCheck, value); - ConfigurationHelper.SetValue(ConfigurationKeys.UpdateCheck, value.ToString()); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.UpdateCheck, value.ToString()); } } - private bool _updateAutoCheck = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.UpdateAutoCheck, bool.FalseString)); + private bool _updateAutoCheck = Convert.ToBoolean(ConfigurationHelper.GetGlobalValue(ConfigurationKeys.UpdateAutoCheck, bool.FalseString)); /// /// Gets or sets a value indicating whether to check update. @@ -3402,11 +3402,11 @@ namespace MaaWpfGui.ViewModels.UI set { SetAndNotify(ref _updateAutoCheck, value); - ConfigurationHelper.SetValue(ConfigurationKeys.UpdateAutoCheck, value.ToString()); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.UpdateAutoCheck, value.ToString()); } } - private string _proxy = ConfigurationHelper.GetValue(ConfigurationKeys.UpdateProxy, string.Empty); + private string _proxy = ConfigurationHelper.GetGlobalValue(ConfigurationKeys.UpdateProxy, string.Empty); /// /// Gets or sets the proxy settings. @@ -3417,7 +3417,7 @@ namespace MaaWpfGui.ViewModels.UI set { SetAndNotify(ref _proxy, value); - ConfigurationHelper.SetValue(ConfigurationKeys.UpdateProxy, value); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.UpdateProxy, value); } } @@ -3435,7 +3435,7 @@ namespace MaaWpfGui.ViewModels.UI } } - private bool _autoDownloadUpdatePackage = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.AutoDownloadUpdatePackage, bool.TrueString)); + private bool _autoDownloadUpdatePackage = Convert.ToBoolean(ConfigurationHelper.GetGlobalValue(ConfigurationKeys.AutoDownloadUpdatePackage, bool.TrueString)); /// /// Gets or sets a value indicating whether to auto download update package. @@ -3446,11 +3446,11 @@ namespace MaaWpfGui.ViewModels.UI set { SetAndNotify(ref _autoDownloadUpdatePackage, value); - ConfigurationHelper.SetValue(ConfigurationKeys.AutoDownloadUpdatePackage, value.ToString()); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.AutoDownloadUpdatePackage, value.ToString()); } } - private bool _autoInstallUpdatePackage = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.AutoInstallUpdatePackage, bool.FalseString)); + private bool _autoInstallUpdatePackage = Convert.ToBoolean(ConfigurationHelper.GetGlobalValue(ConfigurationKeys.AutoInstallUpdatePackage, bool.FalseString)); /// /// Gets or sets a value indicating whether to auto install update package. @@ -3461,7 +3461,7 @@ namespace MaaWpfGui.ViewModels.UI set { SetAndNotify(ref _autoInstallUpdatePackage, value); - ConfigurationHelper.SetValue(ConfigurationKeys.AutoInstallUpdatePackage, value.ToString()); + ConfigurationHelper.SetGlobalValue(ConfigurationKeys.AutoInstallUpdatePackage, value.ToString()); } } diff --git a/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml index 145d50ded7..d02db89a26 100644 --- a/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml @@ -27,7 +27,7 @@ Grid.Row="0" HorizontalAlignment="Center" FontWeight="Bold" - Text="{DynamicResource TimerTip}" + Text="{DynamicResource GlobalConfigTip}" TextAlignment="Center" /> - - - - - - - + - - - - - - - - + + + + + + + + + + HorizontalAlignment="Left" + VerticalAlignment="Center" + Content="{DynamicResource StartupUpdateCheck}" + IsChecked="{Binding UpdateCheck}" + IsEnabled="False" /> + + + + + + + - - - - - - - - - + + + + + + + + - - - - - + - - - -