From 9880c362fd7196b2fc7792f82b533fc80a945eed Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 19 Feb 2025 23:31:26 +0800
Subject: [PATCH 01/47] Remove useless settings control & project reference

---
 .../Flow.Launcher.Plugin.Url.csproj            |  1 -
 Plugins/Flow.Launcher.Plugin.Url/Main.cs       | 10 +---------
 .../SettingsControl.xaml                       | 17 -----------------
 .../SettingsControl.xaml.cs                    | 18 ------------------
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
 delete mode 100644 Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs

diff --git a/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj b/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
index 3db0cd0cb61..6d338733e31 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
@@ -42,7 +42,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Url/Main.cs b/Plugins/Flow.Launcher.Plugin.Url/Main.cs
index 80425a8ff94..03516636d43 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Url/Main.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Windows.Controls;
 
 namespace Flow.Launcher.Plugin.Url
 {
-    public class Main : ISettingProvider,IPlugin, IPluginI18n
+    public class Main : IPlugin, IPluginI18n
     {
         //based on https://gist.github.com/dperini/729294
         private const string urlPattern = "^" +
@@ -43,7 +42,6 @@ public class Main : ISettingProvider,IPlugin, IPluginI18n
         Regex reg = new Regex(urlPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private PluginInitContext context;
         private Settings _settings;
-
         
         public List<Result> Query(Query query)
         {
@@ -82,12 +80,6 @@ public List<Result> Query(Query query)
             return new List<Result>(0);
         }
 
-
-        public Control CreateSettingPanel()
-        {
-            return new SettingsControl(context.API,_settings);
-        }
-
         public bool IsURL(string raw)
         {
             raw = raw.ToLower();
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
deleted file mode 100644
index 8ff7b5ab53b..00000000000
--- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<UserControl
-    x:Class="Flow.Launcher.Plugin.Url.SettingsControl"
-    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"
-    Height="0"
-    d:DesignHeight="300"
-    d:DesignWidth="500"
-    mc:Ignorable="d">
-    <Grid Margin="40,40,10,0">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-    </Grid>
-</UserControl>
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs
deleted file mode 100644
index f68d1bb2db0..00000000000
--- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Windows.Controls;
-
-namespace Flow.Launcher.Plugin.Url
-{
-    public partial class SettingsControl : UserControl
-    {
-        private Settings _settings;
-        private IPublicAPI _flowlauncherAPI;
-
-        public SettingsControl(IPublicAPI flowlauncherAPI,Settings settings)
-        {
-            InitializeComponent();
-            _settings = settings;
-            _flowlauncherAPI = flowlauncherAPI;
-
-        }
-    }
-}

From 6e84326f57c45cc44e6ab6a756244d277c9ef884 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 19 Feb 2025 23:43:17 +0800
Subject: [PATCH 02/47] Reassign margins

---
 .../Resources/Controls/InstalledPluginDisplayKeyword.xaml    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
index ff2f14c4b2d..a88b1a7316f 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -18,9 +18,9 @@
         CornerRadius="0"
         Style="{DynamicResource SettingGroupBox}"
         Visibility="{Binding ActionKeywordsVisibility}">
-        <DockPanel Margin="22 0 18 0" VerticalAlignment="Center">
+        <DockPanel Margin="60 0 18 0" VerticalAlignment="Center">
             <TextBlock
-                Margin="48 0 10 0"
+                Margin="10 0 10 0"
                 DockPanel.Dock="Left"
                 Style="{StaticResource Glyph}">
                 &#xe819;
@@ -34,7 +34,6 @@
             <Button
                 Width="100"
                 Height="34"
-                Margin="5 0 0 0"
                 HorizontalAlignment="Right"
                 Command="{Binding SetActionKeywordsCommand}"
                 Content="{Binding ActionKeywordsText}"

From cc2ba996299bff92cc685844ff9be8df9e1488e9 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 17:51:30 +0800
Subject: [PATCH 03/47] Improve action keyword panel

---
 .../Controls/InstalledPluginDisplayKeyword.xaml        | 10 ++++++----
 Flow.Launcher/Resources/CustomControlTemplate.xaml     |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
index a88b1a7316f..6877253c47e 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -11,21 +11,24 @@
     mc:Ignorable="d">
     <Border
         Width="Auto"
-        Height="52"
+        Height="Auto"
         Margin="0"
         Padding="0"
         BorderThickness="0 1 0 0"
         CornerRadius="0"
         Style="{DynamicResource SettingGroupBox}"
         Visibility="{Binding ActionKeywordsVisibility}">
-        <DockPanel Margin="60 0 18 0" VerticalAlignment="Center">
+        <DockPanel Margin="{StaticResource SettingPanelMargin}">
             <TextBlock
-                Margin="10 0 10 0"
+                Margin="{StaticResource SettingPanelItemRightMargin}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
                 DockPanel.Dock="Left"
                 Style="{StaticResource Glyph}">
                 &#xe819;
             </TextBlock>
             <TextBlock
+                Margin="{StaticResource SettingPanelItemRightMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 DockPanel.Dock="Left"
@@ -33,7 +36,6 @@
                 Text="{DynamicResource actionKeywords}" />
             <Button
                 Width="100"
-                Height="34"
                 HorizontalAlignment="Right"
                 Command="{Binding SetActionKeywordsCommand}"
                 Content="{Binding ActionKeywordsText}"
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 3d599aaedb3..69a8a0acc66 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5585,4 +5585,9 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!--  Settings Panel  -->
+    <Thickness x:Key="SettingPanelMargin">70,9,18,9</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftMargin">9,0,0,0</Thickness>
+    <Thickness x:Key="SettingPanelItemRightMargin">0,0,9,0</Thickness>
 </ResourceDictionary>

From 51e62d2ad528b25c8046197b471b2d673492584d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 21:21:52 +0800
Subject: [PATCH 04/47] Improve action keyword panel

---
 .../Resources/Controls/InstalledPluginDisplayKeyword.xaml  | 5 +++--
 Flow.Launcher/Resources/CustomControlTemplate.xaml         | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
index 6877253c47e..3944f6b75e0 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -20,7 +20,7 @@
         Visibility="{Binding ActionKeywordsVisibility}">
         <DockPanel Margin="{StaticResource SettingPanelMargin}">
             <TextBlock
-                Margin="{StaticResource SettingPanelItemRightMargin}"
+                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 DockPanel.Dock="Left"
@@ -28,7 +28,7 @@
                 &#xe819;
             </TextBlock>
             <TextBlock
-                Margin="{StaticResource SettingPanelItemRightMargin}"
+                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 DockPanel.Dock="Left"
@@ -36,6 +36,7 @@
                 Text="{DynamicResource actionKeywords}" />
             <Button
                 Width="100"
+                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                 HorizontalAlignment="Right"
                 Command="{Binding SetActionKeywordsCommand}"
                 Content="{Binding ActionKeywordsText}"
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 69a8a0acc66..69c535d3c7f 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5587,7 +5587,8 @@
     </Style>
 
     <!--  Settings Panel  -->
-    <Thickness x:Key="SettingPanelMargin">70,9,18,9</Thickness>
-    <Thickness x:Key="SettingPanelItemLeftMargin">9,0,0,0</Thickness>
-    <Thickness x:Key="SettingPanelItemRightMargin">0,0,9,0</Thickness>
+    <Thickness x:Key="SettingPanelMargin">70,0,18,0</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,9,0,9</Thickness>
+    <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,9,9,9</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftRightTopBottomMargin">9,9,9,9</Thickness>
 </ResourceDictionary>

From 8fa34917aab8ed9b1c46c96436c8fbb1d5efb111 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 21:22:17 +0800
Subject: [PATCH 05/47] Redesgin settings panel for calculator plugin

---
 .../Views/CalculatorSettings.xaml                    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index d6237c6daf6..ceee3897c18 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -17,7 +17,7 @@
         <core:LocalizationConverter x:Key="LocalizationConverter" />
     </UserControl.Resources>
 
-    <Grid Margin="70,14,0,14">
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
@@ -30,7 +30,7 @@
         <TextBlock
             Grid.Row="0"
             Grid.Column="0"
-            Margin="0,0,10,0"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             VerticalAlignment="Center"
             FontSize="14"
             Text="{DynamicResource flowlauncher_plugin_calculator_output_decimal_seperator}" />
@@ -39,8 +39,9 @@
             Grid.Row="0"
             Grid.Column="1"
             MaxWidth="300"
-            Margin="10,5,0,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
+            VerticalAlignment="Center"
             ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type calculator:DecimalSeparator}}}"
             SelectedItem="{Binding Settings.DecimalSeparator}">
             <ComboBox.ItemTemplate>
@@ -53,7 +54,7 @@
         <TextBlock
             Grid.Row="1"
             Grid.Column="0"
-            Margin="0,0,10,0"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             VerticalAlignment="Center"
             FontSize="14"
             Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" />
@@ -61,8 +62,9 @@
             x:Name="MaxDecimalPlaces"
             Grid.Row="1"
             Grid.Column="1"
-            Margin="10,5,0,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
+            VerticalAlignment="Center"
             ItemsSource="{Binding MaxDecimalPlacesRange}"
             SelectedItem="{Binding Settings.MaxDecimalPlaces}" />
 

From 64f02c3fd7ee40f673c36aabee44f67a7311899b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 18:22:56 +0800
Subject: [PATCH 06/47] Redesign settings panel for sys plugin & Improve design
 styles

---
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs       | 2 ++
 .../Controls/InstalledPluginDisplayKeyword.xaml          | 6 +++---
 Flow.Launcher/Resources/CustomControlTemplate.xaml       | 9 +++++++--
 .../Views/CalculatorSettings.xaml                        | 4 ++--
 Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml        | 4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 2a4b22bf395..b1888e574fc 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -30,6 +30,8 @@ public class JsonRPCPluginSettings
         private JsonStorage<ConcurrentDictionary<string, object>> _storage;
 
         // maybe move to resource?
+        private static Thickness settingPanelMargin1 = (Thickness)System.Windows.Application.Current.FindResource("SettingPanelMargin");
+        
         private static readonly Thickness settingControlMargin = new(0, 9, 18, 9);
         private static readonly Thickness settingCheckboxMargin = new(0, 9, 9, 9);
         private static readonly Thickness settingPanelMargin = new(0, 0, 0, 0);
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
index 3944f6b75e0..d2d2afa095a 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -20,7 +20,7 @@
         Visibility="{Binding ActionKeywordsVisibility}">
         <DockPanel Margin="{StaticResource SettingPanelMargin}">
             <TextBlock
-                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                Margin="{StaticResource SettingPanelItemRightMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 DockPanel.Dock="Left"
@@ -28,7 +28,7 @@
                 &#xe819;
             </TextBlock>
             <TextBlock
-                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                Margin="{StaticResource SettingPanelItemRightMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 DockPanel.Dock="Left"
@@ -36,7 +36,7 @@
                 Text="{DynamicResource actionKeywords}" />
             <Button
                 Width="100"
-                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
                 HorizontalAlignment="Right"
                 Command="{Binding SetActionKeywordsCommand}"
                 Content="{Binding ActionKeywordsText}"
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 69c535d3c7f..e2a3bda375e 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5587,8 +5587,13 @@
     </Style>
 
     <!--  Settings Panel  -->
-    <Thickness x:Key="SettingPanelMargin">70,0,18,0</Thickness>
+    <Thickness x:Key="SettingPanelMargin">70,9,18,9</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftMargin">9,0,0,0</Thickness>
+    <Thickness x:Key="SettingPanelItemRightMargin">0,0,9,0</Thickness>
+    <Thickness x:Key="SettingPanelItemTopBottomMargin">0,9,0,9</Thickness>
+
     <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,9,0,9</Thickness>
     <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,9,9,9</Thickness>
-    <Thickness x:Key="SettingPanelItemLeftRightTopBottomMargin">9,9,9,9</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftBottomMargin">9,0,0,9</Thickness>
+    <Thickness x:Key="SettingPanelItemRightBottomMargin">0,0,9,9</Thickness>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index ceee3897c18..d7bd11b83c4 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -54,7 +54,7 @@
         <TextBlock
             Grid.Row="1"
             Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+            Margin="{StaticResource SettingPanelItemRightBottomMargin}"
             VerticalAlignment="Center"
             FontSize="14"
             Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" />
@@ -62,7 +62,7 @@
             x:Name="MaxDecimalPlaces"
             Grid.Row="1"
             Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+            Margin="{StaticResource SettingPanelItemRightBottomMargin}"
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
             ItemsSource="{Binding MaxDecimalPlacesRange}"
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
index f806900dedc..95fdd78d4b8 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
@@ -7,11 +7,11 @@
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    <Grid Margin="70,18,18,18">
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <ListView
             x:Name="lbxCommands"
             Grid.Row="0"
-            Margin="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             BorderBrush="DarkGray"
             BorderThickness="1"
             SizeChanged="ListView_SizeChanged"

From 9e43774508fa88ed9001d0d500f636b9c07194fc Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 18:27:43 +0800
Subject: [PATCH 07/47] Improve design for inner settings panel

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml            | 2 --
 .../Views/CalculatorSettings.xaml                             | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index e2a3bda375e..3cd1f5c1c70 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5594,6 +5594,4 @@
 
     <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,9,0,9</Thickness>
     <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,9,9,9</Thickness>
-    <Thickness x:Key="SettingPanelItemLeftBottomMargin">9,0,0,9</Thickness>
-    <Thickness x:Key="SettingPanelItemRightBottomMargin">0,0,9,9</Thickness>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index d7bd11b83c4..ceee3897c18 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -54,7 +54,7 @@
         <TextBlock
             Grid.Row="1"
             Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemRightBottomMargin}"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             VerticalAlignment="Center"
             FontSize="14"
             Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" />
@@ -62,7 +62,7 @@
             x:Name="MaxDecimalPlaces"
             Grid.Row="1"
             Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemRightBottomMargin}"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
             ItemsSource="{Binding MaxDecimalPlacesRange}"

From 65fb98fe84af625b80817ec022b83b5b89e747b9 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 19:01:32 +0800
Subject: [PATCH 08/47] Redesgin settings panel for shell plugin

---
 .../ShellSetting.xaml                          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml b/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
index 8a3b7f11533..32f2ad69c1a 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
@@ -8,7 +8,7 @@
     d:DesignWidth="300"
     Loaded="CMDSetting_OnLoaded"
     mc:Ignorable="d">
-    <Grid Margin="60,10,10,20" VerticalAlignment="Top">
+    <Grid Margin="{StaticResource SettingPanelMargin}" VerticalAlignment="Top">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition />
@@ -21,37 +21,37 @@
         <CheckBox
             x:Name="ReplaceWinR"
             Grid.Row="0"
-            Margin="10,10,5,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Content="{DynamicResource flowlauncher_plugin_cmd_relace_winr}" />
         <CheckBox
             x:Name="CloseShellAfterPress"
             Grid.Row="1"
-            Margin="10,5,5,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Content="{DynamicResource flowlauncher_plugin_cmd_close_cmd_after_press}" />
         <CheckBox
             x:Name="LeaveShellOpen"
             Grid.Row="2"
-            Margin="10,5,5,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Content="{DynamicResource flowlauncher_plugin_cmd_leave_cmd_open}" />
         <CheckBox
             x:Name="AlwaysRunAsAdministrator"
             Grid.Row="3"
-            Margin="10,5,5,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Content="{DynamicResource flowlauncher_plugin_cmd_always_run_as_administrator}" />
         <CheckBox
             x:Name="UseWindowsTerminal"
             Grid.Row="4"
-            Margin="10,5,5,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Content="{DynamicResource flowlauncher_plugin_cmd_use_windows_terminal}" />
         <ComboBox
             x:Name="ShellComboBox"
             Grid.Row="5"
-            Margin="10,5,5,5"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left">
             <ComboBoxItem>CMD</ComboBoxItem>
             <ComboBoxItem>PowerShell</ComboBoxItem>
@@ -61,11 +61,11 @@
         <StackPanel Grid.Row="6" Orientation="Horizontal">
             <CheckBox
                 x:Name="ShowOnlyMostUsedCMDs"
-                Margin="10,5,5,5"
+                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                 Content="{DynamicResource flowlauncher_plugin_cmd_history}" />
             <ComboBox
                 x:Name="ShowOnlyMostUsedCMDsNumber"
-                Margin="10,5,5,5"
+                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                 HorizontalAlignment="Left" />
         </StackPanel>
     </Grid>

From 6d4919f15e1d32de70393044fc7d4ac853ee9a50 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 19:56:31 +0800
Subject: [PATCH 09/47] Redesgin settings panel for plugins manager plugin

---
 .../Views/PluginsManagerSettings.xaml                      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
index f93f7799aba..5b767eb53c8 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
@@ -7,7 +7,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Grid Margin="70 15 18 15">
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.ColumnDefinitions />
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
@@ -15,13 +15,12 @@
         </Grid.RowDefinitions>
         <CheckBox
             Grid.Row="0"
-            Padding="8 0 0 0"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             Content="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
             IsChecked="{Binding WarnFromUnknownSource}" />
         <CheckBox
             Grid.Row="1"
-            Margin="0 10 0 0"
-            Padding="8 0 0 0"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             Content="{DynamicResource plugin_pluginsmanager_plugin_settings_auto_restart}"
             IsChecked="{Binding AutoRestartAfterChanging}" />
     </Grid>

From ac956bccef6bfb34de21fbe3ca3817f0e3f2c238 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 20:51:16 +0800
Subject: [PATCH 10/47] Redesgin settings panel for program plugin

---
 .../Resources/CustomControlTemplate.xaml      |  8 +++
 .../Views/ProgramSetting.xaml                 | 68 +++++++------------
 2 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 3cd1f5c1c70..e57a293208a 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5588,10 +5588,18 @@
 
     <!--  Settings Panel  -->
     <Thickness x:Key="SettingPanelMargin">70,9,18,9</Thickness>
+
     <Thickness x:Key="SettingPanelItemLeftMargin">9,0,0,0</Thickness>
     <Thickness x:Key="SettingPanelItemRightMargin">0,0,9,0</Thickness>
     <Thickness x:Key="SettingPanelItemTopBottomMargin">0,9,0,9</Thickness>
 
     <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,9,0,9</Thickness>
     <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,9,9,9</Thickness>
+
+    <Style x:Key="SettingPanelSeperatorStyle" TargetType="Separator">
+        <Setter Property="Margin" Value="-70 9 -18 9" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
+        <Setter Property="BorderThickness" Value="1" />
+    </Style>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 973ac9f60af..353056ad077 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -10,124 +10,108 @@
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </UserControl.Resources>
-    <Grid Margin="0">
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <DockPanel
-            Margin="70 10 0 8"
-            HorizontalAlignment="Stretch"
-            LastChildFill="True">
+        <DockPanel HorizontalAlignment="Stretch" LastChildFill="True">
             <TextBlock
                 MinWidth="120"
-                Margin="0 5 10 0"
+                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                 Text="{DynamicResource flowlauncher_plugin_program_index_source}" />
             <WrapPanel
                 Width="Auto"
-                Margin="0 0 14 0"
+                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                 HorizontalAlignment="Right"
                 DockPanel.Dock="Right">
                 <CheckBox
                     Name="UWPEnabled"
-                    Margin="12 0 12 0"
+                    Margin="{StaticResource SettingPanelItemRightMargin}"
                     Content="{DynamicResource flowlauncher_plugin_program_index_uwp}"
                     IsChecked="{Binding EnableUWP}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_uwp_tooltip}"
                     Visibility="{Binding ShowUWPCheckbox, Converter={StaticResource BooleanToVisibilityConverter}}" />
                 <CheckBox
                     Name="StartMenuEnabled"
-                    Margin="12 0 12 0"
+                    Margin="{StaticResource SettingPanelItemRightMargin}"
                     Content="{DynamicResource flowlauncher_plugin_program_index_start}"
                     IsChecked="{Binding EnableStartMenuSource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
                 <CheckBox
                     Name="RegistryEnabled"
-                    Margin="12 0 12 0"
+                    Margin="{StaticResource SettingPanelItemRightMargin}"
                     Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
                     IsChecked="{Binding EnableRegistrySource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
                 <CheckBox
                     Name="PATHEnabled"
-                    Margin="12 0 12 0"
                     Content="{DynamicResource flowlauncher_plugin_program_index_PATH}"
                     IsChecked="{Binding EnablePATHSource}"
                     ToolTip="{DynamicResource flowlauncher_plugin_program_index_PATH_tooltip}" />
             </WrapPanel>
         </DockPanel>
-
         <StackPanel
             Grid.Row="1"
             HorizontalAlignment="Stretch"
             Orientation="Vertical">
-            <Separator
-                Height="1"
-                BorderBrush="{DynamicResource Color03B}"
-                BorderThickness="1" />
-            <DockPanel
-                Margin="70 10 0 8"
-                HorizontalAlignment="Stretch"
-                LastChildFill="True">
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <DockPanel HorizontalAlignment="Stretch" LastChildFill="True">
                 <TextBlock
                     MinWidth="120"
-                    Margin="0 5 10 0"
+                    Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                     Text="{DynamicResource flowlauncher_plugin_program_index_option}" />
                 <WrapPanel
                     Width="Auto"
-                    Margin="0 0 14 0"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                     HorizontalAlignment="Right"
                     DockPanel.Dock="Right">
                     <CheckBox
-                        Margin="12 0 12 0"
+                        Margin="{StaticResource SettingPanelItemRightMargin}"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
                         IsChecked="{Binding HideAppsPath}"
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
                     <CheckBox
-                        Margin="12 0 12 0"
+                        Margin="{StaticResource SettingPanelItemRightMargin}"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_hideuninstallers}"
                         IsChecked="{Binding HideUninstallers}"
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hideuninstallers_tooltip}" />
                     <CheckBox
-                        Margin="12 0 12 0"
+                        Margin="{StaticResource SettingPanelItemRightMargin}"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
                         IsChecked="{Binding EnableDescription}"
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
                     <CheckBox
-                        Margin="12 0 12 0"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_hideduplicatedwindowsapp}"
                         IsChecked="{Binding HideDuplicatedWindowsApp}"
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hideduplicatedwindowsapp_tooltip}" />
                 </WrapPanel>
             </DockPanel>
-            <Separator
-                Height="1"
-                BorderBrush="{DynamicResource Color03B}"
-                BorderThickness="1" />
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
             <StackPanel
-                Margin="60 0 0 2"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Orientation="Horizontal">
                 <Button
                     x:Name="btnLoadAllProgramSource"
                     MinWidth="120"
-                    Margin="10 10 5 10"
+                    Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                     HorizontalAlignment="Right"
                     Click="btnLoadAllProgramSource_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_all_programs}" />
                 <Button
                     x:Name="btnProgramSuffixes"
                     MinWidth="120"
-                    Margin="5 10 5 10"
+                    Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                     HorizontalAlignment="Right"
                     Click="BtnProgramSuffixes_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_suffixes}" />
                 <Button
                     x:Name="btnReindex"
                     MinWidth="120"
-                    Margin="5 10 5 10"
+                    Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                     HorizontalAlignment="Right"
                     Click="btnReindex_Click"
                     Content="{DynamicResource flowlauncher_plugin_program_reindex}" />
@@ -140,12 +124,13 @@
                         x:Name="progressBarIndexing"
                         Width="80"
                         Height="20"
+                        Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                         IsIndeterminate="True"
                         Maximum="100"
                         Minimum="0" />
                     <TextBlock
                         Height="20"
-                        Margin="10 0 0 0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                         HorizontalAlignment="Center"
                         Text="{DynamicResource flowlauncher_plugin_program_indexing}" />
                 </StackPanel>
@@ -154,7 +139,7 @@
         <ListView
             x:Name="programSourceView"
             Grid.Row="2"
-            Margin="70 0 20 0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             AllowDrop="True"
             BorderBrush="DarkGray"
             BorderThickness="1"
@@ -203,27 +188,24 @@
                 </GridView>
             </ListView.View>
         </ListView>
-        <DockPanel
-            Grid.Row="3"
-            Grid.RowSpan="1"
-            Margin="0 0 20 0">
+        <DockPanel Grid.Row="3">
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button
                     x:Name="btnProgramSourceStatus"
                     MinWidth="100"
-                    Margin="10"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                     Click="btnProgramSourceStatus_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_disable}" />
                 <Button
                     x:Name="btnEditProgramSource"
                     MinWidth="100"
-                    Margin="10"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                     Click="btnEditProgramSource_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_edit}" />
                 <Button
                     x:Name="btnAddProgramSource"
                     MinWidth="100"
-                    Margin="10 10 0 10"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                     Click="btnAddProgramSource_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_add}" />
             </StackPanel>

From 16b45d38be7584c7ff60ea7b7e23d8923ef3e07f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 20:58:06 +0800
Subject: [PATCH 11/47] Redesgin settings panel for bookmark plugin

---
 .../Views/SettingsControl.xaml                | 146 ++++++++++--------
 1 file changed, 78 insertions(+), 68 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 014deff03b6..6183fa1b2de 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -8,77 +8,87 @@
     d:DesignWidth="500"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     mc:Ignorable="d">
-    <Grid Margin="60,0,10,0">
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
-            <RowDefinition Height="auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <StackPanel Margin="0,10,0,10" Orientation="Vertical">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Margin="10" Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" />
-                <CheckBox
-                    Margin="0,0,15,0"
-                    Content="Chrome"
-                    IsChecked="{Binding LoadChromeBookmark}" />
-                <CheckBox
-                    Margin="0,0,15,0"
-                    Content="Edge"
-                    IsChecked="{Binding LoadEdgeBookmark}" />
-                <CheckBox
-                    Margin="0,0,15,0"
-                    Content="Firefox"
-                    IsChecked="{Binding LoadFirefoxBookmark}" />
+        <StackPanel
+            Grid.Row="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            Orientation="Horizontal">
+            <TextBlock
+                Margin="{StaticResource SettingPanelItemRightMargin}"
+                VerticalAlignment="Center"
+                Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" />
+            <CheckBox
+                Margin="{StaticResource SettingPanelItemRightMargin}"
+                Content="Chrome"
+                IsChecked="{Binding LoadChromeBookmark}" />
+            <CheckBox
+                Margin="{StaticResource SettingPanelItemRightMargin}"
+                Content="Edge"
+                IsChecked="{Binding LoadEdgeBookmark}" />
+            <CheckBox
+                Margin="{StaticResource SettingPanelItemRightMargin}"
+                Content="Firefox"
+                IsChecked="{Binding LoadFirefoxBookmark}" />
+            <Button
+                Margin="{StaticResource SettingPanelItemRightMargin}"
+                Click="Others_Click"
+                Content="{DynamicResource flowlauncher_plugin_browserbookmark_others}" />
+        </StackPanel>
+        <StackPanel
+            Name="CustomBrowsersList"
+            Grid.Row="1"
+            Visibility="Collapsed">
+            <ListView
+                Name="CustomBrowsers"
+                Height="auto"
+                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                BorderBrush="DarkGray"
+                BorderThickness="1"
+                ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
+                MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser"
+                SelectedItem="{Binding SelectedCustomBrowser}"
+                Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
+                <ListView.View>
+                    <GridView>
+                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
+                        <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
+                        <GridViewColumn DisplayMemberBinding="{Binding BrowserType, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserEngine}" />
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <StackPanel
+                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
                 <Button
