Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjusting settings to leverage base class (#5127)

Browse Source 
* renaming / deleting file

* adding in base class

Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas
2020-07-21 14:06:39 -07:00
committed by GitHub
parent d01b93ae5f
commit 398991f3c1
30 changed files with 202 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ColorPickerViewModel.cs
View File

@@ -62,14 +62,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return _colorPickerSettings.properties.ChangeCursor;
return _colorPickerSettings.Properties.ChangeCursor;
}
set
{
if (_colorPickerSettings.properties.ChangeCursor != value)
if (_colorPickerSettings.Properties.ChangeCursor != value)
{
_colorPickerSettings.properties.ChangeCursor = value;
_colorPickerSettings.Properties.ChangeCursor = value;
OnPropertyChanged(nameof(ChangeCursor));
NotifySettingsChanged();
}
@@ -80,14 +80,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return _colorPickerSettings.properties.ActivationShortcut;
return _colorPickerSettings.Properties.ActivationShortcut;
}
set
{
if (_colorPickerSettings.properties.ActivationShortcut != value)
if (_colorPickerSettings.Properties.ActivationShortcut != value)
{
_colorPickerSettings.properties.ActivationShortcut = value;
_colorPickerSettings.Properties.ActivationShortcut = value;
OnPropertyChanged(nameof(ActivationShortcut));
NotifySettingsChanged();
}
@@ -98,14 +98,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return (int)_colorPickerSettings.properties.CopiedColorRepresentation;
return (int)_colorPickerSettings.Properties.CopiedColorRepresentation;
}
set
{
if (_colorPickerSettings.properties.CopiedColorRepresentation != (ColorRepresentationType)value)
if (_colorPickerSettings.Properties.CopiedColorRepresentation != (ColorRepresentationType)value)
{
_colorPickerSettings.properties.CopiedColorRepresentation = (ColorRepresentationType)value;
_colorPickerSettings.Properties.CopiedColorRepresentation = (ColorRepresentationType)value;
OnPropertyChanged(nameof(CopiedColorRepresentationIndex));
NotifySettingsChanged();
}

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

@@ -106,7 +106,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
SettingsUtils.SaveSettings(Settings.Properties.ImageresizerSizes.ToJsonString(), ModuleName, "sizes.json");
_advancedSizes = value;
Settings.Properties.ImageresizerSizes = new ImageresizerSizes(value);
Settings.Properties.ImageresizerSizes = new ImageResizerSizes(value);
SettingsUtils.SaveSettings(Settings.ToJsonString(), ModuleName);
OnPropertyChanged("Sizes");
}

78
src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs
View File

@@ -25,18 +25,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
// Propagate changes to Power Launcher through IPC
ShellPage.DefaultSndMSGCallback(
string.Format("{{ \"powertoys\": {{ \"{0}\": {1} }} }}", PowerLauncherSettings.POWERTOYNAME, JsonSerializer.Serialize(settings)));
string.Format("{{ \"powertoys\": {{ \"{0}\": {1} }} }}", PowerLauncherSettings.ModuleName, JsonSerializer.Serialize(settings)));
};
if (SettingsUtils.SettingsExists(PowerLauncherSettings.POWERTOYNAME))
if (SettingsUtils.SettingsExists(PowerLauncherSettings.ModuleName))
{
settings = SettingsUtils.GetSettings<PowerLauncherSettings>(PowerLauncherSettings.POWERTOYNAME);
settings = SettingsUtils.GetSettings<PowerLauncherSettings>(PowerLauncherSettings.ModuleName);
}
else
{
settings = new PowerLauncherSettings();
settings.properties.open_powerlauncher.Alt = true;
settings.properties.open_powerlauncher.Code = (int)Windows.System.VirtualKey.Space;
settings.properties.maximum_number_of_results = 4;
settings.Properties.open_powerlauncher.Alt = true;
settings.Properties.open_powerlauncher.Code = (int)Windows.System.VirtualKey.Space;
settings.Properties.maximum_number_of_results = 4;
callback(settings);
}
@@ -87,14 +87,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.search_result_preference;
return settings.Properties.search_result_preference;
}
set
{
if (settings.properties.search_result_preference != value)
if (settings.Properties.search_result_preference != value)
{
settings.properties.search_result_preference = value;
settings.Properties.search_result_preference = value;
UpdateSettings();
}
}
@@ -104,14 +104,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.search_type_preference;
return settings.Properties.search_type_preference;
}
set
{
if (settings.properties.search_type_preference != value)
if (settings.Properties.search_type_preference != value)
{
settings.properties.search_type_preference = value;
settings.Properties.search_type_preference = value;
UpdateSettings();
}
}
@@ -121,14 +121,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.maximum_number_of_results;
return settings.Properties.maximum_number_of_results;
}
set
{
if (settings.properties.maximum_number_of_results != value)
if (settings.Properties.maximum_number_of_results != value)
{
settings.properties.maximum_number_of_results = value;
settings.Properties.maximum_number_of_results = value;
UpdateSettings();
}
}
@@ -138,14 +138,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.open_powerlauncher;
return settings.Properties.open_powerlauncher;
}
set
{
if (settings.properties.open_powerlauncher != value)
if (settings.Properties.open_powerlauncher != value)
{
settings.properties.open_powerlauncher = value;
settings.Properties.open_powerlauncher = value;
UpdateSettings();
}
}
@@ -155,14 +155,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.open_file_location;
return settings.Properties.open_file_location;
}
set
{
if (settings.properties.open_file_location != value)
if (settings.Properties.open_file_location != value)
{
settings.properties.open_file_location = value;
settings.Properties.open_file_location = value;
UpdateSettings();
}
}
@@ -172,14 +172,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.copy_path_location;
return settings.Properties.copy_path_location;
}
set
{
if (settings.properties.copy_path_location != value)
if (settings.Properties.copy_path_location != value)
{
settings.properties.copy_path_location = value;
settings.Properties.copy_path_location = value;
UpdateSettings();
}
}
@@ -189,14 +189,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.override_win_r_key;
return settings.Properties.override_win_r_key;
}
set
{
if (settings.properties.override_win_r_key != value)
if (settings.Properties.override_win_r_key != value)
{
settings.properties.override_win_r_key = value;
settings.Properties.override_win_r_key = value;
UpdateSettings();
}
}
@@ -206,14 +206,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.override_win_s_key;
return settings.Properties.override_win_s_key;
}
set
{
if (settings.properties.override_win_s_key != value)
if (settings.Properties.override_win_s_key != value)
{
settings.properties.override_win_s_key = value;
settings.Properties.override_win_s_key = value;
UpdateSettings();
}
}
@@ -223,14 +223,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.ignore_hotkeys_in_fullscreen;
return settings.Properties.ignore_hotkeys_in_fullscreen;
}
set
{
if (settings.properties.ignore_hotkeys_in_fullscreen != value)
if (settings.Properties.ignore_hotkeys_in_fullscreen != value)
{
settings.properties.ignore_hotkeys_in_fullscreen = value;
settings.Properties.ignore_hotkeys_in_fullscreen = value;
UpdateSettings();
}
}
@@ -240,14 +240,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.clear_input_on_launch;
return settings.Properties.clear_input_on_launch;
}
set
{
if (settings.properties.clear_input_on_launch != value)
if (settings.Properties.clear_input_on_launch != value)
{
settings.properties.clear_input_on_launch = value;
settings.Properties.clear_input_on_launch = value;
UpdateSettings();
}
}
@@ -257,14 +257,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
get
{
return settings.properties.disable_drive_detection_warning;
return settings.Properties.disable_drive_detection_warning;
}
set
{
if (settings.properties.disable_drive_detection_warning != value)
if (settings.Properties.disable_drive_detection_warning != value)
{
settings.properties.disable_drive_detection_warning = value;
settings.Properties.disable_drive_detection_warning = value;
UpdateSettings();
}
}

