From e4485c703c9ba49295fada50343aa691fe32ed92 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 18 Apr 2024 16:01:26 +0900
Subject: [PATCH] Add Setting Window Hotkey

---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 1 +
 Flow.Launcher/Languages/en.xaml                       | 1 +
 Flow.Launcher/MainWindow.xaml                         | 9 ++++-----
 Flow.Launcher/SettingWindow.xaml                      | 8 +++++++-
 Flow.Launcher/ViewModel/MainViewModel.cs              | 5 ++++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index daddee2d8..04cdb17d9 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -23,6 +23,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public string AutoCompleteHotkey { get; set; } = $"{KeyConstant.Ctrl} + Tab";
         public string SelectNextItemHotkey { get; set; } = $"Tab";
         public string SelectPrevItemHotkey { get; set; } = $"Shift + Tab";
+        public string SettingWindowHotkey { get; set; } = $"Ctrl+I";
 
         public string Language
         {
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 58e790cd8..1b72b688b 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -186,6 +186,7 @@
     <system:String x:Key="autoCompleteHotkeyToolTip">Runs autocomplete for the selected items.</system:String>
     <system:String x:Key="SelectNextItemHotkey">Next Item Hotkey</system:String>
     <system:String x:Key="SelectPrevItemHotkey">Prev Item Hotkey</system:String>
+    <system:String x:Key="SettingWindowHotkey">Setting Window Hotkey</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String>
     <system:String x:Key="customQueryShortcut">Custom Query Shortcuts</system:String>
     <system:String x:Key="builtinShortcuts">Built-in Shortcuts</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index f0ab829ff..4146ff13c 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -46,10 +46,6 @@
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
         <KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}" />
-        <KeyBinding
-            Key="I"
-            Command="{Binding OpenSettingCommand}"
-            Modifiers="Ctrl" />
         <KeyBinding
             Key="J"
             Command="{Binding SelectNextItemCommand}"
@@ -106,7 +102,6 @@
             Key="OemMinus"
             Command="{Binding DecreaseMaxResultCommand}"
             Modifiers="Control" />
-
         <KeyBinding
             Key="Enter"
             Command="{Binding OpenResultCommand}"
@@ -198,6 +193,10 @@
             Key="{Binding SelectPrevItemHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
             Command="{Binding SelectPrevItemCommand}"
             Modifiers="{Binding SelectPrevItemHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
+        <KeyBinding
+            Key="{Binding SettingWindowHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
+            Command="{Binding OpenSettingCommand}"
+            Modifiers="{Binding SettingWindowHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
     </Window.InputBindings>
     <Grid>
         <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 376c4c940..fc8851934 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2760,7 +2760,6 @@
                                             ValidateKeyGesture="False" />
                                     </cc:Card>
 
-
                                     <cc:Card Title="{DynamicResource SelectPrevItemHotkey}" Icon="&#xf0ad;">
                                         <flowlauncher:HotkeyControl
                                             DefaultHotkey="Shift+Tab"
@@ -2768,6 +2767,13 @@
                                             ValidateKeyGesture="False" />
                                     </cc:Card>
 
+                                    <cc:Card Title="{DynamicResource SettingWindowHotkey}" Icon="&#xe713;">
+                                        <flowlauncher:HotkeyControl
+                                            DefaultHotkey="Ctrl+I"
+                                            Hotkey="{Binding Settings.SettingWindowHotkey}"
+                                            ValidateKeyGesture="False" />
+                                    </cc:Card>
+
                                     <cc:ExCard
                                         Title="{DynamicResource customQueryHotkey}"
                                         Margin="0,14,0,0"
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 293f438ac..2b6dbd59c 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -89,6 +89,9 @@ namespace Flow.Launcher.ViewModel
                     case nameof(Settings.SelectPrevItemHotkey):
                         OnPropertyChanged(nameof(SelectPrevItemHotkey));
                         break;
+                    case nameof(Settings.SettingWindowHotkey):
+                        OnPropertyChanged(nameof(SettingWindowHotkey));
+                        break;
                 }
             };
 
@@ -659,10 +662,10 @@ namespace Flow.Launcher.ViewModel
         }
         
         public string PreviewHotkey => VerifyOrSetDefaultHotkey(Settings.PreviewHotkey, "F1");
-
         public string AutoCompleteHotkey => VerifyOrSetDefaultHotkey(Settings.AutoCompleteHotkey, "Ctrl+Tab");
         public string SelectNextItemHotkey => VerifyOrSetDefaultHotkey(Settings.SelectNextItemHotkey, "Tab");
         public string SelectPrevItemHotkey => VerifyOrSetDefaultHotkey(Settings.SelectPrevItemHotkey, "Shift+Tab");
+        public string SettingWindowHotkey => VerifyOrSetDefaultHotkey(Settings.SettingWindowHotkey, "Ctrl+I");
 
 
         public string Image => Constant.QueryTextBoxIconImagePath;