-                    Margin="0,0,15,0"
-                    Click="Others_Click"
-                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_others}" />
-            </StackPanel>
-            <StackPanel Name="CustomBrowsersList" Visibility="Collapsed">
-                <ListView
-                    Name="CustomBrowsers"
-                    Height="auto"
-                    Margin="10"
-                    BorderBrush="DarkGray"
-                    BorderThickness="1"
-                    ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
-                    MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser"
-                    SelectedItem="{Binding SelectedCustomBrowser}"
-                    Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
-                    <ListView.View>
-                        <GridView>
-                            <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
-                            <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
-                            <GridViewColumn DisplayMemberBinding="{Binding BrowserType, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserEngine}" />
-                        </GridView>
-                    </ListView.View>
-                </ListView>
-                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                    <Button
-                        MinWidth="130"
-                        Margin="10"
-                        Click="NewCustomBrowser"
-                        Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
-                    <Button
-                        MinWidth="130"
-                        Margin="10"
-                        Click="EditCustomBrowser"
-                        Content="{DynamicResource flowlauncher_plugin_browserbookmark_editBrowserBookmark}">
-                        <Button.Style>
-                            <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button">
-                                <Setter Property="IsEnabled" Value="true" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding ElementName=CustomBrowsers, Path=SelectedItems.Count}" Value="0">
-                                        <Setter Property="IsEnabled" Value="false" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
-                    <Button
-                        MinWidth="120"
-                        Margin="10"
-                        Click="DeleteCustomBrowser"
-                        Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
-                </StackPanel>
+                    MinWidth="130"
+                    Click="NewCustomBrowser"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
+                <Button
+                    MinWidth="130"
+                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                    Click="EditCustomBrowser"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_editBrowserBookmark}">
+                    <Button.Style>
+                        <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button">
+                            <Setter Property="IsEnabled" Value="true" />
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding ElementName=CustomBrowsers, Path=SelectedItems.Count}" Value="0">
+                                    <Setter Property="IsEnabled" Value="false" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                </Button>
+                <Button
+                    MinWidth="120"
+                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                    Click="DeleteCustomBrowser"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
             </StackPanel>
         </StackPanel>
     </Grid>

From 975d6eefddc79bb441fdc12e508839bd20491b10 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 21:20:29 +0800
Subject: [PATCH 12/47] Redesgin settings panel for websearch plugin

---
 .../SettingsControl.xaml                      | 82 +++++++++----------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 4cf3bed405f..5c782d044e8 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -35,16 +35,17 @@
             </DockPanel>
         </DataTemplate>
     </UserControl.Resources>
-    <Grid Margin="0,4,0,0">
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="56" />
+            <RowDefinition />
             <RowDefinition Height="50" />
         </Grid.RowDefinitions>
         <ListView
             x:Name="SearchSourcesListView"
             Grid.Row="0"
-            Margin="18,18,18,0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             BorderBrush="DarkGray"
             BorderThickness="1"
             GridViewColumnHeader.Click="SortByColumn"
@@ -60,7 +61,7 @@
                                 <Image
                                     Width="20"
                                     Height="20"
-                                    Margin="6,0,0,0"
+                                    Margin="6 0 0 0"
                                     Source="{Binding Path=IconPath}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
@@ -69,11 +70,11 @@
                     <GridViewColumn
                         Width="130"
                         DisplayMemberBinding="{Binding ActionKeyword}"
-                        Header="{DynamicResource flowlauncher_plugin_websearch_action_keyword}"/>
+                        Header="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
                     <GridViewColumn
-                        Width="350"
+                        Width="239"
                         DisplayMemberBinding="{Binding Title}"
-                        Header="{DynamicResource flowlauncher_plugin_websearch_title}"/>
+                        Header="{DynamicResource flowlauncher_plugin_websearch_title}" />
                     <GridViewColumn Width="140" Header="{DynamicResource flowlauncher_plugin_websearch_enable}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
@@ -97,57 +98,52 @@
         </ListView>
         <StackPanel
             Grid.Row="1"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Button
                 Width="100"
-                Margin="10"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
                 Click="OnDeleteSearchSearchClick"
                 Content="{DynamicResource flowlauncher_plugin_websearch_delete}" />
             <Button
                 Width="100"
-                Margin="10"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
                 Click="OnEditSearchSourceClick"
                 Content="{DynamicResource flowlauncher_plugin_websearch_edit}" />
             <Button
                 Width="100"
-                Margin="10,10,18,10"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
                 Click="OnAddSearchSearchClick"
                 Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
         </StackPanel>
-        <Border
-            Grid.Row="2"
-            Margin="0,0,0,0"
-            HorizontalAlignment="Stretch"
-            BorderBrush="{DynamicResource Color03B}"
-            BorderThickness="0,1,0,0">
-            <DockPanel HorizontalAlignment="Right">
-                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
-                    <Label
-                        Margin="14,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" />
-                    <ComboBox
-                        Height="30"
-                        Margin="0,0,20,0"
-                        VerticalAlignment="Center"
-                        FontSize="11"
-                        IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}"
-                        ItemsSource="{Binding Settings.Suggestions}"
-                        SelectedItem="{Binding Settings.SelectedSuggestion}" />
-                    <Label
-                        Margin="0,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}" />
-                    <CheckBox
-                        Name="EnableSuggestion"
-                        Margin="0,0,8,0"
-                        IsChecked="{Binding Settings.EnableSuggestion}" />
-                </StackPanel>
-                <!--  Not sure why binding IsEnabled directly to Settings.EnableWebSearchSuggestion is not working  -->
-            </DockPanel>
-        </Border>
+        <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeperatorStyle}" />
+        <DockPanel
+            Grid.Row="3"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Right">
+            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+                <Label
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" />
+                <ComboBox
+                    Height="30"
+                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                    VerticalAlignment="Center"
+                    FontSize="11"
+                    IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}"
+                    ItemsSource="{Binding Settings.Suggestions}"
+                    SelectedItem="{Binding Settings.SelectedSuggestion}" />
+                <CheckBox
+                    Name="EnableSuggestion"
+                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}"
+                    IsChecked="{Binding Settings.EnableSuggestion}" />
+            </StackPanel>
+            <!--  Not sure why binding IsEnabled directly to Settings.EnableWebSearchSuggestion is not working  -->
+        </DockPanel>
     </Grid>
 </UserControl>
\ No newline at end of file

From 330a11a843e5f6b41d582ca9aeb2b6b90d1b9a95 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 28 Feb 2025 21:57:27 +0800
Subject: [PATCH 13/47] Adjust margin & Make title vertically center in program
 plugin

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml     | 10 +++++-----
 .../Views/ProgramSetting.xaml                          |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index e57a293208a..7d33047c789 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5587,17 +5587,17 @@
     </Style>
 
     <!--  Settings Panel  -->
-    <Thickness x:Key="SettingPanelMargin">70,9,18,9</Thickness>
+    <Thickness x:Key="SettingPanelMargin">70,13.5,18,13.5</Thickness>
 
     <Thickness x:Key="SettingPanelItemLeftMargin">9,0,0,0</Thickness>
     <Thickness x:Key="SettingPanelItemRightMargin">0,0,9,0</Thickness>
-    <Thickness x:Key="SettingPanelItemTopBottomMargin">0,9,0,9</Thickness>
+    <Thickness x:Key="SettingPanelItemTopBottomMargin">0,4.5,0,4.5</Thickness>
 
-    <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,9,0,9</Thickness>
-    <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,9,9,9</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,4.5,0,4.5</Thickness>
+    <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,4.5,9,4.5</Thickness>
 
     <Style x:Key="SettingPanelSeperatorStyle" TargetType="Separator">
-        <Setter Property="Margin" Value="-70 9 -18 9" />
+        <Setter Property="Margin" Value="-70 13.5 -18 13.5" />
         <Setter Property="Height" Value="1" />
         <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 353056ad077..6a6657959b5 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -21,6 +21,7 @@
             <TextBlock
                 MinWidth="120"
                 Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                VerticalAlignment="Center"
                 Text="{DynamicResource flowlauncher_plugin_program_index_source}" />
             <WrapPanel
                 Width="Auto"
@@ -62,6 +63,7 @@
                 <TextBlock
                     MinWidth="120"
                     Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                    VerticalAlignment="Center"
                     Text="{DynamicResource flowlauncher_plugin_program_index_option}" />
                 <WrapPanel
                     Width="Auto"

From e0fe8e1ffd47bce59503aa977ae866023890abc2 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 28 Feb 2025 22:25:05 +0800
Subject: [PATCH 14/47] Change seperator style

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

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 7d33047c789..9843c4595d3 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5599,7 +5599,7 @@
     <Style x:Key="SettingPanelSeperatorStyle" TargetType="Separator">
         <Setter Property="Margin" Value="-70 13.5 -18 13.5" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Background" Value="{DynamicResource Color03B}" />
     </Style>
 </ResourceDictionary>

From 51a9999a649c8f13e72b9daad96dee2b571b1913 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 28 Feb 2025 22:56:51 +0800
Subject: [PATCH 15/47] Improve code quality & Add seperator type

---
 .../Plugin/JsonRPCPluginSettings.cs           | 463 ++++++++----------
 1 file changed, 217 insertions(+), 246 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index b1888e574fc..bca7f8d9710 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -30,16 +30,9 @@ public class JsonRPCPluginSettings
         private JsonStorage<ConcurrentDictionary<string, object>> _storage;
 
         // maybe move to resource?
-        private static Thickness settingPanelMargin1 = (Thickness)System.Windows.Application.Current.FindResource("SettingPanelMargin");
-        
         private static readonly Thickness settingControlMargin = new(0, 9, 18, 9);
         private static readonly Thickness settingCheckboxMargin = new(0, 9, 9, 9);
-        private static readonly Thickness settingPanelMargin = new(0, 0, 0, 0);
-        private static readonly Thickness settingTextBlockMargin = new(70, 9, 18, 9);
-        private static readonly Thickness settingLabelPanelMargin = new(70, 9, 18, 9);
-        private static readonly Thickness settingLabelMargin = new(0, 0, 0, 0);
-        private static readonly Thickness settingDescMargin = new(0, 2, 0, 0);
-        private static readonly Thickness settingSepMargin = new(0, 0, 0, 2);
+        private static readonly Thickness settingPanelMargin = (Thickness)System.Windows.Application.Current.FindResource("SettingPanelMargin");
 
         public async Task InitializeAsync()
         {
@@ -51,9 +44,10 @@ public async Task InitializeAsync()
                 return;
             }
 
-            foreach (var (type, attributes) in Configuration.Body)
+            foreach (var (_, attributes) in Configuration.Body)
             {
-                if (attributes.Name == null)
+                // Skip if the setting does not have attributes or name
+                if (attributes?.Name == null)
                 {
                     continue;
                 }
@@ -65,7 +59,6 @@ public async Task InitializeAsync()
             }
         }
 
-
         public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
         {
             if (settings == null || settings.Count == 0)
@@ -113,298 +106,249 @@ public void Save()
 
         public Control CreateSettingPanel()
         {
-            if (Settings == null || Settings.Count == 0)
+            // If there are no settings or the settings are empty, return null
+            if (Settings == null || Settings.IsEmpty)
+            {
                 return null;
+            }
 
-            var settingWindow = new UserControl();
+            // Create main grid
             var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
+            mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
+            {
+                Width = new GridLength(70, GridUnitType.Star)  // TODO: Auto
+            });
+            mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
+            {
+                Width = new GridLength(30, GridUnitType.Star)  // TODO: Auto
+            });
 
-            ColumnDefinition gridCol1 = new ColumnDefinition();
-            ColumnDefinition gridCol2 = new ColumnDefinition();
-
-            gridCol1.Width = new GridLength(70, GridUnitType.Star);
-            gridCol2.Width = new GridLength(30, GridUnitType.Star);
-            mainPanel.ColumnDefinitions.Add(gridCol1);
-            mainPanel.ColumnDefinitions.Add(gridCol2);
-            settingWindow.Content = mainPanel;
+            // Iterate over each setting and create one row for it
             int rowCount = 0;
-
-            foreach (var (type, attribute) in Configuration.Body)
+            foreach (var (type, attributes) in Configuration.Body)
             {
-                Separator sep = new Separator();
-                sep.VerticalAlignment = VerticalAlignment.Top;
-                sep.Margin = settingSepMargin;
-                sep.SetResourceReference(Separator.BackgroundProperty, "Color03B"); /* for theme change */
-                var panel = new StackPanel
-                {
-                    Orientation = Orientation.Vertical,
-                    VerticalAlignment = VerticalAlignment.Center,
-                    Margin = settingLabelPanelMargin
-                };
-
-                RowDefinition gridRow = new RowDefinition();
-                mainPanel.RowDefinitions.Add(gridRow);
-                var name = new TextBlock()
-                {
-                    Text = attribute.Label,
-                    VerticalAlignment = VerticalAlignment.Center,
-                    Margin = settingLabelMargin,
-                    TextWrapping = TextWrapping.WrapWithOverflow
-                };
-
-                var desc = new TextBlock()
+                // Skip if the setting does not have attributes or name
+                if (attributes?.Name == null)
                 {
-                    Text = attribute.Description,
-                    FontSize = 12,
-                    VerticalAlignment = VerticalAlignment.Center,
-                    Margin = settingDescMargin,
-                    TextWrapping = TextWrapping.WrapWithOverflow
-                };
-
-                desc.SetResourceReference(TextBlock.ForegroundProperty, "Color04B");
-
-                if (attribute.Description == null) /* if no description, hide */
-                    desc.Visibility = Visibility.Collapsed;
-
-
-                if (type != "textBlock") /* if textBlock, hide desc */
-                {
-                    panel.Children.Add(name);
-                    panel.Children.Add(desc);
+                    continue;
                 }
 
+                // Add a new row to the main grid
+                mainPanel.RowDefinitions.Add(new RowDefinition());
 
-                Grid.SetColumn(panel, 0);
-                Grid.SetRow(panel, rowCount);
-
+                // State controls for column 0 and 1
+                StackPanel panel = null;
                 FrameworkElement contentControl;
 
-                switch (type)
+                // If the type is textBlock or seperator, we do not need to create a panel
+                if (type != "textBlock" && type != "seperator")
                 {
-                    case "textBlock":
+                    // Create a panel to hold the label and description
+                    panel = new StackPanel
                     {
-                        contentControl = new TextBlock
+                        Orientation = Orientation.Vertical,
+                        VerticalAlignment = VerticalAlignment.Center
+                    };
+
+                    // Create a text block for name
+                    var name = new TextBlock()
+                    {
+                        Text = attributes.Label,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        TextWrapping = TextWrapping.WrapWithOverflow
+                    };
+
+                    // Create a text block for description
+                    TextBlock desc = null;
+                    if (attributes.Description != null)
+                    {
+                        desc = new TextBlock()
                         {
-                            Text = attribute.Description.Replace("\\r\\n", "\r\n"),
-                            Margin = settingTextBlockMargin,
-                            Padding = new Thickness(0, 0, 0, 0),
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Left,
-                            TextAlignment = TextAlignment.Left,
-                            TextWrapping = TextWrapping.Wrap
+                            Text = attributes.Description,
+                            FontSize = 12,
+                            VerticalAlignment = VerticalAlignment.Center,
+                            Margin = new(0, 2, 0, 0),  // TODO: Use resource
+                            TextWrapping = TextWrapping.WrapWithOverflow
                         };
 
-                        Grid.SetColumn(contentControl, 0);
-                        Grid.SetColumnSpan(contentControl, 2);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
-
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
-
-                        break;
+                        desc.SetResourceReference(TextBlock.ForegroundProperty, "Color04B"); // for theme change
                     }
-                    case "input":
+
+                    // Add the name and description to the panel
+                    panel.Children.Add(name);
+                    if (desc != null)
                     {
-                        var textBox = new TextBox()
+                        panel.Children.Add(desc);
+                    }
+                }
+
+                switch (type)
+                {
+                    case "textBlock":
                         {
-                            Text = Settings[attribute.Name] as string ?? string.Empty,
-                            Margin = settingControlMargin,
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
-                            ToolTip = attribute.Description
-                        };
+                            contentControl = new TextBlock
+                            {
+                                Text = attributes.Description.Replace("\\r\\n", "\r\n"),
+                                Padding = new Thickness(0, 0, 0, 0),
+                                HorizontalAlignment = System.Windows.HorizontalAlignment.Left,
+                                TextAlignment = TextAlignment.Left,
+                                TextWrapping = TextWrapping.Wrap
+                            };
 
-                        textBox.TextChanged += (_, _) =>
+                            break;
+                        }
+                    case "input":
                         {
-                            Settings[attribute.Name] = textBox.Text;
-                        };
+                            var textBox = new TextBox()
+                            {
+                                Text = Settings[attributes.Name] as string ?? string.Empty,
+                                Margin = settingControlMargin,
+                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                ToolTip = attributes.Description
+                            };
 
-                        contentControl = textBox;
-                        Grid.SetColumn(contentControl, 1);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
+                            textBox.TextChanged += (_, _) =>
+                            {
+                                Settings[attributes.Name] = textBox.Text;
+                            };
 
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
+                            contentControl = textBox;
 
-                        break;
-                    }
+                            break;
+                        }
                     case "inputWithFileBtn":
                     case "inputWithFolderBtn":
-                    {
-                        var textBox = new TextBox()
-                        {
-                            Margin = new Thickness(10, 0, 0, 0),
-                            Text = Settings[attribute.Name] as string ?? string.Empty,
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
-                            ToolTip = attribute.Description
-                        };
-
-                        textBox.TextChanged += (_, _) =>
-                        {
-                            Settings[attribute.Name] = textBox.Text;
-                        };
-
-                        var Btn = new System.Windows.Controls.Button()
                         {
-                            Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
-                        };
+                            var textBox = new TextBox()
+                            {
+                                Margin = new Thickness(10, 0, 0, 0),
+                                Text = Settings[attributes.Name] as string ?? string.Empty,
+                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                ToolTip = attributes.Description
+                            };
 
-                        Btn.Click += (_, _) =>
-                        {
-                            using CommonDialog dialog = type switch
+                            textBox.TextChanged += (_, _) =>
                             {
-                                "inputWithFolderBtn" => new FolderBrowserDialog(),
-                                _ => new OpenFileDialog(),
+                                Settings[attributes.Name] = textBox.Text;
                             };
-                            if (dialog.ShowDialog() != DialogResult.OK) return;
 
-                            var path = dialog switch
+                            var Btn = new System.Windows.Controls.Button()
                             {
-                                FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
-                                OpenFileDialog fileDialog => fileDialog.FileName,
+                                Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
                             };
-                            textBox.Text = path;
-                            Settings[attribute.Name] = path;
-                        };
 
-                        var dockPanel = new DockPanel() { Margin = settingControlMargin };
+                            Btn.Click += (_, _) =>
+                            {
+                                using CommonDialog dialog = type switch
+                                {
+                                    "inputWithFolderBtn" => new FolderBrowserDialog(),
+                                    _ => new OpenFileDialog(),
+                                };
+                                if (dialog.ShowDialog() != DialogResult.OK) return;
+
+                                var path = dialog switch
+                                {
+                                    FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
+                                    OpenFileDialog fileDialog => fileDialog.FileName,
+                                };
+                                textBox.Text = path;
+                                Settings[attributes.Name] = path;
+                            };
 
-                        DockPanel.SetDock(Btn, Dock.Right);
-                        dockPanel.Children.Add(Btn);
-                        dockPanel.Children.Add(textBox);
-                        contentControl = dockPanel;
-                        Grid.SetColumn(contentControl, 1);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
+                            var dockPanel = new DockPanel() { Margin = settingControlMargin };
 
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
+                            DockPanel.SetDock(Btn, Dock.Right);
+                            dockPanel.Children.Add(Btn);
+                            dockPanel.Children.Add(textBox);
+                            contentControl = dockPanel;
 
-                        break;
-                    }
+                            break;
+                        }
                     case "textarea":
-                    {
-                        var textBox = new TextBox()
-                        {
-                            Height = 120,
-                            Margin = settingControlMargin,
-                            VerticalAlignment = VerticalAlignment.Center,
-                            TextWrapping = TextWrapping.WrapWithOverflow,
-                            AcceptsReturn = true,
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
-                            Text = Settings[attribute.Name] as string ?? string.Empty,
-                            ToolTip = attribute.Description
-                        };
-
-                        textBox.TextChanged += (sender, _) =>
                         {
-                            Settings[attribute.Name] = ((TextBox)sender).Text;
-                        };
+                            var textBox = new TextBox()
+                            {
+                                Height = 120,
+                                Margin = settingControlMargin,
+                                VerticalAlignment = VerticalAlignment.Center,
+                                TextWrapping = TextWrapping.WrapWithOverflow,
+                                AcceptsReturn = true,
+                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                Text = Settings[attributes.Name] as string ?? string.Empty,
+                                ToolTip = attributes.Description
+                            };
 
-                        contentControl = textBox;
-                        Grid.SetColumn(contentControl, 1);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
+                            textBox.TextChanged += (sender, _) =>
+                            {
+                                Settings[attributes.Name] = ((TextBox)sender).Text;
+                            };
 
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
+                            contentControl = textBox;
 
-                        break;
-                    }
+                            break;
+                        }
                     case "passwordBox":
-                    {
-                        var passwordBox = new PasswordBox()
                         {
-                            Margin = settingControlMargin,
-                            Password = Settings[attribute.Name] as string ?? string.Empty,
-                            PasswordChar = attribute.passwordChar == default ? '*' : attribute.passwordChar,
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
-                            ToolTip = attribute.Description
-                        };
-
-                        passwordBox.PasswordChanged += (sender, _) =>
-                        {
-                            Settings[attribute.Name] = ((PasswordBox)sender).Password;
-                        };
+                            var passwordBox = new PasswordBox()
+                            {
+                                Margin = settingControlMargin,
+                                Password = Settings[attributes.Name] as string ?? string.Empty,
+                                PasswordChar = attributes.passwordChar == default ? '*' : attributes.passwordChar,
+                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                ToolTip = attributes.Description
+                            };
 
-                        contentControl = passwordBox;
-                        Grid.SetColumn(contentControl, 1);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
+                            passwordBox.PasswordChanged += (sender, _) =>
+                            {
+                                Settings[attributes.Name] = ((PasswordBox)sender).Password;
+                            };
 
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
+                            contentControl = passwordBox;
 
-                        break;
-                    }
+                            break;
+                        }
                     case "dropdown":
-                    {
-                        var comboBox = new System.Windows.Controls.ComboBox()
                         {
-                            ItemsSource = attribute.Options,
-                            SelectedItem = Settings[attribute.Name],
-                            Margin = settingControlMargin,
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
-                            ToolTip = attribute.Description
-                        };
-
-                        comboBox.SelectionChanged += (sender, _) =>
-                        {
-                            Settings[attribute.Name] = (string)((System.Windows.Controls.ComboBox)sender).SelectedItem;
-                        };
+                            var comboBox = new ComboBox()
+                            {
+                                ItemsSource = attributes.Options,
+                                SelectedItem = Settings[attributes.Name],
+                                Margin = settingControlMargin,
+                                HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
+                                ToolTip = attributes.Description
+                            };
 
-                        contentControl = comboBox;
-                        Grid.SetColumn(contentControl, 1);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
+                            comboBox.SelectionChanged += (sender, _) =>
+                            {
+                                Settings[attributes.Name] = (string)((ComboBox)sender).SelectedItem;
+                            };
 
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
+                            contentControl = comboBox;
 
-                        break;
-                    }
+                            break;
+                        }
                     case "checkbox":
                         var checkBox = new CheckBox
                         {
                             IsChecked =
-                                Settings[attribute.Name] is bool isChecked
+                                Settings[attributes.Name] is bool isChecked
                                     ? isChecked
-                                    : bool.Parse(attribute.DefaultValue),
+                                    : bool.Parse(attributes.DefaultValue),
                             Margin = settingCheckboxMargin,
                             HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
-                            ToolTip = attribute.Description
+                            ToolTip = attributes.Description
                         };
 
                         checkBox.Click += (sender, _) =>
                         {
-                            Settings[attribute.Name] = ((CheckBox)sender).IsChecked;
+                            Settings[attributes.Name] = ((CheckBox)sender).IsChecked;
                         };
 
                         contentControl = checkBox;
-                        Grid.SetColumn(contentControl, 1);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
-
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
 
                         break;
                     case "hyperlink":
-                        var hyperlink = new Hyperlink { ToolTip = attribute.Description, NavigateUri = attribute.url };
+                        var hyperlink = new Hyperlink { ToolTip = attributes.Description, NavigateUri = attributes.url };
 
                         var linkbtn = new System.Windows.Controls.Button
                         {
@@ -412,32 +356,59 @@ Settings[attribute.Name] is bool isChecked
                             Margin = settingControlMargin
                         };
 
-                        linkbtn.Content = attribute.urlLabel;
+                        linkbtn.Content = attributes.urlLabel;
 
                         contentControl = linkbtn;
-                        Grid.SetColumn(contentControl, 1);
-                        Grid.SetRow(contentControl, rowCount);
-                        if (rowCount != 0)
-                            mainPanel.Children.Add(sep);
 
