Merge pull request #2696 from onesounds/240516GarulfQueryCycle

Ported "Up Arrow key cycles through Query history" PR

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -31,6 +31,8 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public string SelectPrevPageHotkey { get; set; } = $"PageDown";
         public string OpenContextMenuHotkey { get; set; } = $"Ctrl+O";
         public string SettingWindowHotkey { get; set; } = $"Ctrl+I";
+        public string CycleHistoryUpHotkey { get; set; } = $"{KeyConstant.Alt} + Up";
+        public string CycleHistoryDownHotkey { get; set; } = $"{KeyConstant.Alt} + Down";
 
         public string Language
         {
@@ -280,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))
@@ -340,7 +309,12 @@ namespace Flow.Launcher.Infrastructure.UserSettings
                     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))
@@ -350,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

Flow.Launcher/Languages/en.xaml

@@ -188,6 +188,8 @@
     <system:String x:Key="SelectPrevItemHotkey">Select Previous Item</system:String>
     <system:String x:Key="SelectNextPageHotkey">Next Page</system:String>
     <system:String x:Key="SelectPrevPageHotkey">Previous Page</system:String>
+    <system:String x:Key="CycleHistoryUpHotkey">Cycle Previous Query</system:String>
+    <system:String x:Key="CycleHistoryDownHotkey">Cycle Next Query</system:String>
     <system:String x:Key="OpenContextMenuHotkey">Open Context Menu</system:String>
     <system:String x:Key="SettingWindowHotkey">Open Setting Window</system:String>
     <system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>

Flow.Launcher/MainWindow.xaml

@@ -198,6 +198,14 @@
             Key="{Binding SelectPrevPageHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
             Command="{Binding SelectPrevPageCommand}"
             Modifiers="{Binding SelectPrevPageHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
+        <KeyBinding
+            Key="{Binding CycleHistoryUpHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
+            Command="{Binding ReverseHistoryCommand}"
+            Modifiers="{Binding CycleHistoryUpHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
+        <KeyBinding
+            Key="{Binding CycleHistoryDownHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
+            Command="{Binding ForwardHistoryCommand}"
+            Modifiers="{Binding CycleHistoryDownHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
     </Window.InputBindings>
     <Grid>
         <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">

Flow.Launcher/SettingWindow.xaml

@@ -2810,6 +2810,26 @@
                                                 Type="Inside">
                                                 <cc:HotkeyDisplay Keys="Ctrl+R" />
                                             </cc:Card>
+                                            <cc:Card
+                                                Title="{DynamicResource CycleHistoryUpHotkey}"
+                                                Icon="&#xe70e;"
+                                                Type="Inside">
+                                                <flowlauncher:HotkeyControl
+                                                    DefaultHotkey="Alt+Up"
+                                                    Hotkey="{Binding Settings.CycleHistoryUpHotkey}"
+                                                    HotkeySettings="{Binding Settings}"
+                                                    ValidateKeyGesture="False" />
+                                            </cc:Card>
+                                            <cc:Card
+                                                Title="{DynamicResource CycleHistoryDownHotkey}"
+                                                Icon="&#xe70d;"
+                                                Type="Inside">
+                                                <flowlauncher:HotkeyControl
+                                                    DefaultHotkey="Alt+Down"
+                                                    Hotkey="{Binding Settings.CycleHistoryDownHotkey}"
+                                                    HotkeySettings="{Binding Settings}"
+                                                    ValidateKeyGesture="False" />
+                                            </cc:Card>
                                             <cc:Card
                                                 Title="{DynamicResource ReloadPluginHotkey}"
                                                 Icon="&#xe72c;"

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -42,6 +42,7 @@ namespace Flow.Launcher.ViewModel
         private readonly FlowLauncherJsonStorage<UserSelectedRecord> _userSelectedRecordStorage;
         private readonly FlowLauncherJsonStorage<TopMostRecord> _topMostRecordStorage;
         private readonly History _history;
+        private int lastHistoryIndex = 1;
         private readonly UserSelectedRecord _userSelectedRecord;
         private readonly TopMostRecord _topMostRecord;
 
@@ -83,6 +84,12 @@ namespace Flow.Launcher.ViewModel
                     case nameof(Settings.AutoCompleteHotkey):
                         OnPropertyChanged(nameof(AutoCompleteHotkey));
                         break;
+                    case nameof(Settings.CycleHistoryUpHotkey):
+                        OnPropertyChanged(nameof(CycleHistoryUpHotkey));
+                        break;
+                    case nameof(Settings.CycleHistoryDownHotkey):
+                        OnPropertyChanged(nameof(CycleHistoryDownHotkey));
+                        break;
                     case nameof(Settings.AutoCompleteHotkey2):
                         OnPropertyChanged(nameof(AutoCompleteHotkey2));
                         break;
@@ -256,6 +263,32 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        [RelayCommand]
+        public void ReverseHistory()
+        {
+            if (_history.Items.Count > 0)
+            {
+                ChangeQueryText(_history.Items[_history.Items.Count - lastHistoryIndex].Query.ToString());
+                if (lastHistoryIndex < _history.Items.Count)
+                {
+                    lastHistoryIndex++;
+                }
+            }
+        }
+
+        [RelayCommand]
+        public void ForwardHistory()
+        {
+            if (_history.Items.Count > 0)
+            {
+                ChangeQueryText(_history.Items[_history.Items.Count - lastHistoryIndex].Query.ToString());
+                if (lastHistoryIndex > 1)
+                {
+                    lastHistoryIndex--;
+                }
+            }
+        }
+
         [RelayCommand]
         private void LoadContextMenu()
         {
@@ -346,6 +379,7 @@ namespace Flow.Launcher.ViewModel
             {
                 _userSelectedRecord.Add(result);
                 _history.Add(result.OriginQuery.RawQuery);
+                lastHistoryIndex = 1;
             }
 
             if (hideWindow)
@@ -394,7 +428,18 @@ namespace Flow.Launcher.ViewModel
         [RelayCommand]
         private void SelectPrevItem()
         {
-            SelectedResults.SelectPrevResult();
+            if (_history.Items.Count > 0
+                && QueryText == string.Empty
+                && SelectedIsFromQueryResults())
+            {
+                lastHistoryIndex = 1;
+                ReverseHistory();
+            }
+            else
+            {
+                SelectedResults.SelectPrevResult();
+            }
+        
         }
 
         [RelayCommand]
@@ -690,6 +735,8 @@ namespace Flow.Launcher.ViewModel
         public string SelectPrevPageHotkey => VerifyOrSetDefaultHotkey(Settings.SelectPrevPageHotkey, "");
         public string OpenContextMenuHotkey => VerifyOrSetDefaultHotkey(Settings.OpenContextMenuHotkey, "Ctrl+O");
         public string SettingWindowHotkey => VerifyOrSetDefaultHotkey(Settings.SettingWindowHotkey, "Ctrl+I");
+        public string CycleHistoryUpHotkey => VerifyOrSetDefaultHotkey(Settings.CycleHistoryUpHotkey, "Alt+Up");
+        public string CycleHistoryDownHotkey => VerifyOrSetDefaultHotkey(Settings.CycleHistoryDownHotkey, "Alt+Down");
 
 
         public string Image => Constant.QueryTextBoxIconImagePath;
@@ -1116,6 +1163,7 @@ namespace Flow.Launcher.ViewModel
 
         public async void Hide()
         {
+            lastHistoryIndex = 1;
             // Trick for no delay
             MainWindowOpacity = 0;
             lastContextMenuResult = new Result();