From 0a35810d04eb84470b29c237feaf82883a060975 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 10 Dec 2021 09:21:55 +0900
Subject: [PATCH 1/8] Adjust label width in CustomQueryHotkey Change Done
 Button Style to Accent

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 4ba55b110..b69af88c7 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -82,7 +82,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Width="60"
+                        Width="100"
                         Margin="10"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -111,7 +111,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Width="60"
+                        Width="100"
                         Margin="10"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -119,7 +119,7 @@
                         Text="{DynamicResource customQuery}" />
                     <TextBox
                         x:Name="tbAction"
-                        Width="250"
+                        Width="220"
                         Margin="10"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center" />
@@ -151,7 +151,8 @@
                     Width="100"
                     Height="32"
                     Margin="5,0,10,0"
-                    Click="btnAdd_OnClick">
+                    Click="btnAdd_OnClick"
+                    Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
                 </Button>
             </StackPanel>

From fac1b3a7ad5744705e970e52529b5b9d67822c83 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 10 Dec 2021 10:44:46 +0900
Subject: [PATCH 2/8] Change Checkbox position right to left

---
 .../Views/PluginsManagerSettings.xaml         | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
index d75803066..a62a032f7 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
@@ -1,20 +1,21 @@
-<UserControl x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings"
-        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        d:DesignHeight="450" d:DesignWidth="800">
-    <Grid Margin="70 15 0 15">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid Margin="70,15,0,15">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="250"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="400" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-
-        <TextBlock Grid.Column="0" 
-                   Text="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}" 
-                   VerticalAlignment="Center" 
-                   FontSize="14"/>
-        <CheckBox Grid.Column="1" IsChecked="{Binding WarnFromUnknownSource}" />
+        <CheckBox
+            Grid.Column="0"
+            Padding="8,0,0,0"
+            Content="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
+            IsChecked="{Binding WarnFromUnknownSource}" />
     </Grid>
 </UserControl>

From d1047c98dcde718bce8a930f72266770b35ba39b Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 10 Dec 2021 12:37:09 +0900
Subject: [PATCH 3/8] Change Wizard window to modal (when open in settingwindow
 only)

---
 Flow.Launcher/SettingWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index f17c18441..338b96406 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -293,7 +293,7 @@ namespace Flow.Launcher
         private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
         {
             var WelcomeWindow = new WelcomeWindow(settings);
-            WelcomeWindow.Show();
+            WelcomeWindow.ShowDialog();
         }
         private void OpenLogFolder(object sender, RoutedEventArgs e)
         {

From d573c48bbe882445262d5a0464d7c972944f4d7e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 10 Dec 2021 12:39:52 +0900
Subject: [PATCH 4/8] Add Autocomplete Key (Page3) in Wizard

---
 Flow.Launcher/Languages/en.xaml               |  1 +
 .../Resources/Pages/WelcomePage3.xaml         | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index e11cbd5cb..516471ba3 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -267,6 +267,7 @@
     <system:String x:Key="HotkeyCtrlShiftEnterDesc">Run as Admin</system:String>
     <system:String x:Key="HotkeyCtrlHDesc">Query History</system:String>
     <system:String x:Key="HotkeyESCDesc">Back to Result in Context Menu</system:String>
+    <system:String x:Key="HotkeyTabDesc">Autocomplete</system:String>
     <system:String x:Key="HotkeyRunDesc">Open / Run Selected Item</system:String>
     <system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
     <system:String x:Key="HotkeyF5Desc">Reload Plugin Data</system:String>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
index b424af3d8..e7920d34e 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -4,14 +4,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage3"
     mc:Ignorable="d">
     <Page.Resources>
         <Style x:Key="KbdLine" TargetType="Border">
             <Setter Property="CornerRadius" Value="8" />
-            <Setter Property="Margin" Value="0,4,0,4" />
+            <Setter Property="Margin" Value="0,3,0,3" />
             <Setter Property="Background" Value="{DynamicResource Color01B}" />
         </Style>
         <Style x:Key="Kbd" TargetType="Border">
@@ -60,7 +60,7 @@
                 VerticalScrollBarVisibility="Auto">
                 <Grid>
                     <StackPanel Margin="24,20,24,20">
-                        <StackPanel Margin="0,0,0,20">
+                        <StackPanel Margin="0,0,0,10">
                             <TextBlock
                                 FontSize="20"
                                 FontWeight="SemiBold"
@@ -155,6 +155,26 @@
                             </StackPanel>
                         </Border>
 
+                        <Border Style="{DynamicResource KbdLine}">
+                            <StackPanel Orientation="Horizontal">
+                                <StackPanel
+                                    Width="210"
+                                    Margin="20,5,4,5"
+                                    VerticalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
+                                        <TextBlock Style="{DynamicResource KbdText}" Text="Tab" />
+                                    </Border>
+                                </StackPanel>
+                                <StackPanel VerticalAlignment="Center">
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        FontSize="13"
+                                        Text="{DynamicResource HotkeyTabDesc}" />
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+
                         <Border Style="{DynamicResource KbdLine}">
                             <StackPanel Orientation="Horizontal">
                                 <StackPanel

From bdd5d241ae4efd15912e76fc2d0202b287e1cb20 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 11 Dec 2021 00:09:07 +0900
Subject: [PATCH 5/8] Change Label width to responsive

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml | 120 +++++++++++---------
 1 file changed, 69 insertions(+), 51 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index b69af88c7..2f7d28212 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
     Title="{DynamicResource customeQueryHotkeyTitle}"
-    Width="500"
+    Width="530"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
@@ -79,56 +79,74 @@
                 </StackPanel>
 
                 <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Width="100"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource hotkey}" />