-                        Grid.SetRow(sep, rowCount);
-                        Grid.SetColumn(sep, 0);
-                        Grid.SetColumnSpan(sep, 2);
+                        break;
+                    case "seperator":  // TODO: Support seperator
+                        // TODO: Use style for Seperator
+                        contentControl = new Separator
+                        {
+                            VerticalAlignment = VerticalAlignment.Top,
+                            Margin = new(-70, 13.5, -18, 13.5),
+                            Height = 1
+                        };
+                        contentControl.SetResourceReference(Separator.BackgroundProperty, "Color03B");
 
                         break;
                     default:
                         continue;
                 }
 
-                if (type != "textBlock")
-                    SettingControls[attribute.Name] = contentControl;
+                // If type is textBlock or seperator, we just add the content control to the main grid
+                if (panel == null)
+                {
+                    // Add the content control to the column 0, row rowCount and columnSpan 2 of the main grid
+                    mainPanel.Children.Add(contentControl);
+                    Grid.SetColumn(contentControl, 0);
+                    Grid.SetColumnSpan(contentControl, 2);
+                    Grid.SetRow(contentControl, rowCount);
+                }
+                else
+                {
+                    // Add the panel to the column 0 and row rowCount of the main grid
+                    mainPanel.Children.Add(panel);
+                    Grid.SetColumn(panel, 0);
+                    Grid.SetRow(panel, rowCount);
+
+                    // Add the content control to the column 1 and row rowCount of the main grid
+                    mainPanel.Children.Add(contentControl);
+                    Grid.SetColumn(contentControl, 1);
+                    Grid.SetRow(contentControl, rowCount);
+
+                    // Add into SettingControls for later use if need
+                    SettingControls[attributes.Name] = contentControl;
+                }
 
-                mainPanel.Children.Add(panel);
-                mainPanel.Children.Add(contentControl);
                 rowCount++;
             }
 
-            return settingWindow;
+            // Wrap the main grid in a user control
+            return new UserControl()
+            {
+                Content = mainPanel
+            };
         }
     }
 }

From f283105182c69dbae71e8796c03971e9d59a96f1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 10:08:04 +0800
Subject: [PATCH 16/47] Enable nullable & Improve code quality

---
 .../Plugin/JsonRPCPluginSettings.cs           | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index bca7f8d9710..cf09d96552c 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -14,6 +14,8 @@
 using TextBox = System.Windows.Controls.TextBox;
 using UserControl = System.Windows.Controls.UserControl;
 
+#nullable enable
+
 namespace Flow.Launcher.Core.Plugin
 {
     public class JsonRPCPluginSettings
@@ -24,12 +26,12 @@ public class JsonRPCPluginSettings
         public Dictionary<string, FrameworkElement> SettingControls { get; } = new();
 
         public IReadOnlyDictionary<string, object> Inner => Settings;
-        protected ConcurrentDictionary<string, object> Settings { get; set; }
+        protected ConcurrentDictionary<string, object> Settings { get; set; } = null!;
         public required IPublicAPI API { get; init; }
 
-        private JsonStorage<ConcurrentDictionary<string, object>> _storage;
+        private JsonStorage<ConcurrentDictionary<string, object>> _storage = null!;
 
-        // maybe move to resource?
+        // TODO: Move to resource
         private static readonly Thickness settingControlMargin = new(0, 9, 18, 9);
         private static readonly Thickness settingCheckboxMargin = new(0, 9, 9, 9);
         private static readonly Thickness settingPanelMargin = (Thickness)System.Windows.Application.Current.FindResource("SettingPanelMargin");
@@ -104,10 +106,10 @@ public void Save()
             _storage.Save();
         }
 
-        public Control CreateSettingPanel()
+        public Control? CreateSettingPanel()
         {
             // If there are no settings or the settings are empty, return null
-            if (Settings == null || Settings.IsEmpty)
+            if (Configuration == null || Settings == null || Settings.IsEmpty)
             {
                 return null;
             }
@@ -124,7 +126,7 @@ public Control CreateSettingPanel()
             });
 
             // Iterate over each setting and create one row for it
-            int rowCount = 0;
+            var rowCount = 0;
             foreach (var (type, attributes) in Configuration.Body)
             {
                 // Skip if the setting does not have attributes or name
@@ -137,7 +139,7 @@ public Control CreateSettingPanel()
                 mainPanel.RowDefinitions.Add(new RowDefinition());
 
                 // State controls for column 0 and 1
-                StackPanel panel = null;
+                StackPanel? panel = null;
                 FrameworkElement contentControl;
 
                 // If the type is textBlock or seperator, we do not need to create a panel
@@ -151,6 +153,7 @@ public Control CreateSettingPanel()
                     };
 
                     // Create a text block for name
+                    // TODO: Move to resource
                     var name = new TextBlock()
                     {
                         Text = attributes.Label,
@@ -159,9 +162,10 @@ public Control CreateSettingPanel()
                     };
 
                     // Create a text block for description
-                    TextBlock desc = null;
+                    TextBlock? desc = null;
                     if (attributes.Description != null)
                     {
+                        // TODO: Move to resource
                         desc = new TextBlock()
                         {
                             Text = attributes.Description,
@@ -170,7 +174,6 @@ public Control CreateSettingPanel()
                             Margin = new(0, 2, 0, 0),  // TODO: Use resource
                             TextWrapping = TextWrapping.WrapWithOverflow
                         };
-
                         desc.SetResourceReference(TextBlock.ForegroundProperty, "Color04B"); // for theme change
                     }
 
@@ -188,7 +191,7 @@ public Control CreateSettingPanel()
                         {
                             contentControl = new TextBlock
                             {
-                                Text = attributes.Description.Replace("\\r\\n", "\r\n"),
+                                Text = attributes.Description?.Replace("\\r\\n", "\r\n") ?? string.Empty,
                                 Padding = new Thickness(0, 0, 0, 0),
                                 HorizontalAlignment = System.Windows.HorizontalAlignment.Left,
                                 TextAlignment = TextAlignment.Left,
@@ -250,6 +253,7 @@ public Control CreateSettingPanel()
                                 {
                                     FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
                                     OpenFileDialog fileDialog => fileDialog.FileName,
+                                    _ => string.Empty
                                 };
                                 textBox.Text = path;
                                 Settings[attributes.Name] = path;
@@ -341,7 +345,7 @@ Settings[attributes.Name] is bool isChecked
 
                         checkBox.Click += (sender, _) =>
                         {
-                            Settings[attributes.Name] = ((CheckBox)sender).IsChecked;
+                            Settings[attributes.Name] = ((CheckBox)sender).IsChecked!;
                         };
 
                         contentControl = checkBox;

From 196a840991047f1286af3d9de9223cfb3a5ea779 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 10:21:17 +0800
Subject: [PATCH 17/47] Use auto height row & auto width column

---
 .../Plugin/JsonRPCPluginSettings.cs              | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index cf09d96552c..63c1c7f9d89 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -114,15 +114,15 @@ public void Save()
                 return null;
             }
 
-            // Create main grid
+            // Create main grid with two columns
             var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
             mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
             {
-                Width = new GridLength(70, GridUnitType.Star)  // TODO: Auto
+                Width = new GridLength(0, GridUnitType.Auto)
             });
             mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
             {
-                Width = new GridLength(30, GridUnitType.Star)  // TODO: Auto
+                Width = new GridLength(0, GridUnitType.Auto)
             });
 
             // Iterate over each setting and create one row for it
@@ -136,7 +136,10 @@ public void Save()
                 }
 
                 // Add a new row to the main grid
-                mainPanel.RowDefinitions.Add(new RowDefinition());
+                mainPanel.RowDefinitions.Add(new RowDefinition()
+                {
+                    Height = new GridLength(0, GridUnitType.Auto)
+                });
 
                 // State controls for column 0 and 1
                 StackPanel? panel = null;
@@ -357,11 +360,10 @@ Settings[attributes.Name] is bool isChecked
                         var linkbtn = new System.Windows.Controls.Button
                         {
                             HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
-                            Margin = settingControlMargin
+                            Margin = settingControlMargin,
+                            Content = attributes.urlLabel
                         };
 
-                        linkbtn.Content = attributes.urlLabel;
-
                         contentControl = linkbtn;
 
                         break;

From 43043291c9f39bf7cf1aa7ef877670b071288ad0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 10:33:08 +0800
Subject: [PATCH 18/47] Improve code quality

---
 .../Plugin/JsonRPCPluginSettings.cs           | 111 +++++++++---------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 63c1c7f9d89..5b84c1781cc 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -4,15 +4,8 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
-using System.Windows.Forms;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin;
-using CheckBox = System.Windows.Controls.CheckBox;
-using ComboBox = System.Windows.Controls.ComboBox;
-using Control = System.Windows.Controls.Control;
-using Orientation = System.Windows.Controls.Orientation;
-using TextBox = System.Windows.Controls.TextBox;
-using UserControl = System.Windows.Controls.UserControl;
 
 #nullable enable
 
@@ -34,7 +27,7 @@ public class JsonRPCPluginSettings
         // TODO: Move to resource
         private static readonly Thickness settingControlMargin = new(0, 9, 18, 9);
         private static readonly Thickness settingCheckboxMargin = new(0, 9, 9, 9);
-        private static readonly Thickness settingPanelMargin = (Thickness)System.Windows.Application.Current.FindResource("SettingPanelMargin");
+        private static readonly Thickness settingPanelMargin = (Thickness)Application.Current.FindResource("SettingPanelMargin");
 
         public async Task InitializeAsync()
         {
@@ -64,7 +57,9 @@ public async Task InitializeAsync()
         public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
         {
             if (settings == null || settings.Count == 0)
+            {
                 return;
+            }
 
             foreach (var (key, value) in settings)
             {
@@ -174,7 +169,7 @@ public void Save()
                             Text = attributes.Description,
                             FontSize = 12,
                             VerticalAlignment = VerticalAlignment.Center,
-                            Margin = new(0, 2, 0, 0),  // TODO: Use resource
+                            Margin = new(0, 2, 0, 0),
                             TextWrapping = TextWrapping.WrapWithOverflow
                         };
                         desc.SetResourceReference(TextBlock.ForegroundProperty, "Color04B"); // for theme change
@@ -196,7 +191,7 @@ public void Save()
                             {
                                 Text = attributes.Description?.Replace("\\r\\n", "\r\n") ?? string.Empty,
                                 Padding = new Thickness(0, 0, 0, 0),
-                                HorizontalAlignment = System.Windows.HorizontalAlignment.Left,
+                                HorizontalAlignment = HorizontalAlignment.Left,
                                 TextAlignment = TextAlignment.Left,
                                 TextWrapping = TextWrapping.Wrap
                             };
@@ -209,7 +204,7 @@ public void Save()
                             {
                                 Text = Settings[attributes.Name] as string ?? string.Empty,
                                 Margin = settingControlMargin,
-                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 ToolTip = attributes.Description
                             };
 
@@ -229,7 +224,7 @@ public void Save()
                             {
                                 Margin = new Thickness(10, 0, 0, 0),
                                 Text = Settings[attributes.Name] as string ?? string.Empty,
-                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 ToolTip = attributes.Description
                             };
 
@@ -238,25 +233,29 @@ public void Save()
                                 Settings[attributes.Name] = textBox.Text;
                             };
 
-                            var Btn = new System.Windows.Controls.Button()
+                            var Btn = new Button()
                             {
                                 Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
                             };
 
                             Btn.Click += (_, _) =>
                             {
-                                using CommonDialog dialog = type switch
+                                using System.Windows.Forms.CommonDialog dialog = type switch
                                 {
-                                    "inputWithFolderBtn" => new FolderBrowserDialog(),
-                                    _ => new OpenFileDialog(),
+                                    "inputWithFolderBtn" => new System.Windows.Forms.FolderBrowserDialog(),
+                                    _ => new System.Windows.Forms.OpenFileDialog(),
                                 };
-                                if (dialog.ShowDialog() != DialogResult.OK) return;
+
+                                if (dialog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
+                                {
+                                    return;
+                                }
 
                                 var path = dialog switch
                                 {
-                                    FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
-                                    OpenFileDialog fileDialog => fileDialog.FileName,
-                                    _ => string.Empty
+                                    System.Windows.Forms.FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
+                                    System.Windows.Forms.OpenFileDialog fileDialog => fileDialog.FileName,
+                                    _ => throw new System.NotImplementedException()
                                 };
                                 textBox.Text = path;
                                 Settings[attributes.Name] = path;
@@ -280,7 +279,7 @@ public void Save()
                                 VerticalAlignment = VerticalAlignment.Center,
                                 TextWrapping = TextWrapping.WrapWithOverflow,
                                 AcceptsReturn = true,
-                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 Text = Settings[attributes.Name] as string ?? string.Empty,
                                 ToolTip = attributes.Description
                             };
@@ -301,7 +300,7 @@ public void Save()
                                 Margin = settingControlMargin,
                                 Password = Settings[attributes.Name] as string ?? string.Empty,
                                 PasswordChar = attributes.passwordChar == default ? '*' : attributes.passwordChar,
-                                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 ToolTip = attributes.Description
                             };
 
@@ -321,7 +320,7 @@ public void Save()
                                 ItemsSource = attributes.Options,
                                 SelectedItem = Settings[attributes.Name],
                                 Margin = settingControlMargin,
-                                HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
+                                HorizontalAlignment = HorizontalAlignment.Right,
                                 ToolTip = attributes.Description
                             };
 
@@ -335,49 +334,55 @@ public void Save()
                             break;
                         }
                     case "checkbox":
-                        var checkBox = new CheckBox
                         {
-                            IsChecked =
+                            var checkBox = new CheckBox
+                            {
+                                IsChecked =
                                 Settings[attributes.Name] is bool isChecked
                                     ? isChecked
                                     : bool.Parse(attributes.DefaultValue),
-                            Margin = settingCheckboxMargin,
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
-                            ToolTip = attributes.Description
-                        };
+                                Margin = settingCheckboxMargin,
+                                HorizontalAlignment = HorizontalAlignment.Right,
+                                ToolTip = attributes.Description
+                            };
 
-                        checkBox.Click += (sender, _) =>
-                        {
-                            Settings[attributes.Name] = ((CheckBox)sender).IsChecked!;
-                        };
+                            checkBox.Click += (sender, _) =>
+                            {
+                                Settings[attributes.Name] = ((CheckBox)sender).IsChecked!;
+                            };
 
-                        contentControl = checkBox;
+                            contentControl = checkBox;
 
-                        break;
+                            break;
+                        }
                     case "hyperlink":
-                        var hyperlink = new Hyperlink { ToolTip = attributes.Description, NavigateUri = attributes.url };
-
-                        var linkbtn = new System.Windows.Controls.Button
                         {
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
-                            Margin = settingControlMargin,
-                            Content = attributes.urlLabel
-                        };
+                            var hyperlink = new Hyperlink { ToolTip = attributes.Description, NavigateUri = attributes.url };
 
-                        contentControl = linkbtn;
+                            var linkbtn = new Button
+                            {
+                                HorizontalAlignment = HorizontalAlignment.Right,
+                                Margin = settingControlMargin,
+                                Content = attributes.urlLabel
+                            };
+
+                            contentControl = linkbtn;
 
-                        break;
-                    case "seperator":  // TODO: Support seperator
-                        // TODO: Use style for Seperator
-                        contentControl = new Separator
+                            break;
+                        }
+                    case "seperator":
                         {
-                            VerticalAlignment = VerticalAlignment.Top,
-                            Margin = new(-70, 13.5, -18, 13.5),
-                            Height = 1
-                        };
-                        contentControl.SetResourceReference(Separator.BackgroundProperty, "Color03B");
+                            // TODO: Move to resource
+                            contentControl = new Separator
+                            {
+                                VerticalAlignment = VerticalAlignment.Top,
+                                Margin = new(-70, 13.5, -18, 13.5),
+                                Height = 1
+                            };
+                            contentControl.SetResourceReference(Separator.BackgroundProperty, "Color03B");
 
-                        break;
+                            break;
+                        }
                     default:
                         continue;
                 }

From f99648f3b46ba7b92341b115429653cd3e323e69 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 11:41:27 +0800
Subject: [PATCH 19/47] Redesgin json rpc settings

---
 .../Plugin/JsonRPCPluginSettings.cs           | 88 +++++++++++++------
 1 file changed, 60 insertions(+), 28 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 5b84c1781cc..a604b2b91f1 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -24,10 +24,14 @@ public class JsonRPCPluginSettings
 
         private JsonStorage<ConcurrentDictionary<string, object>> _storage = null!;
 
-        // TODO: Move to resource
-        private static readonly Thickness settingControlMargin = new(0, 9, 18, 9);
-        private static readonly Thickness settingCheckboxMargin = new(0, 9, 9, 9);
-        private static readonly Thickness settingPanelMargin = (Thickness)Application.Current.FindResource("SettingPanelMargin");
+        private static readonly Thickness SettingPanelMargin = (Thickness)Application.Current.FindResource("SettingPanelMargin");
+
+        private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");
+        private static readonly Thickness SettingPanelItemRightMargin = (Thickness)Application.Current.FindResource("SettingPanelItemRightMargin");
+        private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");
+
+        private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
+        private static readonly Thickness SettingPanelItemRightTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemRightTopBottomMargin");
 
         public async Task InitializeAsync()
         {
@@ -109,15 +113,15 @@ public void Save()
                 return null;
             }
 
-            // Create main grid with two columns
-            var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
+            // Create main grid with two columns (Column 1: Auto, Column 2: *)
+            var mainPanel = new Grid { Margin = SettingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
             mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
             {
                 Width = new GridLength(0, GridUnitType.Auto)
             });
             mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
             {
-                Width = new GridLength(0, GridUnitType.Auto)
+                Width = new GridLength(1, GridUnitType.Star)
             });
 
             // Iterate over each setting and create one row for it
@@ -140,12 +144,13 @@ public void Save()
                 StackPanel? panel = null;
                 FrameworkElement contentControl;
 
-                // If the type is textBlock or seperator, we do not need to create a panel
-                if (type != "textBlock" && type != "seperator")
+                // If the type is textBlock, seperator or check box, we do not need to create a panel
+                if (type != "textBlock" && type != "seperator" && type != "checkbox")
                 {
                     // Create a panel to hold the label and description
                     panel = new StackPanel
                     {
+                        Margin = SettingPanelItemTopBottomMargin,
                         Orientation = Orientation.Vertical,
                         VerticalAlignment = VerticalAlignment.Center
                     };
@@ -190,7 +195,7 @@ public void Save()
                             contentControl = new TextBlock
                             {
                                 Text = attributes.Description?.Replace("\\r\\n", "\r\n") ?? string.Empty,
-                                Padding = new Thickness(0, 0, 0, 0),
+                                Margin = SettingPanelItemTopBottomMargin,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 TextAlignment = TextAlignment.Left,
                                 TextWrapping = TextWrapping.Wrap
@@ -203,7 +208,7 @@ public void Save()
                             var textBox = new TextBox()
                             {
                                 Text = Settings[attributes.Name] as string ?? string.Empty,
-                                Margin = settingControlMargin,
+                                Margin = SettingPanelItemLeftTopBottomMargin,
                                 HorizontalAlignment = HorizontalAlignment.Stretch,
                                 ToolTip = attributes.Description
                             };
@@ -222,7 +227,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                Margin = new Thickness(10, 0, 0, 0),
+                                Margin = SettingPanelItemLeftMargin,
                                 Text = Settings[attributes.Name] as string ?? string.Empty,
                                 HorizontalAlignment = HorizontalAlignment.Stretch,
                                 ToolTip = attributes.Description
@@ -235,7 +240,8 @@ public void Save()
 
                             var Btn = new Button()
                             {
-                                Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
+                                Margin = SettingPanelItemLeftMargin,
+                                Content = "Browse"  // TODO: Localization
                             };
 
                             Btn.Click += (_, _) =>
@@ -257,15 +263,20 @@ public void Save()
                                     System.Windows.Forms.OpenFileDialog fileDialog => fileDialog.FileName,
                                     _ => throw new System.NotImplementedException()
                                 };
+
                                 textBox.Text = path;
                                 Settings[attributes.Name] = path;
                             };
 
-                            var dockPanel = new DockPanel() { Margin = settingControlMargin };
+                            var dockPanel = new DockPanel()
+                            {
+                                Margin = SettingPanelItemTopBottomMargin
+                            };
 
                             DockPanel.SetDock(Btn, Dock.Right);
                             dockPanel.Children.Add(Btn);
                             dockPanel.Children.Add(textBox);
+
                             contentControl = dockPanel;
 
                             break;
@@ -274,8 +285,8 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                Height = 120,
-                                Margin = settingControlMargin,
+                                Height = 150,
+                                Margin = SettingPanelItemLeftTopBottomMargin,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 TextWrapping = TextWrapping.WrapWithOverflow,
                                 AcceptsReturn = true,
@@ -297,7 +308,7 @@ public void Save()
                         {
                             var passwordBox = new PasswordBox()
                             {
-                                Margin = settingControlMargin,
+                                Margin = SettingPanelItemLeftTopBottomMargin,
                                 Password = Settings[attributes.Name] as string ?? string.Empty,
                                 PasswordChar = attributes.passwordChar == default ? '*' : attributes.passwordChar,
                                 HorizontalAlignment = HorizontalAlignment.Stretch,
@@ -319,8 +330,8 @@ public void Save()
                             {
                                 ItemsSource = attributes.Options,
                                 SelectedItem = Settings[attributes.Name],
-                                Margin = settingControlMargin,
-                                HorizontalAlignment = HorizontalAlignment.Right,
+                                Margin = SettingPanelItemLeftTopBottomMargin,
+                                HorizontalAlignment = HorizontalAlignment.Left,
                                 ToolTip = attributes.Description
                             };
 
@@ -341,8 +352,9 @@ public void Save()
                                 Settings[attributes.Name] is bool isChecked
                                     ? isChecked
                                     : bool.Parse(attributes.DefaultValue),
-                                Margin = settingCheckboxMargin,
-                                HorizontalAlignment = HorizontalAlignment.Right,
+                                Margin = SettingPanelItemTopBottomMargin,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                Content = attributes.Label,
                                 ToolTip = attributes.Description
                             };
 
@@ -357,13 +369,27 @@ Settings[attributes.Name] is bool isChecked
                         }
                     case "hyperlink":
                         {
-                            var hyperlink = new Hyperlink { ToolTip = attributes.Description, NavigateUri = attributes.url };
+                            var hyperlink = new Hyperlink
+                            {
+                                ToolTip = attributes.Description,
+                                NavigateUri = attributes.url
+                            };
+
+                            hyperlink.Inlines.Add(attributes.urlLabel);
+                            hyperlink.RequestNavigate += (sender, e) =>
+                            {
+                                API.OpenUrl(e.Uri);
+                                e.Handled = true;
+                            };
+
+                            var textBlock = new TextBlock();
+                            textBlock.Inlines.Add(hyperlink);
 
                             var linkbtn = new Button
                             {
-                                HorizontalAlignment = HorizontalAlignment.Right,
-                                Margin = settingControlMargin,
-                                Content = attributes.urlLabel
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                Margin = SettingPanelItemLeftTopBottomMargin,
+                                Content = textBlock
                             };
 
                             contentControl = linkbtn;
@@ -373,13 +399,16 @@ Settings[attributes.Name] is bool isChecked
                     case "seperator":
                         {
                             // TODO: Move to resource
-                            contentControl = new Separator
+                            var sep = new Separator
                             {
                                 VerticalAlignment = VerticalAlignment.Top,
                                 Margin = new(-70, 13.5, -18, 13.5),
                                 Height = 1
                             };
-                            contentControl.SetResourceReference(Separator.BackgroundProperty, "Color03B");
+
+                            sep.SetResourceReference(Separator.BackgroundProperty, "Color03B");
+
+                            contentControl = sep;
 
                             break;
                         }
@@ -407,8 +436,11 @@ Settings[attributes.Name] is bool isChecked
                     mainPanel.Children.Add(contentControl);
                     Grid.SetColumn(contentControl, 1);
                     Grid.SetRow(contentControl, rowCount);
+                }
 
-                    // Add into SettingControls for later use if need
+                // Add into SettingControls for later use if need
+                if (type != "textBlock" && type != "seperator")
+                {
                     SettingControls[attributes.Name] = contentControl;
                 }
 

From e893645b2446aa0a20995b2b581db8dcf276b1ce Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 12:13:58 +0800
Subject: [PATCH 20/47] Improve JsonRPC settings panel design

---
 .../Plugin/JsonRPCPluginSettings.cs           | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index a604b2b91f1..1e0e471f7b1 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -25,13 +25,9 @@ public class JsonRPCPluginSettings
         private JsonStorage<ConcurrentDictionary<string, object>> _storage = null!;
 
         private static readonly Thickness SettingPanelMargin = (Thickness)Application.Current.FindResource("SettingPanelMargin");
-
         private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");
-        private static readonly Thickness SettingPanelItemRightMargin = (Thickness)Application.Current.FindResource("SettingPanelItemRightMargin");
         private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");
-
         private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
-        private static readonly Thickness SettingPanelItemRightTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemRightTopBottomMargin");
 
         public async Task InitializeAsync()
         {
@@ -195,8 +191,9 @@ public void Save()
                             contentControl = new TextBlock
                             {
                                 Text = attributes.Description?.Replace("\\r\\n", "\r\n") ?? string.Empty,
-                                Margin = SettingPanelItemTopBottomMargin,
                                 HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
+                                Margin = SettingPanelItemTopBottomMargin,
                                 TextAlignment = TextAlignment.Left,
                                 TextWrapping = TextWrapping.Wrap
                             };
@@ -207,9 +204,11 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                Text = Settings[attributes.Name] as string ?? string.Empty,
+                                MinWidth = 180,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
-                                HorizontalAlignment = HorizontalAlignment.Stretch,
+                                Text = Settings[attributes.Name] as string ?? string.Empty,
                                 ToolTip = attributes.Description
                             };
 
@@ -227,9 +226,11 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
+                                MinWidth = 240,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
                                 Text = Settings[attributes.Name] as string ?? string.Empty,
-                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 ToolTip = attributes.Description
                             };
 
@@ -240,6 +241,8 @@ public void Save()
 
                             var Btn = new Button()
                             {
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
                                 Content = "Browse"  // TODO: Localization
                             };
