diff --git a/src/settings-ui/QuickAccess.UI/Services/QuickAccessCoordinator.cs b/src/settings-ui/QuickAccess.UI/Services/QuickAccessCoordinator.cs index 3c7880040f..ff685603c7 100644 --- a/src/settings-ui/QuickAccess.UI/Services/QuickAccessCoordinator.cs +++ b/src/settings-ui/QuickAccess.UI/Services/QuickAccessCoordinator.cs @@ -17,7 +17,7 @@ internal sealed class QuickAccessCoordinator : IQuickAccessCoordinator, IDisposa { private readonly MainWindow _window; private readonly QuickAccessLaunchContext _launchContext; - private readonly SettingsUtils _settingsUtils = new(); + private readonly SettingsUtils _settingsUtils = SettingsUtils.Default; private readonly object _generalSettingsLock = new(); private readonly object _ipcLock = new(); private TwoWayPipeMessageIPCManaged? _ipcManager; diff --git a/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs b/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs index affd3868d9..3e0b1e3dd7 100644 --- a/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs +++ b/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs @@ -49,7 +49,7 @@ public sealed class AllAppsViewModel : Observable { _coordinator = coordinator; _dispatcherQueue = DispatcherQueue.GetForCurrentThread(); - _settingsUtils = new SettingsUtils(); + _settingsUtils = SettingsUtils.Default; _settingsRepository = SettingsRepository.GetInstance(_settingsUtils); _generalSettings = _settingsRepository.SettingsConfig; _generalSettings.AddEnabledModuleChangeNotification(ModuleEnabledChangedOnSettingsPage); diff --git a/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs b/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs index 1938cec873..5c38229155 100644 --- a/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs +++ b/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs @@ -36,7 +36,7 @@ public sealed class LauncherViewModel : Observable { _coordinator = coordinator; _dispatcherQueue = DispatcherQueue.GetForCurrentThread(); - var settingsUtils = new SettingsUtils(); + var settingsUtils = SettingsUtils.Default; _settingsRepository = SettingsRepository.GetInstance(settingsUtils); _generalSettings = _settingsRepository.SettingsConfig; _generalSettings.AddEnabledModuleChangeNotification(ModuleEnabledChanged); @@ -102,7 +102,7 @@ public sealed class LauncherViewModel : Observable break; case ModuleType.EnvironmentVariables: { - bool launchAdmin = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.LaunchAdministrator; + bool launchAdmin = SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator; bool isElevated = _coordinator?.IsRunnerElevated ?? false; string eventName = !isElevated && launchAdmin ? Constants.ShowEnvironmentVariablesAdminSharedEvent() @@ -124,7 +124,7 @@ public sealed class LauncherViewModel : Observable break; case ModuleType.Hosts: { - bool launchAdmin = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.LaunchAdministrator; + bool launchAdmin = SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator; bool isElevated = _coordinator?.IsRunnerElevated ?? false; string eventName = !isElevated && launchAdmin ? Constants.ShowHostsAdminSharedEvent() @@ -203,12 +203,12 @@ public sealed class LauncherViewModel : Observable { return moduleType switch { - ModuleType.ColorPicker => SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(), - ModuleType.FancyZones => SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.ToString(), - ModuleType.PowerLauncher => SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenPowerLauncher.ToString(), - ModuleType.PowerOCR => SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(), - ModuleType.Workspaces => SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.Hotkey.Value.ToString(), - ModuleType.MeasureTool => SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(), + ModuleType.ColorPicker => SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(), + ModuleType.FancyZones => SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.ToString(), + ModuleType.PowerLauncher => SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.OpenPowerLauncher.ToString(), + ModuleType.PowerOCR => SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(), + ModuleType.Workspaces => SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.Hotkey.Value.ToString(), + ModuleType.MeasureTool => SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(), ModuleType.ShortcutGuide => GetShortcutGuideToolTip(), _ => string.Empty, }; @@ -216,7 +216,7 @@ public sealed class LauncherViewModel : Observable private string GetShortcutGuideToolTip() { - var shortcutGuideSettings = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig; + var shortcutGuideSettings = SettingsRepository.GetInstance(SettingsUtils.Default).SettingsConfig; return shortcutGuideSettings.Properties.UseLegacyPressWinKeyBehavior.Value ? "Win" : shortcutGuideSettings.Properties.OpenShortcutGuide.ToString(); diff --git a/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs index f627d64b78..e5148d3a06 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs @@ -92,7 +92,7 @@ namespace Microsoft.PowerToys.Settings.UI var outgoing = new OutGoingGeneralSettings(generalSettingsConfig); // Save settings to file - new SettingsUtils().SaveSettings(generalSettingsConfig.ToJsonString()); + SettingsUtils.Default.SaveSettings(generalSettingsConfig.ToJsonString()); // Send IPC message asynchronously to avoid blocking UI and potential recursive calls Task.Run(() => diff --git a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs index 35f1c5a0f1..e6a0f23da7 100644 --- a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs @@ -85,7 +85,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(generalSettingsConfig); // Save settings to file - new SettingsUtils().SaveSettings(generalSettingsConfig.ToJsonString()); + SettingsUtils.Default.SaveSettings(generalSettingsConfig.ToJsonString()); SendConfigMSG(outgoing.ToString()); SortModuleList();