From ee0f8ef22a8563c3b53f697fb1b0f7cf02cc6ae3 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Sat, 11 Dec 2021 11:52:43 -0600
Subject: [PATCH 01/23] Implement PluginSearch TextBox & ContentControl Lazy
 Load

---
 Flow.Launcher/SettingWindow.xaml              | 16 ++++++++--
 Flow.Launcher/SettingWindow.xaml.cs           | 32 +++++++++++++++++--
 Flow.Launcher/ViewModel/PluginViewModel.cs    | 13 +++++++-
 .../ViewModel/SettingWindowViewModel.cs       |  1 +
 4 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index d8c94390ba7..7d144e3a1b0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -901,6 +901,7 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
+                            <RowDefinition Height="73" />
                             <RowDefinition Height="73" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
@@ -912,12 +913,23 @@
                                 Text="{DynamicResource plugin}"
                                 TextAlignment="left" />
                         </Border>
+                        <Border Grid.Row="1" Padding="5,18,0,0">
+                            <TextBox
+                                Name="pluginFilterTxb"
+                                Margin="0,5,0,0"
+                                FontSize="30"
+                                Text=""
+                                TextAlignment="left"
+                                TextChanged="OnPluginSearchTextChanged"
+                                />
+                        </Border>
                         <Border
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="0"
                             Padding="0,0,0,0"
                             Background="{DynamicResource Color01B}">
                             <ListBox
+                                Name="pluginList"
                                 Width="Auto"
                                 Margin="5,0,0,0"
                                 Padding="0,0,7,0"
@@ -942,7 +954,7 @@
                                             Padding="0"
                                             Background="Transparent"
                                             FlowDirection="RightToLeft"
-                                            IsExpanded="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}"
+                                            IsExpanded="{Binding Mode=TwoWay, Path=IsExpanded}"
                                             Style="{StaticResource ExpanderStyle1}">
                                             <Expander.Header>
                                                 <Grid
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index f17c184415e..89d9033b249 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -13,6 +13,8 @@
 using System;
 using System.IO;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Interop;
@@ -41,9 +43,11 @@ public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)
             DataContext = viewModel;
             this.viewModel = viewModel;
             API = api;
+            
         }
 
         #region General
+
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
             RefreshMaximizeRestoreButton();
@@ -52,6 +56,9 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
             HwndTarget hwndTarget = hwndSource.CompositionTarget;
             hwndTarget.RenderMode = RenderMode.SoftwareOnly;
+            
+            pluginListView = (CollectionView) CollectionViewSource.GetDefaultView(pluginList.ItemsSource);
+            pluginListView.Filter = PluginFilter;
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
@@ -247,6 +254,7 @@ private void OnPluginDirecotyClick(object sender, MouseButtonEventArgs e)
                     PluginManager.API.OpenDirectory(directory);
             }
         }
+
         #endregion
 
         #region Proxy
@@ -264,6 +272,7 @@ private async void OnCheckUpdates(object sender, RoutedEventArgs e)
             viewModel.UpdateApp(); // TODO: change to command
         }
 