@@ -268,16 +271,19 @@ public void Save()
                                 Settings[attributes.Name] = path;
                             };
 
-                            var dockPanel = new DockPanel()
+                            var stackPanel = new StackPanel()
                             {
-                                Margin = SettingPanelItemTopBottomMargin
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
+                                Margin = SettingPanelItemTopBottomMargin,
+                                Orientation = Orientation.Horizontal
                             };
 
-                            DockPanel.SetDock(Btn, Dock.Right);
-                            dockPanel.Children.Add(Btn);
-                            dockPanel.Children.Add(textBox);
+                            // Create a stack panel to wrap the button and text box
+                            stackPanel.Children.Add(textBox);
+                            stackPanel.Children.Add(Btn);
 
-                            contentControl = dockPanel;
+                            contentControl = stackPanel;
 
                             break;
                         }
@@ -286,11 +292,12 @@ public void Save()
                             var textBox = new TextBox()
                             {
                                 Height = 150,
-                                Margin = SettingPanelItemLeftTopBottomMargin,
+                                MinWidth = 180,
+                                HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
+                                Margin = SettingPanelItemLeftTopBottomMargin,
                                 TextWrapping = TextWrapping.WrapWithOverflow,
                                 AcceptsReturn = true,
-                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 Text = Settings[attributes.Name] as string ?? string.Empty,
                                 ToolTip = attributes.Description
                             };
@@ -308,10 +315,12 @@ public void Save()
                         {
                             var passwordBox = new PasswordBox()
                             {
+                                MinWidth = 180,
+                                HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
                                 Password = Settings[attributes.Name] as string ?? string.Empty,
                                 PasswordChar = attributes.passwordChar == default ? '*' : attributes.passwordChar,
-                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 ToolTip = attributes.Description
                             };
 
@@ -330,8 +339,9 @@ public void Save()
                             {
                                 ItemsSource = attributes.Options,
                                 SelectedItem = Settings[attributes.Name],
-                                Margin = SettingPanelItemLeftTopBottomMargin,
                                 HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
+                                Margin = SettingPanelItemLeftTopBottomMargin,
                                 ToolTip = attributes.Description
                             };
 
@@ -352,8 +362,9 @@ public void Save()
                                 Settings[attributes.Name] is bool isChecked
                                     ? isChecked
                                     : bool.Parse(attributes.DefaultValue),
-                                Margin = SettingPanelItemTopBottomMargin,
                                 HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
+                                Margin = SettingPanelItemTopBottomMargin,
                                 Content = attributes.Label,
                                 ToolTip = attributes.Description
                             };
@@ -382,17 +393,17 @@ Settings[attributes.Name] is bool isChecked
                                 e.Handled = true;
                             };
 
-                            var textBlock = new TextBlock();
-                            textBlock.Inlines.Add(hyperlink);
-
-                            var linkbtn = new Button
+                            var textBlock = new TextBlock()
                             {
                                 HorizontalAlignment = HorizontalAlignment.Left,
+                                VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
-                                Content = textBlock
+                                TextAlignment = TextAlignment.Left,
+                                TextWrapping = TextWrapping.Wrap
                             };
+                            textBlock.Inlines.Add(hyperlink);
 
-                            contentControl = linkbtn;
+                            contentControl = textBlock;
 
                             break;
                         }

From e1c446128624779d7402a0668b1ecff7378c61e6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 17:43:45 +0800
Subject: [PATCH 21/47] Fix JsonElement parse issue

---
 .../Plugin/JsonRPCPluginSettings.cs           | 63 +++++++++++++++----
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 1e0e471f7b1..8282dec4c9c 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -18,11 +19,11 @@ public class JsonRPCPluginSettings
         public required string SettingPath { get; init; }
         public Dictionary<string, FrameworkElement> SettingControls { get; } = new();
 
-        public IReadOnlyDictionary<string, object> Inner => Settings;
-        protected ConcurrentDictionary<string, object> Settings { get; set; } = null!;
+        public IReadOnlyDictionary<string, object?> Inner => Settings;
+        protected ConcurrentDictionary<string, object?> Settings { get; set; } = null!;
         public required IPublicAPI API { get; init; }
 
-        private JsonStorage<ConcurrentDictionary<string, object>> _storage = null!;
+        private JsonStorage<ConcurrentDictionary<string, object?>> _storage = null!;
 
         private static readonly Thickness SettingPanelMargin = (Thickness)Application.Current.FindResource("SettingPanelMargin");
         private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");
@@ -31,15 +32,35 @@ public class JsonRPCPluginSettings
 
         public async Task InitializeAsync()
         {
-            _storage = new JsonStorage<ConcurrentDictionary<string, object>>(SettingPath);
-            Settings = await _storage.LoadAsync();
+            if (Settings == null)
+            {
+                _storage = new JsonStorage<ConcurrentDictionary<string, object?>>(SettingPath);
+                Settings = await _storage.LoadAsync();
+
+                // Because value type of settings dictionary is object which causes them to be JsonElement when loading from json files,
+                // we need to convert it to the correct type
+                foreach (var (key, value) in Settings)
+                {
+                    if (value is JsonElement jsonElement)
+                    {
+                        Settings[key] = jsonElement.ValueKind switch
+                        {
+                            JsonValueKind.String => jsonElement.GetString() ?? value,
+                            JsonValueKind.True => jsonElement.GetBoolean(),
+                            JsonValueKind.False => jsonElement.GetBoolean(),
+                            JsonValueKind.Null => null,
+                            _ => value
+                        };
+                    }
+                }
+            }
 
             if (Configuration == null)
             {
                 return;
             }
 
-            foreach (var (_, attributes) in Configuration.Body)
+            foreach (var (type, attributes) in Configuration.Body)
             {
                 // Skip if the setting does not have attributes or name
                 if (attributes?.Name == null)
@@ -47,9 +68,20 @@ public async Task InitializeAsync()
                     continue;
                 }
 
-                if (!Settings.ContainsKey(attributes.Name))
+                if (NeedSaveInSettings(type))
                 {
-                    Settings[attributes.Name] = attributes.DefaultValue;
+                    // If need save in settings, we need to make sure the setting exists in the settings file
+                    if (!Settings.ContainsKey(attributes.Name))
+                    {
+                        if (type == "checkbox")
+                        {
+                            Settings[attributes.Name] = bool.Parse(attributes.DefaultValue);
+                        }
+                        else
+                        {
+                            Settings[attributes.Name] = attributes.DefaultValue;
+                        }
+                    }
                 }
             }
         }
@@ -103,8 +135,8 @@ public void Save()
 
         public Control? CreateSettingPanel()
         {
-            // If there are no settings or the settings are empty, return null
-            if (Configuration == null || Settings == null || Settings.IsEmpty)
+            // If there are no settings or the settings configuration is empty, return null
+            if (Configuration == null || Settings == null || Configuration.Body.Count == 0)
             {
                 return null;
             }
@@ -291,7 +323,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                Height = 150,
+                                MaxHeight = 150,
                                 MinWidth = 180,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
@@ -449,8 +481,8 @@ Settings[attributes.Name] is bool isChecked
                     Grid.SetRow(contentControl, rowCount);
                 }
 
-                // Add into SettingControls for later use if need
-                if (type != "textBlock" && type != "seperator")
+                // Add into SettingControls for settings storage if need
+                if (NeedSaveInSettings(type))
                 {
                     SettingControls[attributes.Name] = contentControl;
                 }
@@ -464,5 +496,10 @@ Settings[attributes.Name] is bool isChecked
                 Content = mainPanel
             };
         }
+
+        private static bool NeedSaveInSettings(string type)
+        {
+            return type != "textBlock" && type != "seperator" && type != "hyperlink";
+        }
     }
 }

From 62677bc40ea5c35ef302723264d43be97f35cb84 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 22:08:08 +0800
Subject: [PATCH 22/47] Fix program plugin settings panel top bottom margin
 issue

---
 .../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 6a6657959b5..d57e44542a4 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -67,21 +67,20 @@
                     Text="{DynamicResource flowlauncher_plugin_program_index_option}" />
                 <WrapPanel
                     Width="Auto"
-                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                     HorizontalAlignment="Right"
                     DockPanel.Dock="Right">
                     <CheckBox
-                        Margin="{StaticResource SettingPanelItemRightMargin}"
+                        Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
                         IsChecked="{Binding HideAppsPath}"
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
                     <CheckBox
-                        Margin="{StaticResource SettingPanelItemRightMargin}"
+                        Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_hideuninstallers}"
                         IsChecked="{Binding HideUninstallers}"
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hideuninstallers_tooltip}" />
                     <CheckBox
-                        Margin="{StaticResource SettingPanelItemRightMargin}"
+                        Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
                         IsChecked="{Binding EnableDescription}"
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />

From 317258af2f0b4a372f7f94813a35d56c4f57c362 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 22:08:40 +0800
Subject: [PATCH 23/47] Redesgin settings panel for explorer plugin

---
 .../Plugin/JsonRPCPluginSettings.cs           |    2 +-
 .../Views/ExplorerSettings.xaml               | 1242 ++++++++---------
 2 files changed, 614 insertions(+), 630 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 8282dec4c9c..ab679847304 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -227,7 +227,7 @@ public void Save()
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemTopBottomMargin,
                                 TextAlignment = TextAlignment.Left,
-                                TextWrapping = TextWrapping.Wrap
+                                TextWrapping = TextWrapping.Wrap  // TODO: Check password and others
                             };
 
                             break;
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index ecd6d1fcade..85b155a3956 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -14,99 +14,21 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
+
     <UserControl.Resources>
-        <Style x:Key="ExplorerTabItem" TargetType="{x:Type TabItem}">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type TabItem}">
-
-                        <Border
-                            x:Name="LayoutRoot"
-                            Margin="0 0 0 0"
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="True">
-                            <Grid>
-                                <Border
-                                    x:Name="TabSeparator"
-                                    Width="0"
-                                    Margin="{DynamicResource TabViewItemSeparatorMargin}"
-                                    HorizontalAlignment="Right"
-                                    BorderBrush="{DynamicResource TabViewItemSeparator}"
-                                    BorderThickness="1" />
-                                <Border
-                                    x:Name="TabContainer"
-                                    Grid.Column="1"
-                                    Padding="{DynamicResource TabViewItemHeaderPadding}"
-                                    Background="{DynamicResource TabViewItemHeaderBackground}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <ContentPresenter
-                                            x:Name="ContentPresenter"
-                                            Grid.Column="1"
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            ContentSource="Header"
-                                            Focusable="False"
-                                            RecognizesAccessKey="True"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                            TextElement.FontSize="{DynamicResource TabViewItemHeaderFontSize}"
-                                            TextElement.FontWeight="{TemplateBinding FontWeight}"
-                                            TextElement.Foreground="{DynamicResource Color05B}" />
-                                    </Grid>
-                                </Border>
-                            </Grid>
-                        </Border>
-
-                        <ControlTemplate.Triggers>
-                            <!--  PointerOver  -->
-                            <Trigger Property="IsMouseOver" Value="False">
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color08B}" />
-                            </Trigger>
-                            <!--  PointerOver  -->
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundPointerOver}" />
-
-                            </Trigger>
-                            <!--  Selected  -->
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
-
-                                <Setter Property="Panel.ZIndex" Value="1" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
-                            </Trigger>
-                            <!--  PointerOverSelected  -->
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsMouseOver" Value="True" />
-                                    <Condition Property="IsSelected" Value="True" />
-                                </MultiTrigger.Conditions>
-                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
-
-                                <Setter Property="Panel.ZIndex" Value="1" />
-                                <Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
-                            </MultiTrigger>
-                            <!--  Disabled  -->
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundDisabled}" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
+        <Style x:Key="HeaderTextBlockStyle" TargetType="TextBlock">
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="{StaticResource SettingPanelItemTopBottomMargin}" />
+            <Setter Property="TextAlignment" Value="Left" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="FontWeight" Value="Bold" />
         </Style>
+
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
             <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
+
         <core:TranslationConverter x:Key="TranslationConverter" />
         <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
             <Grid>
@@ -146,7 +68,7 @@
                     </TextBlock.Style>
                 </TextBlock>
 
-                <TextBlock Margin="500 5 0 0">
+                <TextBlock Margin="480 5 0 0">
                     <TextBlock.Style>
                         <Style TargetType="{x:Type TextBlock}">
                             <Style.Triggers>
@@ -167,550 +89,612 @@
 
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
     </UserControl.Resources>
-    <Grid Margin="0">
-        <TabControl
-            x:Name="TabView"
-            MinHeight="0"
-            Background="{DynamicResource Color00B}"
-            BorderThickness="0"
-            SelectedIndex="0"
-            TabStripPlacement="Top">
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_generalsetting_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Grid.Row="0" Margin="30 10 0 0">
-                    <StackPanel>
-                        <StackPanel Orientation="Vertical">
-                            <CheckBox
-                                Margin="0 10 0 0"
-                                HorizontalAlignment="Left"
-                                Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-                                IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
-                            <CheckBox
-                                Margin="0 10 0 0"
-                                HorizontalAlignment="Left"
-                                Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
-                                IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
-                            <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
-                                        <ColumnDefinition Width="*" SharedSizeGroup="B" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Margin="0 6 16 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_file_editor_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Margin="0 6 6 6"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding FileEditorPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 0 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenFileEditorPath}"
-                                            Content="..." />
-                                    </StackPanel>
-
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Margin="0 6 16 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_folder_editor_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Margin="0 6 6 6"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding FolderEditorPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 0 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenFolderEditorPath}"
-                                            Content="..." />
-                                    </StackPanel>
-
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        Margin="0 16 6 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_shell_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            Margin="0 10 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding ShellPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 10 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenShellPath}"
-                                            Content="..." />
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-
-                            <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
-                                        <ColumnDefinition Width="*" SharedSizeGroup="D" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Width="250"
-                                        Margin="10 15 10 10"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding IndexSearchEngines}"
-                                        SelectedItem="{Binding SelectedIndexSearchEngine}" />
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Width="250"
-                                        Margin="10"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding ContentIndexSearchEngines}"
-                                        SelectedItem="{Binding SelectedContentSearchEngine}" />
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Width="250"
-                                        Margin="10"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding PathEnumerationEngines}"
-                                        SelectedItem="{Binding SelectedPathEnumerationEngine}" />
-                                    <TextBlock
-                                        Grid.Row="3"
-                                        Grid.Column="0"
-                                        Margin="0 15 20 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Excluded_File_Types}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <TextBox
-                                        Grid.Row="3"
-                                        Grid.Column="1"
-                                        MinWidth="350"
-                                        Margin="0 9 0 6"
-                                        Text="{Binding ExcludedFileTypes}"
-                                        ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
-                                    <TextBlock
-                                        Grid.Row="4"
-                                        Grid.Column="0"
-                                        Margin="0 15 20 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Maximum_Results}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <TextBox
-                                        Grid.Row="4"
-                                        Grid.Column="1"
-                                        MinWidth="350"
-                                        Margin="0 9 0 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        MaxLength="6"
-                                        PreviewTextInput="AllowOnlyNumericInput"
-                                        Text="{Binding MaxResult}"
-                                        ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
-                                </Grid>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal">
-                                <Button
-                                    Margin="0 10 10 20"
-                                    Padding="20 10 20 10"
-                                    Click="btnOpenIndexingOptions_Click"
-                                    Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
-                            </StackPanel>
-                        </StackPanel>
-
-
-                    </StackPanel>
-                </StackPanel>
-            </TabItem>
-            <TabItem
+
+    <Grid Margin="{StaticResource SettingPanelMargin}">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <!--  General Setting  -->
+        <TextBlock
+            Grid.Row="0"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Style="{StaticResource HeaderTextBlockStyle}"
+            Text="{DynamicResource plugin_explorer_generalsetting_header}" />
+
+        <CheckBox
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+
+        <CheckBox
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
+            IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
+
+        <TextBlock
+            Grid.Row="3"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_file_editor_path}" />
+        <StackPanel
+            Grid.Row="3"
+            Grid.Column="1"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            Orientation="Horizontal">
+            <TextBox
+                MinWidth="180"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Text="{Binding FileEditorPath}"
+                TextWrapping="NoWrap" />
+            <Button
+                MinWidth="45"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Command="{Binding OpenFileEditorPath}"
+                Content="..." />
+        </StackPanel>
+
+        <TextBlock
+            Grid.Row="4"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_folder_editor_path}" />
+        <StackPanel
+            Grid.Row="4"
+            Grid.Column="1"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            Orientation="Horizontal">
+            <TextBox
+                MinWidth="180"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Text="{Binding FolderEditorPath}"
+                TextWrapping="NoWrap" />
+            <Button
+                MinWidth="45"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Command="{Binding OpenFolderEditorPath}"
+                Content="..." />
+        </StackPanel>
+
+        <TextBlock
+            Grid.Row="5"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_shell_path}" />
+        <StackPanel
+            Grid.Row="5"
+            Grid.Column="1"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            Orientation="Horizontal">
+            <TextBox
+                MinWidth="180"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Text="{Binding ShellPath}"
+                TextWrapping="NoWrap" />
+            <Button
+                MinWidth="45"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Command="{Binding OpenShellPath}"
+                Content="..." />
+        </StackPanel>
+
+        <TextBlock
+            Grid.Row="6"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_Index_Search_Engine}" />
+        <ComboBox
+            Grid.Row="6"
+            Grid.Column="1"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            DisplayMemberPath="Description"
+            ItemsSource="{Binding IndexSearchEngines}"
+            SelectedItem="{Binding SelectedIndexSearchEngine}" />
+
+        <TextBlock
+            Grid.Row="7"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_Content_Search_Engine}" />
+        <ComboBox
+            Grid.Row="7"
+            Grid.Column="1"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            DisplayMemberPath="Description"
+            ItemsSource="{Binding ContentIndexSearchEngines}"
+            SelectedItem="{Binding SelectedContentSearchEngine}" />
+
+        <TextBlock
+            Grid.Row="8"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}" />
+        <ComboBox
+            Grid.Row="8"
+            Grid.Column="1"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            DisplayMemberPath="Description"
+            ItemsSource="{Binding PathEnumerationEngines}"
+            SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+
+        <TextBlock
+            Grid.Row="9"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_Excluded_File_Types}" />
+        <TextBox
+            Grid.Row="9"
+            Grid.Column="1"
+            MinWidth="180"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            HorizontalAlignment="Left"
+            Text="{Binding ExcludedFileTypes}"
+            ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
+
+        <TextBlock
+            Grid.Row="10"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_Maximum_Results}" />
+        <TextBox
+            Grid.Row="10"
+            Grid.Column="1"
+            MinWidth="180"
+            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            MaxLength="6"
+            PreviewTextInput="AllowOnlyNumericInput"
+            Text="{Binding MaxResult}"
+            ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
+
+        <Button
+            Grid.Row="11"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            Click="btnOpenIndexingOptions_Click"
+            Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+
+        <!--  Native Context Menu  -->
+        <StackPanel
+            Grid.Row="12"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Orientation="Vertical">
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_native_context_menu_header}" />
+        </StackPanel>
+
+        <CheckBox
+            Grid.Row="13"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
+            IsChecked="{Binding ShowWindowsContextMenu}" />
+
+        <TextBlock
+            Grid.Row="14"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
+            TextWrapping="Wrap" />
+
+        <TextBox
+            Grid.Row="15"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            MinWidth="180"
+            MaxHeight="150"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            AcceptsReturn="True"
+            Text="{Binding WindowsContextMenuIncludedItems}"
+            TextWrapping="Wrap" />
+
+        <TextBlock
+            Grid.Row="16"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
+            TextWrapping="Wrap" />
+
+        <TextBox
+            Grid.Row="17"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            MinWidth="180"
+            MaxHeight="150"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            AcceptsReturn="True"
+            Text="{Binding WindowsContextMenuExcludedItems}"
+            TextWrapping="Wrap" />
+
+        <!--  Preview Panel  -->
+        <StackPanel
+            Grid.Row="18"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Orientation="Vertical">
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_previewpanel_setting_header}" />
+        </StackPanel>
+
+        <DockPanel
+            Grid.Row="19"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            HorizontalAlignment="Stretch"
+            LastChildFill="True">
+            <TextBlock
+                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                VerticalAlignment="Center"
+                Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
+            <WrapPanel
                 Width="Auto"
-                Header="{DynamicResource plugin_explorer_native_context_menu_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="30 20 10 10">
-                    <CheckBox
-                        Margin="0 0 0 0"
-                        Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
-                        IsChecked="{Binding ShowWindowsContextMenu}" />
-
-                    <Grid Margin="0 10 20 10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Margin="0 0 6 6"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
-                            TextWrapping="Wrap" />
-
-                        <TextBox
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Height="300"
-                            Margin="0 6 6 0"
-                            AcceptsReturn="True"
-                            Text="{Binding WindowsContextMenuIncludedItems}"
-                            TextWrapping="Wrap" />
-
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Margin="6 0 0 6"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
-                            TextWrapping="Wrap" />
-
-                        <TextBox
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            Height="300"
-                            Margin="6 6 0 0"
-                            AcceptsReturn="True"
-                            Text="{Binding WindowsContextMenuExcludedItems}"
-                            TextWrapping="Wrap" />
-                    </Grid>
-                </StackPanel>
-            </TabItem>
-            <TabItem
+                HorizontalAlignment="Right"
+                DockPanel.Dock="Right">
+                <CheckBox
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
+                    IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
+                <CheckBox
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
+                    IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
+                <CheckBox
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
+                    IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
+            </WrapPanel>
+        </DockPanel>
+
+        <DockPanel
+            Grid.Row="20"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            HorizontalAlignment="Stretch"
+            LastChildFill="True">
+            <TextBlock
+                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                VerticalAlignment="Center"
+                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}"
+                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}" />
+            <WrapPanel
                 Width="Auto"
-                Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="30 20 0 10">
-                    <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
-                    <CheckBox
-                        Margin="0 10 0 0"
-                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
-                        IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
-
-                    <CheckBox
-                        Margin="0 10 0 0"
-                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
-                        IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
-
-                    <CheckBox
-                        Margin="0 10 0 0"
-                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
-                        IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
-
-                    <StackPanel
-                        Margin="0 20 0 0"
-                        IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                        Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
-                        <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}" />
-                        <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
-                            <ComboBox
-                                Width="200"
-                                ItemsSource="{Binding DateFormatList}"
-                                SelectedItem="{Binding PreviewPanelDateFormat}" />
-                            <TextBlock
-                                Margin="12 0 0 0"
-                                VerticalAlignment="Center"
-                                Foreground="{DynamicResource Color05B}"
-                                Text="{Binding PreviewPanelDateFormatDemo}" />
-                        </StackPanel>
-                        <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
-                            <ComboBox
-                                Width="200"
-                                ItemsSource="{Binding TimeFormatList}"
-                                SelectedItem="{Binding PreviewPanelTimeFormat}" />
-                            <TextBlock
-                                Margin="12 0 0 0"
-                                VerticalAlignment="Center"
-                                Foreground="{DynamicResource Color05B}"
-                                Text="{Binding PreviewPanelTimeFormatDemo}" />
-                        </StackPanel>
-                    </StackPanel>
+                HorizontalAlignment="Right"
+                DockPanel.Dock="Right"
+                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
+                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                    <ComboBox
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        ItemsSource="{Binding DateFormatList}"
+                        SelectedItem="{Binding PreviewPanelDateFormat}" />
+                    <TextBlock
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        VerticalAlignment="Center"
+                        Text="{Binding PreviewPanelDateFormatDemo}" />
                 </StackPanel>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_everything_setting_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="10" Orientation="Vertical">
-                    <CheckBox
-                        Margin="20 10 0 0"
-                        HorizontalAlignment="Left"
-                        Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
-                        IsChecked="{Binding Settings.EverythingSearchFullPath}" />
-                    <CheckBox
-                        Margin="20 10 0 0"
-                        HorizontalAlignment="Left"
-                        Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
-                        IsChecked="{Binding Settings.EverythingEnableRunCount}" />
-                    <StackPanel Orientation="Horizontal">
-                        <Grid Margin="20 10 0 10">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="F" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Margin="0 0 20 0"
-                                VerticalAlignment="Center"
-                                Text="{DynamicResource plugin_explorer_everything_sort_option}"
-                                TextBlock.Foreground="{DynamicResource Color05B}" />
-                            <ComboBox
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Width="200"
-                                VerticalAlignment="Center"
-                                ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
-                                SelectedItem="{Binding Settings.SortOption}"
-                                SelectionChanged="EverythingSortOptionChanged">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
-                                        </Grid>
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                Margin="0 15 20 0"
-                                VerticalAlignment="Center"
-                                Text="{DynamicResource plugin_explorer_everything_installed_path}"
-                                TextBlock.Foreground="{DynamicResource Color05B}" />
-                            <TextBox
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                MinWidth="350"
-                                Margin="0 15 0 0"
-                                Text="{Binding EverythingInstalledPath}" />
-                        </Grid>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock
-                            Name="tbFastSortWarning"
-                            Margin="20 10 10 10"
-                            VerticalAlignment="Center"
-                            DockPanel.Dock="Right"
-                            Foreground="Orange"
-                            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
-                            TextAlignment="Left"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
-                    </StackPanel>
+                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                    <ComboBox
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        ItemsSource="{Binding TimeFormatList}"
+                        SelectedItem="{Binding PreviewPanelTimeFormat}" />
+                    <TextBlock
+                        Margin="{StaticResource SettingPanelItemLeftMargin}"
+                        VerticalAlignment="Center"
+                        Text="{Binding PreviewPanelTimeFormatDemo}" />
                 </StackPanel>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <DockPanel HorizontalAlignment="Stretch">
