From dcc48406b5996ac892aad33b4c0c828236e84882 Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 19 May 2024 22:47:14 +0800
Subject: [PATCH] Extract fixed hotkeys

---
 .../UserSettings/Settings.cs                  | 77 ++++++++++---------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 3d4433493..61a9da400 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -282,42 +282,9 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         {
             get
             {
-                var list = 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+H", "ToggleHistoryHotkey"),
-                    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)
-                };
+                var list = FixedHotkeys();
 
+                // Customizeable hotkeys
                 if(!string.IsNullOrEmpty(Hotkey))
                     list.Add(new(Hotkey, "flowlauncherHotkey", () => Hotkey = ""));
                 if(!string.IsNullOrEmpty(PreviewHotkey))
@@ -347,6 +314,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
                 if (!string.IsNullOrEmpty(CycleHistoryDownHotkey))
                     list.Add(new(CycleHistoryDownHotkey, "CycleHistoryDownHotkey", () => CycleHistoryDownHotkey = ""));
 
+                // Custom Query Hotkeys
                 foreach (var customPluginHotkey in CustomPluginHotkeys)
                 {
                     if (!string.IsNullOrEmpty(customPluginHotkey.Hotkey))
@@ -356,6 +324,45 @@ namespace Flow.Launcher.Infrastructure.UserSettings
                 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+H", "ToggleHistoryHotkey"),
+                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 enum LastQueryMode