+
         private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         {
             API.OpenUrl(e.Uri.AbsoluteUri);
@@ -307,7 +316,7 @@ private void OnPluginStoreRefreshClick(object sender, RoutedEventArgs e)
 
         private void OnExternalPluginInstallClick(object sender, RoutedEventArgs e)
         {
-            if(sender is Button { DataContext: UserPlugin plugin })
+            if (sender is Button { DataContext: UserPlugin plugin })
             {
                 var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7");
                 var actionKeyword = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
@@ -326,7 +335,7 @@ private void OnExternalPluginInstallClick(object sender, RoutedEventArgs e)
             textBox.MoveFocus(tRequest);
         }
 
-        private void ColorSchemeSelectedIndexChanged(object sender, EventArgs e) 
+        private void ColorSchemeSelectedIndexChanged(object sender, EventArgs e)
             => ThemeManager.Current.ApplicationTheme = settings.ColorScheme switch
             {
                 Constant.Light => ApplicationTheme.Light,
@@ -370,5 +379,22 @@ private void Window_StateChanged(object sender, EventArgs e)
             RefreshMaximizeRestoreButton();
         }
 
+        private CollectionView pluginListView;
+
+        private bool PluginFilter(object item)
+        {
+            if (string.IsNullOrEmpty(pluginFilterTxb.Text))
+                return true;
+            if (item is PluginViewModel model)
+            {
+                return StringMatcher.FuzzySearch(pluginFilterTxb.Text, model.PluginPair.Metadata.Name).IsSearchPrecisionScoreMet();
+            }
+            return false;
+        }
+
+        private void OnPluginSearchTextChanged(object sender, TextChangedEventArgs e)
+        {
+            pluginListView.Refresh();
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index 209198822e0..864a606463d 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -30,9 +30,20 @@ public bool PluginState
             get => !PluginPair.Metadata.Disabled;
             set => PluginPair.Metadata.Disabled = !value;
         }
+        public bool IsExpanded
+        {
+            get => _isExpanded;
+            set
+            {
+                _isExpanded = value;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(SettingControl));
+            }
+        }
 
         private Control _settingControl;
-        public Control SettingControl => _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel();
+        private bool _isExpanded;
+        public Control SettingControl => IsExpanded ? _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel() : null;
 
         public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
         public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 342c85da202..7c9caf13c6e 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -19,6 +19,7 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
+using System.Windows.Data;
 
 namespace Flow.Launcher.ViewModel
 {

From 2b134c8b9ab304bac7c0f1ed0be1649729ea3659 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 12 Dec 2021 06:49:15 +0900
Subject: [PATCH 02/23] Adjust Design & Add Searchbox in plugin store

---
 Flow.Launcher/SettingWindow.xaml | 66 +++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 7d144e3a1b0..b130fbfcab7 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -901,30 +901,38 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="73" />
                             <RowDefinition Height="73" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                        <Border Grid.Row="0" Padding="5,18,0,0">
-                            <TextBlock
-                                Margin="0,5,0,0"
-                                FontSize="30"
-                                Style="{StaticResource PageTitle}"
-                                Text="{DynamicResource plugin}"
-                                TextAlignment="left" />
-                        </Border>
-                        <Border Grid.Row="1" Padding="5,18,0,0">
-                            <TextBox
-                                Name="pluginFilterTxb"
-                                Margin="0,5,0,0"
-                                FontSize="30"
-                                Text=""
-                                TextAlignment="left"
-                                TextChanged="OnPluginSearchTextChanged"
-                                />
+                        <Border
+                            Grid.Row="0"
+                            Padding="5,18,0,0"
+                            HorizontalAlignment="Stretch">
+                            <DockPanel>
+                                <TextBlock
+                                    Margin="0,5,0,0"
+                                    DockPanel.Dock="Left"
+                                    FontSize="30"
+                                    Style="{StaticResource PageTitle}"
+                                    Text="{DynamicResource plugin}"
+                                    TextAlignment="Left" />
+                                <DockPanel DockPanel.Dock="Right">
+                                    <TextBox
+                                        Name="pluginFilterTxb"
+                                        Width="150"
+                                        Height="34"
+                                        Margin="0,5,26,0"
+                                        HorizontalAlignment="Right"
+                                        DockPanel.Dock="Right"
+                                        FontSize="14"
+                                        Text=""
+                                        TextAlignment="Left"
+                                        TextChanged="OnPluginSearchTextChanged" />
+                                </DockPanel>
+                            </DockPanel>
                         </Border>
                         <Border
-                            Grid.Row="2"
+                            Grid.Row="1"
                             Grid.Column="0"
                             Padding="0,0,0,0"
                             Background="{DynamicResource Color01B}">
@@ -1296,19 +1304,31 @@
                                 Text="{DynamicResource pluginStore}"
                                 TextAlignment="left" />
                         </Border>
-                        <Border
+                        <DockPanel
                             Grid.Row="0"
                             Grid.Column="1"
-                            Padding="5,18,32,0">
+                            Margin="5,18,0,0">
                             <Button
                                 Height="34"
-                                Margin="0,5,0,5"
+                                Margin="0,5,16,5"
                                 Padding="12,4,12,4"
                                 HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
                                 Click="OnPluginStoreRefreshClick"
                                 Content="{DynamicResource refresh}"
+                                DockPanel.Dock="Right"
                                 FontSize="13" />
-                        </Border>
+                            <TextBox
+                                Width="150"
+                                Height="34"
+                                Margin="0,0,6,0"
+                                HorizontalAlignment="Right"
+                                DockPanel.Dock="Right"
+                                FontSize="14"
+                                Text=""
+                                TextAlignment="Left" />
+
+                        </DockPanel>
                         <Border
                             Grid.Row="1"
                             Grid.Column="0"

From dff67ac670c33e1250ea3ed58e796f86d035a85d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 20 Dec 2021 06:51:38 +0900
Subject: [PATCH 03/23] Add PlaceHolder Text in Searchbox

---
 Flow.Launcher/Languages/en.xaml  |  1 +
 Flow.Launcher/SettingWindow.xaml | 68 ++++++++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 516471ba3b3..fb965984a2f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -53,6 +53,7 @@
 
     <!--  Setting Plugin  -->
     <system:String x:Key="plugin">Plugins</system:String>
+    <system:String x:Key="searchplugin">Search Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="enable">On</system:String>
     <system:String x:Key="disable">Off</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index b130fbfcab7..dd1368ca98a 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -919,7 +919,7 @@
                                 <DockPanel DockPanel.Dock="Right">
                                     <TextBox
                                         Name="pluginFilterTxb"
-                                        Width="150"
+                                        Width="250"
                                         Height="34"
                                         Margin="0,5,26,0"
                                         HorizontalAlignment="Right"
@@ -927,7 +927,37 @@
                                         FontSize="14"
                                         Text=""
                                         TextAlignment="Left"
-                                        TextChanged="OnPluginSearchTextChanged" />
+                                        TextChanged="OnPluginSearchTextChanged">
+                                        <TextBox.Style>
+                                            <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
+                                                <Style.Resources>
+                                                    <VisualBrush
+                                                        x:Key="CueBannerBrush"
+                                                        AlignmentX="Left"
+                                                        AlignmentY="Center"
+                                                        Stretch="None">
+                                                        <VisualBrush.Visual>
+                                                            <Label
+                                                                Padding="10,0,0,0"
+                                                                Content="{DynamicResource searchplugin}"
+                                                                Foreground="{DynamicResource CustomContextDisabled}" />
+                                                        </VisualBrush.Visual>
+                                                    </VisualBrush>
+                                                </Style.Resources>
+                                                <Style.Triggers>
+                                                    <Trigger Property="Text" Value="{x:Static sys:String.Empty}">
+                                                        <Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
+                                                    </Trigger>
+                                                    <Trigger Property="Text" Value="{x:Null}">
+                                                        <Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
+                                                    </Trigger>
+                                                    <Trigger Property="IsKeyboardFocused" Value="True">
+                                                        <Setter Property="Background" Value="{DynamicResource Color02B}" />
+                                                    </Trigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </TextBox.Style>
+                                    </TextBox>
                                 </DockPanel>
                             </DockPanel>
                         </Border>
@@ -1319,14 +1349,44 @@
                                 DockPanel.Dock="Right"
                                 FontSize="13" />
                             <TextBox
-                                Width="150"
+                                Width="250"
                                 Height="34"
                                 Margin="0,0,6,0"
                                 HorizontalAlignment="Right"
                                 DockPanel.Dock="Right"
                                 FontSize="14"
                                 Text=""
-                                TextAlignment="Left" />
+                                TextAlignment="Left">
+                                <TextBox.Style>
+                                    <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
+                                        <Style.Resources>
+                                            <VisualBrush
+                                                x:Key="CueBannerBrush"
+                                                AlignmentX="Left"
+                                                AlignmentY="Center"
+                                                Stretch="None">
+                                                <VisualBrush.Visual>
+                                                    <Label
+                                                        Padding="10,0,0,0"
+                                                        Content="{DynamicResource searchplugin}"
+                                                        Foreground="{DynamicResource CustomContextDisabled}" />
+                                                </VisualBrush.Visual>
+                                            </VisualBrush>
+                                        </Style.Resources>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="{x:Static sys:String.Empty}">
+                                                <Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
+                                            </Trigger>
+                                            <Trigger Property="Text" Value="{x:Null}">
+                                                <Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
+                                            </Trigger>
+                                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                                <Setter Property="Background" Value="{DynamicResource Color02B}" />
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBox.Style>
+                            </TextBox>
 
                         </DockPanel>
                         <Border

From 08d5eaae71547c26f50f35a85dba96e5c3183021 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 4 Jan 2022 16:05:52 +0900
Subject: [PATCH 04/23] Redesign PluginStroe Item List

---
 Flow.Launcher/SettingWindow.xaml | 69 ++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e15d5285cd0..c621a106978 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -319,8 +319,8 @@
             <Setter Property="Padding" Value="0,0,0,0" />
             <Setter Property="Margin" Value="0,0,8,5" />
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
-            <Setter Property="MinWidth" Value="330" />
-            <Setter Property="Height" Value="98" />
+            <Setter Property="MinWidth" Value="100" />
+            <Setter Property="Height" Value="Auto" />
             <!--#region Template for blue highlight win10-->
             <Setter Property="Template">
                 <Setter.Value>
@@ -1304,7 +1304,7 @@
                                             Margin="0,0,6,18"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Top"
-                                            Columns="2"
+                                            Columns="3"
                                             IsItemsHost="True"
                                             SnapsToDevicePixels="True" />
                                     </ItemsPanelTemplate>
@@ -1337,15 +1337,24 @@
                                                 </ControlTemplate>
                                             </ToggleButton.Template>
 
-                                            <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="72" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
+                                            <Grid
+                                                Height="160"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Top">
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="56" />
+                                                    <RowDefinition Height="*" />
+                                                </Grid.RowDefinitions>
                                                 <StackPanel
+                                                    Grid.Row="0"
+                                                    Grid.RowSpan="2"
                                                     Grid.Column="0"
+                                                    Grid.ColumnSpan="2" />
+
+                                                <StackPanel
+                                                    Grid.Row="0"
                                                     Margin="0,0,0,0"
-                                                    VerticalAlignment="Center">
+                                                    VerticalAlignment="Top">
                                                     <StackPanel.Style>
                                                         <Style>
                                                             <Setter Property="StackPanel.Visibility" Value="Visible" />
@@ -1359,16 +1368,18 @@
                                                     <Image
                                                         Width="32"
                                                         Height="32"
-                                                        Margin="8,0,6,0"
-                                                        VerticalAlignment="Center"
+                                                        Margin="20,20,6,0"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Top"
                                                         RenderOptions.BitmapScalingMode="HighQuality"
                                                         Source="{Binding IcoPath, IsAsync=True}"
                                                         Stretch="Uniform" />
                                                 </StackPanel>
                                                 <StackPanel
-                                                    Grid.Column="1"
-                                                    Margin="0,0,8,0"
-                                                    VerticalAlignment="Center"
+                                                    Grid.Row="1"
+                                                    Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
+                                                    Margin="0,6,0,0"
+                                                    VerticalAlignment="Top"
                                                     Panel.ZIndex="0">
                                                     <StackPanel.Style>
                                                         <Style>
@@ -1381,14 +1392,16 @@
                                                         </Style>
                                                     </StackPanel.Style>
                                                     <TextBlock
-                                                        Padding="0,0,20,0"
+                                                        Padding="20,0,20,0"
+                                                        VerticalAlignment="Top"
+                                                        FontWeight="SemiBold"
                                                         Foreground="{DynamicResource Color05B}"
                                                         Text="{Binding Name}"
                                                         TextWrapping="WrapWithOverflow"
                                                         ToolTip="{Binding Version}" />
                                                     <TextBlock
-                                                        Margin="0,2,0,0"
-                                                        Padding="0,0,20,0"
+                                                        Margin="0,6,0,0"
+                                                        Padding="20,0,22,20"
                                                         Foreground="{DynamicResource Color04B}"
                                                         TextWrapping="WrapWithOverflow">
                                                         <Run
@@ -1399,6 +1412,7 @@
 
                                                 </StackPanel>
                                                 <StackPanel
+                                                    Grid.RowSpan="2"
                                                     Grid.Column="0"
                                                     Grid.ColumnSpan="2"
                                                     HorizontalAlignment="Stretch"
@@ -1416,7 +1430,7 @@
 
 
                                                     <Grid
-                                                        Height="94"
+                                                        Height="180"
                                                         HorizontalAlignment="Stretch"
                                                         VerticalAlignment="Stretch"
                                                         Panel.ZIndex="1">
@@ -1428,12 +1442,13 @@
                                                         </Grid.ColumnDefinitions>
 
                                                         <StackPanel
+                                                            Grid.Row="0"
                                                             Grid.Column="0"
                                                             HorizontalAlignment="Stretch"
-                                                            VerticalAlignment="Center">
-                                                            <StackPanel Orientation="Horizontal">
+                                                            VerticalAlignment="Top">
+                                                            <StackPanel Orientation="Vertical">
                                                                 <TextBlock
-                                                                    Margin="20,0,0,0"
+                                                                    Margin="20,20,0,0"
                                                                     Padding="0,0,0,0"
                                                                     FontWeight="Bold"
                                                                     Foreground="{DynamicResource Color05B}"
@@ -1441,14 +1456,14 @@
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Name}" />
                                                                 <TextBlock
-                                                                    Margin="10,0,0,0"
+                                                                    Margin="20,4,0,0"
                                                                     Padding="0,0,20,0"
                                                                     Foreground="{DynamicResource Color05B}"
                                                                     Text="{Binding Version}"
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Version}" />
                                                             </StackPanel>