-                    <Border
-                        Margin="10 10 10 5"
-                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1"
-                        DockPanel.Dock="Top">
-                        <ListView
-                            ItemTemplate="{StaticResource ListViewActionKeywords}"
-                            ItemsSource="{Binding ActionKeywordsModels}"
-                            SelectedItem="{Binding SelectedActionKeyword}" />
-                    </Border>
-                    <StackPanel
-                        HorizontalAlignment="Right"
-                        DockPanel.Dock="Bottom"
-                        Orientation="Horizontal">
-                        <Button
-                            MinWidth="100"
-                            Margin="10"
-                            Command="{Binding EditActionKeywordCommand}"
-                            Content="{DynamicResource plugin_explorer_edit}" />
-                    </StackPanel>
-                </DockPanel>
-            </TabItem>
-            <TabItem
-                Name="expAccessLinks"
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <ScrollViewer>
-                    <DockPanel HorizontalAlignment="Stretch">
-                        <Border
-                            Margin="10 10 10 5"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                            BorderThickness="1"
-                            DockPanel.Dock="Top">
-                            <ListView
-                                x:Name="lbxAccessLinks"
-                                Height="200"
-                                AllowDrop="True"
-                                BorderThickness="1"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxAccessLinks_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.QuickAccessLinks}"
-                                SelectedItem="{Binding SelectedQuickAccessLink}" />
-                        </Border>
-                        <StackPanel
-                            HorizontalAlignment="Right"
-                            DockPanel.Dock="Bottom"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_add}" />
-                        </StackPanel>
-                    </DockPanel>
-                </ScrollViewer>
-            </TabItem>
-            <TabItem
-                Width="Auto"
-                Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
-                Style="{DynamicResource ExplorerTabItem}">
-                <ScrollViewer>
-                    <DockPanel HorizontalAlignment="Stretch">
-                        <Border
-                            Margin="10 10 10 5"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                            BorderThickness="1"
-                            DockPanel.Dock="Top">
-                            <ListView
-                                Name="lbxExcludedPaths"
-                                Height="200"
-                                AllowDrop="True"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxExcludedPaths_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
-                                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
-                        </Border>
-                        <StackPanel
-                            HorizontalAlignment="Right"
-                            DockPanel.Dock="Bottom"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_add}" />
-                        </StackPanel>
-                    </DockPanel>
-                </ScrollViewer>
-            </TabItem>
-        </TabControl>
+            </WrapPanel>
+        </DockPanel>
+
+        <!--  Everything Setting  -->
+        <StackPanel
+            Grid.Row="21"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Orientation="Vertical">
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_everything_setting_header}" />
+        </StackPanel>
+
+        <CheckBox
+            Grid.Row="22"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
+            IsChecked="{Binding Settings.EverythingSearchFullPath}" />
+
+        <CheckBox
+            Grid.Row="23"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
+            IsChecked="{Binding Settings.EverythingEnableRunCount}" />
+
+        <TextBlock
+            Grid.Row="24"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_everything_sort_option}" />
+        <ComboBox
+            Grid.Row="24"
+            Grid.Column="1"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+            VerticalAlignment="Center"
+            ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
+            SelectedItem="{Binding Settings.SortOption}"
+            SelectionChanged="EverythingSortOptionChanged">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
+                    </Grid>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <TextBlock
+            Grid.Row="26"
+            Grid.Column="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Text="{DynamicResource plugin_explorer_everything_installed_path}" />
+        <TextBox
+            Grid.Row="26"
+            Grid.Column="1"
+            MinWidth="240"
+            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+            HorizontalAlignment="Left"
+            Text="{Binding EverythingInstalledPath}" />
+
+        <TextBlock
+            Name="tbFastSortWarning"
+            Grid.Row="27"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            VerticalAlignment="Center"
+            Foreground="Orange"
+            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
+            TextAlignment="Left"
+            TextWrapping="Wrap"
+            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
+
+        <!--  Customise Action Keywords  -->
+        <StackPanel
+            Grid.Row="28"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Orientation="Vertical">
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_manageactionkeywords_header}" />
+        </StackPanel>
+
+        <Border
+            Grid.Row="29"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Stretch"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="1">
+            <ListView
+                ItemTemplate="{StaticResource ListViewActionKeywords}"
+                ItemsSource="{Binding ActionKeywordsModels}"
+                SelectedItem="{Binding SelectedActionKeyword}" />
+        </Border>
+
+        <StackPanel
+            Grid.Row="30"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                MinWidth="100"
+                Command="{Binding EditActionKeywordCommand}"
+                Content="{DynamicResource plugin_explorer_edit}" />
+        </StackPanel>
+
+        <!--  Quick Access Links  -->
+        <StackPanel
+            Grid.Row="31"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Orientation="Vertical">
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_quickaccesslinks_header}" />
+        </StackPanel>
+
+        <Border
+            Grid.Row="32"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Stretch"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="1">
+            <ListView
+                x:Name="lbxAccessLinks"
+                Height="200"
+                AllowDrop="True"
+                BorderThickness="1"
+                DragEnter="lbxAccessLinks_DragEnter"
+                Drop="LbxAccessLinks_OnDrop"
+                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                ItemsSource="{Binding Settings.QuickAccessLinks}"
+                SelectedItem="{Binding SelectedQuickAccessLink}" />
+        </Border>
+
+        <StackPanel
+            Grid.Row="33"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                MinWidth="100"
+                Command="{Binding RemoveLinkCommand}"
+                CommandParameter="QuickAccessLink"
+                Content="{DynamicResource plugin_explorer_delete}" />
+            <Button
+                MinWidth="100"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                Command="{Binding EditLinkCommand}"
+                CommandParameter="QuickAccessLink"
+                Content="{DynamicResource plugin_explorer_edit}" />
+            <Button
+                MinWidth="100"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                Command="{Binding AddLinkCommand}"
+                CommandParameter="QuickAccessLink"
+                Content="{DynamicResource plugin_explorer_add}" />
+        </StackPanel>
+
+        <!--  Index Search Excluded Paths  -->
+        <StackPanel
+            Grid.Row="34"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Orientation="Vertical">
+            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}" />
+        </StackPanel>
+
+        <Border
+            Grid.Row="35"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Stretch"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="1">
+            <ListView
+                Name="lbxExcludedPaths"
+                Height="200"
+                AllowDrop="True"
+                DragEnter="lbxAccessLinks_DragEnter"
+                Drop="LbxExcludedPaths_OnDrop"
+                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
+                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
+        </Border>
+
+        <StackPanel
+            Grid.Row="36"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                MinWidth="100"
+                Command="{Binding RemoveLinkCommand}"
+                CommandParameter="IndexSearchExcludedPaths"
+                Content="{DynamicResource plugin_explorer_delete}" />
+            <Button
+                MinWidth="100"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                Command="{Binding EditLinkCommand}"
+                CommandParameter="IndexSearchExcludedPaths"
+                Content="{DynamicResource plugin_explorer_edit}" />
+            <Button
+                MinWidth="100"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                Command="{Binding AddLinkCommand}"
+                CommandParameter="IndexSearchExcludedPaths"
+                Content="{DynamicResource plugin_explorer_add}" />
+        </StackPanel>
 
     </Grid>
+
 </UserControl>

From cd320f3de6e35a01dc9749a265e4e946f97887e5 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 22:15:22 +0800
Subject: [PATCH 24/47] Move to resource

---
 .../Plugin/JsonRPCPluginSettings.cs              | 10 ++++++----
 .../Resources/CustomControlTemplate.xaml         |  3 +++
 .../Views/ExplorerSettings.xaml                  | 16 ++++++++--------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index ab679847304..499371c4b46 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -29,6 +29,8 @@ public class JsonRPCPluginSettings
         private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");
         private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");
         private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
+        private static readonly double SettingPanelTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelTextBlockMinWidth");
+        private static readonly double SettingPanelPathTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelPathTextBlockMinWidth");
 
         public async Task InitializeAsync()
         {
@@ -236,7 +238,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinWidth = 180,
+                                MinWidth = SettingPanelTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
@@ -258,7 +260,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinWidth = 240,
+                                MinWidth = SettingPanelPathTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
@@ -324,7 +326,7 @@ public void Save()
                             var textBox = new TextBox()
                             {
                                 MaxHeight = 150,
-                                MinWidth = 180,
+                                MinWidth = SettingPanelTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
@@ -347,7 +349,7 @@ public void Save()
                         {
                             var passwordBox = new PasswordBox()
                             {
-                                MinWidth = 180,
+                                MinWidth = SettingPanelTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 9843c4595d3..e10539c8e34 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5602,4 +5602,7 @@
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Background" Value="{DynamicResource Color03B}" />
     </Style>
+
+    <system:Double x:Key="SettingPanelTextBlockMinWidth">180</system:Double>
+    <system:Double x:Key="SettingPanelPathTextBlockMinWidth">240</system:Double>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 85b155a3956..836e2d5589d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -174,7 +174,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="180"
+                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FileEditorPath}"
@@ -201,7 +201,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="180"
+                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FolderEditorPath}"
@@ -228,7 +228,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="180"
+                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding ShellPath}"
@@ -299,7 +299,7 @@
         <TextBox
             Grid.Row="9"
             Grid.Column="1"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             HorizontalAlignment="Left"
             Text="{Binding ExcludedFileTypes}"
@@ -314,7 +314,7 @@
         <TextBox
             Grid.Row="10"
             Grid.Column="1"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
@@ -361,7 +361,7 @@
             Grid.Row="15"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             MaxHeight="150"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
@@ -381,7 +381,7 @@
             Grid.Row="17"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             MaxHeight="150"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
@@ -529,7 +529,7 @@
         <TextBox
             Grid.Row="26"
             Grid.Column="1"
-            MinWidth="240"
+            MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
             Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Text="{Binding EverythingInstalledPath}" />

From 86c055338fc5dde4b1c6f4314aa1d8c2dfe66a0d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 22:17:16 +0800
Subject: [PATCH 25/47] Unify operation button width

---
 .../Views/SettingsControl.xaml                              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 6183fa1b2de..30424f4e892 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -65,11 +65,11 @@
                 HorizontalAlignment="Right"
                 Orientation="Horizontal">
                 <Button
-                    MinWidth="130"
+                    Width="100"
                     Click="NewCustomBrowser"
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
                 <Button
-                    MinWidth="130"
+                    Width="100"
                     Margin="{StaticResource SettingPanelItemLeftMargin}"
                     Click="EditCustomBrowser"
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_editBrowserBookmark}">
@@ -85,7 +85,7 @@
                     </Button.Style>
                 </Button>
                 <Button
-                    MinWidth="120"
+                    Width="100"
                     Margin="{StaticResource SettingPanelItemLeftMargin}"
                     Click="DeleteCustomBrowser"
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />

From 9f55e8387ebfa1591d75404761fe06db565dc25b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 22:25:51 +0800
Subject: [PATCH 26/47] Change file select string

---
 .../Plugin/JsonRPCPluginSettings.cs               |  2 +-
 .../Views/ExplorerSettings.xaml                   | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 499371c4b46..0729fba4231 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -278,7 +278,7 @@ public void Save()
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
-                                Content = "Browse"  // TODO: Localization
+                                Content = API.GetTranslation("select")
                             };
 
                             Btn.Click += (_, _) =>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 836e2d5589d..e525c84add1 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -174,18 +174,17 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
+                MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FileEditorPath}"
                 TextWrapping="NoWrap" />
             <Button
-                MinWidth="45"
                 Margin="{StaticResource SettingPanelItemLeftMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Command="{Binding OpenFileEditorPath}"
-                Content="..." />
+                Content="{DynamicResource select}" />
         </StackPanel>
 
         <TextBlock
@@ -201,18 +200,17 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
+                MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FolderEditorPath}"
                 TextWrapping="NoWrap" />
             <Button
-                MinWidth="45"
                 Margin="{StaticResource SettingPanelItemLeftMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Command="{Binding OpenFolderEditorPath}"
-                Content="..." />
+                Content="{DynamicResource select}" />
         </StackPanel>
 
         <TextBlock
@@ -228,18 +226,17 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
+                MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding ShellPath}"
                 TextWrapping="NoWrap" />
             <Button
-                MinWidth="45"
                 Margin="{StaticResource SettingPanelItemLeftMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Command="{Binding OpenShellPath}"
-                Content="..." />
+                Content="{DynamicResource select}" />
         </StackPanel>
 
         <TextBlock

From bc7f4fe38400d762072ad7ac1951d724ef329e12 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 22:29:14 +0800
Subject: [PATCH 27/47] Improve text area

---
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs        | 4 ++--
 .../Views/ExplorerSettings.xaml                           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 0729fba4231..69934e9f48b 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -325,8 +325,8 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MaxHeight = 150,
-                                MinWidth = SettingPanelTextBlockMinWidth,
+                                MinHeight = 150,
+                                MinWidth = 240,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index e525c84add1..a5e5f60071a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -358,8 +358,8 @@
             Grid.Row="15"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
-            MaxHeight="150"
+            MinWidth="240"
+            MinHeight="150"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
             AcceptsReturn="True"
@@ -378,8 +378,8 @@
             Grid.Row="17"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
-            MaxHeight="150"
+            MinWidth="240"
+            MinHeight="150"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
             AcceptsReturn="True"

From af3a1a310c87feef3196f021000642edc72e698d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 1 Mar 2025 22:38:11 +0800
Subject: [PATCH 28/47] Unify text area min width & height

---
 .../Plugin/JsonRPCPluginSettings.cs           | 21 +++++++++++--------
 .../Resources/CustomControlTemplate.xaml      |  6 ++++--
 .../Views/ExplorerSettings.xaml               | 20 +++++++++---------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 69934e9f48b..388f0b2c962 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -29,8 +29,10 @@ public class JsonRPCPluginSettings
         private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");
         private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");
         private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
-        private static readonly double SettingPanelTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelTextBlockMinWidth");
-        private static readonly double SettingPanelPathTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelPathTextBlockMinWidth");
+        private static readonly double SettingPanelTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelTextBoxMinWidth");
+        private static readonly double SettingPanelPathTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelPathTextBoxMinWidth");
+        private static readonly double SettingPanelAreaTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelAreaTextBoxMinWidth");
+        private static readonly double SettingPanelAreaTextBoxMinHeight = (double)Application.Current.FindResource("SettingPanelAreaTextBoxMinHeight");
 
         public async Task InitializeAsync()
         {
@@ -229,7 +231,7 @@ public void Save()
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemTopBottomMargin,
                                 TextAlignment = TextAlignment.Left,
-                                TextWrapping = TextWrapping.Wrap  // TODO: Check password and others
+                                TextWrapping = TextWrapping.Wrap
                             };
 
                             break;
@@ -238,7 +240,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinWidth = SettingPanelTextBlockMinWidth,
+                                MinWidth = SettingPanelTextBoxMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
@@ -260,7 +262,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinWidth = SettingPanelPathTextBlockMinWidth,
+                                MinWidth = SettingPanelPathTextBoxMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
@@ -325,8 +327,8 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinHeight = 150,
-                                MinWidth = 240,
+                                MinHeight = SettingPanelAreaTextBoxMinHeight,
+                                MinWidth = SettingPanelAreaTextBoxMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
@@ -349,15 +351,16 @@ public void Save()
                         {
                             var passwordBox = new PasswordBox()
                             {
-                                MinWidth = SettingPanelTextBlockMinWidth,
+                                MinWidth = SettingPanelTextBoxMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
                                 Password = Settings[attributes.Name] as string ?? string.Empty,
                                 PasswordChar = attributes.passwordChar == default ? '*' : attributes.passwordChar,
-                                ToolTip = attributes.Description
+                                ToolTip = attributes.Description,
                             };
 
+                            // TODO: Fix issue here
                             passwordBox.PasswordChanged += (sender, _) =>
                             {
                                 Settings[attributes.Name] = ((PasswordBox)sender).Password;
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index e10539c8e34..65002a3a06e 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5603,6 +5603,8 @@
         <Setter Property="Background" Value="{DynamicResource Color03B}" />
     </Style>
 
-    <system:Double x:Key="SettingPanelTextBlockMinWidth">180</system:Double>
-    <system:Double x:Key="SettingPanelPathTextBlockMinWidth">240</system:Double>
+    <system:Double x:Key="SettingPanelTextBoxMinWidth">180</system:Double>
+    <system:Double x:Key="SettingPanelPathTextBoxMinWidth">240</system:Double>
+    <system:Double x:Key="SettingPanelAreaTextBoxMinWidth">270</system:Double>
+    <system:Double x:Key="SettingPanelAreaTextBoxMinHeight">150</system:Double>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index a5e5f60071a..709b1805148 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -174,7 +174,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
+                MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FileEditorPath}"
@@ -200,7 +200,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
+                MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FolderEditorPath}"
@@ -226,7 +226,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
+                MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding ShellPath}"
@@ -296,7 +296,7 @@
         <TextBox
             Grid.Row="9"
             Grid.Column="1"
-            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
+            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             HorizontalAlignment="Left"
             Text="{Binding ExcludedFileTypes}"
@@ -311,7 +311,7 @@
         <TextBox
             Grid.Row="10"
             Grid.Column="1"
-            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
+            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
@@ -358,8 +358,8 @@
             Grid.Row="15"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="240"
-            MinHeight="150"
+            MinWidth="{StaticResource SettingPanelAreaTextBoxMinWidth}"
+            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
             AcceptsReturn="True"
@@ -378,8 +378,8 @@
             Grid.Row="17"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="240"
-            MinHeight="150"
+            MinWidth="{StaticResource SettingPanelAreaTextBoxMinWidth}"
+            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
             AcceptsReturn="True"
@@ -526,7 +526,7 @@
         <TextBox
             Grid.Row="26"
             Grid.Column="1"
-            MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
+            MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
             Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Text="{Binding EverythingInstalledPath}" />

From ae8f64798121e413e67cce58b666966fd90586c6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 2 Mar 2025 09:38:55 +0800
Subject: [PATCH 29/47] Use styles for JsonRPC settings panel

---
 .../Plugin/JsonRPCPluginSettings.cs             | 17 ++++-------------
 .../Resources/CustomControlTemplate.xaml        |  6 ++++++
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 388f0b2c962..a28b4ae0c15 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -188,7 +188,6 @@ public void Save()
                     };
 
                     // Create a text block for name
-                    // TODO: Move to resource
                     var name = new TextBlock()
                     {
                         Text = attributes.Label,
@@ -200,16 +199,14 @@ public void Save()
                     TextBlock? desc = null;
                     if (attributes.Description != null)
                     {
-                        // TODO: Move to resource
                         desc = new TextBlock()
                         {
                             Text = attributes.Description,
-                            FontSize = 12,
                             VerticalAlignment = VerticalAlignment.Center,
-                            Margin = new(0, 2, 0, 0),
                             TextWrapping = TextWrapping.WrapWithOverflow
                         };
-                        desc.SetResourceReference(TextBlock.ForegroundProperty, "Color04B"); // for theme change
+
+                        desc.SetResourceReference(TextBlock.StyleProperty, "SettingPanelTextBlockDescriptionStyle"); // for theme change
                     }
 
                     // Add the name and description to the panel
@@ -446,15 +443,9 @@ Settings[attributes.Name] is bool isChecked
                         }
                     case "seperator":
                         {
-                            // TODO: Move to resource
-                            var sep = new Separator
-                            {
-                                VerticalAlignment = VerticalAlignment.Top,
-                                Margin = new(-70, 13.5, -18, 13.5),
-                                Height = 1
-                            };
+                            var sep = new Separator();
 
-                            sep.SetResourceReference(Separator.BackgroundProperty, "Color03B");
+                            sep.SetResourceReference(Separator.StyleProperty, "SettingPanelSeperatorStyle");
 
                             contentControl = sep;
 
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 65002a3a06e..b646cb6951d 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5607,4 +5607,10 @@
     <system:Double x:Key="SettingPanelPathTextBoxMinWidth">240</system:Double>
     <system:Double x:Key="SettingPanelAreaTextBoxMinWidth">270</system:Double>
     <system:Double x:Key="SettingPanelAreaTextBoxMinHeight">150</system:Double>
+
+    <Style x:Key="SettingPanelTextBlockDescriptionStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Margin" Value="0 2 0 0" />
+        <Setter Property="Foreground" Value="{DynamicResource Color04B}" />
+    </Style>
 </ResourceDictionary>

From 1681ac470c74ef88ae5579782a880a54de982ad3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 2 Mar 2025 11:42:15 +0800
Subject: [PATCH 30/47] Fix path select button possibly invisible issue

---
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs       | 4 ++--
 Flow.Launcher/Resources/CustomControlTemplate.xaml       | 2 +-
 .../Views/ExplorerSettings.xaml                          | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index a28b4ae0c15..92089489600 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -30,7 +30,7 @@ public class JsonRPCPluginSettings
         private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");
         private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
         private static readonly double SettingPanelTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelTextBoxMinWidth");
-        private static readonly double SettingPanelPathTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelPathTextBoxMinWidth");
+        private static readonly double SettingPanelPathTextBoxWidth = (double)Application.Current.FindResource("SettingPanelPathTextBoxWidth");
         private static readonly double SettingPanelAreaTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelAreaTextBoxMinWidth");
         private static readonly double SettingPanelAreaTextBoxMinHeight = (double)Application.Current.FindResource("SettingPanelAreaTextBoxMinHeight");
 
@@ -259,7 +259,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinWidth = SettingPanelPathTextBoxMinWidth,
+                                Width = SettingPanelPathTextBoxWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index b646cb6951d..10d7ff987f3 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5604,7 +5604,7 @@
     </Style>
 
     <system:Double x:Key="SettingPanelTextBoxMinWidth">180</system:Double>
-    <system:Double x:Key="SettingPanelPathTextBoxMinWidth">240</system:Double>
+    <system:Double x:Key="SettingPanelPathTextBoxWidth">240</system:Double>
     <system:Double x:Key="SettingPanelAreaTextBoxMinWidth">270</system:Double>
     <system:Double x:Key="SettingPanelAreaTextBoxMinHeight">150</system:Double>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 709b1805148..5989192f42c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -174,7 +174,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
+                Width="{StaticResource SettingPanelPathTextBoxWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FileEditorPath}"
@@ -200,7 +200,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
+                Width="{StaticResource SettingPanelPathTextBoxWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FolderEditorPath}"
@@ -226,7 +226,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
+                Width="{StaticResource SettingPanelPathTextBoxWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding ShellPath}"
@@ -523,10 +523,11 @@
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             VerticalAlignment="Center"
             Text="{DynamicResource plugin_explorer_everything_installed_path}" />
+        <!--  Here we can use min width because there is no botton following textbox  -->
         <TextBox
             Grid.Row="26"
             Grid.Column="1"
-            MinWidth="{StaticResource SettingPanelPathTextBoxMinWidth}"
+            MinWidth="{StaticResource SettingPanelPathTextBoxWidth}"
             Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Text="{Binding EverythingInstalledPath}" />

From 31892a0fc84bea21ea6d7f9d4aff0d84e57846c3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 2 Mar 2025 11:45:25 +0800
Subject: [PATCH 31/47] Adjust installed plugin keyword margin

---
 .../Resources/Controls/InstalledPluginDisplayKeyword.xaml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
index d2d2afa095a..ded6e0e2776 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -34,9 +34,10 @@
                 DockPanel.Dock="Left"
                 Style="{DynamicResource SettingTitleLabel}"
                 Text="{DynamicResource actionKeywords}" />
+            <!--  Here Margin="0 -4.5 0 -4.5" is to remove redundant top bottom margin from Margin="{StaticResource SettingPanelMargin}"  -->
             <Button
                 Width="100"
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
+                Margin="0 -4.5 0 -4.5"
                 HorizontalAlignment="Right"
                 Command="{Binding SetActionKeywordsCommand}"
                 Content="{Binding ActionKeywordsText}"

From 20d0ed10744a8540392c58da34abdfd69ec60ed6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 3 Mar 2025 20:01:40 +0800
Subject: [PATCH 32/47] Remove unnecessary todo

---
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 92089489600..c9a0d6e47c2 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -357,7 +357,6 @@ public void Save()
                                 ToolTip = attributes.Description,
                             };
 
-                            // TODO: Fix issue here
                             passwordBox.PasswordChanged += (sender, _) =>
                             {
                                 Settings[attributes.Name] = ((PasswordBox)sender).Password;

From 6c80e74d597b967edbf39b78249113170ba8ef81 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 16 Mar 2025 20:22:21 +0800
Subject: [PATCH 33/47] Fix websearch plugin issue & Improve sys plugin
 settings panel

---
 Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml      |  7 ++++---
 .../SettingsControl.xaml                               | 10 ++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
index 80f8c7ccb3e..7908bd1e3cd 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
@@ -9,13 +9,13 @@
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    
+
     <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        
+
         <ListView
             x:Name="lbxCommands"
             Grid.Row="0"
@@ -58,11 +58,12 @@
 
         <StackPanel
             Grid.Row="1"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Button
                 Width="100"
-                Margin="10"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
                 Click="OnEditCommandKeywordClick"
                 Content="{DynamicResource flowlauncher_plugin_sys_edit}" />
         </StackPanel>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 5c782d044e8..1b73aa96681 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -9,6 +9,7 @@
     d:DesignHeight="300"
     d:DesignWidth="500"
     mc:Ignorable="d">
+
     <UserControl.Resources>
         <Style x:Key="BrowserPathBoxStyle" TargetType="TextBox">
             <Setter Property="Height" Value="28" />
@@ -35,13 +36,15 @@
             </DockPanel>
         </DataTemplate>
     </UserControl.Resources>
+
     <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="56" />
+            <RowDefinition Height="Auto" />
             <RowDefinition />
-            <RowDefinition Height="50" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
+
         <ListView
             x:Name="SearchSourcesListView"
             Grid.Row="0"
@@ -96,6 +99,7 @@
                 </GridView>
             </ListView.View>
         </ListView>
+
         <StackPanel
             Grid.Row="1"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
@@ -117,7 +121,9 @@
                 Click="OnAddSearchSearchClick"
                 Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
         </StackPanel>
+
         <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeperatorStyle}" />
+
         <DockPanel
             Grid.Row="3"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"

From fcd7e556412fa7f61c0320fd42e561da0639b1f8 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 16 Mar 2025 21:06:03 +0800
Subject: [PATCH 34/47] Change string resources

---
 Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
index 72f618f551f..21f836bec6c 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
@@ -19,7 +19,7 @@
     <system:String x:Key="flowlauncher_plugin_websearch_action_keyword">Action Keyword</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_url">URL</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_search">Search</system:String>
-    <system:String x:Key="flowlauncher_plugin_websearch_enable_suggestion">Use Search Query Autocomplete:</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_enable_suggestion">Use Search Query Autocomplete</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_enable_suggestion_provider">Autocomplete Data from:</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_pls_select_web_search">Please select a web search</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_delete_warning">Are you sure you want to delete {0}?</system:String>

