Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix settings changes that were made in PR #6620 (#6817)

Browse Source 
* validated that restart elevated and check for updates work.Removed isettingsUtils and reused settings repository

* reverted the name to ImageResizer instead of using ImageResizerSettings.Modulename to make it backward compatible
This commit is contained in:
Alekhya
2020-09-24 10:50:49 -07:00
committed by GitHub
parent 8d934df0c0
commit c941b5333c
5 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/GeneralViewModel.cs
View File

@@ -15,8 +15,6 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{ {
private GeneralSettings GeneralSettingsConfig { get; set; } private GeneralSettings GeneralSettingsConfig { get; set; }
private readonly ISettingsUtils _settingsUtils;
public ButtonClickCommand CheckFoUpdatesEventHandler { get; set; } public ButtonClickCommand CheckFoUpdatesEventHandler { get; set; }
public ButtonClickCommand RestartElevatedButtonEventHandler { get; set; } public ButtonClickCommand RestartElevatedButtonEventHandler { get; set; }
@@ -35,11 +33,10 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
private string _settingsConfigFileFolder = string.Empty; private string _settingsConfigFileFolder = string.Empty;
public GeneralViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, string runAsAdminText, string runAsUserText, bool isElevated, bool isAdmin, Func<string, int> updateTheme, Func<string, int> ipcMSGCallBackFunc, Func<string, int> ipcMSGRestartAsAdminMSGCallBackFunc, Func<string, int> ipcMSGCheckForUpdatesCallBackFunc, string configFileSubfolder = "") public GeneralViewModel(ISettingsRepository<GeneralSettings> settingsRepository, string runAsAdminText, string runAsUserText, bool isElevated, bool isAdmin, Func<string, int> updateTheme, Func<string, int> ipcMSGCallBackFunc, Func<string, int> ipcMSGRestartAsAdminMSGCallBackFunc, Func<string, int> ipcMSGCheckForUpdatesCallBackFunc, string configFileSubfolder = "")
{ {
CheckFoUpdatesEventHandler = new ButtonClickCommand(CheckForUpdates_Click); CheckFoUpdatesEventHandler = new ButtonClickCommand(CheckForUpdates_Click);
RestartElevatedButtonEventHandler = new ButtonClickCommand(Restart_Elevated); RestartElevatedButtonEventHandler = new ButtonClickCommand(Restart_Elevated);
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
// To obtain the general settings configuration of PowerToys if it exists, else to create a new file and return the default configurations. // To obtain the general settings configuration of PowerToys if it exists, else to create a new file and return the default configurations.
GeneralSettingsConfig = settingsRepository.SettingsConfig; GeneralSettingsConfig = settingsRepository.SettingsConfig;
@@ -344,10 +341,9 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
// callback function to launch the URL to check for updates. // callback function to launch the URL to check for updates.
private void CheckForUpdates_Click() private void CheckForUpdates_Click()
{ {
GeneralSettings settings = _settingsUtils.GetSettings<GeneralSettings>(_settingsConfigFileFolder); GeneralSettingsConfig.CustomActionName = "check_for_updates";
settings.CustomActionName = "check_for_updates";
OutGoingGeneralSettings outsettings = new OutGoingGeneralSettings(settings); OutGoingGeneralSettings outsettings = new OutGoingGeneralSettings(GeneralSettingsConfig);
GeneralSettingsCustomAction customaction = new GeneralSettingsCustomAction(outsettings); GeneralSettingsCustomAction customaction = new GeneralSettingsCustomAction(outsettings);
SendCheckForUpdatesConfigMSG(customaction.ToString()); SendCheckForUpdatesConfigMSG(customaction.ToString());
@@ -355,10 +351,9 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
public void Restart_Elevated() public void Restart_Elevated()
{ {
GeneralSettings settings = _settingsUtils.GetSettings<GeneralSettings>(_settingsConfigFileFolder); GeneralSettingsConfig.CustomActionName = "restart_elevation";
settings.CustomActionName = "restart_elevation";
OutGoingGeneralSettings outsettings = new OutGoingGeneralSettings(settings); OutGoingGeneralSettings outsettings = new OutGoingGeneralSettings(GeneralSettingsConfig);
GeneralSettingsCustomAction customaction = new GeneralSettingsCustomAction(outsettings); GeneralSettingsCustomAction customaction = new GeneralSettingsCustomAction(outsettings);
SendRestartAsAdminConfigMSG(customaction.ToString()); SendRestartAsAdminConfigMSG(customaction.ToString());

3
src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ImageResizerViewModel.cs
View File

@@ -19,7 +19,8 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
private ImageResizerSettings Settings { get; set; } private ImageResizerSettings Settings { get; set; }
private const string ModuleName = ImageResizerSettings.ModuleName; // NOTE: Not using ImageResizerSettings.ModuleName ("Image Resizer") to be backward compatible.
private const string ModuleName = "ImageResizer";
private Func<string, int> SendConfigMSG { get; } private Func<string, int> SendConfigMSG { get; }

5
src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs
View File

@@ -35,7 +35,6 @@ namespace ViewModelTests
Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; }; Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; };
Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; }; Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; };
GeneralViewModel viewModel = new GeneralViewModel( GeneralViewModel viewModel = new GeneralViewModel(
new Mock<ISettingsUtils>().Object,
SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object),
"GeneralSettings_RunningAsAdminText", "GeneralSettings_RunningAsAdminText",
"GeneralSettings_RunningAsUserText", "GeneralSettings_RunningAsUserText",
@@ -73,7 +72,6 @@ namespace ViewModelTests
Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; }; Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; };
Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; }; Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; };
GeneralViewModel viewModel = new GeneralViewModel( GeneralViewModel viewModel = new GeneralViewModel(
new Mock<ISettingsUtils>().Object,
SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object),
"GeneralSettings_RunningAsAdminText", "GeneralSettings_RunningAsAdminText",
"GeneralSettings_RunningAsUserText", "GeneralSettings_RunningAsUserText",
@@ -106,7 +104,6 @@ namespace ViewModelTests
// Arrange // Arrange
GeneralViewModel viewModel = new GeneralViewModel( GeneralViewModel viewModel = new GeneralViewModel(
new Mock<ISettingsUtils>().Object,
SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object),
"GeneralSettings_RunningAsAdminText", "GeneralSettings_RunningAsAdminText",
"GeneralSettings_RunningAsUserText", "GeneralSettings_RunningAsUserText",
@@ -140,7 +137,6 @@ namespace ViewModelTests
Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; }; Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; };
Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; }; Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; };
viewModel = new GeneralViewModel( viewModel = new GeneralViewModel(
new Mock<ISettingsUtils>().Object,
SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object),
"GeneralSettings_RunningAsAdminText", "GeneralSettings_RunningAsAdminText",
"GeneralSettings_RunningAsUserText", "GeneralSettings_RunningAsUserText",
@@ -172,7 +168,6 @@ namespace ViewModelTests
Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; }; Func<string, int> SendRestartAdminIPCMessage = msg => { return 0; };
Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; }; Func<string, int> SendCheckForUpdatesIPCMessage = msg => { return 0; };
GeneralViewModel viewModel = new GeneralViewModel( GeneralViewModel viewModel = new GeneralViewModel(
new Mock<ISettingsUtils>().Object,
SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object), SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object),
"GeneralSettings_RunningAsAdminText", "GeneralSettings_RunningAsAdminText",
"GeneralSettings_RunningAsUserText", "GeneralSettings_RunningAsUserText",

3
src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs
View File

@@ -18,8 +18,7 @@ namespace ViewModelTests
[TestClass] [TestClass]
public class ImageResizer public class ImageResizer
{ {
// To have a consistent name. public const string Module = "ImageResizer";
public const string Module = ImageResizerSettings.ModuleName;
private Mock<ISettingsUtils> mockGeneralSettingsUtils; private Mock<ISettingsUtils> mockGeneralSettingsUtils;

1
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
View File

@@ -36,7 +36,6 @@ namespace Microsoft.PowerToys.Settings.UI.Views
var settingsUtils = new SettingsUtils(new SystemIOProvider()); var settingsUtils = new SettingsUtils(new SystemIOProvider());
ViewModel = new GeneralViewModel( ViewModel = new GeneralViewModel(
settingsUtils,
SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
loader.GetString("GeneralSettings_RunningAsAdminText"), loader.GetString("GeneralSettings_RunningAsAdminText"),
loader.GetString("GeneralSettings_RunningAsUserText"), loader.GetString("GeneralSettings_RunningAsUserText"),