mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 10:46:33 +02:00
[Settings] Create a global static instance of SettingsUtils (#44064)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request SettingsUtils is initialized multiple times over the whole solution. This creates one singeltone instance (with the default settings), so it only has to be initialized once (and improve performance a bit with that) <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
This commit is contained in:
@@ -38,7 +38,7 @@ For C# modules, the settings are accessed through the `SettingsUtils` class in t
|
|||||||
using Microsoft.PowerToys.Settings.UI.Library;
|
using Microsoft.PowerToys.Settings.UI.Library;
|
||||||
|
|
||||||
// Read settings
|
// Read settings
|
||||||
var settings = SettingsUtils.GetSettings<ModuleSettings>("ModuleName");
|
var settings = SettingsUtils.Default.GetSettings<ModuleSettings>("ModuleName");
|
||||||
bool enabled = settings.Enabled;
|
bool enabled = settings.Enabled;
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ using Microsoft.PowerToys.Settings.UI.Library;
|
|||||||
|
|
||||||
// Write settings
|
// Write settings
|
||||||
settings.Enabled = true;
|
settings.Enabled = true;
|
||||||
SettingsUtils.SaveSettings(settings.ToJsonString(), "ModuleName");
|
SettingsUtils.Default.SaveSettings(settings.ToJsonString(), "ModuleName");
|
||||||
```
|
```
|
||||||
|
|
||||||
## Settings Handling in Modules
|
## Settings Handling in Modules
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace Microsoft.PowerToys.UITest
|
|||||||
public class SettingsConfigHelper
|
public class SettingsConfigHelper
|
||||||
{
|
{
|
||||||
private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
|
private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
|
||||||
private static readonly SettingsUtils SettingsUtils = new SettingsUtils();
|
private static readonly SettingsUtils SettingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Configures global PowerToys settings to enable only specified modules and disable all others.
|
/// Configures global PowerToys settings to enable only specified modules and disable all others.
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
|
|||||||
public abstract class SettingsResourceModuleTest<TSettingsConfig> : BaseDscTest
|
public abstract class SettingsResourceModuleTest<TSettingsConfig> : BaseDscTest
|
||||||
where TSettingsConfig : ISettingsConfig, new()
|
where TSettingsConfig : ISettingsConfig, new()
|
||||||
{
|
{
|
||||||
private readonly SettingsUtils _settingsUtils = new();
|
private readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
|
||||||
private TSettingsConfig _originalSettings;
|
private TSettingsConfig _originalSettings;
|
||||||
|
|
||||||
protected TSettingsConfig DefaultSettings => new();
|
protected TSettingsConfig DefaultSettings => new();
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace PowerToys.DSC.Models.FunctionData;
|
|||||||
public sealed class SettingsFunctionData<TSettingsConfig> : BaseFunctionData, ISettingsFunctionData
|
public sealed class SettingsFunctionData<TSettingsConfig> : BaseFunctionData, ISettingsFunctionData
|
||||||
where TSettingsConfig : ISettingsConfig, new()
|
where TSettingsConfig : ISettingsConfig, new()
|
||||||
{
|
{
|
||||||
private static readonly SettingsUtils _settingsUtils = new();
|
private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
|
||||||
private static readonly TSettingsConfig _settingsConfig = new();
|
private static readonly TSettingsConfig _settingsConfig = new();
|
||||||
|
|
||||||
private readonly SettingsResourceObject<TSettingsConfig> _input;
|
private readonly SettingsResourceObject<TSettingsConfig> _input;
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ namespace Hosts.Settings
|
|||||||
|
|
||||||
public UserSettings()
|
public UserSettings()
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
var defaultSettings = new HostsProperties();
|
var defaultSettings = new HostsProperties();
|
||||||
ShowStartupWarning = defaultSettings.ShowStartupWarning;
|
ShowStartupWarning = defaultSettings.ShowStartupWarning;
|
||||||
LoopbackDuplicates = defaultSettings.LoopbackDuplicates;
|
LoopbackDuplicates = defaultSettings.LoopbackDuplicates;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace MeasureToolUI
|
|||||||
{
|
{
|
||||||
public sealed class Settings
|
public sealed class Settings
|
||||||
{
|
{
|
||||||
private static readonly SettingsUtils ModuleSettings = new();
|
private static readonly SettingsUtils ModuleSettings = SettingsUtils.Default;
|
||||||
|
|
||||||
public MeasureToolMeasureStyle DefaultMeasureStyle
|
public MeasureToolMeasureStyle DefaultMeasureStyle
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ internal sealed class SettingsHelper
|
|||||||
lock (this.LockObject)
|
lock (this.LockObject)
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
// set this to 1 to disable retries
|
// set this to 1 to disable retries
|
||||||
var remainingRetries = 5;
|
var remainingRetries = 5;
|
||||||
|
|||||||
@@ -192,7 +192,7 @@ namespace MouseWithoutBorders.Class
|
|||||||
|
|
||||||
internal Settings()
|
internal Settings()
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
_watcher = SettingsHelper.GetFileWatcher("MouseWithoutBorders", "settings.json", () =>
|
_watcher = SettingsHelper.GetFileWatcher("MouseWithoutBorders", "settings.json", () =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ namespace PowerOCR.Settings
|
|||||||
[ImportingConstructor]
|
[ImportingConstructor]
|
||||||
public UserSettings(Helpers.IThrottledActionInvoker throttledActionInvoker)
|
public UserSettings(Helpers.IThrottledActionInvoker throttledActionInvoker)
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
ActivationShortcut = new SettingItem<string>(DefaultActivationShortcut);
|
ActivationShortcut = new SettingItem<string>(DefaultActivationShortcut);
|
||||||
PreferredLanguage = new SettingItem<string>(string.Empty);
|
PreferredLanguage = new SettingItem<string>(string.Empty);
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace WorkspacesEditor.Utils
|
|||||||
public class Settings
|
public class Settings
|
||||||
{
|
{
|
||||||
private const string WorkspacesModuleName = "Workspaces";
|
private const string WorkspacesModuleName = "Workspaces";
|
||||||
private static readonly SettingsUtils _settingsUtils = new();
|
private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
public static WorkspacesSettings ReadSettings()
|
public static WorkspacesSettings ReadSettings()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ namespace WorkspacesEditor.ViewModels
|
|||||||
_orderByIndex = value;
|
_orderByIndex = value;
|
||||||
OnPropertyChanged(new PropertyChangedEventArgs(nameof(WorkspacesView)));
|
OnPropertyChanged(new PropertyChangedEventArgs(nameof(WorkspacesView)));
|
||||||
settings.Properties.SortBy = (WorkspacesProperties.SortByProperty)value;
|
settings.Properties.SortBy = (WorkspacesProperties.SortByProperty)value;
|
||||||
settings.Save(new SettingsUtils());
|
settings.Save(SettingsUtils.Default);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ namespace Awake.Core
|
|||||||
{
|
{
|
||||||
_tokenSource = new CancellationTokenSource();
|
_tokenSource = new CancellationTokenSource();
|
||||||
_stateQueue = [];
|
_stateQueue = [];
|
||||||
ModuleSettings = new SettingsUtils();
|
ModuleSettings = SettingsUtils.Default;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static void StartMonitor()
|
internal static void StartMonitor()
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ namespace Awake
|
|||||||
|
|
||||||
private static async Task<int> Main(string[] args)
|
private static async Task<int> Main(string[] args)
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
LockMutex = new Mutex(true, Core.Constants.AppName, out bool instantiated);
|
LockMutex = new Mutex(true, Core.Constants.AppName, out bool instantiated);
|
||||||
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ namespace ColorPicker.Settings
|
|||||||
[ImportingConstructor]
|
[ImportingConstructor]
|
||||||
public UserSettings(Helpers.IThrottledActionInvoker throttledActionInvoker)
|
public UserSettings(Helpers.IThrottledActionInvoker throttledActionInvoker)
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
ChangeCursor = new SettingItem<bool>(true);
|
ChangeCursor = new SettingItem<bool>(true);
|
||||||
ActivationShortcut = new SettingItem<string>(DefaultActivationShortcut);
|
ActivationShortcut = new SettingItem<string>(DefaultActivationShortcut);
|
||||||
CopiedColorRepresentation = new SettingItem<string>(ColorRepresentationType.HEX.ToString());
|
CopiedColorRepresentation = new SettingItem<string>(ColorRepresentationType.HEX.ToString());
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ namespace Microsoft.PowerToys.Run.Plugin.PowerToys
|
|||||||
|
|
||||||
public UtilityProvider()
|
public UtilityProvider()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var generalSettings = settingsUtils.GetSettings<GeneralSettings>();
|
var generalSettings = settingsUtils.GetSettings<GeneralSettings>();
|
||||||
|
|
||||||
_utilities = new List<Utility>();
|
_utilities = new List<Utility>();
|
||||||
@@ -228,7 +228,7 @@ namespace Microsoft.PowerToys.Run.Plugin.PowerToys
|
|||||||
{
|
{
|
||||||
retryCount++;
|
retryCount++;
|
||||||
|
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var generalSettings = settingsUtils.GetSettings<GeneralSettings>();
|
var generalSettings = settingsUtils.GetSettings<GeneralSettings>();
|
||||||
|
|
||||||
foreach (var u in _utilities)
|
foreach (var u in _utilities)
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace PowerLauncher
|
|||||||
|
|
||||||
public SettingsReader(PowerToysRunSettings settings, ThemeManager themeManager)
|
public SettingsReader(PowerToysRunSettings settings, ThemeManager themeManager)
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
_settings = settings;
|
_settings = settings;
|
||||||
_themeManager = themeManager;
|
_themeManager = themeManager;
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace Peek.FilePreviewer.Models
|
|||||||
|
|
||||||
public PreviewSettings()
|
public PreviewSettings()
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
SourceCodeWrapText = false;
|
SourceCodeWrapText = false;
|
||||||
SourceCodeTryFormat = false;
|
SourceCodeTryFormat = false;
|
||||||
SourceCodeFontSize = 14;
|
SourceCodeFontSize = 14;
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ namespace Peek.UI
|
|||||||
|
|
||||||
public UserSettings()
|
public UserSettings()
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
LoadSettingsFromJson();
|
LoadSettingsFromJson();
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ public class SettingsService
|
|||||||
|
|
||||||
public SettingsService(KeyboardListener keyboardListener)
|
public SettingsService(KeyboardListener keyboardListener)
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
_keyboardListener = keyboardListener;
|
_keyboardListener = keyboardListener;
|
||||||
ReadSettings();
|
ReadSettings();
|
||||||
_watcher = Helper.GetFileWatcher(PowerAccentModuleName, "settings.json", () => { ReadSettings(); });
|
_watcher = Helper.GetFileWatcher(PowerAccentModuleName, "settings.json", () => { ReadSettings(); });
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace PowerAccent.Core.Tools
|
|||||||
|
|
||||||
public CharactersUsageInfo()
|
public CharactersUsageInfo()
|
||||||
{
|
{
|
||||||
_filePath = new SettingsUtils().GetSettingsFilePath(PowerAccentSettings.ModuleName, "UsageInfo.json");
|
_filePath = SettingsUtils.Default.GetSettingsFilePath(PowerAccentSettings.ModuleName, "UsageInfo.json");
|
||||||
var data = GetUsageInfoData();
|
var data = GetUsageInfoData();
|
||||||
_characterUsageCounters = data.CharacterUsageCounters;
|
_characterUsageCounters = data.CharacterUsageCounters;
|
||||||
_characterUsageTimestamp = data.CharacterUsageTimestamp;
|
_characterUsageTimestamp = data.CharacterUsageTimestamp;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.PreviewHandler.Monaco
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class Settings
|
public class Settings
|
||||||
{
|
{
|
||||||
private static SettingsUtils moduleSettings = new SettingsUtils();
|
private static SettingsUtils moduleSettings = SettingsUtils.Default;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a value indicating whether word wrapping should be applied. Set by PT settings.
|
/// Gets a value indicating whether word wrapping should be applied. Set by PT settings.
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Stl
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var moduleSettings = new SettingsUtils();
|
var moduleSettings = SettingsUtils.Default;
|
||||||
|
|
||||||
var colorString = moduleSettings.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties.StlThumbnailColor.Value;
|
var colorString = moduleSettings.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties.StlThumbnailColor.Value;
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ namespace SvgPreviewHandler
|
|||||||
{
|
{
|
||||||
internal sealed class Settings
|
internal sealed class Settings
|
||||||
{
|
{
|
||||||
private static readonly SettingsUtils ModuleSettings = new SettingsUtils();
|
private static readonly SettingsUtils ModuleSettings = SettingsUtils.Default;
|
||||||
|
|
||||||
public int ColorMode
|
public int ColorMode
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -592,7 +592,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public (bool Success, string Message, string Severity, bool LastBackupExists, string OptionalMessage) DryRunBackup()
|
public (bool Success, string Message, string Severity, bool LastBackupExists, string OptionalMessage) DryRunBackup()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var appBasePath = Path.GetDirectoryName(settingsUtils.GetSettingsFilePath());
|
var appBasePath = Path.GetDirectoryName(settingsUtils.GetSettingsFilePath());
|
||||||
string settingsBackupAndRestoreDir = GetSettingsBackupAndRestoreDir();
|
string settingsBackupAndRestoreDir = GetSettingsBackupAndRestoreDir();
|
||||||
var results = BackupSettings(appBasePath, settingsBackupAndRestoreDir, true);
|
var results = BackupSettings(appBasePath, settingsBackupAndRestoreDir, true);
|
||||||
|
|||||||
@@ -22,7 +22,14 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
|||||||
private readonly ISettingsPath _settingsPath;
|
private readonly ISettingsPath _settingsPath;
|
||||||
private readonly JsonSerializerOptions _serializerOptions;
|
private readonly JsonSerializerOptions _serializerOptions;
|
||||||
|
|
||||||
public SettingsUtils()
|
/// <summary>
|
||||||
|
/// Gets the default instance of the <see cref="SettingsUtils"/> class for general use.
|
||||||
|
/// Same as instantiating a new instance with the <see cref="SettingsUtils(IFileSystem?, JsonSerializerOptions?)"/> constructor with a new <see cref="FileSystem"/> object as the first argument and <c>null</c> as the second argument.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>For using in tests, you should use one of the public constructors.</remarks>
|
||||||
|
public static SettingsUtils Default { get; } = new SettingsUtils();
|
||||||
|
|
||||||
|
private SettingsUtils()
|
||||||
: this(new FileSystem())
|
: this(new FileSystem())
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -234,7 +241,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
|||||||
public static (bool Success, string Message, string Severity, bool LastBackupExists, string OptionalMessage) BackupSettings()
|
public static (bool Success, string Message, string Severity, bool LastBackupExists, string OptionalMessage) BackupSettings()
|
||||||
{
|
{
|
||||||
var settingsBackupAndRestoreUtilsX = SettingsBackupAndRestoreUtils.Instance;
|
var settingsBackupAndRestoreUtilsX = SettingsBackupAndRestoreUtils.Instance;
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = Default;
|
||||||
var appBasePath = Path.GetDirectoryName(settingsUtils._settingsPath.GetSettingsPath(string.Empty, string.Empty));
|
var appBasePath = Path.GetDirectoryName(settingsUtils._settingsPath.GetSettingsPath(string.Empty, string.Empty));
|
||||||
string settingsBackupAndRestoreDir = settingsBackupAndRestoreUtilsX.GetSettingsBackupAndRestoreDir();
|
string settingsBackupAndRestoreDir = settingsBackupAndRestoreUtilsX.GetSettingsBackupAndRestoreDir();
|
||||||
|
|
||||||
@@ -247,7 +254,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
|||||||
public static (bool Success, string Message, string Severity) RestoreSettings()
|
public static (bool Success, string Message, string Severity) RestoreSettings()
|
||||||
{
|
{
|
||||||
var settingsBackupAndRestoreUtilsX = SettingsBackupAndRestoreUtils.Instance;
|
var settingsBackupAndRestoreUtilsX = SettingsBackupAndRestoreUtils.Instance;
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = Default;
|
||||||
var appBasePath = Path.GetDirectoryName(settingsUtils._settingsPath.GetSettingsPath(string.Empty, string.Empty));
|
var appBasePath = Path.GetDirectoryName(settingsUtils._settingsPath.GetSettingsPath(string.Empty, string.Empty));
|
||||||
string settingsBackupAndRestoreDir = settingsBackupAndRestoreUtilsX.GetSettingsBackupAndRestoreDir();
|
string settingsBackupAndRestoreDir = settingsBackupAndRestoreUtilsX.GetSettingsBackupAndRestoreDir();
|
||||||
return settingsBackupAndRestoreUtilsX.RestoreSettings(appBasePath, settingsBackupAndRestoreDir);
|
return settingsBackupAndRestoreUtilsX.RestoreSettings(appBasePath, settingsBackupAndRestoreDir);
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public sealed class GetSettingCommandLineCommand
|
|||||||
var modulesSettings = new Dictionary<string, Dictionary<string, object>>();
|
var modulesSettings = new Dictionary<string, Dictionary<string, object>>();
|
||||||
|
|
||||||
var settingsAssembly = CommandLineUtils.GetSettingsAssembly();
|
var settingsAssembly = CommandLineUtils.GetSettingsAssembly();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
var enabledModules = SettingsRepository<GeneralSettings>.GetInstance(settingsUtils).SettingsConfig.Enabled;
|
var enabledModules = SettingsRepository<GeneralSettings>.GetInstance(settingsUtils).SettingsConfig.Enabled;
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ namespace ViewModelTests
|
|||||||
using (var viewModel = new ColorPickerViewModel(
|
using (var viewModel = new ColorPickerViewModel(
|
||||||
ISettingsUtilsMocks.GetStubSettingsUtils<ColorPickerSettings>().Object,
|
ISettingsUtilsMocks.GetStubSettingsUtils<ColorPickerSettings>().Object,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(ISettingsUtilsMocks.GetStubSettingsUtils<GeneralSettings>().Object),
|
SettingsRepository<GeneralSettings>.GetInstance(ISettingsUtilsMocks.GetStubSettingsUtils<GeneralSettings>().Object),
|
||||||
SettingsRepository<ColorPickerSettings>.GetInstance(new SettingsUtils()),
|
SettingsRepository<ColorPickerSettings>.GetInstance(SettingsUtils.Default),
|
||||||
ColorPickerIsEnabledByDefaultIPC))
|
ColorPickerIsEnabledByDefaultIPC))
|
||||||
{
|
{
|
||||||
Assert.IsTrue(viewModel.IsEnabled);
|
Assert.IsTrue(viewModel.IsEnabled);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
// See the LICENSE file in the project root for more information.
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.IO.Abstractions;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
|
||||||
using Microsoft.PowerToys.Settings.UI.Library;
|
using Microsoft.PowerToys.Settings.UI.Library;
|
||||||
@@ -120,7 +121,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void IsEnabledShouldDisableModuleWhenSuccessful()
|
public void IsEnabledShouldDisableModuleWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
Func<string, int> sendMockIPCConfigMSG = msg =>
|
Func<string, int> sendMockIPCConfigMSG = msg =>
|
||||||
{
|
{
|
||||||
@@ -140,7 +141,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ShiftDragShouldSetValue2FalseWhenSuccessful()
|
public void ShiftDragShouldSetValue2FalseWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -158,7 +159,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void OverrideSnapHotkeysShouldSetValue2TrueWhenSuccessful()
|
public void OverrideSnapHotkeysShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -176,7 +177,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void MoveWindowsAcrossMonitorsShouldSetValue2TrueWhenSuccessful()
|
public void MoveWindowsAcrossMonitorsShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -194,7 +195,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void MoveWindowsBasedOnPositionShouldSetValue2TrueWhenSuccessful()
|
public void MoveWindowsBasedOnPositionShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -217,7 +218,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void QuickLayoutSwitchShouldSetValue2FalseWhenSuccessful()
|
public void QuickLayoutSwitchShouldSetValue2FalseWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -235,7 +236,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void FlashZonesOnQuickSwitchShouldSetValue2FalseWhenSuccessful()
|
public void FlashZonesOnQuickSwitchShouldSetValue2FalseWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -253,7 +254,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void MakeDraggedWindowsTransparentShouldSetValue2TrueWhenSuccessful()
|
public void MakeDraggedWindowsTransparentShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -271,7 +272,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void MouseSwitchShouldSetValue2TrueWhenSuccessful()
|
public void MouseSwitchShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -289,7 +290,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void DisplayOrWorkAreaChangeMoveWindowsShouldSetValue2FalseWhenSuccessful()
|
public void DisplayOrWorkAreaChangeMoveWindowsShouldSetValue2FalseWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -307,7 +308,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZoneSetChangeMoveWindowsShouldSetValue2TrueWhenSuccessful()
|
public void ZoneSetChangeMoveWindowsShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -325,7 +326,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void AppLastZoneMoveWindowsShouldSetValue2TrueWhenSuccessful()
|
public void AppLastZoneMoveWindowsShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -343,7 +344,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void OpenWindowOnActiveMonitorShouldSetValue2TrueWhenSuccessful()
|
public void OpenWindowOnActiveMonitorShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -361,7 +362,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void RestoreSizeShouldSetValue2TrueWhenSuccessful()
|
public void RestoreSizeShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -379,7 +380,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void UseCursorPosEditorStartupScreenShouldSetValue2FalseWhenSuccessful()
|
public void UseCursorPosEditorStartupScreenShouldSetValue2FalseWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -397,7 +398,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ShowOnAllMonitorsShouldSetValue2TrueWhenSuccessful()
|
public void ShowOnAllMonitorsShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -415,7 +416,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void SpanZonesAcrossMonitorsShouldSetValue2TrueWhenSuccessful()
|
public void SpanZonesAcrossMonitorsShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -433,7 +434,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void OverlappingZonesAlgorithmIndexShouldSetValue2AnotherWhenSuccessful()
|
public void OverlappingZonesAlgorithmIndexShouldSetValue2AnotherWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -451,7 +452,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void AllowChildWindowsToSnapShouldSetValue2TrueWhenSuccessful()
|
public void AllowChildWindowsToSnapShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -469,7 +470,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void DisableRoundCornersOnSnapShouldSetValue2TrueWhenSuccessful()
|
public void DisableRoundCornersOnSnapShouldSetValue2TrueWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -487,7 +488,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZoneHighlightColorShouldSetColorValue2WhiteWhenSuccessful()
|
public void ZoneHighlightColorShouldSetColorValue2WhiteWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -505,7 +506,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZoneBorderColorShouldSetColorValue2WhiteWhenSuccessful()
|
public void ZoneBorderColorShouldSetColorValue2WhiteWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -523,7 +524,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZoneInActiveColorShouldSetColorValue2WhiteWhenSuccessful()
|
public void ZoneInActiveColorShouldSetColorValue2WhiteWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -541,7 +542,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ExcludedAppsShouldSetColorValue2WhiteWhenSuccessful()
|
public void ExcludedAppsShouldSetColorValue2WhiteWhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
@@ -559,7 +560,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void HighlightOpacityShouldSetOpacityValueTo60WhenSuccessful()
|
public void HighlightOpacityShouldSetOpacityValueTo60WhenSuccessful()
|
||||||
{
|
{
|
||||||
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>();
|
Mock<SettingsUtils> mockSettingsUtils = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// arrange
|
// arrange
|
||||||
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
FancyZonesViewModel viewModel = new FancyZonesViewModel(mockSettingsUtils.Object, SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<FancyZonesSettings>.GetInstance(mockFancyZonesSettingsUtils.Object), sendMockIPCConfigMSG, FancyZonesTestFolderName);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
// See the LICENSE file in the project root for more information.
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.IO.Abstractions;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
|
||||||
using Microsoft.PowerToys.Settings.UI.Library;
|
using Microsoft.PowerToys.Settings.UI.Library;
|
||||||
@@ -69,7 +70,7 @@ namespace ViewModelTests
|
|||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void IsEnabledShouldEnableModuleWhenSuccessful()
|
public void IsEnabledShouldEnableModuleWhenSuccessful()
|
||||||
{
|
{
|
||||||
var settingsUtilsMock = new Mock<SettingsUtils>();
|
var settingsUtilsMock = new Mock<SettingsUtils>(new FileSystem(), null);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
// Initialize mock function of sending IPC message.
|
// Initialize mock function of sending IPC message.
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
|
|||||||
|
|
||||||
static HotkeyConflictIgnoreHelper()
|
static HotkeyConflictIgnoreHelper()
|
||||||
{
|
{
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
_generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(_settingsUtils);
|
_generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(_settingsUtils);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ namespace Microsoft.PowerToys.Settings.UI
|
|||||||
var settingValue = cmdArgs[3];
|
var settingValue = cmdArgs[3];
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
SetSettingCommandLineCommand.Execute(settingName, settingValue, new SettingsUtils());
|
SetSettingCommandLineCommand.Execute(settingName, settingValue, SettingsUtils.Default);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -151,7 +151,7 @@ namespace Microsoft.PowerToys.Settings.UI
|
|||||||
{
|
{
|
||||||
using (var settings = JsonDocument.Parse(File.ReadAllText(ipcFileName)))
|
using (var settings = JsonDocument.Parse(File.ReadAllText(ipcFileName)))
|
||||||
{
|
{
|
||||||
SetAdditionalSettingsCommandLineCommand.Execute(moduleName, settings, new SettingsUtils());
|
SetAdditionalSettingsCommandLineCommand.Execute(moduleName, settings, SettingsUtils.Default);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -357,7 +357,7 @@ namespace Microsoft.PowerToys.Settings.UI
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ISettingsUtils settingsUtils = new SettingsUtils();
|
private static ISettingsUtils settingsUtils = SettingsUtils.Default;
|
||||||
private static ThemeService themeService = new ThemeService(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils));
|
private static ThemeService themeService = new ThemeService(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils));
|
||||||
|
|
||||||
public static ThemeService ThemeService => themeService;
|
public static ThemeService ThemeService => themeService;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ namespace Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard
|
|||||||
|
|
||||||
public ShortcutConflictWindow()
|
public ShortcutConflictWindow()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new ShortcutConflictViewModel(
|
ViewModel = new ShortcutConflictViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
|
|||||||
{
|
{
|
||||||
this.InitializeComponent();
|
this.InitializeComponent();
|
||||||
|
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new AllAppsViewModel(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), Views.ShellPage.SendDefaultIPCMessage);
|
ViewModel = new AllAppsViewModel(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), Views.ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
|
|||||||
public LaunchPage()
|
public LaunchPage()
|
||||||
{
|
{
|
||||||
this.InitializeComponent();
|
this.InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new LauncherViewModel(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), Views.ShellPage.SendDefaultIPCMessage);
|
ViewModel = new LauncherViewModel(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), Views.ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
}
|
}
|
||||||
@@ -51,7 +51,7 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
|
|||||||
break;
|
break;
|
||||||
case ModuleType.EnvironmentVariables: // Launch Environment Variables
|
case ModuleType.EnvironmentVariables: // Launch Environment Variables
|
||||||
{
|
{
|
||||||
bool launchAdmin = SettingsRepository<EnvironmentVariablesSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.LaunchAdministrator;
|
bool launchAdmin = SettingsRepository<EnvironmentVariablesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
|
||||||
string eventName = !App.IsElevated && launchAdmin
|
string eventName = !App.IsElevated && launchAdmin
|
||||||
? Constants.ShowEnvironmentVariablesAdminSharedEvent()
|
? Constants.ShowEnvironmentVariablesAdminSharedEvent()
|
||||||
: Constants.ShowEnvironmentVariablesSharedEvent();
|
: Constants.ShowEnvironmentVariablesSharedEvent();
|
||||||
@@ -74,7 +74,7 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
|
|||||||
|
|
||||||
case ModuleType.Hosts: // Launch Hosts
|
case ModuleType.Hosts: // Launch Hosts
|
||||||
{
|
{
|
||||||
bool launchAdmin = SettingsRepository<HostsSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.LaunchAdministrator;
|
bool launchAdmin = SettingsRepository<HostsSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
|
||||||
string eventName = !App.IsElevated && launchAdmin
|
string eventName = !App.IsElevated && launchAdmin
|
||||||
? Constants.ShowHostsAdminSharedEvent()
|
? Constants.ShowHostsAdminSharedEvent()
|
||||||
: Constants.ShowHostsSharedEvent();
|
: Constants.ShowHostsSharedEvent();
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ namespace Microsoft.PowerToys.Settings.UI
|
|||||||
// open main window
|
// open main window
|
||||||
ShellPage.SetUpdatingGeneralSettingsCallback((ModuleType moduleType, bool isEnabled) =>
|
ShellPage.SetUpdatingGeneralSettingsCallback((ModuleType moduleType, bool isEnabled) =>
|
||||||
{
|
{
|
||||||
SettingsRepository<GeneralSettings> repository = SettingsRepository<GeneralSettings>.GetInstance(new SettingsUtils());
|
SettingsRepository<GeneralSettings> repository = SettingsRepository<GeneralSettings>.GetInstance(SettingsUtils.Default);
|
||||||
GeneralSettings generalSettingsConfig = repository.SettingsConfig;
|
GeneralSettings generalSettingsConfig = repository.SettingsConfig;
|
||||||
bool needToUpdate = ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType) != isEnabled;
|
bool needToUpdate = ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType) != isEnabled;
|
||||||
|
|
||||||
|
|||||||
@@ -35,9 +35,9 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
AdvancedPasteUIHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.AdvancedPasteUIShortcut.GetKeysList();
|
AdvancedPasteUIHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.AdvancedPasteUIShortcut.GetKeysList();
|
||||||
PasteAsPlainTextHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.PasteAsPlainTextShortcut.GetKeysList();
|
PasteAsPlainTextHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.PasteAsPlainTextShortcut.GetKeysList();
|
||||||
PasteAsMarkdownHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.PasteAsMarkdownShortcut.GetKeysList();
|
PasteAsMarkdownHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.PasteAsMarkdownShortcut.GetKeysList();
|
||||||
|
|
||||||
// TODO(stefan): Check how to remove additional space if item is set to Collapsed.
|
// TODO(stefan): Check how to remove additional space if item is set to Collapsed.
|
||||||
if (PasteAsMarkdownHotkeyControl.Keys.Count > 0)
|
if (PasteAsMarkdownHotkeyControl.Keys.Count > 0)
|
||||||
@@ -45,7 +45,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
PasteAsMarkdownHotkeyControl.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
PasteAsMarkdownHotkeyControl.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
PasteAsJsonHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.PasteAsJsonShortcut.GetKeysList();
|
PasteAsJsonHotkeyControl.Keys = SettingsRepository<AdvancedPasteSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.PasteAsJsonShortcut.GetKeysList();
|
||||||
if (PasteAsJsonHotkeyControl.Keys.Count > 0)
|
if (PasteAsJsonHotkeyControl.Keys.Count > 0)
|
||||||
{
|
{
|
||||||
PasteAsJsonHotkeyControl.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
PasteAsJsonHotkeyControl.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
HotkeyControl.Keys = SettingsRepository<AlwaysOnTopSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.Hotkey.Value.GetKeysList();
|
HotkeyControl.Keys = SettingsRepository<AlwaysOnTopSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.Hotkey.Value.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
ColorPickerSettings settings = new SettingsUtils().GetSettingsOrDefault<ColorPickerSettings, ColorPickerSettingsVersion1>(ColorPickerSettings.ModuleName, settingsUpgrader: ColorPickerSettings.UpgradeSettings);
|
ColorPickerSettings settings = SettingsUtils.Default.GetSettingsOrDefault<ColorPickerSettings, ColorPickerSettingsVersion1>(ColorPickerSettings.ModuleName, settingsUpgrader: ColorPickerSettings.UpgradeSettings);
|
||||||
|
|
||||||
HotkeyControl.Keys = settings.Properties.ActivationShortcut.GetKeysList();
|
HotkeyControl.Keys = settings.Properties.ActivationShortcut.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
ReparentHotkeyControl.Keys = SettingsRepository<CropAndLockSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ReparentHotkey.Value.GetKeysList();
|
ReparentHotkeyControl.Keys = SettingsRepository<CropAndLockSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ReparentHotkey.Value.GetKeysList();
|
||||||
ThumbnailHotkeyControl.Keys = SettingsRepository<CropAndLockSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ThumbnailHotkey.Value.GetKeysList();
|
ThumbnailHotkeyControl.Keys = SettingsRepository<CropAndLockSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ThumbnailHotkey.Value.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
|
|
||||||
private void Launch_EnvironmentVariables_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
private void Launch_EnvironmentVariables_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
bool launchAdmin = SettingsRepository<EnvironmentVariablesSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.LaunchAdministrator;
|
bool launchAdmin = SettingsRepository<EnvironmentVariablesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
|
||||||
string eventName = !App.IsElevated && launchAdmin
|
string eventName = !App.IsElevated && launchAdmin
|
||||||
? Constants.ShowEnvironmentVariablesAdminSharedEvent()
|
? Constants.ShowEnvironmentVariablesAdminSharedEvent()
|
||||||
: Constants.ShowEnvironmentVariablesSharedEvent();
|
: Constants.ShowEnvironmentVariablesSharedEvent();
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
HotkeyControl.Keys = SettingsRepository<FancyZonesSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.GetKeysList();
|
HotkeyControl.Keys = SettingsRepository<FancyZonesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
|
|
||||||
private void Launch_Hosts_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
private void Launch_Hosts_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
bool launchAdmin = SettingsRepository<HostsSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.LaunchAdministrator;
|
bool launchAdmin = SettingsRepository<HostsSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
|
||||||
string eventName = !App.IsElevated && launchAdmin
|
string eventName = !App.IsElevated && launchAdmin
|
||||||
? Constants.ShowHostsAdminSharedEvent()
|
? Constants.ShowHostsAdminSharedEvent()
|
||||||
: Constants.ShowHostsSharedEvent();
|
: Constants.ShowHostsSharedEvent();
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
HotkeyActivation.Keys = SettingsRepository<MeasureToolSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
HotkeyActivation.Keys = SettingsRepository<MeasureToolSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -21,10 +21,10 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.Overview]);
|
ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.Overview]);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
|
|
||||||
FancyZonesHotkeyControl.Keys = SettingsRepository<FancyZonesSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.GetKeysList();
|
FancyZonesHotkeyControl.Keys = SettingsRepository<FancyZonesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.GetKeysList();
|
||||||
RunHotkeyControl.Keys = SettingsRepository<PowerLauncherSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenPowerLauncher.GetKeysList();
|
RunHotkeyControl.Keys = SettingsRepository<PowerLauncherSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.OpenPowerLauncher.GetKeysList();
|
||||||
ColorPickerHotkeyControl.Keys = SettingsRepository<ColorPickerSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
ColorPickerHotkeyControl.Keys = SettingsRepository<ColorPickerSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
||||||
AlwaysOnTopHotkeyControl.Keys = SettingsRepository<AlwaysOnTopSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.Hotkey.Value.GetKeysList();
|
AlwaysOnTopHotkeyControl.Keys = SettingsRepository<AlwaysOnTopSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.Hotkey.Value.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SettingsLaunchButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
private void SettingsLaunchButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
HotkeyControl.Keys = SettingsRepository<PeekSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
HotkeyControl.Keys = SettingsRepository<PeekSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
HotkeyControl.Keys = SettingsRepository<PowerOcrSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
HotkeyControl.Keys = SettingsRepository<PowerOcrSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
|
|
||||||
HotkeyControl.Keys = SettingsRepository<PowerLauncherSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenPowerLauncher.GetKeysList();
|
HotkeyControl.Keys = SettingsRepository<PowerLauncherSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.OpenPowerLauncher.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
|
|
||||||
public ObservableCollection<OobePowerToysModule> Modules { get; }
|
public ObservableCollection<OobePowerToysModule> Modules { get; }
|
||||||
|
|
||||||
private static ISettingsUtils settingsUtils = new SettingsUtils();
|
private static ISettingsUtils settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
/* NOTE: Experimentation for OOBE is currently turned off on server side. Keeping this code in a comment to allow future experiments.
|
/* NOTE: Experimentation for OOBE is currently turned off on server side. Keeping this code in a comment to allow future experiments.
|
||||||
private bool ExperimentationToggleSwitchEnabled { get; set; } = true;
|
private bool ExperimentationToggleSwitchEnabled { get; set; } = true;
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
var settingsProperties = SettingsRepository<ShortcutGuideSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties;
|
var settingsProperties = SettingsRepository<ShortcutGuideSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties;
|
||||||
|
|
||||||
if ((bool)settingsProperties.UseLegacyPressWinKeyBehavior.Value)
|
if ((bool)settingsProperties.UseLegacyPressWinKeyBehavior.Value)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
ViewModel.LogOpeningModuleEvent();
|
||||||
HotkeyControl.Keys = SettingsRepository<WorkspacesSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.Hotkey.Value.GetKeysList();
|
HotkeyControl.Keys = SettingsRepository<WorkspacesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.Hotkey.Value.GetKeysList();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public AdvancedPastePage()
|
public AdvancedPastePage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new AdvancedPasteViewModel(
|
ViewModel = new AdvancedPasteViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public AlwaysOnTopPage()
|
public AlwaysOnTopPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new AlwaysOnTopViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<AlwaysOnTopSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new AlwaysOnTopViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<AlwaysOnTopSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
{
|
{
|
||||||
_dispatcherQueue = DispatcherQueue.GetForCurrentThread();
|
_dispatcherQueue = DispatcherQueue.GetForCurrentThread();
|
||||||
_fileSystem = new FileSystem();
|
_fileSystem = new FileSystem();
|
||||||
_settingsUtils = new SettingsUtils();
|
_settingsUtils = SettingsUtils.Default;
|
||||||
_sendConfigMsg = ShellPage.SendDefaultIPCMessage;
|
_sendConfigMsg = ShellPage.SendDefaultIPCMessage;
|
||||||
|
|
||||||
ViewModel = new AwakeViewModel();
|
ViewModel = new AwakeViewModel();
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public CmdPalPage()
|
public CmdPalPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new CmdPalViewModel(
|
ViewModel = new CmdPalViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public ColorPickerPage()
|
public ColorPickerPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new ColorPickerViewModel(
|
ViewModel = new ColorPickerViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public CropAndLockPage()
|
public CropAndLockPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new CropAndLockViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<CropAndLockSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new CropAndLockViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<CropAndLockSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public DashboardPage()
|
public DashboardPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
ViewModel = new DashboardViewModel(
|
ViewModel = new DashboardViewModel(
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public EnvironmentVariablesPage()
|
public EnvironmentVariablesPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new EnvironmentVariablesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<EnvironmentVariablesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
ViewModel = new EnvironmentVariablesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<EnvironmentVariablesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public FancyZonesPage()
|
public FancyZonesPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new FancyZonesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<FancyZonesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new FancyZonesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<FancyZonesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
Loaded += (s, e) => ViewModel.OnPageLoaded();
|
Loaded += (s, e) => ViewModel.OnPageLoaded();
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public FileLocksmithPage()
|
public FileLocksmithPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new FileLocksmithViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new FileLocksmithViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
// Load string resources
|
// Load string resources
|
||||||
var loader = Helpers.ResourceLoaderInstance.ResourceLoader;
|
var loader = Helpers.ResourceLoaderInstance.ResourceLoader;
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
|
|
||||||
Action stateUpdatingAction = () =>
|
Action stateUpdatingAction = () =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public HostsPage()
|
public HostsPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new HostsViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<HostsSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
ViewModel = new HostsViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<HostsSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
||||||
BackupsCountInputSettingsCard.Header = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Header");
|
BackupsCountInputSettingsCard.Header = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Header");
|
||||||
BackupsCountInputSettingsCard.Description = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Description");
|
BackupsCountInputSettingsCard.Description = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Description");
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public ImageResizerPage()
|
public ImageResizerPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var resourceLoader = ResourceLoaderInstance.ResourceLoader;
|
var resourceLoader = ResourceLoaderInstance.ResourceLoader;
|
||||||
Func<string, string> loader = resourceLoader.GetString;
|
Func<string, string> loader = resourceLoader.GetString;
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public KeyboardManagerPage()
|
public KeyboardManagerPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new KeyboardManagerViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, FilterRemapKeysList);
|
ViewModel = new KeyboardManagerViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, FilterRemapKeysList);
|
||||||
|
|
||||||
watcher = Helper.GetFileWatcher(
|
watcher = Helper.GetFileWatcher(
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public LightSwitchPage()
|
public LightSwitchPage()
|
||||||
{
|
{
|
||||||
this.settingsUtils = new SettingsUtils();
|
this.settingsUtils = SettingsUtils.Default;
|
||||||
this.sendConfigMsg = ShellPage.SendDefaultIPCMessage;
|
this.sendConfigMsg = ShellPage.SendDefaultIPCMessage;
|
||||||
|
|
||||||
this.generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(this.settingsUtils);
|
this.generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(this.settingsUtils);
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public MeasureToolPage()
|
public MeasureToolPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new MeasureToolViewModel(
|
ViewModel = new MeasureToolViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
{
|
{
|
||||||
// By mistake, the first release of Find My Mouse was saving settings in two places at the same time.
|
// By mistake, the first release of Find My Mouse was saving settings in two places at the same time.
|
||||||
// Delete the wrong path for Find My Mouse settings.
|
// Delete the wrong path for Find My Mouse settings.
|
||||||
var tempSettingsUtils = new SettingsUtils();
|
var tempSettingsUtils = SettingsUtils.Default;
|
||||||
if (tempSettingsUtils.SettingsExists("Find My Mouse"))
|
if (tempSettingsUtils.SettingsExists("Find My Mouse"))
|
||||||
{
|
{
|
||||||
var settingsFilePath = tempSettingsUtils.GetSettingsFilePath("Find My Mouse");
|
var settingsFilePath = tempSettingsUtils.GetSettingsFilePath("Find My Mouse");
|
||||||
@@ -34,7 +34,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new MouseUtilsViewModel(
|
ViewModel = new MouseUtilsViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public MouseWithoutBordersPage()
|
public MouseWithoutBordersPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new MouseWithoutBordersViewModel(
|
ViewModel = new MouseWithoutBordersViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public NewPlusPage()
|
public NewPlusPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settings_utils = new SettingsUtils();
|
var settings_utils = SettingsUtils.Default;
|
||||||
ViewModel = new NewPlusViewModel(settings_utils, SettingsRepository<GeneralSettings>.GetInstance(settings_utils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new NewPlusViewModel(settings_utils, SettingsRepository<GeneralSettings>.GetInstance(settings_utils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public PeekPage()
|
public PeekPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new PeekViewModel(
|
ViewModel = new PeekViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public PowerAccentPage()
|
public PowerAccentPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new PowerAccentViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new PowerAccentViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
this.InitializeComponent();
|
this.InitializeComponent();
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public PowerLauncherPage()
|
public PowerLauncherPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
_lastIPCMessageSentTick = Environment.TickCount;
|
_lastIPCMessageSentTick = Environment.TickCount;
|
||||||
|
|
||||||
PowerLauncherSettings settings = SettingsRepository<PowerLauncherSettings>.GetInstance(settingsUtils)?.SettingsConfig;
|
PowerLauncherSettings settings = SettingsRepository<PowerLauncherSettings>.GetInstance(settingsUtils)?.SettingsConfig;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public PowerOcrPage()
|
public PowerOcrPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new PowerOcrViewModel(
|
ViewModel = new PowerOcrViewModel(
|
||||||
settingsUtils,
|
settingsUtils,
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public PowerPreviewPage()
|
public PowerPreviewPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new PowerPreviewViewModel(SettingsRepository<PowerPreviewSettings>.GetInstance(settingsUtils), SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new PowerPreviewViewModel(SettingsRepository<PowerPreviewSettings>.GetInstance(settingsUtils), SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
public PowerRenamePage()
|
public PowerRenamePage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new PowerRenameViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new PowerRenameViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
|
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public RegistryPreviewPage()
|
public RegistryPreviewPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new RegistryPreviewViewModel(
|
ViewModel = new RegistryPreviewViewModel(
|
||||||
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
|
||||||
SettingsRepository<RegistryPreviewSettings>.GetInstance(settingsUtils),
|
SettingsRepository<RegistryPreviewSettings>.GetInstance(settingsUtils),
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
SetWindowTitle();
|
SetWindowTitle();
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new ShellViewModel(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils));
|
ViewModel = new ShellViewModel(SettingsRepository<GeneralSettings>.GetInstance(settingsUtils));
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
ShellHandler = this;
|
ShellHandler = this;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new ShortcutGuideViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<ShortcutGuideSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new ShortcutGuideViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<ShortcutGuideSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public WorkspacesPage()
|
public WorkspacesPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new WorkspacesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<WorkspacesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
ViewModel = new WorkspacesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<WorkspacesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
public ZoomItPage()
|
public ZoomItPage()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
ViewModel = new ZoomItViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, PickFileDialog, PickFontDialog);
|
ViewModel = new ZoomItViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, PickFileDialog, PickFontDialog);
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -251,7 +251,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
|
if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var settings = NewPlusViewModel.LoadSettings(settingsUtils);
|
var settings = NewPlusViewModel.LoadSettings(settingsUtils);
|
||||||
NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
|
NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
|
||||||
}
|
}
|
||||||
@@ -390,7 +390,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsAlwaysOnTop()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsAlwaysOnTop()
|
||||||
{
|
{
|
||||||
ISettingsRepository<AlwaysOnTopSettings> moduleSettingsRepository = SettingsRepository<AlwaysOnTopSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<AlwaysOnTopSettings> moduleSettingsRepository = SettingsRepository<AlwaysOnTopSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("AlwaysOnTop_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.Hotkey.Value.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("AlwaysOnTop_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.Hotkey.Value.GetKeysList() },
|
||||||
@@ -411,7 +411,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsColorPicker()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsColorPicker()
|
||||||
{
|
{
|
||||||
ISettingsRepository<ColorPickerSettings> moduleSettingsRepository = SettingsRepository<ColorPickerSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<ColorPickerSettings> moduleSettingsRepository = SettingsRepository<ColorPickerSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var settings = moduleSettingsRepository.SettingsConfig;
|
var settings = moduleSettingsRepository.SettingsConfig;
|
||||||
var hotkey = settings.Properties.ActivationShortcut;
|
var hotkey = settings.Properties.ActivationShortcut;
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
@@ -423,7 +423,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsLightSwitch()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsLightSwitch()
|
||||||
{
|
{
|
||||||
ISettingsRepository<LightSwitchSettings> moduleSettingsRepository = SettingsRepository<LightSwitchSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<LightSwitchSettings> moduleSettingsRepository = SettingsRepository<LightSwitchSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var settings = moduleSettingsRepository.SettingsConfig;
|
var settings = moduleSettingsRepository.SettingsConfig;
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
@@ -434,7 +434,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsCropAndLock()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsCropAndLock()
|
||||||
{
|
{
|
||||||
ISettingsRepository<CropAndLockSettings> moduleSettingsRepository = SettingsRepository<CropAndLockSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<CropAndLockSettings> moduleSettingsRepository = SettingsRepository<CropAndLockSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var settings = moduleSettingsRepository.SettingsConfig;
|
var settings = moduleSettingsRepository.SettingsConfig;
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
@@ -455,7 +455,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsFancyZones()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsFancyZones()
|
||||||
{
|
{
|
||||||
ISettingsRepository<FancyZonesSettings> moduleSettingsRepository = SettingsRepository<FancyZonesSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<FancyZonesSettings> moduleSettingsRepository = SettingsRepository<FancyZonesSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var settings = moduleSettingsRepository.SettingsConfig;
|
var settings = moduleSettingsRepository.SettingsConfig;
|
||||||
string activationMode = $"{resourceLoader.GetString(settings.Properties.FancyzonesShiftDrag.Value ? "FancyZones_ActivationShiftDrag" : "FancyZones_ActivationNoShiftDrag")}.";
|
string activationMode = $"{resourceLoader.GetString(settings.Properties.FancyzonesShiftDrag.Value ? "FancyZones_ActivationShiftDrag" : "FancyZones_ActivationNoShiftDrag")}.";
|
||||||
|
|
||||||
@@ -470,7 +470,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsFindMyMouse()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsFindMyMouse()
|
||||||
{
|
{
|
||||||
ISettingsRepository<FindMyMouseSettings> moduleSettingsRepository = SettingsRepository<FindMyMouseSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<FindMyMouseSettings> moduleSettingsRepository = SettingsRepository<FindMyMouseSettings>.GetInstance(SettingsUtils.Default);
|
||||||
string shortDescription = resourceLoader.GetString("FindMyMouse_ShortDescription");
|
string shortDescription = resourceLoader.GetString("FindMyMouse_ShortDescription");
|
||||||
var settings = moduleSettingsRepository.SettingsConfig;
|
var settings = moduleSettingsRepository.SettingsConfig;
|
||||||
var activationMethod = settings.Properties.ActivationMethod.Value;
|
var activationMethod = settings.Properties.ActivationMethod.Value;
|
||||||
@@ -508,7 +508,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsMouseHighlighter()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsMouseHighlighter()
|
||||||
{
|
{
|
||||||
ISettingsRepository<MouseHighlighterSettings> moduleSettingsRepository = SettingsRepository<MouseHighlighterSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<MouseHighlighterSettings> moduleSettingsRepository = SettingsRepository<MouseHighlighterSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("MouseHighlighter_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("MouseHighlighter_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
||||||
@@ -518,7 +518,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsMouseJump()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsMouseJump()
|
||||||
{
|
{
|
||||||
ISettingsRepository<MouseJumpSettings> moduleSettingsRepository = SettingsRepository<MouseJumpSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<MouseJumpSettings> moduleSettingsRepository = SettingsRepository<MouseJumpSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("MouseJump_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("MouseJump_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
||||||
@@ -528,7 +528,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsMousePointerCrosshairs()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsMousePointerCrosshairs()
|
||||||
{
|
{
|
||||||
ISettingsRepository<MousePointerCrosshairsSettings> moduleSettingsRepository = SettingsRepository<MousePointerCrosshairsSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<MousePointerCrosshairsSettings> moduleSettingsRepository = SettingsRepository<MousePointerCrosshairsSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("MouseCrosshairs_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("MouseCrosshairs_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
||||||
@@ -538,7 +538,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsAdvancedPaste()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsAdvancedPaste()
|
||||||
{
|
{
|
||||||
ISettingsRepository<AdvancedPasteSettings> moduleSettingsRepository = SettingsRepository<AdvancedPasteSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<AdvancedPasteSettings> moduleSettingsRepository = SettingsRepository<AdvancedPasteSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("AdvancedPasteUI_Shortcut/Header"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.AdvancedPasteUIShortcut.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("AdvancedPasteUI_Shortcut/Header"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.AdvancedPasteUIShortcut.GetKeysList() },
|
||||||
@@ -560,7 +560,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsPeek()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsPeek()
|
||||||
{
|
{
|
||||||
ISettingsRepository<PeekSettings> moduleSettingsRepository = SettingsRepository<PeekSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<PeekSettings> moduleSettingsRepository = SettingsRepository<PeekSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("Peek_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("Peek_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
||||||
@@ -570,7 +570,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerLauncher()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerLauncher()
|
||||||
{
|
{
|
||||||
ISettingsRepository<PowerLauncherSettings> moduleSettingsRepository = SettingsRepository<PowerLauncherSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<PowerLauncherSettings> moduleSettingsRepository = SettingsRepository<PowerLauncherSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("Run_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.OpenPowerLauncher.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("Run_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.OpenPowerLauncher.GetKeysList() },
|
||||||
@@ -580,7 +580,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerAccent()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerAccent()
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
PowerAccentSettings moduleSettings = settingsUtils.GetSettingsOrDefault<PowerAccentSettings>(PowerAccentSettings.ModuleName);
|
PowerAccentSettings moduleSettings = settingsUtils.GetSettingsOrDefault<PowerAccentSettings>(PowerAccentSettings.ModuleName);
|
||||||
var activationMethod = moduleSettings.Properties.ActivationKey;
|
var activationMethod = moduleSettings.Properties.ActivationKey;
|
||||||
string activation = string.Empty;
|
string activation = string.Empty;
|
||||||
@@ -600,7 +600,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsWorkspaces()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsWorkspaces()
|
||||||
{
|
{
|
||||||
ISettingsRepository<WorkspacesSettings> moduleSettingsRepository = SettingsRepository<WorkspacesSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<WorkspacesSettings> moduleSettingsRepository = SettingsRepository<WorkspacesSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var settings = moduleSettingsRepository.SettingsConfig;
|
var settings = moduleSettingsRepository.SettingsConfig;
|
||||||
|
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
@@ -622,7 +622,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsMeasureTool()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsMeasureTool()
|
||||||
{
|
{
|
||||||
ISettingsRepository<MeasureToolSettings> moduleSettingsRepository = SettingsRepository<MeasureToolSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<MeasureToolSettings> moduleSettingsRepository = SettingsRepository<MeasureToolSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("ScreenRuler_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("ScreenRuler_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
||||||
@@ -632,7 +632,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsShortcutGuide()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsShortcutGuide()
|
||||||
{
|
{
|
||||||
ISettingsRepository<ShortcutGuideSettings> moduleSettingsRepository = SettingsRepository<ShortcutGuideSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<ShortcutGuideSettings> moduleSettingsRepository = SettingsRepository<ShortcutGuideSettings>.GetInstance(SettingsUtils.Default);
|
||||||
|
|
||||||
var shortcut = moduleSettingsRepository.SettingsConfig.Properties.UseLegacyPressWinKeyBehavior.Value
|
var shortcut = moduleSettingsRepository.SettingsConfig.Properties.UseLegacyPressWinKeyBehavior.Value
|
||||||
? new List<object> { 92 } // Right Windows key code
|
? new List<object> { 92 } // Right Windows key code
|
||||||
@@ -647,7 +647,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerOCR()
|
private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerOCR()
|
||||||
{
|
{
|
||||||
ISettingsRepository<PowerOcrSettings> moduleSettingsRepository = SettingsRepository<PowerOcrSettings>.GetInstance(new SettingsUtils());
|
ISettingsRepository<PowerOcrSettings> moduleSettingsRepository = SettingsRepository<PowerOcrSettings>.GetInstance(SettingsUtils.Default);
|
||||||
var list = new List<DashboardModuleItem>
|
var list = new List<DashboardModuleItem>
|
||||||
{
|
{
|
||||||
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("PowerOcr_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("PowerOcr_ShortDescription"), Shortcut = moduleSettingsRepository.SettingsConfig.Properties.ActivationShortcut.GetKeysList() },
|
||||||
@@ -662,14 +662,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private void EnvironmentVariablesLaunchClicked(object sender, RoutedEventArgs e)
|
private void EnvironmentVariablesLaunchClicked(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var environmentVariablesViewModel = new EnvironmentVariablesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<EnvironmentVariablesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
var environmentVariablesViewModel = new EnvironmentVariablesViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<EnvironmentVariablesSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
||||||
environmentVariablesViewModel.Launch();
|
environmentVariablesViewModel.Launch();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HostLaunchClicked(object sender, RoutedEventArgs e)
|
private void HostLaunchClicked(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var hostsViewModel = new HostsViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<HostsSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
var hostsViewModel = new HostsViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<HostsSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
|
||||||
hostsViewModel.Launch();
|
hostsViewModel.Launch();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,12 +88,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
{
|
{
|
||||||
return moduleType switch
|
return moduleType switch
|
||||||
{
|
{
|
||||||
ModuleType.ColorPicker => SettingsRepository<ColorPickerSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(),
|
ModuleType.ColorPicker => SettingsRepository<ColorPickerSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(),
|
||||||
ModuleType.FancyZones => SettingsRepository<FancyZonesSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.ToString(),
|
ModuleType.FancyZones => SettingsRepository<FancyZonesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.ToString(),
|
||||||
ModuleType.PowerLauncher => SettingsRepository<PowerLauncherSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenPowerLauncher.ToString(),
|
ModuleType.PowerLauncher => SettingsRepository<PowerLauncherSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.OpenPowerLauncher.ToString(),
|
||||||
ModuleType.PowerOCR => SettingsRepository<PowerOcrSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(),
|
ModuleType.PowerOCR => SettingsRepository<PowerOcrSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(),
|
||||||
ModuleType.Workspaces => SettingsRepository<WorkspacesSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.Hotkey.Value.ToString(),
|
ModuleType.Workspaces => SettingsRepository<WorkspacesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.Hotkey.Value.ToString(),
|
||||||
ModuleType.MeasureTool => SettingsRepository<MeasureToolSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(),
|
ModuleType.MeasureTool => SettingsRepository<MeasureToolSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(),
|
||||||
ModuleType.ShortcutGuide => GetShortcutGuideToolTip(),
|
ModuleType.ShortcutGuide => GetShortcutGuideToolTip(),
|
||||||
_ => string.Empty,
|
_ => string.Empty,
|
||||||
};
|
};
|
||||||
@@ -111,7 +111,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
|
|
||||||
private string GetShortcutGuideToolTip()
|
private string GetShortcutGuideToolTip()
|
||||||
{
|
{
|
||||||
var shortcutGuideSettings = SettingsRepository<ShortcutGuideSettings>.GetInstance(new SettingsUtils()).SettingsConfig;
|
var shortcutGuideSettings = SettingsRepository<ShortcutGuideSettings>.GetInstance(SettingsUtils.Default).SettingsConfig;
|
||||||
return shortcutGuideSettings.Properties.UseLegacyPressWinKeyBehavior.Value
|
return shortcutGuideSettings.Properties.UseLegacyPressWinKeyBehavior.Value
|
||||||
? "Win"
|
? "Win"
|
||||||
: shortcutGuideSettings.Properties.OpenShortcutGuide.ToString();
|
: shortcutGuideSettings.Properties.OpenShortcutGuide.ToString();
|
||||||
|
|||||||
@@ -1145,7 +1145,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
_settingsBackupMessage = GetResourceString(results.Message) + results.OptionalMessage;
|
_settingsBackupMessage = GetResourceString(results.Message) + results.OptionalMessage;
|
||||||
|
|
||||||
// now we do a dry run to get the results for "setting match"
|
// now we do a dry run to get the results for "setting match"
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
var appBasePath = Path.GetDirectoryName(settingsUtils.GetSettingsFilePath());
|
var appBasePath = Path.GetDirectoryName(settingsUtils.GetSettingsFilePath());
|
||||||
settingsBackupAndRestoreUtils.BackupSettings(appBasePath, settingsBackupAndRestoreDir, true);
|
settingsBackupAndRestoreUtils.BackupSettings(appBasePath, settingsBackupAndRestoreDir, true);
|
||||||
|
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Check if the experimentation toggle is enabled in the settings
|
// Check if the experimentation toggle is enabled in the settings
|
||||||
var settingsUtils = new SettingsUtils();
|
var settingsUtils = SettingsUtils.Default;
|
||||||
bool isExperimentationEnabled = SettingsRepository<GeneralSettings>.GetInstance(settingsUtils).SettingsConfig.EnableExperimentation;
|
bool isExperimentationEnabled = SettingsRepository<GeneralSettings>.GetInstance(settingsUtils).SettingsConfig.EnableExperimentation;
|
||||||
|
|
||||||
// Only read the registry value if the experimentation toggle is enabled
|
// Only read the registry value if the experimentation toggle is enabled
|
||||||
|
|||||||
Reference in New Issue
Block a user