-                                                            <StackPanel Margin="20,2,120,0" Orientation="Vertical">
+                                                            <StackPanel Margin="20,6,20,0" Orientation="Vertical">
                                                                 <TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
                                                                     <Hyperlink
                                                                         Foreground="{DynamicResource Color04B}"
@@ -1459,12 +1474,14 @@
                                                                 </TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
-                                                        <Border Padding="0,0,20,0">
+                                                        <Border
+                                                            Grid.Row="0"
+                                                            Grid.Column="1"
+                                                            Padding="0,0,0,0">
                                                             <Button
                                                                 Name="ShortCutButtonPrev"
-                                                                Grid.Column="1"
                                                                 MinHeight="40"
-                                                                Margin="0,0,0,0"
+                                                                Margin="0,70,20,0"
                                                                 Padding="15,5,15,5"
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"

From 2e54bc005077214cd4a7378cf9dcd900234751b9 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 4 Jan 2022 18:01:59 +0900
Subject: [PATCH 05/23] Add "New" and "Installed" App Label in pluginstore

---
 Flow.Launcher/Images/installed.png | Bin 0 -> 1950 bytes
 Flow.Launcher/Images/new.png       | Bin 0 -> 2687 bytes
 Flow.Launcher/SettingWindow.xaml   |  24 +++++++++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 Flow.Launcher/Images/installed.png
 create mode 100644 Flow.Launcher/Images/new.png

