diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 871317bd3..872af4560 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -204,7 +204,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings // This needs to be loaded last by staying at the bottom public PluginsSettings PluginSettings { get; set; } = new PluginsSettings(); - internal ObservableCollection ShortCuts { get; set; } = new(); + internal ObservableCollection CustomShortcuts { get; set; } = new(); } public enum LastQueryMode diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index e21af2bea..10a69f572 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -386,7 +386,7 @@ namespace Flow.Launcher MessageBox.Show(deleteWarning, InternationalizationManager.Instance.GetTranslation("delete"), MessageBoxButton.YesNo) == MessageBoxResult.Yes) { - settings.ShortCuts.Remove(item.Value); + settings.CustomShortcuts.Remove(item.Value); } } private void OnEditCustomShortCutClick(object sender, RoutedEventArgs e) @@ -397,7 +397,7 @@ namespace Flow.Launcher var shortcutSettingWindow = new CustomShortcutSetting(item.Value); if (shortcutSettingWindow.ShowDialog() == true) { - settings.ShortCuts[viewModel.SelectCustomShortcutIndex.Value] = shortcutSettingWindow.ShortCut; + settings.CustomShortcuts[viewModel.SelectCustomShortcutIndex.Value] = shortcutSettingWindow.ShortCut; } } else @@ -411,7 +411,7 @@ namespace Flow.Launcher var shortcutSettingWindow = new CustomShortcutSetting(); if (shortcutSettingWindow.ShowDialog() == true) { - settings.ShortCuts.Add(shortcutSettingWindow.ShortCut); + settings.CustomShortcuts.Add(shortcutSettingWindow.ShortCut); } } } diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs index 134e85d28..c42bfb9c6 100644 --- a/Flow.Launcher/ViewModel/MainViewModel.cs +++ b/Flow.Launcher/ViewModel/MainViewModel.cs @@ -554,7 +554,7 @@ namespace Flow.Launcher.ViewModel return; } - var query = ConstructQuery(QueryText, _settings.ShortCuts); + var query = ConstructQuery(QueryText, _settings.CustomShortcuts); _updateSource?.Dispose(); diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 1f088a869..e9976177f 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -180,7 +180,7 @@ namespace Flow.Launcher.ViewModel public List Languages => _translater.LoadAvailableLanguages(); public IEnumerable MaxResultsRange => Enumerable.Range(2, 16); - public ObservableCollection ShortCuts => Settings.ShortCuts; + public ObservableCollection ShortCuts => Settings.CustomShortcuts; public string TestProxy() {