Improve Hotkey System

Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs

@@ -6,7 +6,7 @@
 
 namespace Flow.Launcher.Infrastructure.Hotkey
 {
-    public class HotkeyModel
+    public record struct HotkeyModel
     {
         public bool Alt { get; set; }
         public bool Shift { get; set; }
@@ -17,8 +17,7 @@ public class HotkeyModel
 
         private static readonly Dictionary<Key, string> specialSymbolDictionary = new Dictionary<Key, string>
         {
-            {Key.Space, "Space"},
-            {Key.Oem3, "~"}
+            { Key.Space, "Space" }, { Key.Oem3, "~" }
         };
 
         public ModifierKeys ModifierKeys
@@ -30,18 +29,22 @@ public ModifierKeys ModifierKeys
                 {
                     modifierKeys |= ModifierKeys.Alt;
                 }
+
                 if (Shift)
                 {
                     modifierKeys |= ModifierKeys.Shift;
                 }
+
                 if (Win)
                 {
                     modifierKeys |= ModifierKeys.Windows;
                 }
+
                 if (Ctrl)
                 {
                     modifierKeys |= ModifierKeys.Control;
                 }
+
                 return modifierKeys;
             }
         }
@@ -66,31 +69,37 @@ private void Parse(string hotkeyString)
             {
                 return;
             }
+
             List<string> keys = hotkeyString.Replace(" ", "").Split('+').ToList();
             if (keys.Contains("Alt"))
             {
                 Alt = true;
                 keys.Remove("Alt");
             }
+
             if (keys.Contains("Shift"))
             {
                 Shift = true;
                 keys.Remove("Shift");
             }
+
             if (keys.Contains("Win"))
             {
                 Win = true;
                 keys.Remove("Win");
             }
+
             if (keys.Contains("Ctrl"))
             {
                 Ctrl = true;
                 keys.Remove("Ctrl");
             }
+
             if (keys.Count == 1)
             {
                 string charKey = keys[0];
-                KeyValuePair<Key, string>? specialSymbolPair = specialSymbolDictionary.FirstOrDefault(pair => pair.Value == charKey);
+                KeyValuePair<Key, string>? specialSymbolPair =
+                    specialSymbolDictionary.FirstOrDefault(pair => pair.Value == charKey);
                 if (specialSymbolPair.Value.Value != null)
                 {
                     CharKey = specialSymbolPair.Value.Key;
@@ -103,41 +112,46 @@ private void Parse(string hotkeyString)
                     }
                     catch (ArgumentException)
                     {
-
                     }
                 }
             }
         }
 
         public override string ToString()
         {
-            List<string> keys = new List<string>();
-            if (Ctrl)
+            return string.Join(" + ", EnumerateDisplayKeys());
+        }
+
+        public IEnumerable<string> EnumerateDisplayKeys()
+        {
+            if (Ctrl && CharKey is not (Key.LeftCtrl or Key.RightCtrl))
             {
-                keys.Add("Ctrl");
+                yield return "Ctrl";
             }
-            if (Alt)
+
+            if (Alt && CharKey is not (Key.LeftAlt or Key.RightAlt))
             {
-                keys.Add("Alt");
+                yield return "Alt";
             }
-            if (Shift)
+
+            if (Shift && CharKey is not (Key.LeftShift or Key.RightShift))
             {
-                keys.Add("Shift");
+                yield return "Shift";
             }
-            if (Win)
+
+            if (Win && CharKey is not (Key.LWin or Key.RWin))
             {
-                keys.Add("Win");
+                yield return "Win";
             }
 
             if (CharKey != Key.None)
             {
-                keys.Add(specialSymbolDictionary.ContainsKey(CharKey)
-                    ? specialSymbolDictionary[CharKey]
-                    : CharKey.ToString());
+                yield return specialSymbolDictionary.TryGetValue(CharKey, out var value)
+                    ? value
+                    : CharKey.ToString();
             }
-            return string.Join(" + ", keys);
         }
-        
+
         /// <summary>
         /// Validate hotkey
         /// </summary>
@@ -164,11 +178,13 @@ public bool Validate(bool validateKeyGestrue = false)
                         {
                             KeyGesture keyGesture = new KeyGesture(CharKey, ModifierKeys);
                         }
-                        catch (System.Exception e) when (e is NotSupportedException || e is InvalidEnumArgumentException)
+                        catch (System.Exception e) when
+                            (e is NotSupportedException || e is InvalidEnumArgumentException)
                         {
                             return false;
                         }
                     }
+
                     if (ModifierKeys == ModifierKeys.None)
                     {
                         return !IsPrintableCharacter(CharKey);
@@ -206,18 +222,6 @@ private static bool IsPrintableCharacter(Key key)
                    key == Key.Decimal;
         }
 