From 43bf6342cad39d5695c6d9e3fcfce31b0dea209f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 17 Mar 2025 11:19:47 +0800
Subject: [PATCH 35/47] Improve area text box

---
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs          | 4 +---
 Flow.Launcher/Resources/CustomControlTemplate.xaml          | 1 -
 .../Views/ExplorerSettings.xaml                             | 6 ++----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index a9fcc802adc..e086027a52e 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -31,7 +31,6 @@ public class JsonRPCPluginSettings
         private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
         private static readonly double SettingPanelTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelTextBoxMinWidth");
         private static readonly double SettingPanelPathTextBoxWidth = (double)Application.Current.FindResource("SettingPanelPathTextBoxWidth");
-        private static readonly double SettingPanelAreaTextBoxMinWidth = (double)Application.Current.FindResource("SettingPanelAreaTextBoxMinWidth");
         private static readonly double SettingPanelAreaTextBoxMinHeight = (double)Application.Current.FindResource("SettingPanelAreaTextBoxMinHeight");
 
         public async Task InitializeAsync()
@@ -327,8 +326,7 @@ public Control CreateSettingPanel()
                             var textBox = new TextBox()
                             {
                                 MinHeight = SettingPanelAreaTextBoxMinHeight,
-                                MinWidth = SettingPanelAreaTextBoxMinWidth,
-                                HorizontalAlignment = HorizontalAlignment.Left,
+                                HorizontalAlignment = HorizontalAlignment.Stretch,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
                                 TextWrapping = TextWrapping.WrapWithOverflow,
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 10d7ff987f3..eadd23bcd53 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5605,7 +5605,6 @@
 
     <system:Double x:Key="SettingPanelTextBoxMinWidth">180</system:Double>
     <system:Double x:Key="SettingPanelPathTextBoxWidth">240</system:Double>
-    <system:Double x:Key="SettingPanelAreaTextBoxMinWidth">270</system:Double>
     <system:Double x:Key="SettingPanelAreaTextBoxMinHeight">150</system:Double>
 
     <Style x:Key="SettingPanelTextBlockDescriptionStyle" TargetType="TextBlock">
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 5989192f42c..20d56c0e920 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -358,10 +358,9 @@
             Grid.Row="15"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="{StaticResource SettingPanelAreaTextBoxMinWidth}"
             MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
+            HorizontalAlignment="Stretch"
             AcceptsReturn="True"
             Text="{Binding WindowsContextMenuIncludedItems}"
             TextWrapping="Wrap" />
@@ -378,10 +377,9 @@
             Grid.Row="17"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="{StaticResource SettingPanelAreaTextBoxMinWidth}"
             MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
+            HorizontalAlignment="Stretch"
             AcceptsReturn="True"
             Text="{Binding WindowsContextMenuExcludedItems}"
             TextWrapping="Wrap" />

From afb38db572d312c5fc601f01756658ccf95bdcef Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 17 Mar 2025 11:38:27 +0800
Subject: [PATCH 36/47] Fix possible null reference exception

---
 .../Plugin/JsonRPCPluginSettings.cs           | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index e086027a52e..5ca81e7571b 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -78,7 +78,8 @@ public async Task InitializeAsync()
                     {
                         if (type == "checkbox")
                         {
-                            Settings[attributes.Name] = bool.Parse(attributes.DefaultValue);
+                            // If can parse the default value to bool, use it, otherwise use false
+                            Settings[attributes.Name] = bool.TryParse(attributes.DefaultValue, out var value) && value;
                         }
                         else
                         {
@@ -105,19 +106,24 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
                     switch (control)
                     {
                         case TextBox textBox:
-                            textBox.Dispatcher.Invoke(() => textBox.Text = value as string ?? string.Empty);
+                            var text = value as string ?? string.Empty;
+                            textBox.Dispatcher.Invoke(() => textBox.Text = text);
                             break;
                         case PasswordBox passwordBox:
-                            passwordBox.Dispatcher.Invoke(() => passwordBox.Password = value as string ?? string.Empty);
+                            var password = value as string ?? string.Empty;
+                            passwordBox.Dispatcher.Invoke(() => passwordBox.Password = password);
                             break;
                         case ComboBox comboBox:
                             comboBox.Dispatcher.Invoke(() => comboBox.SelectedItem = value);
                             break;
                         case CheckBox checkBox:
+                            var isChecked = value is bool boolValue
+                                ? boolValue
+                                // If can parse the default value to bool, use it, otherwise use false
+                                : value is string stringValue && bool.TryParse(stringValue, out var boolValueFromString)
+                                    && boolValueFromString;
                             checkBox.Dispatcher.Invoke(() =>
-                                checkBox.IsChecked = value is bool isChecked
-                                    ? isChecked
-                                    : bool.Parse(value as string ?? string.Empty));
+                                checkBox.IsChecked = isChecked);
                             break;
                     }
                 }
@@ -145,6 +151,7 @@ public bool NeedCreateSettingPanel()
         public Control CreateSettingPanel()
         {
             // No need to check if NeedCreateSettingPanel is true because CreateSettingPanel will only be called if it's true
+            // if (!NeedCreateSettingPanel()) return null;
 
             // Create main grid with two columns (Column 1: Auto, Column 2: *)
             var mainPanel = new Grid { Margin = SettingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
@@ -159,7 +166,7 @@ public Control CreateSettingPanel()
 
             // Iterate over each setting and create one row for it
             var rowCount = 0;
-            foreach (var (type, attributes) in Configuration.Body)
+            foreach (var (type, attributes) in Configuration!.Body)
             {
                 // Skip if the setting does not have attributes or name
                 if (attributes?.Name == null)
@@ -389,12 +396,14 @@ public Control CreateSettingPanel()
                         }
                     case "checkbox":
                         {
+                            // If can parse the default value to bool, use it, otherwise use false
+                            var defaultValue = bool.TryParse(attributes.DefaultValue, out var value) && value;
                             var checkBox = new CheckBox
                             {
                                 IsChecked =
                                 Settings[attributes.Name] is bool isChecked
                                     ? isChecked
-                                    : bool.Parse(attributes.DefaultValue),
+                                    : defaultValue,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemTopBottomMargin,
@@ -404,7 +413,7 @@ Settings[attributes.Name] is bool isChecked
 
                             checkBox.Click += (sender, _) =>
                             {
-                                Settings[attributes.Name] = ((CheckBox)sender).IsChecked!;
+                                Settings[attributes.Name] = ((CheckBox)sender).IsChecked ?? defaultValue;
                             };
 
                             contentControl = checkBox;

From 444d29506df334c2d00715043f9205474314a779 Mon Sep 17 00:00:00 2001
From: Jack Ye <1160210343@qq.com>
Date: Thu, 20 Mar 2025 17:38:31 +0800
Subject: [PATCH 37/47] Update
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Co-authored-by: Yan Li <Yusyuriv@users.noreply.github.com>
---
 .../Plugin/JsonRPCPluginSettings.cs           | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 5ca81e7571b..6496a413f3c 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -44,17 +44,16 @@ public async Task InitializeAsync()
                 // we need to convert it to the correct type
                 foreach (var (key, value) in Settings)
                 {
-                    if (value is JsonElement jsonElement)
+                    if (value is not JsonElement jsonElement) continue;
+
+                    Settings[key] = jsonElement.ValueKind switch
                     {
-                        Settings[key] = jsonElement.ValueKind switch
-                        {
-                            JsonValueKind.String => jsonElement.GetString() ?? value,
-                            JsonValueKind.True => jsonElement.GetBoolean(),
-                            JsonValueKind.False => jsonElement.GetBoolean(),
-                            JsonValueKind.Null => null,
-                            _ => value
-                        };
-                    }
+                        JsonValueKind.String => jsonElement.GetString() ?? value,
+                        JsonValueKind.True => jsonElement.GetBoolean(),
+                        JsonValueKind.False => jsonElement.GetBoolean(),
+                        JsonValueKind.Null => null,
+                        _ => value
+                    };
                 }
             }
 

From f14e79dbc165de03a61cc7bb9adea6a9c1648a17 Mon Sep 17 00:00:00 2001
From: Jack Ye <1160210343@qq.com>
Date: Thu, 20 Mar 2025 17:41:11 +0800
Subject: [PATCH 38/47] Update
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Co-authored-by: Yan Li <Yusyuriv@users.noreply.github.com>
---
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 6496a413f3c..e05c9a3f7b7 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -183,8 +183,8 @@ public Control CreateSettingPanel()
                 StackPanel? panel = null;
                 FrameworkElement contentControl;
 
-                // If the type is textBlock, seperator or check box, we do not need to create a panel
-                if (type != "textBlock" && type != "seperator" && type != "checkbox")
+                // If the type is textBlock, separator, or checkbox, we do not need to create a panel
+                if (type != "textBlock" && type != "separator" && type != "checkbox")
                 {
                     // Create a panel to hold the label and description
                     panel = new StackPanel

From ffc5047810224bbaa595e579d7df307d4926cee7 Mon Sep 17 00:00:00 2001
From: Jack Ye <1160210343@qq.com>
Date: Thu, 20 Mar 2025 17:41:21 +0800
Subject: [PATCH 39/47] Update
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Co-authored-by: Yan Li <Yusyuriv@users.noreply.github.com>
---
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index e05c9a3f7b7..5ff05509cdf 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -448,7 +448,7 @@ Settings[attributes.Name] is bool isChecked
 
                             break;
                         }
-                    case "seperator":
+                    case "separator":
                         {
                             var sep = new Separator();
 

From 1d625c9134dbae90fd17bb68096459346582a1d9 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 20 Mar 2025 18:05:25 +0800
Subject: [PATCH 40/47] Update
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Co-authored-by: Yan Li <Yusyuriv@users.noreply.github.com>
---
 .../Plugin/JsonRPCPluginSettings.cs           | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 5ff05509cdf..5cb8f609750 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -65,26 +65,22 @@ public async Task InitializeAsync()
             foreach (var (type, attributes) in Configuration.Body)
             {
                 // Skip if the setting does not have attributes or name
-                if (attributes?.Name == null)
+                if (attributes?.Name == null) continue;
+
+                // Skip if the setting does not have attributes or name
+                if (!NeedSaveInSettings(type)) continue;
+
+                // If need save in settings, we need to make sure the setting exists in the settings file
+                if (Settings.ContainsKey(attributes.Name)) continue;
+
+                if (type == "checkbox")
                 {
-                    continue;
+                    // If can parse the default value to bool, use it, otherwise use false
+                    Settings[attributes.Name] = bool.TryParse(attributes.DefaultValue, out var value) && value;
                 }
-
-                if (NeedSaveInSettings(type))
+                else
                 {
-                    // If need save in settings, we need to make sure the setting exists in the settings file
-                    if (!Settings.ContainsKey(attributes.Name))
-                    {
-                        if (type == "checkbox")
-                        {
-                            // If can parse the default value to bool, use it, otherwise use false
-                            Settings[attributes.Name] = bool.TryParse(attributes.DefaultValue, out var value) && value;
-                        }
-                        else
-                        {
-                            Settings[attributes.Name] = attributes.DefaultValue;
-                        }
-                    }
+                    Settings[attributes.Name] = attributes.DefaultValue;
                 }
             }
         }

From 13fcdc60fa2a2a11a543306817de8ed416d64fbf Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 20 Mar 2025 18:11:53 +0800
Subject: [PATCH 41/47] Fix typo 'seperator'

---
 .../Plugin/JsonRPCPluginSettings.cs              |  6 +++---
 .../Resources/CustomControlTemplate.xaml         |  2 +-
 Plugins/Flow.Launcher.Plugin.Calculator/Main.cs  | 16 ++++++++--------
 .../Views/ExplorerSettings.xaml                  | 12 ++++++------
 .../Views/ProgramSetting.xaml                    |  4 ++--
 .../SettingsControl.xaml                         |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 5cb8f609750..5b0c9f07933 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -448,7 +448,7 @@ Settings[attributes.Name] is bool isChecked
                         {
                             var sep = new Separator();
 
-                            sep.SetResourceReference(Separator.StyleProperty, "SettingPanelSeperatorStyle");
+                            sep.SetResourceReference(Separator.StyleProperty, "SettingPanelSeparatorStyle");
 
                             contentControl = sep;
 
@@ -458,7 +458,7 @@ Settings[attributes.Name] is bool isChecked
                         continue;
                 }
 
-                // If type is textBlock or seperator, we just add the content control to the main grid
+                // If type is textBlock or separator, we just add the content control to the main grid
                 if (panel == null)
                 {
                     // Add the content control to the column 0, row rowCount and columnSpan 2 of the main grid
@@ -498,7 +498,7 @@ Settings[attributes.Name] is bool isChecked
 
         private static bool NeedSaveInSettings(string type)
         {
-            return type != "textBlock" && type != "seperator" && type != "hyperlink";
+            return type != "textBlock" && type != "separator" && type != "hyperlink";
         }
     }
 }
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index eadd23bcd53..aeb8f872fd2 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5596,7 +5596,7 @@
     <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,4.5,0,4.5</Thickness>
     <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,4.5,9,4.5</Thickness>
 
-    <Style x:Key="SettingPanelSeperatorStyle" TargetType="Separator">
+    <Style x:Key="SettingPanelSeparatorStyle" TargetType="Separator">
         <Setter Property="Margin" Value="-70 13.5 -18 13.5" />
         <Setter Property="Height" Value="1" />
         <Setter Property="VerticalAlignment" Value="Top" />
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
index 7f42eacf6db..b1e4cd60601 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -155,16 +155,16 @@ private string ChangeDecimalSeparator(decimal value, string newDecimalSeparator)
             return value.ToString(numberFormatInfo);
         }
 
-        private string GetDecimalSeparator()
+        private static string GetDecimalSeparator()
         {
-            string systemDecimalSeperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
-            switch (_settings.DecimalSeparator)
+            string systemDecimalSeparator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            return _settings.DecimalSeparator switch
             {
-                case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;
-                case DecimalSeparator.Dot: return dot;
-                case DecimalSeparator.Comma: return comma;
-                default: return systemDecimalSeperator;
-            }
+                DecimalSeparator.UseSystemLocale => systemDecimalSeparator,
+                DecimalSeparator.Dot => dot,
+                DecimalSeparator.Comma => comma,
+                _ => systemDecimalSeparator,
+            };
         }
 
         private bool IsBracketComplete(string query)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 20d56c0e920..90fc898eadc 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -334,7 +334,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_native_context_menu_header}" />
         </StackPanel>
 
@@ -390,7 +390,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_previewpanel_setting_header}" />
         </StackPanel>
 
@@ -470,7 +470,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_everything_setting_header}" />
         </StackPanel>
 
@@ -549,7 +549,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_manageactionkeywords_header}" />
         </StackPanel>
 
@@ -586,7 +586,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_quickaccesslinks_header}" />
         </StackPanel>
 
@@ -642,7 +642,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}" />
         </StackPanel>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index d57e44542a4..5c0ba8d0bd8 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -58,7 +58,7 @@
             Grid.Row="1"
             HorizontalAlignment="Stretch"
             Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <DockPanel HorizontalAlignment="Stretch" LastChildFill="True">
                 <TextBlock
                     MinWidth="120"
@@ -90,7 +90,7 @@
                         ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hideduplicatedwindowsapp_tooltip}" />
                 </WrapPanel>
             </DockPanel>
-            <Separator Style="{StaticResource SettingPanelSeperatorStyle}" />
+            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
             <StackPanel
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 1b73aa96681..1ce9b70b4a0 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -122,7 +122,7 @@
                 Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
         </StackPanel>
 
-        <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeperatorStyle}" />
+        <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeparatorStyle}" />
 
         <DockPanel
             Grid.Row="3"

From 782c11c57f53676ea8b21dc62fa76dd2fb88f924 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 20 Mar 2025 18:17:47 +0800
Subject: [PATCH 42/47] Update
 Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Co-authored-by: Yan Li <Yusyuriv@users.noreply.github.com>
---
 .../Plugin/JsonRPCPluginSettings.cs           | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 5b0c9f07933..944b2fd100d 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -57,10 +57,7 @@ public async Task InitializeAsync()
                 }
             }
 
-            if (Configuration == null)
-            {
-                return;
-            }
+            if (Configuration == null) return;
 
             foreach (var (type, attributes) in Configuration.Body)
             {
@@ -87,10 +84,7 @@ public async Task InitializeAsync()
 
         public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
         {
-            if (settings == null || settings.Count == 0)
-            {
-                return;
-            }
+            if (settings == null || settings.Count == 0) return;
 
             foreach (var (key, value) in settings)
             {
@@ -117,8 +111,7 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
                                 // If can parse the default value to bool, use it, otherwise use false
                                 : value is string stringValue && bool.TryParse(stringValue, out var boolValueFromString)
                                     && boolValueFromString;
-                            checkBox.Dispatcher.Invoke(() =>
-                                checkBox.IsChecked = isChecked);
+                            checkBox.Dispatcher.Invoke(() =>checkBox.IsChecked = isChecked);
                             break;
                     }
                 }
@@ -164,10 +157,7 @@ public Control CreateSettingPanel()
             foreach (var (type, attributes) in Configuration!.Body)
             {
                 // Skip if the setting does not have attributes or name
-                if (attributes?.Name == null)
-                {
-                    continue;
-                }
+                if (attributes?.Name == null) continue;
 
                 // Add a new row to the main grid
                 mainPanel.RowDefinitions.Add(new RowDefinition()
@@ -214,10 +204,7 @@ public Control CreateSettingPanel()
 
                     // Add the name and description to the panel
                     panel.Children.Add(name);
-                    if (desc != null)
-                    {
-                        panel.Children.Add(desc);
-                    }
+                    if (desc != null) panel.Children.Add(desc);
                 }
 
                 switch (type)
@@ -481,10 +468,7 @@ Settings[attributes.Name] is bool isChecked
                 }
 
                 // Add into SettingControls for settings storage if need
-                if (NeedSaveInSettings(type))
-                {
-                    SettingControls[attributes.Name] = contentControl;
-                }
+                if (NeedSaveInSettings(type)) SettingControls[attributes.Name] = contentControl;
 
                 rowCount++;
             }

From e5298d31e6bd18d4d28238d91e1f022c97b4a37b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 20 Mar 2025 20:31:57 +0800
Subject: [PATCH 43/47] Revert "ExplorerSettings.xaml"

---
 .../Views/ExplorerSettings.xaml               | 1238 +++++++++--------
 1 file changed, 629 insertions(+), 609 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 90fc898eadc..066801c89ee 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -14,21 +14,94 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-
     <UserControl.Resources>
-        <Style x:Key="HeaderTextBlockStyle" TargetType="TextBlock">
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="Margin" Value="{StaticResource SettingPanelItemTopBottomMargin}" />
-            <Setter Property="TextAlignment" Value="Left" />
-            <Setter Property="TextWrapping" Value="Wrap" />
-            <Setter Property="FontWeight" Value="Bold" />
+        <Style x:Key="ExplorerTabItem" TargetType="{x:Type TabItem}">
+            <Setter Property="MinWidth" Value="120" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TabItem}">
+                        <Border
+                            x:Name="LayoutRoot"
+                            Margin="0"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="True">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <Border
+                                    x:Name="TabSeparator"
+                                    Width="0"
+                                    Margin="0"
+                                    HorizontalAlignment="Right"
+                                    BorderBrush="{DynamicResource TabViewItemSeparator}"
+                                    BorderThickness="1" />
+
+                                <Border
+                                    x:Name="TabContainer"
+                                    Grid.Column="1"
+                                    Padding="10 5"
+                                    Background="{DynamicResource Color06B}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}">
+                                    <ContentPresenter
+                                        x:Name="ContentPresenter"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        ContentSource="Header"
+                                        Focusable="False"
+                                        RecognizesAccessKey="True"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                        TextElement.FontSize="{TemplateBinding FontSize}"
+                                        TextElement.FontWeight="{TemplateBinding FontWeight}"
+                                        TextElement.Foreground="{DynamicResource Color08B}" />
+                                </Border>
+                            </Grid>
+                        </Border>
+
+                        <ControlTemplate.Triggers>
+                            <!--  Default  -->
+                            <Trigger Property="IsMouseOver" Value="False">
+                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
+                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color08B}" />
+                            </Trigger>
+                            <!--  PointerOver  -->
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
+                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundPointerOver}" />
+                            </Trigger>
+                            <!--  Selected  -->
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
+                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                                <Setter Property="Panel.ZIndex" Value="1" />
+                                <Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
+                            </Trigger>
+                            <!--  PointerOverSelected  -->
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                    <Condition Property="IsSelected" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
+                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                                <Setter Property="Panel.ZIndex" Value="1" />
+                                <Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
+                            </MultiTrigger>
+                            <!--  Disabled  -->
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundDisabled}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
         </Style>
-
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
             <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
-
         <core:TranslationConverter x:Key="TranslationConverter" />
         <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
             <Grid>
@@ -68,7 +141,7 @@
                     </TextBlock.Style>
                 </TextBlock>
 
-                <TextBlock Margin="480 5 0 0">
+                <TextBlock Margin="500 5 0 0">
                     <TextBlock.Style>
                         <Style TargetType="{x:Type TextBlock}">
                             <Style.Triggers>
@@ -89,608 +162,555 @@
 
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
     </UserControl.Resources>
-
-    <Grid Margin="{StaticResource SettingPanelMargin}">
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-
-        <!--  General Setting  -->
-        <TextBlock
-            Grid.Row="0"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Style="{StaticResource HeaderTextBlockStyle}"
-            Text="{DynamicResource plugin_explorer_generalsetting_header}" />
-
-        <CheckBox
-            Grid.Row="1"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
-
-        <CheckBox
-            Grid.Row="2"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
-            IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
-
-        <TextBlock
-            Grid.Row="3"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_file_editor_path}" />
-        <StackPanel
-            Grid.Row="3"
-            Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            Orientation="Horizontal">
-            <TextBox
-                Width="{StaticResource SettingPanelPathTextBoxWidth}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Text="{Binding FileEditorPath}"
-                TextWrapping="NoWrap" />
-            <Button
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Command="{Binding OpenFileEditorPath}"
-                Content="{DynamicResource select}" />
-        </StackPanel>
-
-        <TextBlock
-            Grid.Row="4"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_folder_editor_path}" />
-        <StackPanel
-            Grid.Row="4"
-            Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            Orientation="Horizontal">
-            <TextBox
-                Width="{StaticResource SettingPanelPathTextBoxWidth}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Text="{Binding FolderEditorPath}"
-                TextWrapping="NoWrap" />
-            <Button
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Command="{Binding OpenFolderEditorPath}"
-                Content="{DynamicResource select}" />
-        </StackPanel>
-
-        <TextBlock
-            Grid.Row="5"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_shell_path}" />
-        <StackPanel
-            Grid.Row="5"
-            Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            Orientation="Horizontal">
-            <TextBox
-                Width="{StaticResource SettingPanelPathTextBoxWidth}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Text="{Binding ShellPath}"
-                TextWrapping="NoWrap" />
-            <Button
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Command="{Binding OpenShellPath}"
-                Content="{DynamicResource select}" />
-        </StackPanel>
-
-        <TextBlock
-            Grid.Row="6"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_Index_Search_Engine}" />
-        <ComboBox
-            Grid.Row="6"
-            Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            DisplayMemberPath="Description"
-            ItemsSource="{Binding IndexSearchEngines}"
-            SelectedItem="{Binding SelectedIndexSearchEngine}" />
-
-        <TextBlock
-            Grid.Row="7"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_Content_Search_Engine}" />
-        <ComboBox
-            Grid.Row="7"
-            Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            DisplayMemberPath="Description"
-            ItemsSource="{Binding ContentIndexSearchEngines}"
-            SelectedItem="{Binding SelectedContentSearchEngine}" />
-
-        <TextBlock
-            Grid.Row="8"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}" />
-        <ComboBox
-            Grid.Row="8"
-            Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            DisplayMemberPath="Description"
-            ItemsSource="{Binding PathEnumerationEngines}"
-            SelectedItem="{Binding SelectedPathEnumerationEngine}" />
-
-        <TextBlock
-            Grid.Row="9"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_Excluded_File_Types}" />
-        <TextBox
-            Grid.Row="9"
-            Grid.Column="1"
-            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            HorizontalAlignment="Left"
-            Text="{Binding ExcludedFileTypes}"
-            ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
-
-        <TextBlock
-            Grid.Row="10"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_Maximum_Results}" />
-        <TextBox
-            Grid.Row="10"
-            Grid.Column="1"
-            MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
-            Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            MaxLength="6"
-            PreviewTextInput="AllowOnlyNumericInput"
-            Text="{Binding MaxResult}"
-            ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
-
-        <Button
-            Grid.Row="11"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            Click="btnOpenIndexingOptions_Click"
-            Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
-
-        <!--  Native Context Menu  -->
-        <StackPanel
-            Grid.Row="12"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
-            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_native_context_menu_header}" />
-        </StackPanel>
-
-        <CheckBox
-            Grid.Row="13"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
-            IsChecked="{Binding ShowWindowsContextMenu}" />
-
-        <TextBlock
-            Grid.Row="14"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
-            TextWrapping="Wrap" />
-
-        <TextBox
-            Grid.Row="15"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Stretch"
-            AcceptsReturn="True"
-            Text="{Binding WindowsContextMenuIncludedItems}"
-            TextWrapping="Wrap" />
-
-        <TextBlock
-            Grid.Row="16"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
-            TextWrapping="Wrap" />
-
-        <TextBox
-            Grid.Row="17"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Stretch"
-            AcceptsReturn="True"
-            Text="{Binding WindowsContextMenuExcludedItems}"
-            TextWrapping="Wrap" />
-
-        <!--  Preview Panel  -->
-        <StackPanel
-            Grid.Row="18"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
-            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_previewpanel_setting_header}" />
-        </StackPanel>
-
-        <DockPanel
-            Grid.Row="19"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            HorizontalAlignment="Stretch"
-            LastChildFill="True">
-            <TextBlock
-                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                VerticalAlignment="Center"
-                Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
-            <WrapPanel
+    <Grid Margin="0">
+        <TabControl
+            x:Name="TabView"
+            MinHeight="0"
+            Background="{DynamicResource Color00B}"
+            BorderThickness="0"
+            SelectedIndex="0"
+            TabStripPlacement="Top">
+            <TabControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </TabControl.ItemsPanel>
+            <TabItem
                 Width="Auto"
