Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 18:26:39 +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

6
src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
View File

@@ -60,9 +60,9 @@ namespace ColorPicker.Settings
var settings = SettingsUtils.GetSettings<ColorPickerSettings>(ColorPickerModuleName);
if (settings != null)
{
ChangeCursor.Value = settings.properties.ChangeCursor;
ActivationShortcut.Value = settings.properties.ActivationShortcut.ToString();
CopiedColorRepresentation.Value = settings.properties.CopiedColorRepresentation;
ChangeCursor.Value = settings.Properties.ChangeCursor;
ActivationShortcut.Value = settings.Properties.ActivationShortcut.ToString();
CopiedColorRepresentation.Value = settings.Properties.CopiedColorRepresentation;
}
retry = false;

4
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs
View File

@@ -202,8 +202,8 @@ namespace Microsoft.Plugin.Indexer
}
public void UpdateSettings(PowerLauncherSettings settings)
{
_settings.MaxSearchCount = settings.properties.maximum_number_of_results;
_driveDetection.IsDriveDetectionWarningCheckBoxSelected = settings.properties.disable_drive_detection_warning;
_settings.MaxSearchCount = settings.Properties.maximum_number_of_results;
_driveDetection.IsDriveDetectionWarningCheckBoxSelected = settings.Properties.disable_drive_detection_warning;
}
public Control CreateSettingPanel()
{

18
src/modules/launcher/PowerLauncher/SettingsWatcher.cs
View File

@@ -26,7 +26,7 @@ namespace PowerLauncher
{
_settings = settings;
// Set up watcher
_watcher = Microsoft.PowerToys.Settings.UI.Lib.Utilities.Helper.GetFileWatcher(PowerLauncherSettings.POWERTOYNAME, "settings.json", OverloadSettings);
_watcher = Microsoft.PowerToys.Settings.UI.Lib.Utilities.Helper.GetFileWatcher(PowerLauncherSettings.ModuleName, "settings.json", OverloadSettings);
// Load initial settings file
OverloadSettings();
@@ -41,9 +41,9 @@ namespace PowerLauncher
retry = false;
try
{
var overloadSettings = SettingsUtils.GetSettings<PowerLauncherSettings>(PowerLauncherSettings.POWERTOYNAME);
var overloadSettings = SettingsUtils.GetSettings<PowerLauncherSettings>(PowerLauncherSettings.ModuleName);
var openPowerlauncher = ConvertHotkey(overloadSettings.properties.open_powerlauncher);
var openPowerlauncher = ConvertHotkey(overloadSettings.Properties.open_powerlauncher);
if (_settings.Hotkey != openPowerlauncher)
{
_settings.Hotkey = openPowerlauncher;
@@ -56,14 +56,14 @@ namespace PowerLauncher
shellSettings.UpdateSettings(overloadSettings);
}
if (_settings.MaxResultsToShow != overloadSettings.properties.maximum_number_of_results)
if (_settings.MaxResultsToShow != overloadSettings.Properties.maximum_number_of_results)
{
_settings.MaxResultsToShow = overloadSettings.properties.maximum_number_of_results;
_settings.MaxResultsToShow = overloadSettings.Properties.maximum_number_of_results;
}
if (_settings.IgnoreHotkeysOnFullscreen != overloadSettings.properties.ignore_hotkeys_in_fullscreen)
if (_settings.IgnoreHotkeysOnFullscreen != overloadSettings.Properties.ignore_hotkeys_in_fullscreen)
{
_settings.IgnoreHotkeysOnFullscreen = overloadSettings.properties.ignore_hotkeys_in_fullscreen;
_settings.IgnoreHotkeysOnFullscreen = overloadSettings.Properties.ignore_hotkeys_in_fullscreen;
}
var indexer = PluginManager.AllPlugins.Find(p => p.Metadata.Name.Equals("Windows Indexer Plugin", StringComparison.OrdinalIgnoreCase));
@@ -73,9 +73,9 @@ namespace PowerLauncher
indexerSettings.UpdateSettings(overloadSettings);
}
if (_settings.ClearInputOnLaunch != overloadSettings.properties.clear_input_on_launch)
if (_settings.ClearInputOnLaunch != overloadSettings.Properties.clear_input_on_launch)
{
_settings.ClearInputOnLaunch = overloadSettings.properties.clear_input_on_launch;
_settings.ClearInputOnLaunch = overloadSettings.Properties.clear_input_on_launch;
}
}
// the settings application can hold a lock on the settings.json file which will result in a IOException.