-        public override bool Equals(object obj)
-        {
-            if (obj is HotkeyModel other)
-            {
-                return ModifierKeys == other.ModifierKeys && CharKey == other.CharKey;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
         public override int GetHashCode()
         {
             return HashCode.Combine(ModifierKeys, CharKey);

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -20,6 +20,16 @@ public class Settings : BaseModel
         public bool ShowOpenResultHotkey { get; set; } = true;
         public double WindowSize { get; set; } = 580;
         public string PreviewHotkey { get; set; } = $"F1";
+        public string AutoCompleteHotkey { get; set; } = $"{KeyConstant.Ctrl} + Tab";
+        public string AutoCompleteHotkey2 { get; set; } = $"";
+        public string SelectNextItemHotkey { get; set; } = $"Tab";
+        public string SelectNextItemHotkey2 { get; set; } = $"";
+        public string SelectPrevItemHotkey { get; set; } = $"Shift + Tab";
+        public string SelectPrevItemHotkey2 { get; set; } = $"";
+        public string SelectNextPageHotkey { get; set; } = $"";
+        public string SelectPrevPageHotkey { get; set; } = $"";
+        public string OpenContextMenuHotkey { get; set; } = $"Ctrl+O";
+        public string SettingWindowHotkey { get; set; } = $"Ctrl+I";
 
         public string Language
         {

Flow.Launcher/CustomQueryHotkeySetting.xaml

@@ -2,10 +2,12 @@
     x:Class="Flow.Launcher.CustomQueryHotkeySetting"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
     Title="{DynamicResource customeQueryHotkeyTitle}"
     Width="530"
     Background="{DynamicResource PopuBGColor}"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     MouseDown="window_MouseDown"
@@ -60,94 +62,75 @@
                 </Grid>
             </StackPanel>
             <StackPanel Margin="26,0,26,0">
-                <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                <TextBlock
+                    Margin="0,0,0,12"
+                    FontSize="20"
+                    FontWeight="SemiBold"
+                    Text="{DynamicResource customeQueryHotkeyTitle}"
+                    TextAlignment="Left" />
+                <TextBlock
+                    FontSize="14"
+                    Text="{DynamicResource customeQueryHotkeyTips}"
+                    TextAlignment="Left"
+                    TextWrapping="WrapWithOverflow" />
+                <Image
+                    Width="478"
+                    Margin="0,20,0,0"
+                    Source="/Images/illustration_01.png" />
+
+                <Grid Width="478" Margin="0,20,0,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
                     <TextBlock
+                        Grid.Row="0"
                         Grid.Column="0"
-                        Margin="0,0,0,0"
-                        FontSize="20"
-                        FontWeight="SemiBold"
-                        Text="{DynamicResource customeQueryHotkeyTitle}"
-                        TextAlignment="Left" />
-                </StackPanel>
-                <StackPanel>
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource hotkey}" />
+                    <flowlauncher:HotkeyControl
+                        x:Name="HotkeyControl"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="2"
+                        Margin="10,0,10,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        HorizontalContentAlignment="Left"
+                        DefaultHotkey="" />
                     <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         FontSize="14"
-                        Text="{DynamicResource customeQueryHotkeyTips}"
-                        TextAlignment="Left"
-                        TextWrapping="WrapWithOverflow" />
-                    <Image
-                        Width="478"
-                        Margin="0,20,0,0"
-                        Source="/Images/illustration_01.png" />
-                </StackPanel>
-
-                <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
-                    <Grid Width="478">
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Margin="10"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource hotkey}" />
-                        <StackPanel
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Orientation="Horizontal">
-                            <flowlauncher:HotkeyControl
-                                x:Name="ctlHotkey"
-                                Grid.Column="1"
-                                Width="200"
-                                Height="36"
-                                Margin="10,0,10,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Left" />
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{DynamicResource actionKeyword}" />
-                        </StackPanel>
-                        <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Margin="10"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource customQuery}" />
-                        <DockPanel
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            LastChildFill="True">
-                            <Button
-                                x:Name="btnTestActionKeyword"
-                                Margin="0,0,10,0"
-                                Padding="10,5,10,5"
-                                Click="BtnTestActionKeyword_OnClick"
-                                Content="{DynamicResource preview}"
-                                DockPanel.Dock="Right" />
-                            <TextBox
-                                x:Name="tbAction"
-                                Margin="10"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center" />
-                        </DockPanel>
-                    </Grid>
-                </StackPanel>
+                        Text="{DynamicResource customQuery}" />
+                    <TextBox
+                        x:Name="tbAction"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="10"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center" />
+                    <Button
+                        x:Name="btnTestActionKeyword"
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        Margin="0,0,10,0"
+                        Padding="10,5,10,5"
+                        Click="BtnTestActionKeyword_OnClick"
+                        Content="{DynamicResource preview}" />
+                </Grid>
             </StackPanel>
         </StackPanel>
         <Border
@@ -174,4 +157,4 @@
             </StackPanel>
         </Border>
     </Grid>
-</Window>
+</Window>