-                HorizontalAlignment="Right"
-                DockPanel.Dock="Right">
-                <CheckBox
-                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
-                    IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
-                <CheckBox
-                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
-                    IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
-                <CheckBox
-                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
-                    Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
-                    IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
-            </WrapPanel>
-        </DockPanel>
-
-        <DockPanel
-            Grid.Row="20"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            HorizontalAlignment="Stretch"
-            LastChildFill="True">
-            <TextBlock
-                Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}"
-                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}" />
-            <WrapPanel
+                Header="{DynamicResource plugin_explorer_generalsetting_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <StackPanel Grid.Row="0" Margin="30 10 0 0">
+                    <StackPanel>
+                        <StackPanel Orientation="Vertical">
+                            <CheckBox
+                                Margin="0 10 0 0"
+                                HorizontalAlignment="Left"
+                                Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+                                IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+                            <CheckBox
+                                Margin="0 10 0 0"
+                                HorizontalAlignment="Left"
+                                Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
+                                IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
+                            <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
+                                        <ColumnDefinition Width="*" SharedSizeGroup="B" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+
+                                    <TextBlock
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Margin="0 6 16 6"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_file_editor_path}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <StackPanel
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Margin="0 6 6 6"
+                                        Orientation="Horizontal">
+                                        <TextBox
+                                            Width="250"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding FileEditorPath}"
+                                            TextWrapping="NoWrap" />
+                                        <Button
+                                            MinWidth="50"
+                                            Margin="5 0 0 0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Command="{Binding OpenFileEditorPath}"
+                                            Content="..." />
+                                    </StackPanel>
+
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Margin="0 6 16 6"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_folder_editor_path}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <StackPanel
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Margin="0 6 6 6"
+                                        Orientation="Horizontal">
+                                        <TextBox
+                                            Width="250"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding FolderEditorPath}"
+                                            TextWrapping="NoWrap" />
+                                        <Button
+                                            MinWidth="50"
+                                            Margin="5 0 0 0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Command="{Binding OpenFolderEditorPath}"
+                                            Content="..." />
+                                    </StackPanel>
+
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        Margin="0 16 6 6"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_shell_path}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <StackPanel
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Orientation="Horizontal">
+                                        <TextBox
+                                            Width="250"
+                                            Margin="0 10 0 0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding ShellPath}"
+                                            TextWrapping="NoWrap" />
+                                        <Button
+                                            MinWidth="50"
+                                            Margin="5 10 0 0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            Command="{Binding OpenShellPath}"
+                                            Content="..." />
+                                    </StackPanel>
+                                </Grid>
+                            </StackPanel>
+
+                            <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
+                                        <ColumnDefinition Width="*" SharedSizeGroup="D" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Margin="0 0 10 0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <ComboBox
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Width="250"
+                                        Margin="10 15 10 10"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        DisplayMemberPath="Description"
+                                        ItemsSource="{Binding IndexSearchEngines}"
+                                        SelectedItem="{Binding SelectedIndexSearchEngine}" />
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Margin="0 0 10 0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <ComboBox
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Width="250"
+                                        Margin="10"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        DisplayMemberPath="Description"
+                                        ItemsSource="{Binding ContentIndexSearchEngines}"
+                                        SelectedItem="{Binding SelectedContentSearchEngine}" />
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        Margin="0 0 10 0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <ComboBox
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Width="250"
+                                        Margin="10"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        DisplayMemberPath="Description"
+                                        ItemsSource="{Binding PathEnumerationEngines}"
+                                        SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+                                    <TextBlock
+                                        Grid.Row="3"
+                                        Grid.Column="0"
+                                        Margin="0 15 20 0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Excluded_File_Types}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <TextBox
+                                        Grid.Row="3"
+                                        Grid.Column="1"
+                                        MinWidth="350"
+                                        Margin="0 9 0 6"
+                                        Text="{Binding ExcludedFileTypes}"
+                                        ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
+                                    <TextBlock
+                                        Grid.Row="4"
+                                        Grid.Column="0"
+                                        Margin="0 15 20 0"
+                                        VerticalAlignment="Center"
+                                        Text="{DynamicResource plugin_explorer_Maximum_Results}"
+                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                    <TextBox
+                                        Grid.Row="4"
+                                        Grid.Column="1"
+                                        MinWidth="350"
+                                        Margin="0 9 0 6"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        MaxLength="6"
+                                        PreviewTextInput="AllowOnlyNumericInput"
+                                        Text="{Binding MaxResult}"
+                                        ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
+                                </Grid>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal">
+                                <Button
+                                    Margin="0 10 10 20"
+                                    Padding="20 10 20 10"
+                                    Click="btnOpenIndexingOptions_Click"
+                                    Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+                            </StackPanel>
+                        </StackPanel>
+
+
+                    </StackPanel>
+                </StackPanel>
+            </TabItem>
+            <TabItem
                 Width="Auto"
-                HorizontalAlignment="Right"
-                DockPanel.Dock="Right"
-                IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
-                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
-                    <ComboBox
-                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                        ItemsSource="{Binding DateFormatList}"
-                        SelectedItem="{Binding PreviewPanelDateFormat}" />
-                    <TextBlock
-                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                        VerticalAlignment="Center"
-                        Text="{Binding PreviewPanelDateFormatDemo}" />
+                Header="{DynamicResource plugin_explorer_native_context_menu_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <StackPanel Margin="30 20 10 10">
+                    <CheckBox
+                        Margin="0 0 0 0"
+                        Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
+                        IsChecked="{Binding ShowWindowsContextMenu}" />
+
+                    <Grid Margin="0 10 20 10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="0 0 6 6"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
+                            TextWrapping="Wrap" />
+
+                        <TextBox
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Height="300"
+                            Margin="0 6 6 0"
+                            AcceptsReturn="True"
+                            Text="{Binding WindowsContextMenuIncludedItems}"
+                            TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Margin="6 0 0 6"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
+                            TextWrapping="Wrap" />
+
+                        <TextBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Height="300"
+                            Margin="6 6 0 0"
+                            AcceptsReturn="True"
+                            Text="{Binding WindowsContextMenuExcludedItems}"
+                            TextWrapping="Wrap" />
+                    </Grid>
                 </StackPanel>
-                <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
-                    <ComboBox
-                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                        ItemsSource="{Binding TimeFormatList}"
-                        SelectedItem="{Binding PreviewPanelTimeFormat}" />
-                    <TextBlock
-                        Margin="{StaticResource SettingPanelItemLeftMargin}"
-                        VerticalAlignment="Center"
-                        Text="{Binding PreviewPanelTimeFormatDemo}" />
+            </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <StackPanel Margin="30 20 0 10">
+                    <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
+                    <CheckBox
+                        Margin="0 10 0 0"
+                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
+                        IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
+
+                    <CheckBox
+                        Margin="0 10 0 0"
+                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
+                        IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
+
+                    <CheckBox
+                        Margin="0 10 0 0"
+                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
+                        IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
+
+                    <StackPanel
+                        Margin="0 20 0 0"
+                        IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                        Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
+                        <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}" />
+                        <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
+                            <ComboBox
+                                Width="200"
+                                ItemsSource="{Binding DateFormatList}"
+                                SelectedItem="{Binding PreviewPanelDateFormat}" />
+                            <TextBlock
+                                Margin="12 0 0 0"
+                                VerticalAlignment="Center"
+                                Foreground="{DynamicResource Color05B}"
+                                Text="{Binding PreviewPanelDateFormatDemo}" />
+                        </StackPanel>
+                        <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
+                            <ComboBox
+                                Width="200"
+                                ItemsSource="{Binding TimeFormatList}"
+                                SelectedItem="{Binding PreviewPanelTimeFormat}" />
+                            <TextBlock
+                                Margin="12 0 0 0"
+                                VerticalAlignment="Center"
+                                Foreground="{DynamicResource Color05B}"
+                                Text="{Binding PreviewPanelTimeFormatDemo}" />
+                        </StackPanel>
+                    </StackPanel>
                 </StackPanel>
-            </WrapPanel>
-        </DockPanel>
-
-        <!--  Everything Setting  -->
-        <StackPanel
-            Grid.Row="21"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
-            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_everything_setting_header}" />
-        </StackPanel>
-
-        <CheckBox
-            Grid.Row="22"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
-            IsChecked="{Binding Settings.EverythingSearchFullPath}" />
-
-        <CheckBox
-            Grid.Row="23"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
-            IsChecked="{Binding Settings.EverythingEnableRunCount}" />
-
-        <TextBlock
-            Grid.Row="24"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_everything_sort_option}" />
-        <ComboBox
-            Grid.Row="24"
-            Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
-            VerticalAlignment="Center"
-            ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
-            SelectedItem="{Binding Settings.SortOption}"
-            SelectionChanged="EverythingSortOptionChanged">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <Grid>
-                        <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
-                    </Grid>
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
-
-        <TextBlock
-            Grid.Row="26"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Text="{DynamicResource plugin_explorer_everything_installed_path}" />
-        <!--  Here we can use min width because there is no botton following textbox  -->
-        <TextBox
-            Grid.Row="26"
-            Grid.Column="1"
-            MinWidth="{StaticResource SettingPanelPathTextBoxWidth}"
-            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
-            HorizontalAlignment="Left"
-            Text="{Binding EverythingInstalledPath}" />
-
-        <TextBlock
-            Name="tbFastSortWarning"
-            Grid.Row="27"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            VerticalAlignment="Center"
-            Foreground="Orange"
-            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
-            TextAlignment="Left"
-            TextWrapping="Wrap"
-            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
-
-        <!--  Customise Action Keywords  -->
-        <StackPanel
-            Grid.Row="28"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
-            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_manageactionkeywords_header}" />
-        </StackPanel>
-
-        <Border
-            Grid.Row="29"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Stretch"
-            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="1">
-            <ListView
-                ItemTemplate="{StaticResource ListViewActionKeywords}"
-                ItemsSource="{Binding ActionKeywordsModels}"
-                SelectedItem="{Binding SelectedActionKeyword}" />
-        </Border>
-
-        <StackPanel
-            Grid.Row="30"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Right"
-            Orientation="Horizontal">
-            <Button
-                MinWidth="100"
-                Command="{Binding EditActionKeywordCommand}"
-                Content="{DynamicResource plugin_explorer_edit}" />
-        </StackPanel>
-
-        <!--  Quick Access Links  -->
-        <StackPanel
-            Grid.Row="31"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
-            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_quickaccesslinks_header}" />
-        </StackPanel>
-
-        <Border
-            Grid.Row="32"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Stretch"
-            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="1">
-            <ListView
-                x:Name="lbxAccessLinks"
-                Height="200"
-                AllowDrop="True"
-                BorderThickness="1"
-                DragEnter="lbxAccessLinks_DragEnter"
-                Drop="LbxAccessLinks_OnDrop"
-                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                ItemsSource="{Binding Settings.QuickAccessLinks}"
-                SelectedItem="{Binding SelectedQuickAccessLink}" />
-        </Border>
-
-        <StackPanel
-            Grid.Row="33"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Right"
-            Orientation="Horizontal">
-            <Button
-                MinWidth="100"
-                Command="{Binding RemoveLinkCommand}"
-                CommandParameter="QuickAccessLink"
-                Content="{DynamicResource plugin_explorer_delete}" />
-            <Button
-                MinWidth="100"
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                Command="{Binding EditLinkCommand}"
-                CommandParameter="QuickAccessLink"
-                Content="{DynamicResource plugin_explorer_edit}" />
-            <Button
-                MinWidth="100"
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                Command="{Binding AddLinkCommand}"
-                CommandParameter="QuickAccessLink"
-                Content="{DynamicResource plugin_explorer_add}" />
-        </StackPanel>
-
-        <!--  Index Search Excluded Paths  -->
-        <StackPanel
-            Grid.Row="34"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Orientation="Vertical">
-            <Separator Style="{StaticResource SettingPanelSeparatorStyle}" />
-            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}" />
-        </StackPanel>
-
-        <Border
-            Grid.Row="35"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Stretch"
-            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="1">
-            <ListView
-                Name="lbxExcludedPaths"
-                Height="200"
-                AllowDrop="True"
-                DragEnter="lbxAccessLinks_DragEnter"
-                Drop="LbxExcludedPaths_OnDrop"
-                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
-                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
-        </Border>
-
-        <StackPanel
-            Grid.Row="36"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Right"
-            Orientation="Horizontal">
-            <Button
-                MinWidth="100"
-                Command="{Binding RemoveLinkCommand}"
-                CommandParameter="IndexSearchExcludedPaths"
-                Content="{DynamicResource plugin_explorer_delete}" />
-            <Button
-                MinWidth="100"
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                Command="{Binding EditLinkCommand}"
-                CommandParameter="IndexSearchExcludedPaths"
-                Content="{DynamicResource plugin_explorer_edit}" />
-            <Button
-                MinWidth="100"
-                Margin="{StaticResource SettingPanelItemLeftMargin}"
-                Command="{Binding AddLinkCommand}"
-                CommandParameter="IndexSearchExcludedPaths"
-                Content="{DynamicResource plugin_explorer_add}" />
-        </StackPanel>
+            </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_everything_setting_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <StackPanel Margin="10" Orientation="Vertical">
+                    <CheckBox
+                        Margin="20 10 0 0"
+                        HorizontalAlignment="Left"
+                        Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
+                        IsChecked="{Binding Settings.EverythingSearchFullPath}" />
+                    <CheckBox
+                        Margin="20 10 0 0"
+                        HorizontalAlignment="Left"
+                        Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
+                        IsChecked="{Binding Settings.EverythingEnableRunCount}" />
+                    <StackPanel Orientation="Horizontal">
+                        <Grid Margin="20 10 0 10">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="F" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="0 0 20 0"
+                                VerticalAlignment="Center"
+                                Text="{DynamicResource plugin_explorer_everything_sort_option}"
+                                TextBlock.Foreground="{DynamicResource Color05B}" />
+                            <ComboBox
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Width="200"
+                                VerticalAlignment="Center"
+                                ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
+                                SelectedItem="{Binding Settings.SortOption}"
+                                SelectionChanged="EverythingSortOptionChanged">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid>
+                                            <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
+                                        </Grid>
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Margin="0 15 20 0"
+                                VerticalAlignment="Center"
+                                Text="{DynamicResource plugin_explorer_everything_installed_path}"
+                                TextBlock.Foreground="{DynamicResource Color05B}" />
+                            <TextBox
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                MinWidth="350"
+                                Margin="0 15 0 0"
+                                Text="{Binding EverythingInstalledPath}" />
+                        </Grid>
+                    </StackPanel>
+                    <StackPanel>
+                        <TextBlock
+                            Name="tbFastSortWarning"
+                            Margin="20 10 10 10"
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
+                            Foreground="Orange"
+                            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
+                            TextAlignment="Left"
+                            TextWrapping="Wrap"
+                            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
+                    </StackPanel>
+                </StackPanel>
+            </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <DockPanel HorizontalAlignment="Stretch">
+                    <Border
+                        Margin="10 10 10 5"
+                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                        BorderThickness="1"
+                        DockPanel.Dock="Top">
+                        <ListView
+                            ItemTemplate="{StaticResource ListViewActionKeywords}"
+                            ItemsSource="{Binding ActionKeywordsModels}"
+                            SelectedItem="{Binding SelectedActionKeyword}" />
+                    </Border>
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Horizontal">
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding EditActionKeywordCommand}"
+                            Content="{DynamicResource plugin_explorer_edit}" />
+                    </StackPanel>
+                </DockPanel>
+            </TabItem>
+            <TabItem
+                Name="expAccessLinks"
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <ScrollViewer>
+                    <DockPanel HorizontalAlignment="Stretch">
+                        <Border
+                            Margin="10 10 10 5"
+                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                            BorderThickness="1"
+                            DockPanel.Dock="Top">
+                            <ListView
+                                x:Name="lbxAccessLinks"
+                                Height="200"
+                                AllowDrop="True"
+                                BorderThickness="1"
+                                DragEnter="lbxAccessLinks_DragEnter"
+                                Drop="LbxAccessLinks_OnDrop"
+                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                                ItemsSource="{Binding Settings.QuickAccessLinks}"
+                                SelectedItem="{Binding SelectedQuickAccessLink}" />
+                        </Border>
+                        <StackPanel
+                            HorizontalAlignment="Right"
+                            DockPanel.Dock="Bottom"
+                            Orientation="Horizontal">
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding RemoveLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_delete}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding EditLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_edit}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding AddLinkCommand}"
+                                CommandParameter="QuickAccessLink"
+                                Content="{DynamicResource plugin_explorer_add}" />
+                        </StackPanel>
+                    </DockPanel>
+                </ScrollViewer>
+            </TabItem>
+            <TabItem
+                Width="Auto"
+                Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
+                Style="{DynamicResource ExplorerTabItem}">
+                <ScrollViewer>
+                    <DockPanel HorizontalAlignment="Stretch">
+                        <Border
+                            Margin="10 10 10 5"
+                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                            BorderThickness="1"
+                            DockPanel.Dock="Top">
+                            <ListView
+                                Name="lbxExcludedPaths"
+                                Height="200"
+                                AllowDrop="True"
+                                DragEnter="lbxAccessLinks_DragEnter"
+                                Drop="LbxExcludedPaths_OnDrop"
+                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
+                                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
+                        </Border>
+                        <StackPanel
+                            HorizontalAlignment="Right"
+                            DockPanel.Dock="Bottom"
+                            Orientation="Horizontal">
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding RemoveLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_delete}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding EditLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_edit}" />
+                            <Button
+                                MinWidth="100"
+                                Margin="10"
+                                Command="{Binding AddLinkCommand}"
+                                CommandParameter="IndexSearchExcludedPaths"
+                                Content="{DynamicResource plugin_explorer_add}" />
+                        </StackPanel>
+                    </DockPanel>
+                </ScrollViewer>
+            </TabItem>
+        </TabControl>
 
     </Grid>
-
 </UserControl>

From d533f53eb79ffed4941ffc426d25a62d77bc75c4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 20 Mar 2025 20:59:35 +0800
Subject: [PATCH 44/47] Add global margin & Remove inner margin & Remove inner
 scroll viewer

---
 .../Views/ExplorerSettings.xaml               | 578 +++++++++---------
 1 file changed, 286 insertions(+), 292 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 066801c89ee..3ff04d86cb5 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -14,6 +14,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
+
     <UserControl.Resources>
         <Style x:Key="ExplorerTabItem" TargetType="{x:Type TabItem}">
             <Setter Property="MinWidth" Value="120" />
@@ -99,10 +100,10 @@
                 </Setter.Value>
             </Setter>
         </Style>
+
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
             <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
-        <core:TranslationConverter x:Key="TranslationConverter" />
         <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
             <Grid>
                 <TextBlock
@@ -141,7 +142,7 @@
                     </TextBlock.Style>
                 </TextBlock>
 
-                <TextBlock Margin="500 5 0 0">
+                <TextBlock Margin="480 5 0 0">
                     <TextBlock.Style>
                         <Style TargetType="{x:Type TextBlock}">
                             <Style.Triggers>
@@ -160,9 +161,11 @@
             </Grid>
         </DataTemplate>
 
+        <core:TranslationConverter x:Key="TranslationConverter" />
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
     </UserControl.Resources>
-    <Grid Margin="0">
+
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <TabControl
             x:Name="TabView"
             MinHeight="0"
@@ -179,225 +182,221 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_generalsetting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Grid.Row="0" Margin="30 10 0 0">
-                    <StackPanel>
-                        <StackPanel Orientation="Vertical">
-                            <CheckBox
-                                Margin="0 10 0 0"
-                                HorizontalAlignment="Left"
-                                Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-                                IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
-                            <CheckBox
-                                Margin="0 10 0 0"
-                                HorizontalAlignment="Left"
-                                Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
-                                IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
-                            <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
-                                        <ColumnDefinition Width="*" SharedSizeGroup="B" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Margin="0 6 16 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_file_editor_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Margin="0 6 6 6"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding FileEditorPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 0 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenFileEditorPath}"
-                                            Content="..." />
-                                    </StackPanel>
+                <StackPanel Orientation="Vertical">
+                    <StackPanel Orientation="Vertical">
+                        <CheckBox
+                            Margin="0 10 0 0"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+                            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+                        <CheckBox
+                            Margin="0 10 0 0"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
+                            IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
+                        <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
+                                    <ColumnDefinition Width="*" SharedSizeGroup="B" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
 
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Margin="0 6 16 6"
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="0 6 16 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_file_editor_path}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <StackPanel
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Margin="0 6 6 6"
+                                    Orientation="Horizontal">
+                                    <TextBox
+                                        Width="250"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_folder_editor_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Margin="0 6 6 6"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding FolderEditorPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 0 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenFolderEditorPath}"
-                                            Content="..." />
-                                    </StackPanel>
-
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        Margin="0 16 6 6"
+                                        Text="{Binding FileEditorPath}"
+                                        TextWrapping="NoWrap" />
+                                    <Button
+                                        MinWidth="50"
+                                        Margin="5 0 0 0"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_shell_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            Margin="0 10 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding ShellPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 10 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenShellPath}"
-                                            Content="..." />
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
+                                        Command="{Binding OpenFileEditorPath}"
+                                        Content="..." />
+                                </StackPanel>
 
-                            <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
-                                        <ColumnDefinition Width="*" SharedSizeGroup="D" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="0"
-                                        Grid.Column="1"
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="0 6 16 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_folder_editor_path}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Margin="0 6 6 6"
+                                    Orientation="Horizontal">
+                                    <TextBox
                                         Width="250"
-                                        Margin="10 15 10 10"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding IndexSearchEngines}"
-                                        SelectedItem="{Binding SelectedIndexSearchEngine}" />
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Width="250"
-                                        Margin="10"
+                                        Text="{Binding FolderEditorPath}"
+                                        TextWrapping="NoWrap" />
+                                    <Button
+                                        MinWidth="50"
+                                        Margin="5 0 0 0"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding ContentIndexSearchEngines}"
-                                        SelectedItem="{Binding SelectedContentSearchEngine}" />
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="2"
-                                        Grid.Column="1"
+                                        Command="{Binding OpenFolderEditorPath}"
+                                        Content="..." />
+                                </StackPanel>
+
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    Margin="0 16 6 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_shell_path}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <StackPanel
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Orientation="Horizontal">
+                                    <TextBox
                                         Width="250"
-                                        Margin="10"
+                                        Margin="0 10 0 0"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding PathEnumerationEngines}"
-                                        SelectedItem="{Binding SelectedPathEnumerationEngine}" />
-                                    <TextBlock
-                                        Grid.Row="3"
-                                        Grid.Column="0"
-                                        Margin="0 15 20 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Excluded_File_Types}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <TextBox
-                                        Grid.Row="3"
-                                        Grid.Column="1"
-                                        MinWidth="350"
-                                        Margin="0 9 0 6"
-                                        Text="{Binding ExcludedFileTypes}"
-                                        ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
-                                    <TextBlock
-                                        Grid.Row="4"
-                                        Grid.Column="0"
-                                        Margin="0 15 20 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Maximum_Results}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <TextBox
-                                        Grid.Row="4"
-                                        Grid.Column="1"
-                                        MinWidth="350"
-                                        Margin="0 9 0 6"
+                                        Text="{Binding ShellPath}"
+                                        TextWrapping="NoWrap" />
+                                    <Button
+                                        MinWidth="50"
+                                        Margin="5 10 0 0"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        MaxLength="6"
-                                        PreviewTextInput="AllowOnlyNumericInput"
-                                        Text="{Binding MaxResult}"
-                                        ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
-                                </Grid>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal">
-                                <Button
-                                    Margin="0 10 10 20"
-                                    Padding="20 10 20 10"
-                                    Click="btnOpenIndexingOptions_Click"
-                                    Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
-                            </StackPanel>
+                                        Command="{Binding OpenShellPath}"
+                                        Content="..." />
+                                </StackPanel>
+                            </Grid>
                         </StackPanel>
 
-
+                        <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
+                                    <ColumnDefinition Width="*" SharedSizeGroup="D" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="0 0 10 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <ComboBox
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Width="250"
+                                    Margin="10 15 10 10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    DisplayMemberPath="Description"
+                                    ItemsSource="{Binding IndexSearchEngines}"
+                                    SelectedItem="{Binding SelectedIndexSearchEngine}" />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="0 0 10 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <ComboBox
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Width="250"
+                                    Margin="10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    DisplayMemberPath="Description"
+                                    ItemsSource="{Binding ContentIndexSearchEngines}"
+                                    SelectedItem="{Binding SelectedContentSearchEngine}" />
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    Margin="0 0 10 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <ComboBox
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Width="250"
+                                    Margin="10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    DisplayMemberPath="Description"
+                                    ItemsSource="{Binding PathEnumerationEngines}"
+                                    SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+                                <TextBlock
+                                    Grid.Row="3"
+                                    Grid.Column="0"
+                                    Margin="0 15 20 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Excluded_File_Types}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <TextBox
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    MinWidth="350"
+                                    Margin="0 9 0 6"
+                                    Text="{Binding ExcludedFileTypes}"
+                                    ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
+                                <TextBlock
+                                    Grid.Row="4"
+                                    Grid.Column="0"
+                                    Margin="0 15 20 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Maximum_Results}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <TextBox
+                                    Grid.Row="4"
+                                    Grid.Column="1"
+                                    MinWidth="350"
+                                    Margin="0 9 0 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    MaxLength="6"
+                                    PreviewTextInput="AllowOnlyNumericInput"
+                                    Text="{Binding MaxResult}"
+                                    ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
+                            </Grid>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <Button
+                                Margin="0 10 10 20"
+                                Padding="20 10 20 10"
+                                Click="btnOpenIndexingOptions_Click"
+                                Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+                        </StackPanel>
                     </StackPanel>
                 </StackPanel>
             </TabItem>
@@ -405,7 +404,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_native_context_menu_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="30 20 10 10">
+                <StackPanel Orientation="Vertical">
                     <CheckBox
                         Margin="0 0 0 0"
                         Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
@@ -461,7 +460,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="30 20 0 10">
+                <StackPanel Orientation="Vertical">
                     <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
                     <CheckBox
                         Margin="0 10 0 0"
@@ -512,7 +511,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_everything_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="10" Orientation="Vertical">
+                <StackPanel Orientation="Vertical">
                     <CheckBox
                         Margin="20 10 0 0"
                         HorizontalAlignment="Left"