diff --git a/Flow.Launcher/Images/installed.png b/Flow.Launcher/Images/installed.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4055d689cd56351496143c7437827de87b829d5
GIT binary patch
literal 1950
zcmbVN3v3f*9KTLn_5j=*!g$Tg4b&;ud-T?>x0R)?%#GMFN8JMy{d)Jcy{x@E?rv)b
zi3|cNzCxmsfs!Z&8AKtIMVBn-V$2Xk8R`-lD2)LH6U3>6M~w5ku5FkZkI>xXySv~2
z_y7GL-@lvd>mHkyGbabbuxYh5o(6QM%`+<#U7IqlzJPAoYE6rdVYvn7X~DL?U5H_K
z_e;KJquKj7FDMZ!5EVbP#v&?0V^~FHOa($KG;lu*O0tW%*#8-UOQMTtD)rJ{wF-u$
znl&0+zNXG6tZ5aTB2l>*uZZ!8AOa15$0A`_=VLA+!ONqy`I;i|1jJ}{5pL5V-t4W%
zs}v354l6?nG)?0Urxl8T_1glAaF%8nia`fQGAwVSd5*=CKLWYa!~oymsZKgWPc9;4
z7%ERu(P-2fwOJJ{NHI>QlcHIQWl4k}^$ytpF;doxQw$!c3!0=Fk|N_KBk(J2hKoQ_
z$76`7X<AuN<_TqtiUE~kth5<Z0w@Y;oZ6;^6V63}f?*hevY{g^lg6qc#ZdH+as%r0
z=Lrr_ZoS^Lk4d#eB54=8v7{Y^kxa;>Xx-PLLaG7kN}DFYCGALNu^ElZS7{I!isn<4
zaH>-EDakl%voiQYO_D4sQN83k1Ly$;bP=d(EJ-sY&G{HRj}ETv5!%Vq^f=V3h*F?q
zGAKv$rOpXZ)H5P5z%9X|zy}m90#LwG1Oy?a%0U88r;)Ex!it6*BXzcf3a^*1m30Hi
z0<8782o$qbl0@E4mx+Fs^OI#_0Fa!>LDDZmKsp#204K+CrG7SL?@@#{v$83B5!s6l
z(LqC2B!PotNvDkykv*`JHb<H0uyG8F*i-h)Gzo1j5WZs`bHkY}!PiJSDpp5wM=Xb{
zldG_VC%S+Kg4x|JLNLn;MI!lHnj{0a7r{7fGz1apP0BqE)0Kb`1sZe*QMPW`PSlOW
z>!AJS(r>SLH<mu3{q971GOa=g$U%r^B}JIQQ07n>FADYldL_PHH-J)bG}X*ydY+<(
z^hAa-qSny7z5HCH3&Sj%YdvmXX#It4J#`uGyywR(1!T$4#;t|S;OBp2%p5$jvb=TW
zo?iO<k&`v=Hf|5?*>NSaw|&OazL%L51FII;3oR{kb82QZ$LCSo_K%ziM1T28R2(hr
zAb!--ms>b1KOQ*pzz?TSjJ-aspt5`?5UNgF^5fN0`g*SA9(?nNd-!<ODZ>8u{5*^7
z>71J%AN*}zcV$K9lZU?C_~~85z^hqmamJ|^F$Y=>KYec3@YKDp6*VsMr&zKZ;`hBn
z3a=3HlI{iWtX}NQV){V0aW(MW<v%Z-KejM${)VA0gZ-#u*U@8N-;-mlpE7&*&okFu
zi_KbQ?R7the{gB#7kjpj{j=%)%&voLFYNobu>uQUS#@~y$F{tWE$3<%6g3SD#2=os
z>y2-J8np}+aqF@7_Wr)GbbATroXYIJzp*JBdj{LNV|6|~`|R3HPuyF6@mML=|H*;F
zt(|q2MbWc`b52fw3hVCN;yu^A;{5TKE>=tXw+!`gStq_3`PKf{hxXBRp6M)#{Vio_
WW5_vGI+XYatzA;*+4tzP8~y_@Hj^m;

literal 0
HcmV?d00001

diff --git a/Flow.Launcher/Images/new.png b/Flow.Launcher/Images/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a87b8186d574646c88b5956b8695703763923c
GIT binary patch
literal 2687
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
Q_ZQLMH&|G`dQ;Z_0HGQUX8-^I

literal 0
HcmV?d00001

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index c621a106978..20002459fe0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1349,7 +1349,29 @@
                                                     Grid.Row="0"
                                                     Grid.RowSpan="2"
                                                     Grid.Column="0"
-                                                    Grid.ColumnSpan="2" />
+                                                    Grid.ColumnSpan="2"
+                                                    HorizontalAlignment="Right"
+                                                    Orientation="Horizontal">
+                                                    <Image
+                                                        Width="32"
+                                                        Height="32"
+                                                        Margin="0,0,8,0"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Top"
+                                                        RenderOptions.BitmapScalingMode="HighQuality"
+                                                        Source="/Images/new.png"
+                                                        Stretch="Uniform" />
+                                                    <Image
+                                                        Width="28"
+                                                        Height="28"
+                                                        Margin="0,-2,8,0"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Top"
+                                                        RenderOptions.BitmapScalingMode="HighQuality"
+                                                        Source="/Images/installed.png"
+                                                        Stretch="Uniform"
+                                                        Visibility="Visible" />
+                                                </StackPanel>
 
                                                 <StackPanel
                                                     Grid.Row="0"

From 455b2405e6d2e124e03df05edc9c660e2a201de7 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Sun, 6 Feb 2022 17:50:02 -0600
Subject: [PATCH 06/23] Refresh List on focus lost or enter

---
 Flow.Launcher/SettingWindow.xaml    | 3 ++-
 Flow.Launcher/SettingWindow.xaml.cs | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index dd1368ca98a..c33e268315b 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -927,7 +927,8 @@
                                         FontSize="14"
                                         Text=""
                                         TextAlignment="Left"
-                                        TextChanged="OnPluginSearchTextChanged">
+                                        LostFocus="RefreshPluginListEventHandler"
+                                        KeyDown="PluginFilterTxb_OnKeyDown">
                                         <TextBox.Style>
                                             <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
                                                 <Style.Resources>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index fd7cb29364b..1f9e15a1037 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -21,6 +21,7 @@
 using System.Windows.Navigation;
 using Button = System.Windows.Controls.Button;
 using Control = System.Windows.Controls.Control;
+using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using MessageBox = System.Windows.MessageBox;
 using TextBox = System.Windows.Controls.TextBox;
 using ThemeManager = ModernWpf.ThemeManager;
@@ -392,9 +393,14 @@ private bool PluginFilter(object item)
             return false;
         }
 
-        private void OnPluginSearchTextChanged(object sender, TextChangedEventArgs e)
+        private void RefreshPluginListEventHandler(object sender, RoutedEventArgs e)
         {
             pluginListView.Refresh();
         }
+        private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.Key == Key.Enter)
+                pluginListView.Refresh();
+        }
     }
 }
\ No newline at end of file

From 0168aea12861a688ffa47eef9978eab68723e122 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 7 Feb 2022 20:53:44 +1100
Subject: [PATCH 07/23] remove unused

---
 Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 7c9caf13c6e..342c85da202 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -19,7 +19,6 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
-using System.Windows.Data;
 
 namespace Flow.Launcher.ViewModel
 {

From 4b102dc3f79173ba9cc85223e862b3331f801217 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Sat, 12 Feb 2022 15:32:44 -0600
Subject: [PATCH 08/23] Don't refresh listview if search term is the same

---
 Flow.Launcher/SettingWindow.xaml.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 1f9e15a1037..6abf35b9e57 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -44,7 +44,7 @@ public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)
             DataContext = viewModel;
             this.viewModel = viewModel;
             API = api;
-            
+
         }
 
         #region General
@@ -57,8 +57,8 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
             HwndTarget hwndTarget = hwndSource.CompositionTarget;
             hwndTarget.RenderMode = RenderMode.SoftwareOnly;
-            
-            pluginListView = (CollectionView) CollectionViewSource.GetDefaultView(pluginList.ItemsSource);
+
+            pluginListView = (CollectionView)CollectionViewSource.GetDefaultView(pluginList.ItemsSource);
             pluginListView.Filter = PluginFilter;
         }
 
@@ -393,14 +393,20 @@ private bool PluginFilter(object item)
             return false;
         }
 
+        private string lastSearch = "";
+
         private void RefreshPluginListEventHandler(object sender, RoutedEventArgs e)
         {
-            pluginListView.Refresh();
+            if (pluginFilterTxb.Text != lastSearch)
+            {
+                lastSearch = pluginFilterTxb.Text;
+                pluginListView.Refresh();
+            }
         }
         private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
         {
-            if(e.Key == Key.Enter)
-                pluginListView.Refresh();
+            if (e.Key == Key.Enter)
+                RefreshPluginListEventHandler(sender, e);
         }
     }
 }
\ No newline at end of file

From d87ee11268c93b7ba83c145013f36a7725edef0b Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Sat, 12 Feb 2022 15:42:11 -0600
Subject: [PATCH 09/23] add ctrl+f hotkey to focus the search textbox

---
 Flow.Launcher/SettingWindow.xaml    | 3 ++-
 Flow.Launcher/SettingWindow.xaml.cs | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index c33e268315b..18c88c82e1f 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -879,7 +879,8 @@
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>
-                <TabItem>
+                <TabItem
+                    KeyDown="OnPluginSettingKeydown">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 6abf35b9e57..da9ca241f53 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -408,5 +408,10 @@ private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
             if (e.Key == Key.Enter)
                 RefreshPluginListEventHandler(sender, e);
         }
+        private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
+        {
+            if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control && e.Key == Key.F)
+                pluginFilterTxb.Focus();
+        }
     }
 }
\ No newline at end of file

From a8bcda2cd33912a87d7553101fb52b342e7346c1 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Thu, 30 Jun 2022 08:47:10 -0500
Subject: [PATCH 10/23] Implement the search functionality in PluginStore Page

---
 Flow.Launcher/SettingWindow.xaml    | 12 +++++----
 Flow.Launcher/SettingWindow.xaml.cs | 40 +++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 8259a33f629..d53d589ff54 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -878,8 +878,7 @@
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>
-                <TabItem
-                    KeyDown="OnPluginSettingKeydown">
+                <TabItem KeyDown="OnPluginSettingKeydown">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -925,10 +924,10 @@
                                         HorizontalAlignment="Right"
                                         DockPanel.Dock="Right"
                                         FontSize="14"
-                                        Text=""
-                                        TextAlignment="Left"
+                                        KeyDown="PluginFilterTxb_OnKeyDown"
                                         LostFocus="RefreshPluginListEventHandler"
-                                        KeyDown="PluginFilterTxb_OnKeyDown">
+                                        Text=""
+                                        TextAlignment="Left">
                                         <TextBox.Style>
                                             <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
                                                 <Style.Resources>
@@ -1344,6 +1343,9 @@
                                 HorizontalAlignment="Right"
                                 DockPanel.Dock="Right"
                                 FontSize="14"
+                                Name="pluginStoreFilterTxb"
+                                KeyDown="PluginFilterTxb_OnKeyDown"
+                                LostFocus="RefreshPluginStoreEventHandler"
                                 Text=""
                                 TextAlignment="Left">
                                 <TextBox.Style>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 61514317a1a..74c28af3286 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -59,7 +59,10 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             hwndTarget.RenderMode = RenderMode.SoftwareOnly;
 
             pluginListView = (CollectionView)CollectionViewSource.GetDefaultView(pluginList.ItemsSource);
-            pluginListView.Filter = PluginFilter;
+            pluginListView.Filter = PluginListFilter;
+
+            pluginStoreView = (CollectionView)CollectionViewSource.GetDefaultView(StoreListBox.ItemsSource); 
+            pluginStoreView.Filter = PluginStoreFilter;
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
@@ -381,8 +384,9 @@ private void Window_StateChanged(object sender, EventArgs e)
         }
 
         private CollectionView pluginListView;
+        private CollectionView pluginStoreView;
 
-        private bool PluginFilter(object item)
+        private bool PluginListFilter(object item)
         {
             if (string.IsNullOrEmpty(pluginFilterTxb.Text))
                 return true;
@@ -392,22 +396,48 @@ private bool PluginFilter(object item)
             }
             return false;
         }
+        private bool PluginStoreFilter(object item)
+        {
+            if (string.IsNullOrEmpty(pluginStoreFilterTxb.Text))
+                return true;
+            if (item is UserPlugin model)
+            {
+                return StringMatcher.FuzzySearch(pluginStoreFilterTxb.Text, model.Name).IsSearchPrecisionScoreMet();
+            }
+            return false;
+        }
 
-        private string lastSearch = "";
+        private string lastPluginListSearch = "";
+        private string lastPluginStoreSearch = "";
 
         private void RefreshPluginListEventHandler(object sender, RoutedEventArgs e)
         {
-            if (pluginFilterTxb.Text != lastSearch)
+            if (pluginFilterTxb.Text != lastPluginListSearch)
             {
-                lastSearch = pluginFilterTxb.Text;
+                lastPluginListSearch = pluginFilterTxb.Text;
                 pluginListView.Refresh();
             }
         }
+
+        private void RefreshPluginStoreEventHandler(object sender, RoutedEventArgs e)
+        {
+            if (pluginStoreFilterTxb.Text != lastPluginStoreSearch)
+            {
+                lastPluginStoreSearch = pluginStoreFilterTxb.Text;
+                pluginStoreView.Refresh();
+            }
+        }
         private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
                 RefreshPluginListEventHandler(sender, e);
         }
+
+        private void PluginStoreFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+                RefreshPluginListEventHandler(sender, e);
+        }
         private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
         {
             if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control && e.Key == Key.F)

From defda0a3362fc2f084311dc0452687e6ce126386 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Thu, 30 Jun 2022 16:51:07 -0500
Subject: [PATCH 11/23] Append unadded file

---
 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 74c28af3286..d754c4f24f4 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -430,7 +430,7 @@ private void RefreshPluginStoreEventHandler(object sender, RoutedEventArgs e)
         private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
-                RefreshPluginListEventHandler(sender, e);
+                RefreshPluginStoreEventHandler(sender, e);
         }
 
         private void PluginStoreFilterTxb_OnKeyDown(object sender, KeyEventArgs e)

From 67dfe9da606f1323599be96e2a019a0b6b7bf0a9 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 20 Sep 2022 20:22:00 +0900
Subject: [PATCH 12/23] Installed/New label Image to Text

---
 Flow.Launcher/Images/installed.png | Bin 1950 -> 0 bytes
 Flow.Launcher/Images/new.png       | Bin 2687 -> 0 bytes
 Flow.Launcher/SettingWindow.xaml   |  42 ++++++++++++++++++-----------
 3 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 100644 Flow.Launcher/Images/installed.png
 delete mode 100644 Flow.Launcher/Images/new.png

diff --git a/Flow.Launcher/Images/installed.png b/Flow.Launcher/Images/installed.png
deleted file mode 100644
index e4055d689cd56351496143c7437827de87b829d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1950
zcmbVN3v3f*9KTLn_5j=*!g$Tg4b&;ud-T?>x0R)?%#GMFN8JMy{d)Jcy{x@E?rv)b
zi3|cNzCxmsfs!Z&8AKtIMVBn-V$2Xk8R`-lD2)LH6U3>6M~w5ku5FkZkI>xXySv~2
z_y7GL-@lvd>mHkyGbabbuxYh5o(6QM%`+<#U7IqlzJPAoYE6rdVYvn7X~DL?U5H_K
z_e;KJquKj7FDMZ!5EVbP#v&?0V^~FHOa($KG;lu*O0tW%*#8-UOQMTtD)rJ{wF-u$
znl&0+zNXG6tZ5aTB2l>*uZZ!8AOa15$0A`_=VLA+!ONqy`I;i|1jJ}{5pL5V-t4W%
zs}v354l6?nG)?0Urxl8T_1glAaF%8nia`fQGAwVSd5*=CKLWYa!~oymsZKgWPc9;4
z7%ERu(P-2fwOJJ{NHI>QlcHIQWl4k}^$ytpF;doxQw$!c3!0=Fk|N_KBk(J2hKoQ_
z$76`7X<AuN<_TqtiUE~kth5<Z0w@Y;oZ6;^6V63}f?*hevY{g^lg6qc#ZdH+as%r0
z=Lrr_ZoS^Lk4d#eB54=8v7{Y^kxa;>Xx-PLLaG7kN}DFYCGALNu^ElZS7{I!isn<4
zaH>-EDakl%voiQYO_D4sQN83k1Ly$;bP=d(EJ-sY&G{HRj}ETv5!%Vq^f=V3h*F?q
zGAKv$rOpXZ)H5P5z%9X|zy}m90#LwG1Oy?a%0U88r;)Ex!it6*BXzcf3a^*1m30Hi
z0<8782o$qbl0@E4mx+Fs^OI#_0Fa!>LDDZmKsp#204K+CrG7SL?@@#{v$83B5!s6l
z(LqC2B!PotNvDkykv*`JHb<H0uyG8F*i-h)Gzo1j5WZs`bHkY}!PiJSDpp5wM=Xb{
zldG_VC%S+Kg4x|JLNLn;MI!lHnj{0a7r{7fGz1apP0BqE)0Kb`1sZe*QMPW`PSlOW
z>!AJS(r>SLH<mu3{q971GOa=g$U%r^B}JIQQ07n>FADYldL_PHH-J)bG}X*ydY+<(
z^hAa-qSny7z5HCH3&Sj%YdvmXX#It4J#`uGyywR(1!T$4#;t|S;OBp2%p5$jvb=TW
zo?iO<k&`v=Hf|5?*>NSaw|&OazL%L51FII;3oR{kb82QZ$LCSo_K%ziM1T28R2(hr
zAb!--ms>b1KOQ*pzz?TSjJ-aspt5`?5UNgF^5fN0`g*SA9(?nNd-!<ODZ>8u{5*^7
z>71J%AN*}zcV$K9lZU?C_~~85z^hqmamJ|^F$Y=>KYec3@YKDp6*VsMr&zKZ;`hBn
z3a=3HlI{iWtX}NQV){V0aW(MW<v%Z-KejM${)VA0gZ-#u*U@8N-;-mlpE7&*&okFu
zi_KbQ?R7the{gB#7kjpj{j=%)%&voLFYNobu>uQUS#@~y$F{tWE$3<%6g3SD#2=os
z>y2-J8np}+aqF@7_Wr)GbbATroXYIJzp*JBdj{LNV|6|~`|R3HPuyF6@mML=|H*;F
zt(|q2MbWc`b52fw3hVCN;yu^A;{5TKE>=tXw+!`gStq_3`PKf{hxXBRp6M)#{Vio_
WW5_vGI+XYatzA;*+4tzP8~y_@Hj^m;

diff --git a/Flow.Launcher/Images/new.png b/Flow.Launcher/Images/new.png
deleted file mode 100644
index 10a87b8186d574646c88b5956b8695703763923c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2687
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
Q_ZQLMH&|G`dQ;Z_0HGQUX8-^I

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 667ba1a0622..42b3c99de94 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1334,13 +1334,13 @@
                                 DockPanel.Dock="Right"
                                 FontSize="13" />
                             <TextBox
+                                Name="pluginStoreFilterTxb"
                                 Width="250"
                                 Height="34"
                                 Margin="0,0,6,0"
                                 HorizontalAlignment="Right"
                                 DockPanel.Dock="Right"
                                 FontSize="14"
-                                Name="pluginStoreFilterTxb"
                                 KeyDown="PluginFilterTxb_OnKeyDown"
                                 LostFocus="RefreshPluginStoreEventHandler"
                                 Text=""
@@ -1446,27 +1446,37 @@
                                                     Grid.RowSpan="2"
                                                     Grid.Column="0"
                                                     Grid.ColumnSpan="2"
+                                                    Margin="0,0,2,0"
                                                     HorizontalAlignment="Right"
                                                     Orientation="Horizontal">
-                                                    <Image
-                                                        Width="32"
-                                                        Height="32"
-                                                        Margin="0,0,8,0"
+                                                    <Border
+                                                        x:Name="LabelNew"
+                                                        Margin="0,10,8,0"
+                                                        Padding="6,2,6,2"
                                                         HorizontalAlignment="Right"
                                                         VerticalAlignment="Top"
-                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                        Source="/Images/new.png"
-                                                        Stretch="Uniform" />
-                                                    <Image
-                                                        Width="28"
-                                                        Height="28"
-                                                        Margin="0,-2,8,0"
+                                                        Background="#f14551"
+                                                        CornerRadius="4"
+                                                        Visibility="Collapsed">
+                                                        <TextBlock
+                                                            FontSize="11"
+                                                            Foreground="White"
+                                                            Text="New" />
+                                                    </Border>
+                                                    <Border
+                                                        x:Name="Labelinstalled"
+                                                        Margin="0,10,8,0"
+                                                        Padding="6,2,6,2"
                                                         HorizontalAlignment="Right"
                                                         VerticalAlignment="Top"
-                                                        RenderOptions.BitmapScalingMode="HighQuality"
-                                                        Source="/Images/installed.png"
-                                                        Stretch="Uniform"
-                                                        Visibility="Visible" />
+                                                        Background="{DynamicResource ToggleSwitchFillOn}"
+                                                        CornerRadius="4"
+                                                        Visibility="Collapsed">
+                                                        <TextBlock
+                                                            FontSize="11"
+                                                            Foreground="White"
+                                                            Text="Installed" />
+                                                    </Border>
                                                 </StackPanel>
 
                                                 <StackPanel

From f3db1f34321aa2a018323ee526e9ad1952122f45 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Tue, 20 Sep 2022 08:37:15 -0500
Subject: [PATCH 13/23] Typo

---
 Flow.Launcher/SettingWindow.xaml    | 2 +-
 Flow.Launcher/SettingWindow.xaml.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 42b3c99de94..9b12c2d088a 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2299,7 +2299,7 @@
                                     <Button
                                         MinWidth="100"
                                         Margin="10,10,0,10"
-                                        Click="OnAddCustomeHotkeyClick"
+                                        Click="OnAddCustomHotkeyClick"
                                         Content="{DynamicResource add}" />
                                 </StackPanel>
                             </Grid>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 8854a53f5c4..ed49862ea69 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -168,7 +168,7 @@ private void OnnEditCustomHotkeyClick(object sender, RoutedEventArgs e)
             }
         }
 
-        private void OnAddCustomeHotkeyClick(object sender, RoutedEventArgs e)
+        private void OnAddCustomHotkeyClick(object sender, RoutedEventArgs e)
         {
             new CustomQueryHotkeySetting(this, settings).ShowDialog();
         }

From 1798e2651de3e50ef635cc41d942429643073880 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Tue, 20 Sep 2022 08:56:56 -0500
Subject: [PATCH 14/23] fix some behavior - enter in plugin list - ctrl+f for
 plugin store

---
 Flow.Launcher/SettingWindow.xaml    |  4 ++--
 Flow.Launcher/SettingWindow.xaml.cs | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 9b12c2d088a..d465c45a5f7 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1282,7 +1282,7 @@
                 </TabItem>
 
                 <!--#region Plugin Store-->
-                <TabItem>
+                <TabItem KeyDown="PluginStore_OnKeyDown">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -1341,7 +1341,7 @@
                                 HorizontalAlignment="Right"
                                 DockPanel.Dock="Right"
                                 FontSize="14"
-                                KeyDown="PluginFilterTxb_OnKeyDown"
+                                KeyDown="PluginStoreFilterTxb_OnKeyDown"
                                 LostFocus="RefreshPluginStoreEventHandler"
                                 Text=""
                                 TextAlignment="Left">
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index ed49862ea69..b92087386f8 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -369,7 +369,8 @@ private bool PluginStoreFilter(object item)
                 return true;
             if (item is UserPlugin model)
             {
-                return StringMatcher.FuzzySearch(pluginStoreFilterTxb.Text, model.Name).IsSearchPrecisionScoreMet();
+                return StringMatcher.FuzzySearch(pluginStoreFilterTxb.Text, model.Name).IsSearchPrecisionScoreMet()
+                    || StringMatcher.FuzzySearch(pluginStoreFilterTxb.Text, model.Description).IsSearchPrecisionScoreMet();
             }
             return false;
         }
@@ -397,13 +398,13 @@ private void RefreshPluginStoreEventHandler(object sender, RoutedEventArgs e)
         private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
-                RefreshPluginStoreEventHandler(sender, e);
+                RefreshPluginListEventHandler(sender, e);
         }
 
         private void PluginStoreFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
-                RefreshPluginListEventHandler(sender, e);
+                RefreshPluginStoreEventHandler(sender, e);
         }
         private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
         {
@@ -420,5 +421,12 @@ private void SelectedPluginChanged(object sender, SelectionChangedEventArgs e)
         {
 
         }
+        private void PluginStore_OnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.F && (Keyboard.Modifiers & ModifierKeys.Control) != 0)
+            {
+                pluginStoreFilterTxb.Focus();
+            }
+        }
     }
 }

From 9f3d2e1038bb55ecc4796cd25cc9416b789b0e02 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 29 Sep 2022 15:17:45 +0900
Subject: [PATCH 15/23] - Add 'No Result' message when no result - Adjust
 Control Position

---
 Flow.Launcher/Languages/en.xaml  |  3 ++
 Flow.Launcher/SettingWindow.xaml | 93 ++++++++++++++++++++++++--------
 2 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 634f00bf10e..03ccdf95f37 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -60,6 +60,9 @@
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
+    <system:String x:Key="searchplugin_Noresult_Title">No results to display</system:String>
+    <system:String x:Key="searchplugin_Noresult_Subtitle">Try another search term.</system:String>
+    <system:String x:Key="searchplugin_Noresult_Subtitle_Network">Please check your network connection or try another search term.</system:String>
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="enable">On</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index d465c45a5f7..e66e351e4b5 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -386,6 +386,55 @@
             <!--#endregion-->
         </Style>
 
+        <Style
+            x:Key="PluginListStyle"
+            BasedOn="{StaticResource {x:Type ListBox}}"
+            TargetType="ListBox">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=Items.Count}" Value="0">
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Grid>
+                                    <StackPanel>
+                                        <TextBlock
+                                            Margin="0,20,0,4"
+                                            FontWeight="Bold"
+                                            Text="{DynamicResource searchplugin_Noresult_Title}" />
+                                        <TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle}" />
+                                    </StackPanel>
+                                </Grid>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+
+        <Style
+            x:Key="StoreListStyle"
+            BasedOn="{StaticResource {x:Type ListBox}}"
+            TargetType="ListBox">
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=Items.Count}" Value="0">
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Grid>
+                                    <StackPanel>
+                                        <TextBlock
+                                            Margin="0,20,0,4"
+                                            FontWeight="Bold"
+                                            Text="{DynamicResource searchplugin_Noresult_Title}" />
+                                        <TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle_Network}" />
+                                    </StackPanel>
+                                </Grid>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
         <!--  For Tab Header responsive Width  -->
         <Style TargetType="{x:Type TabControl}">
             <Setter Property="FontSize" Value="14" />
@@ -914,7 +963,7 @@
                                 <DockPanel DockPanel.Dock="Right">
                                     <TextBox
                                         Name="pluginFilterTxb"
-                                        Width="250"
+                                        Width="150"
                                         Height="34"
                                         Margin="0,5,26,0"
                                         HorizontalAlignment="Right"
@@ -975,7 +1024,8 @@
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 SelectedItem="{Binding SelectedPlugin}"
                                 SelectionChanged="SelectedPluginChanged"
-                                SnapsToDevicePixels="True">
+                                SnapsToDevicePixels="True"
+                                Style="{DynamicResource PluginListStyle}">
                                 <ListBox.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <StackPanel Margin="0,0,0,18" />
@@ -1322,22 +1372,12 @@
                         <DockPanel
                             Grid.Row="0"
                             Grid.Column="1"
-                            Margin="5,18,0,0">
-                            <Button
-                                Height="34"
-                                Margin="0,5,16,5"
-                                Padding="12,4,12,4"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Click="OnPluginStoreRefreshClick"
-                                Content="{DynamicResource refresh}"
-                                DockPanel.Dock="Right"
-                                FontSize="13" />
+                            Margin="5,24,0,0">
                             <TextBox
                                 Name="pluginStoreFilterTxb"
-                                Width="250"
+                                Width="150"
                                 Height="34"
-                                Margin="0,0,6,0"
+                                Margin="0,0,26,0"
                                 HorizontalAlignment="Right"
                                 DockPanel.Dock="Right"
                                 FontSize="14"
@@ -1375,7 +1415,16 @@
                                     </Style>
                                 </TextBox.Style>
                             </TextBox>
-
+                            <Button
+                                Height="34"
+                                Margin="0,5,10,5"
+                                Padding="12,4,12,4"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Click="OnPluginStoreRefreshClick"
+                                Content="{DynamicResource refresh}"
+                                DockPanel.Dock="Right"
+                                FontSize="13" />
                         </DockPanel>
                         <Border
                             Grid.Row="1"
@@ -1385,7 +1434,7 @@
                             <ListBox
                                 x:Name="StoreListBox"
                                 Width="Auto"
-                                Margin="6,0,0,0"
+                                Margin="5,1,0,0"
                                 Padding="0,0,0,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
@@ -1393,11 +1442,12 @@
                                 ItemContainerStyle="{StaticResource StoreList}"
                                 ItemsSource="{Binding ExternalPlugins}"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                SelectionMode="Single">
+                                SelectionMode="Single"
+                                Style="{DynamicResource StoreListStyle}">
                                 <ListBox.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <UniformGrid
-                                            Margin="0,0,6,18"
+                                            Margin="0,0,17,18"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Top"
                                             Columns="3"
@@ -1576,7 +1626,7 @@
                                                             VerticalAlignment="Top">
                                                             <StackPanel Orientation="Vertical">
                                                                 <TextBlock
-                                                                    Margin="20,20,0,0"
+                                                                    Margin="20,20,20,0"
                                                                     Padding="0,0,0,0"
                                                                     FontWeight="Bold"
                                                                     Foreground="{DynamicResource Color05B}"
@@ -1584,7 +1634,7 @@
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Name}" />
                                                                 <TextBlock
-                                                                    Margin="20,4,0,0"
+                                                                    Margin="20,4,20,0"
                                                                     Padding="0,0,20,0"
                                                                     Foreground="{DynamicResource Color05B}"
                                                                     Text="{Binding Version}"
@@ -1625,7 +1675,6 @@
                                 </ListBox.ItemTemplate>
                             </ListBox>
                         </Border>
-
                     </Grid>
                 </TabItem>
                 <!--#endregion-->

From 798fd903966a2e4724d96746bb224ddf13a96dc8 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 29 Sep 2022 15:25:21 +0900
Subject: [PATCH 16/23] Add Tooltip for searchboxes

---
 Flow.Launcher/Languages/en.xaml  |  1 +
 Flow.Launcher/SettingWindow.xaml | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 03ccdf95f37..b2018254c6f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -60,6 +60,7 @@
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
+    <system:String x:Key="searchpluginToolTip">Ctrl+F to Search Plugins</system:String>
     <system:String x:Key="searchplugin_Noresult_Title">No results to display</system:String>
     <system:String x:Key="searchplugin_Noresult_Subtitle">Try another search term.</system:String>
     <system:String x:Key="searchplugin_Noresult_Subtitle_Network">Please check your network connection or try another search term.</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e66e351e4b5..e6796234634 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -972,7 +972,10 @@
                                         KeyDown="PluginFilterTxb_OnKeyDown"
                                         LostFocus="RefreshPluginListEventHandler"
                                         Text=""
-                                        TextAlignment="Left">
+                                        TextAlignment="Left"
+                                        ToolTip="{DynamicResource searchpluginToolTip}"
+                                        ToolTipService.InitialShowDelay="200"
+                                        ToolTipService.Placement="Top">
                                         <TextBox.Style>
                                             <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
                                                 <Style.Resources>
@@ -1384,7 +1387,10 @@
                                 KeyDown="PluginStoreFilterTxb_OnKeyDown"
                                 LostFocus="RefreshPluginStoreEventHandler"
                                 Text=""
-                                TextAlignment="Left">
+                                TextAlignment="Left"
+                                ToolTip="{DynamicResource searchpluginToolTip}"
+                                ToolTipService.InitialShowDelay="200"
+                                ToolTipService.Placement="Top">
                                 <TextBox.Style>
                                     <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
                                         <Style.Resources>

From f8cef1d928648577624bd7ebfae7b5232cc5a6ec Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 29 Sep 2022 15:27:38 +0900
Subject: [PATCH 17/23] Adjust noresult message position

---
 Flow.Launcher/SettingWindow.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e6796234634..7fc58377775 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -395,7 +395,7 @@
                     <Setter Property="Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Grid>
+                                <Grid Margin="20,0,0,0">
                                     <StackPanel>
                                         <TextBlock
                                             Margin="0,20,0,4"
@@ -420,7 +420,7 @@
                     <Setter Property="Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Grid>
+                                <Grid Margin="20,0,0,0">
                                     <StackPanel>
                                         <TextBlock
                                             Margin="0,20,0,4"

From 7c3e0e25c4bc09174510780cffd5759cef5dabcf Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Tue, 11 Oct 2022 13:37:58 +1100
Subject: [PATCH 18/23] formatting

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

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index e681d78ab23..44c5933245b 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -383,6 +383,7 @@ private bool PluginListFilter(object item)
             }
             return false;
         }
+
         private bool PluginStoreFilter(object item)
         {
             if (string.IsNullOrEmpty(pluginStoreFilterTxb.Text))

From 559920360e716a3a35c3e43c3e455af187b46eb1 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Tue, 11 Oct 2022 13:46:13 +1100
Subject: [PATCH 19/23] formatting

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

diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 44c5933245b..c253a1d0cdc 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -427,6 +427,7 @@ private void PluginStoreFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
             if (e.Key == Key.Enter)
                 RefreshPluginStoreEventHandler(sender, e);
         }
+
         private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
         {
             if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control && e.Key == Key.F)

From 3317bab0291cbb55e6dbd08fdbb8afd8957ff6c3 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 11 Oct 2022 12:10:30 +0900
Subject: [PATCH 20/23] Remove No Network Message in Noresult

---
 Flow.Launcher.sln                | 1 +
 Flow.Launcher/Languages/en.xaml  | 5 ++---
 Flow.Launcher/SettingWindow.xaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index 0d9eea06c64..f59d3d26fb7 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -213,6 +213,7 @@ Global
 		{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.ActiveCfg = Release|Any CPU
 		{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.Build.0 = Release|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 8d5d041460b..752adb53afd 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -62,9 +62,8 @@
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
     <system:String x:Key="searchpluginToolTip">Ctrl+F to Search Plugins</system:String>
-    <system:String x:Key="searchplugin_Noresult_Title">No results to display</system:String>
-    <system:String x:Key="searchplugin_Noresult_Subtitle">Try another search term.</system:String>
-    <system:String x:Key="searchplugin_Noresult_Subtitle_Network">Please check your network connection or try another search term.</system:String>
+    <system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
+    <system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="enable">On</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index f300203ac86..a8997886e9e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -428,7 +428,7 @@
                                             Margin="0,20,0,4"
                                             FontWeight="Bold"
                                             Text="{DynamicResource searchplugin_Noresult_Title}" />
-                                        <TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle_Network}" />
+                                        <TextBlock Text="{DynamicResource searchplugin_Noresult}" />
                                     </StackPanel>
                                 </Grid>
                             </ControlTemplate>

From 682f5029a9c51a0020bb553e204fc67191f1d28a Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 11 Oct 2022 12:13:03 +0900
Subject: [PATCH 21/23] Remove Useless Size Value

---
 Flow.Launcher/SettingWindow.xaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index a8997886e9e..7f88aeec4c0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -323,8 +323,6 @@
             <Setter Property="Padding" Value="0,0,0,0" />
             <Setter Property="Margin" Value="0,0,8,5" />
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
-            <Setter Property="MinWidth" Value="100" />
-            <Setter Property="Height" Value="Auto" />
             <!--#region Template for blue highlight win10-->
             <Setter Property="Template">
                 <Setter.Value>

From 7b1fb22a5bf81b44c0ada3008d3ffa3b479080ba Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Tue, 11 Oct 2022 20:36:11 +1100
Subject: [PATCH 22/23] formatting

---
 Flow.Launcher/Languages/en.xaml            |  2 +-
 Flow.Launcher/SettingWindow.xaml.cs        | 12 ++----------
 Flow.Launcher/ViewModel/PluginViewModel.cs | 10 ++++++++--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 752adb53afd..2019c1b6629 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -61,7 +61,7 @@
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
-    <system:String x:Key="searchpluginToolTip">Ctrl+F to Search Plugins</system:String>
+    <system:String x:Key="searchpluginToolTip">Ctrl+F to search plugins</system:String>
     <system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
     <system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
     <system:String x:Key="plugin">Plugin</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index c253a1d0cdc..51017b96bd7 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -65,6 +65,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
             pluginStoreView = (CollectionView)CollectionViewSource.GetDefaultView(StoreListBox.ItemsSource); 
             pluginStoreView.Filter = PluginStoreFilter;
+
             InitializePosition();
         }
 
@@ -246,7 +247,6 @@ private void OnCheckUpdates(object sender, RoutedEventArgs e)
             viewModel.UpdateApp(); // TODO: change to command
         }
 
-
         private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         {
             API.OpenUrl(e.Uri.AbsoluteUri);
@@ -416,6 +416,7 @@ private void RefreshPluginStoreEventHandler(object sender, RoutedEventArgs e)
                 pluginStoreView.Refresh();
             }
         }
+
         private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
@@ -434,15 +435,6 @@ private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
                 pluginFilterTxb.Focus();
         }
 
-        private void ItemSizeChanged(object sender, SizeChangedEventArgs e)
-        {
-
-        }
-
-        private void SelectedPluginChanged(object sender, SelectionChangedEventArgs e)
-        {
-
-        }
         private void PluginStore_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.F && (Keyboard.Modifiers & ModifierKeys.Control) != 0)
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index 38f2421a137..2294681b4dc 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -1,4 +1,4 @@
-using System.Windows;
+using System.Windows;
 using System.Windows.Media;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Infrastructure.Image;
@@ -43,7 +43,13 @@ public bool IsExpanded
 
         private Control _settingControl;
         private bool _isExpanded;
-        public Control SettingControl => IsExpanded ? _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel() : null;
+        public Control SettingControl 
+            => IsExpanded
+                ? _settingControl
+                    ??= PluginPair.Plugin is not ISettingProvider settingProvider
+                        ? new Control() 
+                        : settingProvider.CreateSettingPanel() 
+                : null;
 
         public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
         public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";

From db71ffd691a1ecf91a0abd8cbfa202fd7f49aeab Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Tue, 11 Oct 2022 20:48:54 +1100
Subject: [PATCH 23/23] remove obsolete calls

---
 Flow.Launcher/SettingWindow.xaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 7f88aeec4c0..0a63b3a6cfb 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1030,7 +1030,6 @@
                                 ScrollViewer.CanContentScroll="False"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 SelectedItem="{Binding SelectedPlugin}"
-                                SelectionChanged="SelectedPluginChanged"
                                 SnapsToDevicePixels="True"
                                 Style="{DynamicResource PluginListStyle}">
                                 <ListBox.ItemsPanel>
@@ -1220,8 +1219,7 @@
                                                             Margin="0"
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"
-                                                            Content="{Binding SettingControl}"
-                                                            SizeChanged="ItemSizeChanged" />
+                                                            Content="{Binding SettingControl}" />
                                                     </StackPanel>
 
                                                     <StackPanel>