From d7a11aef33001aa7bdc1964aa2bc1122969aba22 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 9 Jun 2024 02:40:11 +0900
Subject: [PATCH] Add HotkeyPreset Item

---
 Flow.Launcher/Languages/en.xaml               |  1 +
 .../Views/SettingsPaneHotkey.xaml             | 40 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 83831a398..03160535e 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -204,6 +204,7 @@
     <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="OpenNativeContextMenuHotkey">Open Native Context Menu</system:String>
     <system:String x:Key="SettingWindowHotkey">Open Setting Window</system:String>
     <system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>
     <system:String x:Key="ToggleGameModeHotkey">Toggle Game Mode</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
index 3f0f89560..22e3960ef 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
@@ -5,9 +5,9 @@
     xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-    xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
     xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     Title="Hotkey"
     d:DataContext="{d:DesignInstance viewModels:SettingsPaneHotkeyViewModel}"
@@ -33,9 +33,9 @@
                 Sub="{DynamicResource flowlauncherHotkeyToolTip}">
                 <flowlauncher:HotkeyControl
                     ChangeHotkey="{Binding SetTogglingHotkeyCommand}"
-                    HotkeySettings="{Binding Settings}"
                     DefaultHotkey="Alt+Space"
                     Hotkey="{Binding Settings.Hotkey}"
+                    HotkeySettings="{Binding Settings}"
                     ValidateKeyGesture="True"
                     WindowTitle="{DynamicResource flowlauncherHotkey}" />
             </cc:Card>
@@ -45,17 +45,15 @@
                 Icon="&#xe8a1;"
                 Sub="{DynamicResource previewHotkeyToolTip}">
                 <flowlauncher:HotkeyControl
-                    HotkeySettings="{Binding Settings}"
                     DefaultHotkey="F1"
                     Hotkey="{Binding Settings.PreviewHotkey}"
+                    HotkeySettings="{Binding Settings}"
                     ValidateKeyGesture="False"
                     WindowTitle="{DynamicResource previewHotkey}" />
             </cc:Card>
 
             <cc:CardGroup Margin="0 12 0 0">
-                <cc:Card
-                    Title="{DynamicResource openResultModifiers}"
-                    Sub="{DynamicResource openResultModifiersToolTip}">
+                <cc:Card Title="{DynamicResource openResultModifiers}" Sub="{DynamicResource openResultModifiersToolTip}">
                     <ComboBox
                         Width="120"
                         FontSize="14"
@@ -106,9 +104,9 @@
                         Icon="&#xede3;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey="Ctrl+I"
                             Hotkey="{Binding Settings.OpenContextMenuHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -117,15 +115,20 @@
                         Type="Inside">
                         <cc:HotkeyDisplay Keys="Shift+Enter" />
                     </cc:Card>
-
+                    <cc:Card
+                        Title="{DynamicResource OpenNativeContextMenuHotkey}"
+                        Icon="&#xede3;"
+                        Type="Inside">
+                        <cc:HotkeyDisplay Keys="Alt+Enter" />
+                    </cc:Card>
                     <cc:Card
                         Title="{DynamicResource SettingWindowHotkey}"
                         Icon="&#xe713;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey="Ctrl+I"
                             Hotkey="{Binding Settings.SettingWindowHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -172,9 +175,9 @@
                         Icon="&#xf0ad;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey=""
                             Hotkey="{Binding Settings.SelectPrevPageHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -182,9 +185,9 @@
                         Icon="&#xf0ae;"
                         Type="Inside">
                         <flowlauncher:HotkeyControl
-                            HotkeySettings="{Binding Settings}"
                             DefaultHotkey=""
                             Hotkey="{Binding Settings.SelectNextPageHotkey}"
+                            HotkeySettings="{Binding Settings}"
                             ValidateKeyGesture="False" />
                     </cc:Card>
 
@@ -217,9 +220,9 @@
                 Sub="{DynamicResource autoCompleteHotkeyToolTip}">
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey="Ctrl+Tab"
                         Hotkey="{Binding Settings.AutoCompleteHotkey}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -227,9 +230,9 @@
                     Sub="{DynamicResource AdditionalHotkeyToolTip}"
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey=""
                         Hotkey="{Binding Settings.AutoCompleteHotkey2}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -240,9 +243,9 @@
                 Icon="&#xe74a;">
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey="Shift+Tab"
                         Hotkey="{Binding Settings.SelectPrevItemHotkey}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -250,9 +253,9 @@
                     Sub="{DynamicResource AdditionalHotkeyToolTip}"
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey=""
                         Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -263,9 +266,9 @@
                 Icon="&#xe74b;">
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey="Tab"
                         Hotkey="{Binding Settings.SelectNextItemHotkey}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -273,9 +276,9 @@
                     Sub="{DynamicResource AdditionalHotkeyToolTip}"
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey=""
                         Hotkey="{Binding Settings.SelectNextItemHotkey2}"
+                        HotkeySettings="{Binding Settings}"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -435,8 +438,7 @@
                                     <GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
                                         <GridViewColumn.CellTemplate>
                                             <DataTemplate DataType="{x:Type userSettings:BuiltinShortcutModel}">
-                                                <TextBlock
-                                                    Text="{Binding Description, Converter={StaticResource TranslationConverter}}" />
+                                                <TextBlock Text="{Binding Description, Converter={StaticResource TranslationConverter}}" />
                                             </DataTemplate>
                                         </GridViewColumn.CellTemplate>
                                     </GridViewColumn>