@@ -619,98 +618,93 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <ScrollViewer>
-                    <DockPanel HorizontalAlignment="Stretch">
-                        <Border
-                            Margin="10 10 10 5"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                <DockPanel HorizontalAlignment="Stretch">
+                    <Border
+                        Margin="10 10 10 5"
+                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                        BorderThickness="1"
+                        DockPanel.Dock="Top">
+                        <ListView
+                            x:Name="lbxAccessLinks"
+                            Height="200"
+                            AllowDrop="True"
                             BorderThickness="1"
-                            DockPanel.Dock="Top">
-                            <ListView
-                                x:Name="lbxAccessLinks"
-                                Height="200"
-                                AllowDrop="True"
-                                BorderThickness="1"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxAccessLinks_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.QuickAccessLinks}"
-                                SelectedItem="{Binding SelectedQuickAccessLink}" />
-                        </Border>
-                        <StackPanel
-                            HorizontalAlignment="Right"
-                            DockPanel.Dock="Bottom"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_add}" />
-                        </StackPanel>
-                    </DockPanel>
-                </ScrollViewer>
+                            DragEnter="lbxAccessLinks_DragEnter"
+                            Drop="LbxAccessLinks_OnDrop"
+                            ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                            ItemsSource="{Binding Settings.QuickAccessLinks}"
+                            SelectedItem="{Binding SelectedQuickAccessLink}" />
+                    </Border>
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Horizontal">
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding RemoveLinkCommand}"
+                            CommandParameter="QuickAccessLink"
+                            Content="{DynamicResource plugin_explorer_delete}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding EditLinkCommand}"
+                            CommandParameter="QuickAccessLink"
+                            Content="{DynamicResource plugin_explorer_edit}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding AddLinkCommand}"
+                            CommandParameter="QuickAccessLink"
+                            Content="{DynamicResource plugin_explorer_add}" />
+                    </StackPanel>
+                </DockPanel>
             </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <ScrollViewer>
-                    <DockPanel HorizontalAlignment="Stretch">
-                        <Border
-                            Margin="10 10 10 5"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                            BorderThickness="1"
-                            DockPanel.Dock="Top">
-                            <ListView
-                                Name="lbxExcludedPaths"
-                                Height="200"
-                                AllowDrop="True"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxExcludedPaths_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
-                                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
-                        </Border>
-                        <StackPanel
-                            HorizontalAlignment="Right"
-                            DockPanel.Dock="Bottom"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_add}" />
-                        </StackPanel>
-                    </DockPanel>
-                </ScrollViewer>
+                <DockPanel HorizontalAlignment="Stretch">
+                    <Border
+                        Margin="10 10 10 5"
+                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                        BorderThickness="1"
+                        DockPanel.Dock="Top">
+                        <ListView
+                            Name="lbxExcludedPaths"
+                            Height="200"
+                            AllowDrop="True"
+                            DragEnter="lbxAccessLinks_DragEnter"
+                            Drop="LbxExcludedPaths_OnDrop"
+                            ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                            ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
+                            SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
+                    </Border>
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Horizontal">
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding RemoveLinkCommand}"
+                            CommandParameter="IndexSearchExcludedPaths"
+                            Content="{DynamicResource plugin_explorer_delete}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding EditLinkCommand}"
+                            CommandParameter="IndexSearchExcludedPaths"
+                            Content="{DynamicResource plugin_explorer_edit}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding AddLinkCommand}"
+                            CommandParameter="IndexSearchExcludedPaths"
+                            Content="{DynamicResource plugin_explorer_add}" />
+                    </StackPanel>
+                </DockPanel>
             </TabItem>
         </TabControl>
-
     </Grid>
 </UserControl>

From 3fee5aea5c51c8007c2b8e1276f15a473a581856 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 20 Mar 2025 21:21:40 +0800
Subject: [PATCH 45/47] Redesign explorer settings panel

---
 .../Views/ExplorerSettings.xaml               | 877 ++++++++++--------
 1 file changed, 487 insertions(+), 390 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 3ff04d86cb5..2bd58b6ce12 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -182,448 +182,527 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_generalsetting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Orientation="Vertical">
-                    <StackPanel Orientation="Vertical">
-                        <CheckBox
-                            Margin="0 10 0 0"
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <CheckBox
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+                        IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+
+                    <CheckBox
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
+                        IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_file_editor_path}" />
+                    <StackPanel
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        Orientation="Horizontal">
+                        <TextBox
+                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
                             HorizontalAlignment="Left"
-                            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-                            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
-                        <CheckBox
-                            Margin="0 10 0 0"
+                            VerticalAlignment="Center"
+                            Text="{Binding FileEditorPath}"
+                            TextWrapping="NoWrap" />
+                        <Button
+                            Margin="{StaticResource SettingPanelItemLeftMargin}"
                             HorizontalAlignment="Left"
-                            Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
-                            IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
-                        <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
-                                    <ColumnDefinition Width="*" SharedSizeGroup="B" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
+                            VerticalAlignment="Center"
+                            Command="{Binding OpenFileEditorPath}"
+                            Content="{DynamicResource select}" />
+                    </StackPanel>
 
-                                <TextBlock
-                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    Margin="0 6 16 6"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_file_editor_path}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <StackPanel
-                                    Grid.Row="0"
-                                    Grid.Column="1"
-                                    Margin="0 6 6 6"
-                                    Orientation="Horizontal">
-                                    <TextBox
-                                        Width="250"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding FileEditorPath}"
-                                        TextWrapping="NoWrap" />
-                                    <Button
-                                        MinWidth="50"
-                                        Margin="5 0 0 0"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Command="{Binding OpenFileEditorPath}"
-                                        Content="..." />
-                                </StackPanel>
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_folder_editor_path}" />
+                    <StackPanel
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        Orientation="Horizontal">
+                        <TextBox
+                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding FolderEditorPath}"
+                            TextWrapping="NoWrap" />
+                        <Button
+                            Margin="{StaticResource SettingPanelItemLeftMargin}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Command="{Binding OpenFolderEditorPath}"
+                            Content="{DynamicResource select}" />
+                    </StackPanel>
 
-                                <TextBlock
-                                    Grid.Row="1"
-                                    Grid.Column="0"
-                                    Margin="0 6 16 6"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_folder_editor_path}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <StackPanel
-                                    Grid.Row="1"
-                                    Grid.Column="1"
-                                    Margin="0 6 6 6"
-                                    Orientation="Horizontal">
-                                    <TextBox
-                                        Width="250"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding FolderEditorPath}"
-                                        TextWrapping="NoWrap" />
-                                    <Button
-                                        MinWidth="50"
-                                        Margin="5 0 0 0"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Command="{Binding OpenFolderEditorPath}"
-                                        Content="..." />
-                                </StackPanel>
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_shell_path}" />
+                    <StackPanel
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        Orientation="Horizontal">
+                        <TextBox
+                            Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding ShellPath}"
+                            TextWrapping="NoWrap" />
+                        <Button
+                            Margin="{StaticResource SettingPanelItemLeftMargin}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Command="{Binding OpenShellPath}"
+                            Content="{DynamicResource select}" />
+                    </StackPanel>
 
-                                <TextBlock
-                                    Grid.Row="2"
-                                    Grid.Column="0"
-                                    Margin="0 16 6 6"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_shell_path}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <StackPanel
-                                    Grid.Row="2"
-                                    Grid.Column="1"
-                                    Orientation="Horizontal">
-                                    <TextBox
-                                        Width="250"
-                                        Margin="0 10 0 0"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding ShellPath}"
-                                        TextWrapping="NoWrap" />
-                                    <Button
-                                        MinWidth="50"
-                                        Margin="5 10 0 0"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Command="{Binding OpenShellPath}"
-                                        Content="..." />
-                                </StackPanel>
-                            </Grid>
-                        </StackPanel>
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_Index_Search_Engine}" />
+                    <ComboBox
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        DisplayMemberPath="Description"
+                        ItemsSource="{Binding IndexSearchEngines}"
+                        SelectedItem="{Binding SelectedIndexSearchEngine}" />
 
-                        <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
-                                    <ColumnDefinition Width="*" SharedSizeGroup="D" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock
-                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    Margin="0 0 10 0"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <ComboBox
-                                    Grid.Row="0"
-                                    Grid.Column="1"
-                                    Width="250"
-                                    Margin="10 15 10 10"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    DisplayMemberPath="Description"
-                                    ItemsSource="{Binding IndexSearchEngines}"
-                                    SelectedItem="{Binding SelectedIndexSearchEngine}" />
-                                <TextBlock
-                                    Grid.Row="1"
-                                    Grid.Column="0"
-                                    Margin="0 0 10 0"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <ComboBox
-                                    Grid.Row="1"
-                                    Grid.Column="1"
-                                    Width="250"
-                                    Margin="10"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    DisplayMemberPath="Description"
-                                    ItemsSource="{Binding ContentIndexSearchEngines}"
-                                    SelectedItem="{Binding SelectedContentSearchEngine}" />
-                                <TextBlock
-                                    Grid.Row="2"
-                                    Grid.Column="0"
-                                    Margin="0 0 10 0"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <ComboBox
-                                    Grid.Row="2"
-                                    Grid.Column="1"
-                                    Width="250"
-                                    Margin="10"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    DisplayMemberPath="Description"
-                                    ItemsSource="{Binding PathEnumerationEngines}"
-                                    SelectedItem="{Binding SelectedPathEnumerationEngine}" />
-                                <TextBlock
-                                    Grid.Row="3"
-                                    Grid.Column="0"
-                                    Margin="0 15 20 0"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_Excluded_File_Types}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <TextBox
-                                    Grid.Row="3"
-                                    Grid.Column="1"
-                                    MinWidth="350"
-                                    Margin="0 9 0 6"
-                                    Text="{Binding ExcludedFileTypes}"
-                                    ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
-                                <TextBlock
-                                    Grid.Row="4"
-                                    Grid.Column="0"
-                                    Margin="0 15 20 0"
-                                    VerticalAlignment="Center"
-                                    Text="{DynamicResource plugin_explorer_Maximum_Results}"
-                                    TextBlock.Foreground="{DynamicResource Color05B}" />
-                                <TextBox
-                                    Grid.Row="4"
-                                    Grid.Column="1"
-                                    MinWidth="350"
-                                    Margin="0 9 0 6"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
-                                    MaxLength="6"
-                                    PreviewTextInput="AllowOnlyNumericInput"
-                                    Text="{Binding MaxResult}"
-                                    ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
-                            </Grid>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <Button
-                                Margin="0 10 10 20"
-                                Padding="20 10 20 10"
-                                Click="btnOpenIndexingOptions_Click"
-                                Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
-                        </StackPanel>
-                    </StackPanel>
-                </StackPanel>
+                    <TextBlock
+                        Grid.Row="6"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_Content_Search_Engine}" />
+                    <ComboBox
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        DisplayMemberPath="Description"
+                        ItemsSource="{Binding ContentIndexSearchEngines}"
+                        SelectedItem="{Binding SelectedContentSearchEngine}" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}" />
+                    <ComboBox
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        DisplayMemberPath="Description"
+                        ItemsSource="{Binding PathEnumerationEngines}"
+                        SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+
+                    <TextBlock
+                        Grid.Row="8"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_Excluded_File_Types}" />
+                    <TextBox
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        Text="{Binding ExcludedFileTypes}"
+                        ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
+
+                    <TextBlock
+                        Grid.Row="9"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_Maximum_Results}" />
+                    <TextBox
+                        Grid.Row="9"
+                        Grid.Column="1"
+                        MinWidth="{StaticResource SettingPanelTextBoxMinWidth}"
+                        Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        MaxLength="6"
+                        PreviewTextInput="AllowOnlyNumericInput"
+                        Text="{Binding MaxResult}"
+                        ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
+
+                    <Button
+                        Grid.Row="10"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        Click="btnOpenIndexingOptions_Click"
+                        Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+                </Grid>
             </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_native_context_menu_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Orientation="Vertical">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
                     <CheckBox
-                        Margin="0 0 0 0"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                         Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
                         IsChecked="{Binding ShowWindowsContextMenu}" />
 
-                    <Grid Margin="0 10 20 10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Margin="0 0 6 6"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
-                            TextWrapping="Wrap" />
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_native_context_menu_include_patterns_guide}"
+                        TextWrapping="Wrap" />
 
-                        <TextBox
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Height="300"
-                            Margin="0 6 6 0"
-                            AcceptsReturn="True"
-                            Text="{Binding WindowsContextMenuIncludedItems}"
-                            TextWrapping="Wrap" />
+                    <TextBox
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Stretch"
+                        AcceptsReturn="True"
+                        Text="{Binding WindowsContextMenuIncludedItems}"
+                        TextWrapping="Wrap" />
 
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Margin="6 0 0 6"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
-                            TextWrapping="Wrap" />
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_native_context_menu_exclude_patterns_guide}"
+                        TextWrapping="Wrap" />
 
-                        <TextBox
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            Height="300"
-                            Margin="6 6 0 0"
-                            AcceptsReturn="True"
-                            Text="{Binding WindowsContextMenuExcludedItems}"
-                            TextWrapping="Wrap" />
-                    </Grid>
-                </StackPanel>
+                    <TextBox
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        MinHeight="{StaticResource SettingPanelAreaTextBoxMinHeight}"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Stretch"
+                        AcceptsReturn="True"
+                        Text="{Binding WindowsContextMenuExcludedItems}"
+                        TextWrapping="Wrap" />
+                </Grid>
             </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Orientation="Vertical">
-                    <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
-                    <CheckBox
-                        Margin="0 10 0 0"
-                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
-                        IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
-
-                    <CheckBox
-                        Margin="0 10 0 0"
-                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
-                        IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
 
-                    <CheckBox
-                        Margin="0 10 0 0"
-                        Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
-                        IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
+                    <DockPanel
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        HorizontalAlignment="Stretch"
+                        LastChildFill="True">
+                        <TextBlock
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            Foreground="{DynamicResource Color05B}"
+                            Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
+                        <WrapPanel
+                            Width="Auto"
+                            HorizontalAlignment="Right"
+                            DockPanel.Dock="Right">
+                            <CheckBox
+                                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                                Content="{DynamicResource plugin_explorer_previewpanel_display_file_size_checkbox}"
+                                IsChecked="{Binding ShowFileSizeInPreviewPanel}" />
+                            <CheckBox
+                                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                                Content="{DynamicResource plugin_explorer_previewpanel_display_file_creation_checkbox}"
+                                IsChecked="{Binding ShowCreatedDateInPreviewPanel}" />
+                            <CheckBox
+                                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                                Content="{DynamicResource plugin_explorer_previewpanel_display_file_modification_checkbox}"
+                                IsChecked="{Binding ShowModifiedDateInPreviewPanel}" />
+                        </WrapPanel>
+                    </DockPanel>
 
-                    <StackPanel
-                        Margin="0 20 0 0"
-                        IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
-                        Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
-                        <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}" />
-                        <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
-                            <ComboBox
-                                Width="200"
-                                ItemsSource="{Binding DateFormatList}"
-                                SelectedItem="{Binding PreviewPanelDateFormat}" />
-                            <TextBlock
-                                Margin="12 0 0 0"
-                                VerticalAlignment="Center"
-                                Foreground="{DynamicResource Color05B}"
-                                Text="{Binding PreviewPanelDateFormatDemo}" />
-                        </StackPanel>
-                        <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
-                            <ComboBox
-                                Width="200"
-                                ItemsSource="{Binding TimeFormatList}"
-                                SelectedItem="{Binding PreviewPanelTimeFormat}" />
-                            <TextBlock
-                                Margin="12 0 0 0"
-                                VerticalAlignment="Center"
-                                Foreground="{DynamicResource Color05B}"
-                                Text="{Binding PreviewPanelTimeFormatDemo}" />
-                        </StackPanel>
-                    </StackPanel>
-                </StackPanel>
+                    <DockPanel
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        HorizontalAlignment="Stretch"
+                        LastChildFill="True">
+                        <TextBlock
+                            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                            VerticalAlignment="Center"
+                            Foreground="{DynamicResource Color05B}"
+                            IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                            Text="{DynamicResource plugin_explorer_previewpanel_date_and_time_format_label}"
+                            Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}" />
+                        <WrapPanel
+                            Width="Auto"
+                            HorizontalAlignment="Right"
+                            DockPanel.Dock="Right"
+                            IsEnabled="{Binding ShowPreviewPanelDateTimeChoices}"
+                            Visibility="{Binding PreviewPanelDateTimeChoicesVisibility}">
+                            <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                                <ComboBox
+                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                    ItemsSource="{Binding DateFormatList}"
+                                    SelectedItem="{Binding PreviewPanelDateFormat}" />
+                                <TextBlock
+                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                    VerticalAlignment="Center"
+                                    Foreground="{DynamicResource Color05B}"
+                                    Text="{Binding PreviewPanelDateFormatDemo}" />
+                            </StackPanel>
+                            <StackPanel Margin="{StaticResource SettingPanelItemTopBottomMargin}" Orientation="Horizontal">
+                                <ComboBox
+                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                    ItemsSource="{Binding TimeFormatList}"
+                                    SelectedItem="{Binding PreviewPanelTimeFormat}" />
+                                <TextBlock
+                                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                                    VerticalAlignment="Center"
+                                    Foreground="{DynamicResource Color05B}"
+                                    Text="{Binding PreviewPanelTimeFormatDemo}" />
+                            </StackPanel>
+                        </WrapPanel>
+                    </DockPanel>
+                </Grid>
             </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_everything_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Orientation="Vertical">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
                     <CheckBox
-                        Margin="20 10 0 0"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                         HorizontalAlignment="Left"
                         Content="{DynamicResource flowlauncher_plugin_everything_search_fullpath}"
                         IsChecked="{Binding Settings.EverythingSearchFullPath}" />
+
                     <CheckBox
-                        Margin="20 10 0 0"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                         HorizontalAlignment="Left"
                         Content="{DynamicResource flowlauncher_plugin_everything_enable_run_count}"
                         IsChecked="{Binding Settings.EverythingEnableRunCount}" />
-                    <StackPanel Orientation="Horizontal">
-                        <Grid Margin="20 10 0 10">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="F" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Margin="0 0 20 0"
-                                VerticalAlignment="Center"
-                                Text="{DynamicResource plugin_explorer_everything_sort_option}"
-                                TextBlock.Foreground="{DynamicResource Color05B}" />
-                            <ComboBox
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Width="200"
-                                VerticalAlignment="Center"
-                                ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
-                                SelectedItem="{Binding Settings.SortOption}"
-                                SelectionChanged="EverythingSortOptionChanged">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
-                                        </Grid>
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                Margin="0 15 20 0"
-                                VerticalAlignment="Center"
-                                Text="{DynamicResource plugin_explorer_everything_installed_path}"
-                                TextBlock.Foreground="{DynamicResource Color05B}" />
-                            <TextBox
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                MinWidth="350"
-                                Margin="0 15 0 0"
-                                Text="{Binding EverythingInstalledPath}" />
-                        </Grid>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock
-                            Name="tbFastSortWarning"
-                            Margin="20 10 10 10"
-                            VerticalAlignment="Center"
-                            DockPanel.Dock="Right"
-                            Foreground="Orange"
-                            Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
-                            TextAlignment="Left"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
-                    </StackPanel>
-                </StackPanel>
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_everything_sort_option}" />
+                    <ComboBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        ItemsSource="{Binding Settings.SortOptions, Mode=OneWay}"
+                        SelectedItem="{Binding Settings.SortOption}"
+                        SelectionChanged="EverythingSortOptionChanged">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <TextBlock Text="{Binding Converter={StaticResource EnumNameConverter}}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource Color05B}"
+                        Text="{DynamicResource plugin_explorer_everything_installed_path}" />
+                    <TextBox
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Width="{StaticResource SettingPanelPathTextBoxWidth}"
+                        Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                        HorizontalAlignment="Left"
+                        Text="{Binding EverythingInstalledPath}" />
+
+                    <TextBlock
+                        Name="tbFastSortWarning"
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        VerticalAlignment="Center"
+                        Foreground="Orange"
+                        Text="{Binding SortOptionWarningMessage, Mode=OneTime}"
+                        TextAlignment="Left"
+                        TextWrapping="Wrap"
+                        Visibility="{Binding FastSortWarningVisibility, Mode=OneTime}" />
+                </Grid>
             </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <DockPanel HorizontalAlignment="Stretch">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
                     <Border
-                        Margin="10 10 10 5"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Stretch"
                         BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1"
-                        DockPanel.Dock="Top">
+                        BorderThickness="1">
                         <ListView
                             ItemTemplate="{StaticResource ListViewActionKeywords}"
                             ItemsSource="{Binding ActionKeywordsModels}"
                             SelectedItem="{Binding SelectedActionKeyword}" />
                     </Border>
+
                     <StackPanel
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                         HorizontalAlignment="Right"
-                        DockPanel.Dock="Bottom"
                         Orientation="Horizontal">
                         <Button
                             MinWidth="100"
-                            Margin="10"
                             Command="{Binding EditActionKeywordCommand}"
                             Content="{DynamicResource plugin_explorer_edit}" />
                     </StackPanel>
-                </DockPanel>
+                </Grid>
             </TabItem>
             <TabItem
                 Name="expAccessLinks"
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <DockPanel HorizontalAlignment="Stretch">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
                     <Border
-                        Margin="10 10 10 5"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Stretch"
                         BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1"
-                        DockPanel.Dock="Top">
+                        BorderThickness="1">
                         <ListView
                             x:Name="lbxAccessLinks"
                             Height="200"
@@ -635,41 +714,56 @@
                             ItemsSource="{Binding Settings.QuickAccessLinks}"
                             SelectedItem="{Binding SelectedQuickAccessLink}" />
                     </Border>
+
                     <StackPanel
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                         HorizontalAlignment="Right"
-                        DockPanel.Dock="Bottom"
                         Orientation="Horizontal">
                         <Button
                             MinWidth="100"
-                            Margin="10"
                             Command="{Binding RemoveLinkCommand}"
                             CommandParameter="QuickAccessLink"
                             Content="{DynamicResource plugin_explorer_delete}" />
                         <Button
                             MinWidth="100"
-                            Margin="10"
+                            Margin="{StaticResource SettingPanelItemLeftMargin}"
                             Command="{Binding EditLinkCommand}"
                             CommandParameter="QuickAccessLink"
                             Content="{DynamicResource plugin_explorer_edit}" />
                         <Button
                             MinWidth="100"
-                            Margin="10"
+                            Margin="{StaticResource SettingPanelItemLeftMargin}"
                             Command="{Binding AddLinkCommand}"
                             CommandParameter="QuickAccessLink"
                             Content="{DynamicResource plugin_explorer_add}" />
                     </StackPanel>
-                </DockPanel>
+                </Grid>
             </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <DockPanel HorizontalAlignment="Stretch">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
                     <Border
-                        Margin="10 10 10 5"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                        HorizontalAlignment="Stretch"
                         BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                        BorderThickness="1"
-                        DockPanel.Dock="Top">
+                        BorderThickness="1">
                         <ListView
                             Name="lbxExcludedPaths"
                             Height="200"
@@ -680,30 +774,33 @@
                             ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
                             SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
                     </Border>
+
                     <StackPanel
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                         HorizontalAlignment="Right"
-                        DockPanel.Dock="Bottom"
                         Orientation="Horizontal">
                         <Button
                             MinWidth="100"
-                            Margin="10"
                             Command="{Binding RemoveLinkCommand}"
                             CommandParameter="IndexSearchExcludedPaths"
                             Content="{DynamicResource plugin_explorer_delete}" />
                         <Button
                             MinWidth="100"
-                            Margin="10"
+                            Margin="{StaticResource SettingPanelItemLeftMargin}"
                             Command="{Binding EditLinkCommand}"
                             CommandParameter="IndexSearchExcludedPaths"
                             Content="{DynamicResource plugin_explorer_edit}" />
                         <Button
                             MinWidth="100"
-                            Margin="10"
+                            Margin="{StaticResource SettingPanelItemLeftMargin}"
                             Command="{Binding AddLinkCommand}"
                             CommandParameter="IndexSearchExcludedPaths"
                             Content="{DynamicResource plugin_explorer_add}" />
                     </StackPanel>
-                </DockPanel>
+                </Grid>
             </TabItem>
         </TabControl>
     </Grid>

From 024bf6424aa13fe266008d57d7f23febb5b5a37b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 20 Mar 2025 21:36:02 +0800
Subject: [PATCH 46/47] Use trick for left alignment

---
 .../Views/ExplorerSettings.xaml                 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 2bd58b6ce12..5f1dbb10173 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -166,9 +166,12 @@
     </UserControl.Resources>
 
     <Grid Margin="{StaticResource SettingPanelMargin}">
+        <!--  Here Margin="-25 0" for TabControl and Margin="25 0" for content in TabItem are trick to force left alignment  -->
+        <!--  Since head items in TabControl have additional left-right spacing  -->
         <TabControl
             x:Name="TabView"
             MinHeight="0"
+            Margin="-25 0"
             Background="{DynamicResource Color00B}"
             BorderThickness="0"
             SelectedIndex="0"
@@ -182,7 +185,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_generalsetting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <Grid>
+                <Grid Margin="25 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
@@ -399,7 +402,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_native_context_menu_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <Grid>
+                <Grid Margin="25 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
@@ -465,7 +468,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <Grid>
+                <Grid Margin="25 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
@@ -554,7 +557,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_everything_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <Grid>
+                <Grid Margin="25 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
@@ -642,7 +645,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <Grid>
+                <Grid Margin="25 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
@@ -685,7 +688,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <Grid>
+                <Grid Margin="25 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
@@ -746,7 +749,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <Grid>
+                <Grid Margin="25 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />

From ca0299ec89608a12ac6decdf49069f792442a239 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 20 Mar 2025 22:49:15 +0900
Subject: [PATCH 47/47] Adjust margin

---
 .../Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 5f1dbb10173..1bdb9d36a89 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -171,7 +171,7 @@
         <TabControl
             x:Name="TabView"
             MinHeight="0"
-            Margin="-25 0"
+            Margin="-25 -10 0 0"
             Background="{DynamicResource Color00B}"
             BorderThickness="0"
             SelectedIndex="0"