Add Toggle History hotkey functionality and binding

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -50,6 +50,7 @@ public void Save()
         public string SelectPrevPageHotkey { get; set; } = $"PageDown";
         public string OpenContextMenuHotkey { get; set; } = $"Ctrl+O";
         public string SettingWindowHotkey { get; set; } = $"Ctrl+I";
+        public string OpenHistoryHotkey { get; set; } = $"Ctrl+H";
         public string CycleHistoryUpHotkey { get; set; } = $"{KeyConstant.Alt} + Up";
         public string CycleHistoryDownHotkey { get; set; } = $"{KeyConstant.Alt} + Down";
 
@@ -426,6 +427,8 @@ public List<RegisteredHotkeyData> RegisteredHotkeys
                     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))
@@ -461,7 +464,6 @@ private List<RegisteredHotkeyData> FixedHotkeys()
                 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"),

Flow.Launcher/HotkeyControl.xaml.cs

@@ -100,6 +100,7 @@
             PreviewHotkey,
             OpenContextMenuHotkey,
             SettingWindowHotkey,
+            OpenHistoryHotkey,
             CycleHistoryUpHotkey,
             CycleHistoryDownHotkey,
             SelectPrevPageHotkey,
@@ -114,7 +115,7 @@
 
         // We can initialize settings in static field because it has been constructed in App constuctor
         // and it will not construct settings instances twice
         private static readonly Settings _settings = Ioc.Default.GetRequiredService<Settings>();
 
         private string hotkey = string.Empty;
         public string Hotkey
@@ -130,6 +131,7 @@
                     HotkeyType.PreviewHotkey => _settings.PreviewHotkey,
                     HotkeyType.OpenContextMenuHotkey => _settings.OpenContextMenuHotkey,
                     HotkeyType.SettingWindowHotkey => _settings.SettingWindowHotkey,
+                    HotkeyType.OpenHistoryHotkey => _settings.OpenHistoryHotkey,
                     HotkeyType.CycleHistoryUpHotkey => _settings.CycleHistoryUpHotkey,
                     HotkeyType.CycleHistoryDownHotkey => _settings.CycleHistoryDownHotkey,
                     HotkeyType.SelectPrevPageHotkey => _settings.SelectPrevPageHotkey,
@@ -166,6 +168,9 @@
                     case HotkeyType.SettingWindowHotkey:
                         _settings.SettingWindowHotkey = value;
                         break;
+                    case HotkeyType.OpenHistoryHotkey:
+                        _settings.OpenHistoryHotkey = value;
+                        break;                    
                     case HotkeyType.CycleHistoryUpHotkey:
                         _settings.CycleHistoryUpHotkey = value;
                         break;
@@ -253,10 +258,10 @@
                 case HotkeyControlDialog.EResultType.Cancel:
                     SetHotkey(Hotkey);
                     return;
                 case HotkeyControlDialog.EResultType.Save:
                     SetHotkey(dialog.ResultValue);
                     break;
                 case HotkeyControlDialog.EResultType.Delete:
                     Delete();
                     break;
             }

Flow.Launcher/MainWindow.xaml

@@ -64,10 +64,6 @@
             Key="R"
             Command="{Binding ReQueryCommand}"
             Modifiers="Ctrl" />
-        <KeyBinding
-            Key="H"
-            Command="{Binding LoadHistoryCommand}"
-            Modifiers="Ctrl" />
         <KeyBinding
             Key="OemCloseBrackets"
             Command="{Binding IncreaseWidthCommand}"
@@ -191,6 +187,10 @@
             Key="{Binding SettingWindowHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
             Command="{Binding OpenSettingCommand}"
             Modifiers="{Binding SettingWindowHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
+        <KeyBinding
+            Key="{Binding OpenHistoryHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
+            Command="{Binding LoadHistoryCommand}"
+            Modifiers="{Binding OpenHistoryHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
         <KeyBinding
             Key="{Binding OpenContextMenuHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
             Command="{Binding LoadContextMenuCommand}"

Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml

@@ -89,7 +89,10 @@
                         Title="{DynamicResource ToggleHistoryHotkey}"
                         Icon=""
                         Type="Inside">
-                        <cc:HotkeyDisplay Keys="Ctrl+H" />
+                        <flowlauncher:HotkeyControl
+                            DefaultHotkey="Ctrl+H"
+                            Type="OpenHistoryHotkey"
+                            ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
                         Title="{DynamicResource CopyFilePathHotkey}"

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -69,7 +69,7 @@
             _lastQuery = new Query();
             _ignoredQueryText = null; // null as invalid value
 
             Settings = Ioc.Default.GetRequiredService<Settings>();
             Settings.PropertyChanged += (_, args) =>
             {
                 switch (args.PropertyName)
@@ -137,6 +137,9 @@
                     case nameof(Settings.SettingWindowHotkey):
                         OnPropertyChanged(nameof(SettingWindowHotkey));
                         break;
+                    case nameof(Settings.OpenHistoryHotkey):
+                        OnPropertyChanged(nameof(OpenHistoryHotkey));
+                        break;
                 }
             };
 
@@ -886,6 +889,7 @@
         public string SelectPrevPageHotkey => VerifyOrSetDefaultHotkey(Settings.SelectPrevPageHotkey, "");
         public string OpenContextMenuHotkey => VerifyOrSetDefaultHotkey(Settings.OpenContextMenuHotkey, "Ctrl+O");
         public string SettingWindowHotkey => VerifyOrSetDefaultHotkey(Settings.SettingWindowHotkey, "Ctrl+I");
+        public string OpenHistoryHotkey => VerifyOrSetDefaultHotkey(Settings.OpenHistoryHotkey, "Ctrl+H");
         public string CycleHistoryUpHotkey => VerifyOrSetDefaultHotkey(Settings.CycleHistoryUpHotkey, "Alt+Up");
         public string CycleHistoryDownHotkey => VerifyOrSetDefaultHotkey(Settings.CycleHistoryDownHotkey, "Alt+Down");
 
@@ -1842,7 +1846,7 @@
             VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = false });
         }
 
 #pragma warning restore VSTHRD100 // Avoid async void methods
 
         /// <summary>
         /// Save history, user selected records and top most records