From b7db22a8494f2284e460c953d3d3b8639772ff97 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 12 Jul 2025 15:10:52 +0800
Subject: [PATCH] Redesign hotkey page

---
 .../Views/SettingsPaneHotkey.xaml             | 97 +++++++++++--------
 1 file changed, 57 insertions(+), 40 deletions(-)

diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
index a211d6710..b5162c809 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
@@ -79,31 +79,34 @@
                 Sub="{DynamicResource hotkeyPresetsToolTip}">
                 <StackPanel>
                     <cc:Card
-                        Title="{DynamicResource OpenContainFolderHotkey}"
-                        Icon="&#xe8b7;"
+                        Title="{DynamicResource HotkeyUpDownDesc}"
+                        Icon="&#xede3;"
                         Type="Inside">
-                        <cc:HotkeyDisplay Keys="Ctrl+Enter" />
+                        <cc:HotkeyDisplay Keys="←+→" />
                     </cc:Card>
                     <cc:Card
-                        Title="{DynamicResource RunAsAdminHotkey}"
-                        Icon="&#xe7ef;"
+                        Title="{DynamicResource HotkeyLeftRightDesc}"
+                        Icon="&#xEC8F;"
                         Type="Inside">
-                        <cc:HotkeyDisplay Keys="Ctrl+Shift+Enter" />
+                        <cc:HotkeyDisplay Keys="↑+↓" />
                     </cc:Card>
                     <cc:Card
-                        Title="{DynamicResource ToggleHistoryHotkey}"
-                        Icon="&#xf738;"
+                        Title="{DynamicResource HotkeyESCDesc}"
+                        Icon="&#xE72B;"
                         Type="Inside">
-                        <flowlauncher:HotkeyControl
-                            DefaultHotkey="Ctrl+H"
-                            Type="OpenHistoryHotkey"
-                            ValidateKeyGesture="False" />
+                        <cc:HotkeyDisplay Keys="ESC" />
                     </cc:Card>
                     <cc:Card
-                        Title="{DynamicResource CopyFilePathHotkey}"
-                        Icon="&#xe8c8;"
+                        Title="{DynamicResource HotkeyRunDesc}"
+                        Icon="&#xE8A7;"
                         Type="Inside">
-                        <cc:HotkeyDisplay Keys="Ctrl+Shift+C" />
+                        <cc:HotkeyDisplay Keys="ENTER" />
+                    </cc:Card>
+                    <cc:Card
+                        Title="{DynamicResource OpenContextMenuHotkey}"
+                        Icon="&#xede3;"
+                        Type="Inside">
+                        <cc:HotkeyDisplay Keys="Shift+Enter" />
                     </cc:Card>
                     <cc:Card
                         Title="{DynamicResource OpenContextMenuHotkey}"
@@ -115,16 +118,13 @@
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
-                        Title="{DynamicResource OpenContextMenuHotkey}"
-                        Icon="&#xede3;"
+                        Title="{DynamicResource ToggleHistoryHotkey}"
+                        Icon="&#xf738;"
                         Type="Inside">
-                        <cc:HotkeyDisplay Keys="Shift+Enter" />
-                    </cc:Card>
-                    <cc:Card
-                        Title="{DynamicResource OpenNativeContextMenuHotkey}"
-                        Icon="&#xede3;"
-                        Type="Inside">
-                        <cc:HotkeyDisplay Keys="Alt+Enter" />
+                        <flowlauncher:HotkeyControl
+                            DefaultHotkey="Ctrl+H"
+                            Type="OpenHistoryHotkey"
+                            ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
                         Title="{DynamicResource SettingWindowHotkey}"
@@ -136,16 +136,23 @@
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
-                        Title="{DynamicResource ToggleGameModeHotkey}"
-                        Icon="&#xe7fc;"
+                        Title="{DynamicResource ReloadPluginHotkey}"
+                        Icon="&#xe72c;"
+                        Sub="{DynamicResource ReloadPluginHotkeyToolTip}"
                         Type="Inside">
-                        <cc:HotkeyDisplay Keys="Ctrl+F12" />
+                        <cc:HotkeyDisplay Keys="F5" />
                     </cc:Card>
                     <cc:Card
-                        Title="{DynamicResource RequeryHotkey}"
-                        Icon="&#xe72c;"
+                        Title="{DynamicResource HotkeySelectFirstResult}"
+                        Icon="&#xE898;"
                         Type="Inside">
-                        <cc:HotkeyDisplay Keys="Ctrl+R" />
+                        <cc:HotkeyDisplay Keys="Alt+Home" />
+                    </cc:Card>
+                    <cc:Card
+                        Title="{DynamicResource HotkeySelectLastResult}"
+                        Icon="&#xE896;"
+                        Type="Inside">
+                        <cc:HotkeyDisplay Keys="Alt+End" />
                     </cc:Card>
                     <cc:Card
                         Title="{DynamicResource CycleHistoryUpHotkey}"
@@ -165,13 +172,6 @@
                             Type="CycleHistoryDownHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
-                    <cc:Card
-                        Title="{DynamicResource ReloadPluginHotkey}"
-                        Icon="&#xe72c;"
-                        Sub="{DynamicResource ReloadPluginHotkeyToolTip}"
-                        Type="Inside">
-                        <cc:HotkeyDisplay Keys="F5" />
-                    </cc:Card>
                     <cc:Card
                         Title="{DynamicResource SelectPrevPageHotkey}"
                         Icon="&#xf0ad;"
@@ -190,7 +190,24 @@
                             Type="SelectNextPageHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
-
+                    <cc:Card
+                        Title="{DynamicResource RequeryHotkey}"
+                        Icon="&#xe72c;"
+                        Type="Inside">
+                        <cc:HotkeyDisplay Keys="Ctrl+R" />
+                    </cc:Card>
+                    <cc:Card
+                        Title="{DynamicResource ToggleGameModeHotkey}"
+                        Icon="&#xe7fc;"
+                        Type="Inside">
+                        <cc:HotkeyDisplay Keys="Ctrl+F12" />
+                    </cc:Card>
+                    <cc:Card
+                        Title="{DynamicResource CopyFilePathHotkey}"
+                        Icon="&#xe8c8;"
+                        Type="Inside">
+                        <cc:HotkeyDisplay Keys="Ctrl+Shift+C" />
+                    </cc:Card>
                     <cc:Card
                         Title="{DynamicResource QuickWidthHotkey}"
                         Icon="&#xe7ea;"
@@ -205,8 +222,8 @@
                         Icon="&#xe7eb;"
                         Type="Inside">
                         <StackPanel Orientation="Horizontal">
-                            <cc:HotkeyDisplay Keys="Ctrl+Plus" />
-                            <cc:HotkeyDisplay Margin="4 0 0 0" Keys="Ctrl+Minus" />
+                            <cc:HotkeyDisplay Keys="Ctrl+Minus" />
+                            <cc:HotkeyDisplay Margin="4 0 0 0" Keys="Ctrl+Plus" />
                         </StackPanel>
                     </cc:Card>
                 </StackPanel>