From 588a89bc549c9f2666b5b2c32f5a6e7f70836961 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 26 Apr 2024 02:17:24 +0900
Subject: [PATCH] - Adjust String - Adjust item order

---
 Flow.Launcher/Languages/en.xaml  |  4 +--
 Flow.Launcher/SettingWindow.xaml | 60 +++++++++++++++-----------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index b71e25e8f..3b4f35327 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -196,8 +196,8 @@
     <system:String x:Key="OpenContainFolderHotkey">Open Containing Folder</system:String>
     <system:String x:Key="RunAsAdminHotkey">Run As Admin</system:String>
     <system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
-    <system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width Size</system:String>
-    <system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height Size</system:String>
+    <system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width</system:String>
+    <system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height</system:String>
     <system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String>
     <system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function.</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ba4c4f99e..57782e420 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2807,15 +2807,6 @@
                                                 Type="Inside">
                                                 <cc:HotkeyDisplay Keys="F5" />
                                             </cc:Card>
-                                            <cc:Card
-                                                Title="{DynamicResource SelectNextPageHotkey}"
-                                                Icon="&#xf0ae;"
-                                                Type="Inside">
-                                                <flowlauncher:HotkeyControl
-                                                    DefaultHotkey=""
-                                                    Hotkey="{Binding Settings.SelectNextPageHotkey}"
-                                                    ValidateKeyGesture="False" />
-                                            </cc:Card>
                                             <cc:Card
                                                 Title="{DynamicResource SelectPrevPageHotkey}"
                                                 Icon="&#xf0ad;"
@@ -2825,7 +2816,15 @@
                                                     Hotkey="{Binding Settings.SelectPrevPageHotkey}"
                                                     ValidateKeyGesture="False" />
                                             </cc:Card>
-
+                                            <cc:Card
+                                                Title="{DynamicResource SelectNextPageHotkey}"
+                                                Icon="&#xf0ae;"
+                                                Type="Inside">
+                                                <flowlauncher:HotkeyControl
+                                                    DefaultHotkey=""
+                                                    Hotkey="{Binding Settings.SelectNextPageHotkey}"
+                                                    ValidateKeyGesture="False" />
+                                            </cc:Card>
                                             <cc:Card
                                                 Title="{DynamicResource QuickWidthHotkey}"
                                                 Icon="&#xe7ea;"
@@ -2870,6 +2869,26 @@
                                         </cc:Card>
                                     </cc:ExCard>
 
+                                    <cc:ExCard
+                                        Title="{DynamicResource SelectPrevItemHotkey}"
+                                        Margin="0,4,0,0"
+                                        Icon="&#xe74a;">
+                                        <cc:ExCard.SideContent>
+                                            <flowlauncher:HotkeyControl
+                                                DefaultHotkey="Shift+Tab"
+                                                Hotkey="{Binding Settings.SelectPrevItemHotkey}"
+                                                ValidateKeyGesture="False" />
+                                        </cc:ExCard.SideContent>
+                                        <cc:Card
+                                            Title="{DynamicResource SelectPrevItemHotkey}"
+                                            Sub="{DynamicResource AdditionalHotkeyToolTip}"
+                                            Type="InsideFit">
+                                            <flowlauncher:HotkeyControl
+                                                DefaultHotkey=""
+                                                Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
+                                                ValidateKeyGesture="False" />
+                                        </cc:Card>
+                                    </cc:ExCard>
 
                                     <cc:ExCard
                                         Title="{DynamicResource SelectNextItemHotkey}"
@@ -2892,27 +2911,6 @@
                                         </cc:Card>
                                     </cc:ExCard>
 
-                                    <cc:ExCard
-                                        Title="{DynamicResource SelectPrevItemHotkey}"
-                                        Margin="0,4,0,0"
-                                        Icon="&#xe74a;">
-                                        <cc:ExCard.SideContent>
-                                            <flowlauncher:HotkeyControl
-                                                DefaultHotkey="Shift+Tab"
-                                                Hotkey="{Binding Settings.SelectPrevItemHotkey}"
-                                                ValidateKeyGesture="False" />
-                                        </cc:ExCard.SideContent>
-                                        <cc:Card
-                                            Title="{DynamicResource SelectPrevItemHotkey}"
-                                            Sub="{DynamicResource AdditionalHotkeyToolTip}"
-                                            Type="InsideFit">
-                                            <flowlauncher:HotkeyControl
-                                                DefaultHotkey=""
-                                                Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
-                                                ValidateKeyGesture="False" />
-                                        </cc:Card>
-                                    </cc:ExCard>
-
                                     <cc:ExCard
                                         Title="{DynamicResource customQueryHotkey}"
                                         Margin="0,20,0,0"