-                    <flowlauncher:HotkeyControl
-                        x:Name="ctlHotkey"
-                        Grid.Column="1"
-                        Width="200"
-                        Height="34"
-                        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>
-
-                <StackPanel Margin="0,0,0,0" Orientation="Horizontal">
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Width="100"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource customQuery}" />
-                    <TextBox
-                        x:Name="tbAction"
-                        Width="220"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center" />
-                    <Button
-                        x:Name="btnTestActionKeyword"
-                        Height="30"
-                        Padding="10,5,10,5"
-                        Click="BtnTestActionKeyword_OnClick"
-                        Content="{DynamicResource preview}" />
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Width="Auto"
+                            MinWidth="110"
+                            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="34"
+                                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"
+                            Width="Auto"
+                            MinWidth="110"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource customQuery}" />
+                        <StackPanel
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Orientation="Horizontal">
+                            <TextBox
+                                x:Name="tbAction"
+                                MinWidth="220"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center" />
+                            <Button
+                                x:Name="btnTestActionKeyword"
+                                Padding="10,5,10,5"
+                                Click="BtnTestActionKeyword_OnClick"
+                                Content="{DynamicResource preview}" />
+                        </StackPanel>
+                    </Grid>
                 </StackPanel>
             </StackPanel>
         </StackPanel>

From f449ef7d555d7060ffa2f802970f3d38f80e5292 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 12 Dec 2021 01:21:57 +0900
Subject: [PATCH 6/8] Change Priority numberbox box to possible negative number

---
 Flow.Launcher/PriorityChangeWindow.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index 8fb27c470..d50bf82db 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -90,7 +90,6 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         CornerRadius="4"
-                        Minimum="0"
                         SmallChange="1"
                         SpinButtonPlacementMode="Inline" />
                 </StackPanel>

From 33be8f91b422b8db8fdb8cf66aa1f8c5e5a3fc4d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 12 Dec 2021 01:55:26 +0900
Subject: [PATCH 7/8] Revert "Change Priority numberbox box to possible
 negative number"

This reverts commit f449ef7d555d7060ffa2f802970f3d38f80e5292.
---
 Flow.Launcher/PriorityChangeWindow.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index d50bf82db..8fb27c470 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -90,6 +90,7 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         CornerRadius="4"
+                        Minimum="0"
                         SmallChange="1"
                         SpinButtonPlacementMode="Inline" />
                 </StackPanel>

From 72aaf066245e2f3696558a842eb1a783b9330af6 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 12 Dec 2021 01:58:14 +0900
Subject: [PATCH 8/8] Remove "Minimum = 0" in Priority

---
 Flow.Launcher/PriorityChangeWindow.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index 8fb27c470..d50bf82db 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -90,7 +90,6 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         CornerRadius="4"
-                        Minimum="0"
                         SmallChange="1"
                         SpinButtonPlacementMode="Inline" />
                 </StackPanel>