From b232100052024cff9aff53aa15f7b2447f1f3cef Mon Sep 17 00:00:00 2001
From: Yusyuriv <Yusyuriv@users.noreply.github.com>
Date: Mon, 27 May 2024 14:15:43 +0600
Subject: [PATCH 1/2] Fix startup error message when not able to register
 hotkey being English-only

---
 Flow.Launcher/App.xaml.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 9fa5af7e3..765a1a559 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -81,7 +81,7 @@ namespace Flow.Launcher
 
                 await PluginManager.InitializePluginsAsync(API);
                 await imageLoadertask;
-                
+
                 var window = new MainWindow(_settings, _mainVM);
 
                 Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
@@ -89,12 +89,13 @@ namespace Flow.Launcher
                 Current.MainWindow = window;
                 Current.MainWindow.Title = Constant.FlowLauncher;
 
-                HotKeyMapper.Initialize(_mainVM);
-
                 // todo temp fix for instance code logic
                 // load plugin before change language, because plugin language also needs be changed
                 InternationalizationManager.Instance.Settings = _settings;
                 InternationalizationManager.Instance.ChangeLanguage(_settings.Language);
+
+                HotKeyMapper.Initialize(_mainVM);
+
                 // main windows needs initialized before theme change because of blur settings
                 ThemeManager.Instance.Settings = _settings;
                 ThemeManager.Instance.ChangeTheme(_settings.Theme);

From bb5173ab013741b604563cc7908c95234d9e3b47 Mon Sep 17 00:00:00 2001
From: Yusyuriv <Yusyuriv@users.noreply.github.com>
Date: Wed, 29 May 2024 12:17:39 +0600
Subject: [PATCH 2/2] Improve plugins pane performance in settings

---
 .../Controls/InstalledPluginDisplay.xaml      | 107 +-----------------
 .../InstalledPluginDisplayBottomData.xaml     |  81 +++++++++++++
 .../InstalledPluginDisplayBottomData.xaml.cs  |  11 ++
 .../InstalledPluginDisplayKeyword.xaml        |  47 ++++++++
 .../InstalledPluginDisplayKeyword.xaml.cs     |  11 ++
 Flow.Launcher/ViewModel/PluginViewModel.cs    |   7 ++
 6 files changed, 159 insertions(+), 105 deletions(-)
 create mode 100644 Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml
 create mode 100644 Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml.cs
 create mode 100644 Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
 create mode 100644 Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml.cs

diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
index c2ed4975b..ed3c29690 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
@@ -93,42 +93,7 @@
         </Expander.Header>
 
         <StackPanel>
-            <Border
-                Width="Auto"
-                Height="52"
-                Margin="0"
-                Padding="0"
-                BorderThickness="0 1 0 0"
-                CornerRadius="0"
-                Style="{DynamicResource SettingGroupBox}"
-                Visibility="{Binding ActionKeywordsVisibility}">
-                <DockPanel Margin="22 0 18 0" VerticalAlignment="Center">
-                    <TextBlock
-                        Margin="48 0 10 0"
-                        DockPanel.Dock="Left"
-                        Style="{StaticResource Glyph}">
-                        &#xe819;
-                    </TextBlock>
-                    <TextBlock
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Left"
-                        Style="{DynamicResource SettingTitleLabel}"
-                        Text="{DynamicResource actionKeywords}" />
-                    <Button
-                        Width="100"
-                        Height="34"
-                        Margin="5 0 0 0"
-                        HorizontalAlignment="Right"
-                        Command="{Binding SetActionKeywordsCommand}"
-                        Content="{Binding ActionKeywordsText}"
-                        Cursor="Hand"
-                        DockPanel.Dock="Right"
-                        FontWeight="Bold"
-                        ToolTip="{DynamicResource actionKeywordsTooltip}"
-                        Visibility="{Binding ActionKeywordsVisibility}" />
-                </DockPanel>
-            </Border>
+            <ContentControl Content="{Binding BottomPart1}" />
 
             <Border
                 BorderThickness="0 1 0 0"
@@ -150,75 +115,7 @@
                     Content="{Binding SettingControl}" />
             </Border>
 
