diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs index 07fc62d134..0cbe70b11b 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/PowerLauncherViewModel.cs @@ -184,190 +184,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels } } } - - public HotkeySettings OpenConsole - { - callback = (PowerLauncherSettings settings) => - { - // Propagate changes to Power Launcher through IPC - ShellPage.DefaultSndMSGCallback( - string.Format("{{ \"powertoys\": {{ \"{0}\": {1} }} }}", PowerLauncherSettings.POWERTOYNAME, JsonSerializer.Serialize(settings))); - }; - if (SettingsUtils.SettingsExists(PowerLauncherSettings.POWERTOYNAME)) - { - settings = SettingsUtils.GetSettings(PowerLauncherSettings.POWERTOYNAME); - } - 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; - callback(settings); - } - - if (SettingsUtils.SettingsExists()) - { - generalSettings = SettingsUtils.GetSettings(); - } - else - { - generalSettings = new GeneralSettings(); - } - } - - public PowerLauncherViewModel(PowerLauncherSettings settings, SendCallback callback) - { - this.settings = settings; - this.callback = callback; - } - - private void UpdateSettings([CallerMemberName] string propertyName = null) - { - // Notify UI of property change - OnPropertyChanged(propertyName); - - callback(settings); - } - - public bool EnablePowerLauncher - { - get - { - return generalSettings.Enabled.PowerLauncher; - } - - set - { - if (generalSettings.Enabled.PowerLauncher != value) - { - generalSettings.Enabled.PowerLauncher = value; - OnPropertyChanged(nameof(EnablePowerLauncher)); - OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(generalSettings); - ShellPage.DefaultSndMSGCallback(outgoing.ToString()); - } - } - } - - public string SearchResultPreference - { - get - { - return settings.properties.search_result_preference; - } - - set - { - if (settings.properties.search_result_preference != value) - { - settings.properties.search_result_preference = value; - UpdateSettings(); - } - } - } - - public string SearchTypePreference - { - get - { - return settings.properties.search_type_preference; - } - - set - { - if (settings.properties.search_type_preference != value) - { - settings.properties.search_type_preference = value; - UpdateSettings(); - } - } - } - - public int MaximumNumberOfResults - { - get - { - return settings.properties.maximum_number_of_results; - } - - set - { - if (settings.properties.maximum_number_of_results != value) - { - settings.properties.maximum_number_of_results = value; - UpdateSettings(); - } - } - } - - public HotkeySettings OpenPowerLauncher - { - get - { - return settings.properties.open_powerlauncher; - } - - set - { - if (settings.properties.open_powerlauncher != value) - { - settings.properties.open_powerlauncher = value; - UpdateSettings(); - } - } - } - - public HotkeySettings OpenFileLocation - { - get - { - return settings.properties.open_file_location; - } - - set - { - if (settings.properties.open_file_location != value) - { - settings.properties.open_file_location = value; - UpdateSettings(); - } - } - } - - public HotkeySettings CopyPathLocation - { - get - { - return settings.properties.copy_path_location; - } - - set - { - if (settings.properties.copy_path_location != value) - { - settings.properties.copy_path_location = value; - UpdateSettings(); - } - } - } - - public HotkeySettings OpenConsole - { - get - { - return settings.properties.open_console; - } - - set - { - if (settings.properties.open_console != value) - { - settings.properties.open_console = value; - UpdateSettings(); - } - } - } - + public bool OverrideWinRKey { get