From 8260f75d9b1e516fcb74ee9dba0f7cbeaefd3cc3 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Apr 2024 11:17:28 +0900
Subject: [PATCH] Adjust Item Sort

---
 Flow.Launcher/Languages/en.xaml  |   2 +
 Flow.Launcher/SettingWindow.xaml | 109 ++++++++++---------------------
 2 files changed, 38 insertions(+), 73 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 96556f186..58e790cd8 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -176,6 +176,8 @@
     <system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
     <system:String x:Key="previewHotkey">Preview Hotkey</system:String>
     <system:String x:Key="previewHotkeyToolTip">Enter shortcut to show/hide preview in search window.</system:String>
+    <system:String x:Key="basicHotkey">Basic Hotkeys</system:String>
+    <system:String x:Key="basicHotkeyToolTip">List of shortcuts used by basic</system:String>
     <system:String x:Key="openResultModifiers">Open Result Modifier Key</system:String>
     <system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
     <system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index eff9532a8..3e4f827a6 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2636,24 +2636,6 @@
                                     Text="{DynamicResource hotkeys}"
                                     TextAlignment="left" />
 
-
-                                <cc:ExCard
-                                    Title="Fixed Hotkeys"
-                                    Icon="&#xeda7;"
-                                    Sub="TSTSTS">
-                                    <StackPanel>
-                                        <cc:Card
-                                            Title="{DynamicResource flowlauncherHotkey}"
-                                            Icon="&#xeda7;"
-                                            Sub="{DynamicResource flowlauncherHotkeyToolTip}"
-                                            Type="Inside" />
-                                        <cc:Card
-                                            Title="{DynamicResource flowlauncherHotkey}"
-                                            Icon="&#xeda7;"
-                                            Sub="{DynamicResource flowlauncherHotkeyToolTip}"
-                                            Type="Inside" />
-                                    </StackPanel>
-                                </cc:ExCard>
                                 <StackPanel Grid.Row="1">
                                     <cc:Card
                                         Title="{DynamicResource flowlauncherHotkey}"
@@ -2666,7 +2648,7 @@
                                 <StackPanel Grid.Row="2">
                                     <cc:Card
                                         Title="{DynamicResource previewHotkey}"
-                                        Icon="&#xe8a1;;"
+                                        Icon="&#xe8a1;"
                                         Sub="{DynamicResource previewHotkeyToolTip}">
                                         <flowlauncher:HotkeyControl DataContext="{Binding PreviewHotkeyViewModel}" />
                                     </cc:Card>
@@ -2730,60 +2712,41 @@
                                 </Border>
 
                                 <StackPanel Grid.Row="2">
-                                    <Border Margin="0,16,0,0" Style="{DynamicResource SettingGroupBox}">
-                                        <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource autoCompleteHotkey}" />
-                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource autoCompleteHotkeyToolTip}" />
-                                            </StackPanel>
-                                            <flowlauncher:HotkeyControl
-                                                Grid.Row="0"
-                                                Grid.Column="2"
-                                                Margin="0,0,16,0"
-                                                HorizontalAlignment="Right"
-                                                HorizontalContentAlignment="Right"
-                                                DataContext="{Binding AutoCompleteHotkeyViewModel}" />
-                                            <TextBlock Style="{StaticResource Glyph}">
-                                                &#xe893;
-                                            </TextBlock>
-                                        </ItemsControl>
-                                    </Border>
-                                    <Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
-                                        <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SelectNextItemHotkey}" />
-                                            </StackPanel>
-                                            <flowlauncher:HotkeyControl
-                                                x:Name="SelectNextItemHotkeyControl"
-                                                Grid.Row="0"
-                                                Grid.Column="2"
-                                                Margin="0,0,16,0"
-                                                HorizontalAlignment="Right"
-                                                HorizontalContentAlignment="Right"
-                                                DataContext="{Binding SelectNextItemHotkeyViewModel}" />
-                                            <TextBlock Style="{StaticResource Glyph}">
-                                                &#xf0ae;
-                                            </TextBlock>
-                                        </ItemsControl>
-                                    </Border>
-                                    <Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
-                                        <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SelectPrevItemHotkey}" />
-                                            </StackPanel>
-                                            <flowlauncher:HotkeyControl
-                                                x:Name="SelectPrevItemHotkeyControl"
-                                                Grid.Row="0"
-                                                Grid.Column="2"
-                                                Margin="0,0,16,0"
-                                                HorizontalAlignment="Right"
-                                                HorizontalContentAlignment="Right"
-                                                DataContext="{Binding SelectPrevItemHotkeyViewModel}" />
-                                            <TextBlock Style="{StaticResource Glyph}">
-                                                &#xf0ad;
-                                            </TextBlock>
-                                        </ItemsControl>
-                                    </Border>
+                                    <cc:ExCard
+                                        Title="{DynamicResource basicHotkey}"
+                                        Margin="0,12,0,0"
+                                        Icon="&#xe966;"
+                                        Sub="{DynamicResource basicHotkeyToolTip}">
+                                        <StackPanel>
+                                            <cc:Card
+                                                Title="{DynamicResource flowlauncherHotkey}"
+                                                Icon="&#xeda7;"
+                                                Sub="{DynamicResource flowlauncherHotkeyToolTip}"
+                                                Type="Inside" />
+                                            <cc:Card
+                                                Title="{DynamicResource flowlauncherHotkey}"
+                                                Icon="&#xeda7;"
+                                                Sub="{DynamicResource flowlauncherHotkeyToolTip}"
+                                                Type="Inside" />
+                                        </StackPanel>
+                                    </cc:ExCard>
+
+                                    <cc:Card
+                                        Title="{DynamicResource autoCompleteHotkey}"
+                                        Margin="0,12,0,0"
+                                        Icon="&#xe893;"
+                                        Sub="{DynamicResource autoCompleteHotkeyToolTip}">
+                                        <flowlauncher:HotkeyControl DataContext="{Binding AutoCompleteHotkeyViewModel}" />
+                                    </cc:Card>
+
+                                    <cc:Card Title="{DynamicResource SelectNextItemHotkey}" Icon="&#xf0ae;">
+                                        <flowlauncher:HotkeyControl DataContext="{Binding SelectNextItemHotkeyViewModel}" />
+                                    </cc:Card>
+
+
+                                    <cc:Card Title="{DynamicResource SelectPrevItemHotkey}" Icon="&#xf0ad;">
+                                        <flowlauncher:HotkeyControl DataContext="{Binding SelectPrevItemHotkeyViewModel}" />
+                                    </cc:Card>
                                 </StackPanel>
 
                                 <TextBlock