-            <Border
-                Margin="0"
-                Padding="15 10"
-                VerticalAlignment="Center"
-                BorderThickness="0 1 0 0"
-                CornerRadius="0 0 5 5"
-                Style="{DynamicResource SettingGroupBox}">
-                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                    <TextBlock
-                        Margin="10 0 0 0"
-                        VerticalAlignment="center"
-                        FontSize="11"
-                        Foreground="{DynamicResource PluginInfoColor}"
-                        Text="{DynamicResource author}" />
-                    <TextBlock
-                        Margin="5 0 0 0"
-                        VerticalAlignment="center"
-                        FontSize="11"
-                        Foreground="{DynamicResource PluginInfoColor}"
-                        Text="{Binding PluginPair.Metadata.Author}" />
-                    <TextBlock
-                        Margin="10 0 0 0"
-                        VerticalAlignment="Center"
-                        FontSize="11"
-                        Foreground="{DynamicResource PluginInfoColor}"
-                        Text="|" />
-                    <TextBlock
-                        Margin="10 0 5 0"
-                        VerticalAlignment="Center"
-                        FontSize="11"
-                        Foreground="{DynamicResource PluginInfoColor}"
-                        Text="{Binding Version}"
-                        ToolTip="{Binding InitAndQueryTime}"
-                        ToolTipService.InitialShowDelay="500" />
-                    <TextBlock
-                        Margin="5 0"
-                        VerticalAlignment="Center"
-                        FontSize="11"
-                        Foreground="{DynamicResource PluginInfoColor}"
-                        Text="|" />
-                    <TextBlock
-                        Margin="5 0 0 0"
-                        Style="{DynamicResource LinkBtnStyle}"
-                        Text="&#xe80f;"
-                        ToolTip="{DynamicResource plugin_query_web}">
-                        <TextBlock.InputBindings>
-                            <MouseBinding Command="{Binding OpenSourceCodeLinkCommand}" MouseAction="LeftClick" />
-                        </TextBlock.InputBindings>
-                    </TextBlock>
-                    <TextBlock
-                        Margin="10 0 0 0"
-                        Style="{DynamicResource LinkBtnStyle}"
-                        Text="&#xe74d;"
-                        ToolTip="{DynamicResource plugin_uninstall}">
-                        <TextBlock.InputBindings>
-                            <MouseBinding Command="{Binding OpenDeletePluginWindowCommand}" MouseAction="LeftClick" />
-                        </TextBlock.InputBindings>
-                    </TextBlock>
-                    <TextBlock
-                        Margin="10 0 5 0"
-                        Style="{DynamicResource LinkBtnStyle}"
-                        Text="&#xe8b7;"
-                        ToolTip="{DynamicResource pluginDirectory}">
-                        <TextBlock.InputBindings>
-                            <MouseBinding Command="{Binding OpenPluginDirectoryCommand}" MouseAction="LeftClick" />
-                        </TextBlock.InputBindings>
-                    </TextBlock>
-                </StackPanel>
-            </Border>
+            <ContentControl Content="{Binding BottomPart2}" />
         </StackPanel>
     </Expander>
 </UserControl>
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml
new file mode 100644
index 000000000..83a771728
--- /dev/null
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml
@@ -0,0 +1,81 @@
+<UserControl
+    x:Class="Flow.Launcher.Resources.Controls.InstalledPluginDisplayBottomData"
+    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"
+    xmlns:viewModel="clr-namespace:Flow.Launcher.ViewModel"
+    d:DataContext="{d:DesignInstance viewModel:PluginViewModel}"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    mc:Ignorable="d">
+    <Border
+        Margin="0"
+        Padding="15 10"
+        VerticalAlignment="Center"
+        BorderThickness="0 1 0 0"
+        CornerRadius="0 0 5 5"
+        Style="{DynamicResource SettingGroupBox}">
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <TextBlock
+                Margin="10 0 0 0"
+                VerticalAlignment="center"
+                FontSize="11"
+                Foreground="{DynamicResource PluginInfoColor}"
+                Text="{DynamicResource author}" />
+            <TextBlock
+                Margin="5 0 0 0"
+                VerticalAlignment="center"
+                FontSize="11"
+                Foreground="{DynamicResource PluginInfoColor}"
+                Text="{Binding PluginPair.Metadata.Author}" />
+            <TextBlock
+                Margin="10 0 0 0"
+                VerticalAlignment="Center"
+                FontSize="11"
+                Foreground="{DynamicResource PluginInfoColor}"
+                Text="|" />
+            <TextBlock
+                Margin="10 0 5 0"
+                VerticalAlignment="Center"
+                FontSize="11"
+                Foreground="{DynamicResource PluginInfoColor}"
+                Text="{Binding Version}"
+                ToolTip="{Binding InitAndQueryTime}"
+                ToolTipService.InitialShowDelay="500" />
+            <TextBlock
+                Margin="5 0"
+                VerticalAlignment="Center"
+                FontSize="11"
+                Foreground="{DynamicResource PluginInfoColor}"
+                Text="|" />
+            <TextBlock
+                Margin="5 0 0 0"
+                Style="{DynamicResource LinkBtnStyle}"
+                Text="&#xe80f;"
+                ToolTip="{DynamicResource plugin_query_web}">
+                <TextBlock.InputBindings>
+                    <MouseBinding Command="{Binding OpenSourceCodeLinkCommand}" MouseAction="LeftClick" />
+                </TextBlock.InputBindings>
+            </TextBlock>
+            <TextBlock
+                Margin="10 0 0 0"
+                Style="{DynamicResource LinkBtnStyle}"
+                Text="&#xe74d;"
+                ToolTip="{DynamicResource plugin_uninstall}">
+                <TextBlock.InputBindings>
+                    <MouseBinding Command="{Binding OpenDeletePluginWindowCommand}" MouseAction="LeftClick" />
+                </TextBlock.InputBindings>
+            </TextBlock>
+            <TextBlock
+                Margin="10 0 5 0"
+                Style="{DynamicResource LinkBtnStyle}"
+                Text="&#xe8b7;"
+                ToolTip="{DynamicResource pluginDirectory}">
+                <TextBlock.InputBindings>
+                    <MouseBinding Command="{Binding OpenPluginDirectoryCommand}" MouseAction="LeftClick" />
+                </TextBlock.InputBindings>
+            </TextBlock>
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml.cs b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml.cs
new file mode 100644
index 000000000..f8d0afe61
--- /dev/null
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayBottomData.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Flow.Launcher.Resources.Controls;
+
+public partial class InstalledPluginDisplayBottomData : UserControl
+{
+    public InstalledPluginDisplayBottomData()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
new file mode 100644
index 000000000..ff2f14c4b
--- /dev/null
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -0,0 +1,47 @@
+<UserControl
+    x:Class="Flow.Launcher.Resources.Controls.InstalledPluginDisplayKeyword"
+    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"
+    xmlns:viewModel="clr-namespace:Flow.Launcher.ViewModel"
+    d:DataContext="{d:DesignInstance viewModel:PluginViewModel}"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    mc:Ignorable="d">
+    <Border
+        Width="Auto"
+        Height="52"
+        Margin="0"
+        Padding="0"
+        BorderThickness="0 1 0 0"
+        CornerRadius="0"
+        Style="{DynamicResource SettingGroupBox}"
+        Visibility="{Binding ActionKeywordsVisibility}">
+        <DockPanel Margin="22 0 18 0" VerticalAlignment="Center">
+            <TextBlock
+                Margin="48 0 10 0"
+                DockPanel.Dock="Left"
+                Style="{StaticResource Glyph}">
+                &#xe819;
+            </TextBlock>
+            <TextBlock
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                DockPanel.Dock="Left"
+                Style="{DynamicResource SettingTitleLabel}"
+                Text="{DynamicResource actionKeywords}" />
+            <Button
+                Width="100"
+                Height="34"
+                Margin="5 0 0 0"
+                HorizontalAlignment="Right"
+                Command="{Binding SetActionKeywordsCommand}"
+                Content="{Binding ActionKeywordsText}"
+                Cursor="Hand"
+                DockPanel.Dock="Right"
+                FontWeight="Bold"
+                ToolTip="{DynamicResource actionKeywordsTooltip}" />
+        </DockPanel>
+    </Border>
+</UserControl>
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml.cs b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml.cs
new file mode 100644
index 000000000..36b15efe0
--- /dev/null
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Flow.Launcher.Resources.Controls;
+
+public partial class InstalledPluginDisplayKeyword : UserControl
+{
+    public InstalledPluginDisplayKeyword()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index b4daa8c7a..4ce8bd470 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -7,6 +7,7 @@ using Flow.Launcher.Core.Plugin;
 using System.Windows.Controls;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Resources.Controls;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -83,6 +84,12 @@ namespace Flow.Launcher.ViewModel
         private Control _settingControl;
         private bool _isExpanded;
 
+        private Control _bottomPart1;
+        public Control BottomPart1 => IsExpanded ? _bottomPart1 ??= new InstalledPluginDisplayKeyword() : null;
+
+        private Control _bottomPart2;
+        public Control BottomPart2 => IsExpanded ? _bottomPart2 ??= new InstalledPluginDisplayBottomData() : null;
+
         public bool HasSettingControl => PluginPair.Plugin is ISettingProvider;
         public Control SettingControl
             => IsExpanded