20
src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerRenameViewModel.cs
View File

@@ -29,11 +29,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
SettingsUtils.SaveSettings(localSettings.ToJsonString(), ModuleName, "power-rename-settings.json");
}
_powerRenameEnabledOnContextMenu = Settings.properties.ShowIcon.Value;
_powerRenameEnabledOnContextExtendedMenu = Settings.properties.ExtendedContextMenuOnly.Value;
_powerRenameRestoreFlagsOnLaunch = Settings.properties.PersistState.Value;
_powerRenameMaxDispListNumValue = Settings.properties.MaxMRUSize.Value;
_autoComplete = Settings.properties.MRUEnabled.Value;
_powerRenameEnabledOnContextMenu = Settings.Properties.ShowIcon.Value;
_powerRenameEnabledOnContextExtendedMenu = Settings.Properties.ExtendedContextMenuOnly.Value;
_powerRenameRestoreFlagsOnLaunch = Settings.Properties.PersistState.Value;
_powerRenameMaxDispListNumValue = Settings.Properties.MaxMRUSize.Value;
_autoComplete = Settings.Properties.MRUEnabled.Value;
GeneralSettings generalSettings;
try
@@ -94,7 +94,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
if (value != _autoComplete)
{
_autoComplete = value;
Settings.properties.MRUEnabled.Value = value;
Settings.Properties.MRUEnabled.Value = value;
RaisePropertyChanged();
RaisePropertyChanged("GlobalAndMruEnabled");
}
@@ -122,7 +122,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
if (value != _powerRenameEnabledOnContextMenu)
{
_powerRenameEnabledOnContextMenu = value;
Settings.properties.ShowIcon.Value = value;
Settings.Properties.ShowIcon.Value = value;
RaisePropertyChanged();
}
}
@@ -140,7 +140,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
if (value != _powerRenameEnabledOnContextExtendedMenu)
{
_powerRenameEnabledOnContextExtendedMenu = value;
Settings.properties.ExtendedContextMenuOnly.Value = value;
Settings.Properties.ExtendedContextMenuOnly.Value = value;
RaisePropertyChanged();
}
}
@@ -158,7 +158,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
if (value != _powerRenameRestoreFlagsOnLaunch)
{
_powerRenameRestoreFlagsOnLaunch = value;
Settings.properties.PersistState.Value = value;
Settings.Properties.PersistState.Value = value;
RaisePropertyChanged();
}
}
@@ -176,7 +176,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
if (value != _powerRenameMaxDispListNumValue)
{
_powerRenameMaxDispListNumValue = value;
Settings.properties.MaxMRUSize.Value = value;
Settings.Properties.MaxMRUSize.Value = value;
RaisePropertyChanged();
}
}