Change RegisteredHotkeys to observable

Author: Jack251970

Flow.Launcher.Infrastructure/Hotkey/IHotkeySettings.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace Flow.Launcher.Infrastructure.Hotkey;
 
@@ -13,5 +13,5 @@ public interface IHotkeySettings
     /// A list of hotkeys that have already been registered. The dialog will display these hotkeys and provide a way to
     /// unregister them.
     /// </summary>
-    public List<RegisteredHotkeyData> RegisteredHotkeys { get; }
+    public ObservableCollection<RegisteredHotkeyData> RegisteredHotkeys { get; }
 }

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -435,92 +435,7 @@ public bool ShowAtTopmost
         public PluginsSettings PluginSettings { get; set; } = new();
 
         [JsonIgnore]
-        public List<RegisteredHotkeyData> RegisteredHotkeys
-        {
-            get
-            {
-                var list = FixedHotkeys();
-
-                // Customizeable hotkeys
-                if (!string.IsNullOrEmpty(Hotkey))
-                    list.Add(new(Hotkey, "flowlauncherHotkey", () => Hotkey = ""));
-                if (!string.IsNullOrEmpty(PreviewHotkey))
-                    list.Add(new(PreviewHotkey, "previewHotkey", () => PreviewHotkey = ""));
-                if (!string.IsNullOrEmpty(AutoCompleteHotkey))
-                    list.Add(new(AutoCompleteHotkey, "autoCompleteHotkey", () => AutoCompleteHotkey = ""));
-                if (!string.IsNullOrEmpty(AutoCompleteHotkey2))
-                    list.Add(new(AutoCompleteHotkey2, "autoCompleteHotkey", () => AutoCompleteHotkey2 = ""));
-                if (!string.IsNullOrEmpty(SelectNextItemHotkey))
-                    list.Add(new(SelectNextItemHotkey, "SelectNextItemHotkey", () => SelectNextItemHotkey = ""));
-                if (!string.IsNullOrEmpty(SelectNextItemHotkey2))
-                    list.Add(new(SelectNextItemHotkey2, "SelectNextItemHotkey", () => SelectNextItemHotkey2 = ""));
-                if (!string.IsNullOrEmpty(SelectPrevItemHotkey))
-                    list.Add(new(SelectPrevItemHotkey, "SelectPrevItemHotkey", () => SelectPrevItemHotkey = ""));
-                if (!string.IsNullOrEmpty(SelectPrevItemHotkey2))
-                    list.Add(new(SelectPrevItemHotkey2, "SelectPrevItemHotkey", () => SelectPrevItemHotkey2 = ""));
-                if (!string.IsNullOrEmpty(SettingWindowHotkey))
-                    list.Add(new(SettingWindowHotkey, "SettingWindowHotkey", () => SettingWindowHotkey = ""));
-                if (!string.IsNullOrEmpty(OpenHistoryHotkey))
-                    list.Add(new(OpenHistoryHotkey, "OpenHistoryHotkey", () => OpenHistoryHotkey = ""));                
-                if (!string.IsNullOrEmpty(OpenContextMenuHotkey))
-                    list.Add(new(OpenContextMenuHotkey, "OpenContextMenuHotkey", () => OpenContextMenuHotkey = ""));
-                if (!string.IsNullOrEmpty(SelectNextPageHotkey))
-                    list.Add(new(SelectNextPageHotkey, "SelectNextPageHotkey", () => SelectNextPageHotkey = ""));
-                if (!string.IsNullOrEmpty(SelectPrevPageHotkey))
-                    list.Add(new(SelectPrevPageHotkey, "SelectPrevPageHotkey", () => SelectPrevPageHotkey = ""));
-                if (!string.IsNullOrEmpty(CycleHistoryUpHotkey))
-                    list.Add(new(CycleHistoryUpHotkey, "CycleHistoryUpHotkey", () => CycleHistoryUpHotkey = ""));
-                if (!string.IsNullOrEmpty(CycleHistoryDownHotkey))
-                    list.Add(new(CycleHistoryDownHotkey, "CycleHistoryDownHotkey", () => CycleHistoryDownHotkey = ""));
-
-                // Custom Query Hotkeys
-                foreach (var customPluginHotkey in CustomPluginHotkeys)
-                {
-                    if (!string.IsNullOrEmpty(customPluginHotkey.Hotkey))
-                        list.Add(new(customPluginHotkey.Hotkey, "customQueryHotkey", () => customPluginHotkey.Hotkey = ""));
-                }
-
-                return list;
-            }
-        }
-
-        private List<RegisteredHotkeyData> FixedHotkeys()
-        {
-            return new List<RegisteredHotkeyData>
-            {
-                new("Up", "HotkeyLeftRightDesc"),
-                new("Down", "HotkeyLeftRightDesc"),
-                new("Left", "HotkeyUpDownDesc"),
-                new("Right", "HotkeyUpDownDesc"),
-                new("Escape", "HotkeyESCDesc"),
-                new("F5", "ReloadPluginHotkey"),
-                new("Alt+Home", "HotkeySelectFirstResult"),
-                new("Alt+End", "HotkeySelectLastResult"),
-                new("Ctrl+R", "HotkeyRequery"),
-                new("Ctrl+OemCloseBrackets", "QuickWidthHotkey"),
-                new("Ctrl+OemOpenBrackets", "QuickWidthHotkey"),
-                new("Ctrl+OemPlus", "QuickHeightHotkey"),
-                new("Ctrl+OemMinus", "QuickHeightHotkey"),
-                new("Ctrl+Shift+Enter", "HotkeyCtrlShiftEnterDesc"),
-                new("Shift+Enter", "OpenContextMenuHotkey"),
-                new("Enter", "HotkeyRunDesc"),
-                new("Ctrl+Enter", "OpenContainFolderHotkey"),
-                new("Alt+Enter", "HotkeyOpenResult"),
-                new("Ctrl+F12", "ToggleGameModeHotkey"),
-                new("Ctrl+Shift+C", "CopyFilePathHotkey"),
-
-                new($"{OpenResultModifiers}+D1", "HotkeyOpenResultN", 1),
-                new($"{OpenResultModifiers}+D2", "HotkeyOpenResultN", 2),
-                new($"{OpenResultModifiers}+D3", "HotkeyOpenResultN", 3),
-                new($"{OpenResultModifiers}+D4", "HotkeyOpenResultN", 4),
-                new($"{OpenResultModifiers}+D5", "HotkeyOpenResultN", 5),
-                new($"{OpenResultModifiers}+D6", "HotkeyOpenResultN", 6),
-                new($"{OpenResultModifiers}+D7", "HotkeyOpenResultN", 7),
-                new($"{OpenResultModifiers}+D8", "HotkeyOpenResultN", 8),
-                new($"{OpenResultModifiers}+D9", "HotkeyOpenResultN", 9),
-                new($"{OpenResultModifiers}+D0", "HotkeyOpenResultN", 10)
-            };
-        }
+        public ObservableCollection<RegisteredHotkeyData> RegisteredHotkeys { get; } = new();
     }
 
     public enum LastQueryMode