From c240f1e2e03fcb1eedc5ae6d8a7266184b21d40d Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 11 Feb 2023 07:37:18 +0900
Subject: [PATCH 1/6] - Added Guide Texts in CustomBrowsePopup - Added 'Edit'
 Button, It will be disable when non-select situation - Added Browse Button in
 Path Select Textbox

---
 ...low.Launcher.Plugin.BrowserBookmark.csproj |  14 ++-
 .../Languages/en.xaml                         |   5 +
 .../Views/CustomBrowserSetting.xaml           |  73 +++++++++---
 .../Views/CustomBrowserSetting.xaml.cs        |  15 ++-
 .../Views/SettingsControl.xaml                | 108 ++++++++++--------
 .../Views/SettingsControl.xaml.cs             |   9 ++
 6 files changed, 153 insertions(+), 71 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
index c42378a9a36..253a53f1e56 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -64,14 +64,16 @@
     <Compile Remove="Bookmark.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="System.Windows.Forms">
+      <HintPath>..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <Target Name="CopyDLLs" AfterTargets="Build">
     <Message Text="Executing CopyDLLs task" Importance="High" />
-    <Copy
-      SourceFiles="$(TargetDir)\runtimes\win-x64\native\SQLite.Interop.dll"
-      DestinationFolder="$(TargetDir)\x64" />
-    <Copy
-      SourceFiles="$(TargetDir)\runtimes\win-x86\native\SQLite.Interop.dll"
-      DestinationFolder="$(TargetDir)\x86" />
+    <Copy SourceFiles="$(TargetDir)\runtimes\win-x64\native\SQLite.Interop.dll" DestinationFolder="$(TargetDir)\x64" />
+    <Copy SourceFiles="$(TargetDir)\runtimes\win-x86\native\SQLite.Interop.dll" DestinationFolder="$(TargetDir)\x86" />
   </Target>
 
   <Target Name="DeleteRuntimesFolder" AfterTargets="CopyDLLs">
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index 5dbe925c1cd..427b538ffc0 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -20,7 +20,12 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserName">Browser Name</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory">Data Directory Path</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_addBrowserBookmark">Add</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_editBrowserBookmark">Edit</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Delete</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_browseBrowserBookmark">Browse</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_others">Others</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Browser Engine</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">If you are using a special browser such as Brave or Librewolf, or a portable version, you must add the bookmarks data directory (not file) and engine type in order for this plugin to work.</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmark data location is: "C:\Users\username\AppData\Local\BraveSoftware\Brave-Browser\UserData".</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage03">After changing these values, close all setting windows and press F5 when Flow Launcher is open to reload the plug-in.</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index 499d2283449..a8ecb54f9b8 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure"
     Title="{DynamicResource flowlauncher_plugin_browserbookmark_bookmarkDataSetting}"
-    Width="520"
+    Width="550"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     KeyDown="WindowKeyDown"
@@ -71,8 +71,8 @@
                         TextAlignment="Left" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,0,20" Orientation="Horizontal">
-                    <Grid Width="444" HorizontalAlignment="Stretch">
+                <StackPanel Margin="0,0,0,20" Orientation="Horizontal">
+                    <Grid Width="474" HorizontalAlignment="Stretch">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
@@ -81,17 +81,45 @@
                             <RowDefinition />
                             <RowDefinition />
                             <RowDefinition />
+                            <RowDefinition />
                         </Grid.RowDefinitions>
-                        <TextBlock
+                        <StackPanel
                             Grid.Row="0"
                             Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="5,0,0,20">
+                            <TextBlock
+                                Margin="0,0,0,4"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_browserbookmark_guideMessage01}"
+                                TextWrapping="WrapWithOverflow" />
+                            <TextBlock
+                                Margin="0,4,0,4"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_browserbookmark_guideMessage02}"
+                                TextWrapping="WrapWithOverflow" />
+                            <TextBlock
+                                Margin="0,4,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource flowlauncher_plugin_browserbookmark_guideMessage03}"
+                                TextWrapping="WrapWithOverflow" />
+                        </StackPanel>
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
                             Margin="5,0,20,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
                         <TextBox
-                            Grid.Row="0"
+                            Grid.Row="1"
                             Grid.Column="1"
                             Width="120"
                             Height="34"
@@ -100,7 +128,7 @@
                             VerticalAlignment="Center"
                             Text="{Binding Name}" />
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="0"
                             Margin="5,10,20,0"
                             HorizontalAlignment="Left"
@@ -108,7 +136,7 @@
                             FontSize="14"
                             Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserEngine}" />
                         <ComboBox
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="1"
                             Width="120"
                             Height="34"
@@ -116,24 +144,35 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type local:BrowserType}}}"
-                            SelectedItem="{Binding BrowserType}">
-                        </ComboBox>
+                            SelectedItem="{Binding BrowserType}" />
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="0"
                             Margin="5,10,20,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
-                        <TextBox
-                            Grid.Row="2"
+                        <DockPanel
+                            Grid.Row="3"
                             Grid.Column="1"
-                            Height="34"
-                            Margin="5,10,0,0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center"
-                            Text="{Binding DataDirectoryPath}" />
+                            LastChildFill="True">
+                            <Button
+                                Height="34"
+                                MinWidth="100"
+                                Margin="5,10,0,0"
+                                VerticalContentAlignment="Stretch"
+                                Click="OnSelectPathClick"
+                                Content="{DynamicResource flowlauncher_plugin_browserbookmark_browseBrowserBookmark}"
+                                DockPanel.Dock="Right" />
+                            <TextBox
+                                Name="PathTextBox"
+                                Height="34"
+                                Margin="5,10,0,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                Text="{Binding DataDirectoryPath}" />
+                        </DockPanel>
                     </Grid>
                 </StackPanel>
             </StackPanel>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
index 392d4695ab7..0ac2199625a 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
@@ -1,7 +1,10 @@
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using Microsoft.Win32;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Forms;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 {
@@ -25,7 +28,7 @@ public CustomBrowserSettingWindow(CustomBrowser browser)
 
         private void ConfirmCancelEditCustomBrowser(object sender, RoutedEventArgs e)
         {
-            if (DataContext is CustomBrowser editBrowser && e.Source is Button button)
+            if (DataContext is CustomBrowser editBrowser && e.Source is System.Windows.Controls.Button button)
             {
                 if (button.Name == "btnConfirm")
                 {
@@ -39,12 +42,20 @@ private void ConfirmCancelEditCustomBrowser(object sender, RoutedEventArgs e)
             Close();
         }
 
-        private void WindowKeyDown(object sender, KeyEventArgs e)
+        private void WindowKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
             {
                 ConfirmCancelEditCustomBrowser(sender, e);
             }
         }
+
+        private void OnSelectPathClick(object sender, RoutedEventArgs e)
+        {
+            var dialog = new FolderBrowserDialog();
+            dialog.ShowDialog();
+            PathTextBox.Text = dialog.SelectedPath;
+            string folder = dialog.SelectedPath;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 628a9417b2e..408256f4560 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -1,67 +1,83 @@
 <UserControl
-        x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.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"
-        d:DesignHeight="300"
-        d:DesignWidth="500"
-        DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        mc:Ignorable="d">
+    x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.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"
+    d:DesignHeight="300"
+    d:DesignWidth="500"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    mc:Ignorable="d">
     <Grid Margin="60,0,10,0">
         <Grid.RowDefinitions>
-            <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 Settings.LoadChromeBookmark}"/>
-                <CheckBox Margin="0,0,15,0"
-                          Content="Edge"
-                          IsChecked="{Binding Settings.LoadEdgeBookmark}"/>
-                <CheckBox Margin="0,0,15,0"
-                          Content="Firefox"
-                          IsChecked="{Binding Settings.LoadFirefoxBookmark}"/>
+                <TextBlock Margin="10" Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" />
+                <CheckBox
+                    Margin="0,0,15,0"
+                    Content="Chrome"
+                    IsChecked="{Binding Settings.LoadChromeBookmark}" />
+                <CheckBox
+                    Margin="0,0,15,0"
+                    Content="Edge"
+                    IsChecked="{Binding Settings.LoadEdgeBookmark}" />
+                <CheckBox
+                    Margin="0,0,15,0"
+                    Content="Firefox"
+                    IsChecked="{Binding Settings.LoadFirefoxBookmark}" />
                 <Button
-                        Margin="0,0,15,0"
-                        Click="Others_Click"
-                        Content="{DynamicResource flowlauncher_plugin_browserbookmark_others}"/>
+                    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}}">
+                    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}"/>
+                            <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}"/>
+                        MinWidth="130"
+                        Margin="10"
+                        Click="NewCustomBrowser"
+                        Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
                     <Button
-                            MinWidth="120"
-                            Margin="10"
-                            Click="DeleteCustomBrowser"
-                            Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}"/>
+                        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>
             </StackPanel>
         </StackPanel>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index e67c73923f6..479d0c7bbb4 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -70,5 +70,14 @@ private void Others_Click(object sender, RoutedEventArgs e)
             else
                 CustomBrowsersList.Visibility = Visibility.Collapsed;
         }
+
+        private void EditCustomBrowser(object sender, RoutedEventArgs e)
+        {
+            if (SelectedCustomBrowser is null)
+                return;
+
+            var window = new CustomBrowserSettingWindow(SelectedCustomBrowser);
+            window.ShowDialog();
+        }
     }
 }

From b2b22dc4cfe95775a89127e2953fd6fc2bd420ed Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 11 Feb 2023 14:14:42 +0900
Subject: [PATCH 2/6] Fix UseWindowsForms in csproj

---
 .../Flow.Launcher.Plugin.BrowserBookmark.csproj            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
index 253a53f1e56..25577d96b60 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -11,6 +11,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -64,12 +65,6 @@
     <Compile Remove="Bookmark.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms">
-      <HintPath>..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <Target Name="CopyDLLs" AfterTargets="Build">
     <Message Text="Executing CopyDLLs task" Importance="High" />
     <Copy SourceFiles="$(TargetDir)\runtimes\win-x64\native\SQLite.Interop.dll" DestinationFolder="$(TargetDir)\x64" />

From dd61d195e29d539f9da93e4eec443a1e5d83ac89 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 12 Feb 2023 01:27:31 +0800
Subject: [PATCH 3/6] Update desc

---
 .../Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index 427b538ffc0..5aee1483826 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -25,7 +25,7 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browseBrowserBookmark">Browse</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_others">Others</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Browser Engine</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">If you are using a special browser such as Brave or Librewolf, or a portable version, you must add the bookmarks data directory (not file) and engine type in order for this plugin to work.</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmark data location is: "C:\Users\username\AppData\Local\BraveSoftware\Brave-Browser\UserData".</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">If you are not using Chrome, Firefox or Edge, or you are using their portable version, you need to add bookmarks data directory and select correct browser engine to make this plugin work.</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmarks data location is: "%LOCALAPPDATA%\BraveSoftware\Brave-Browser\UserData". For Firefox engine, the bookmarks directory is the folder contains the places.sqlite file.</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage03">After changing these values, close all setting windows and press F5 when Flow Launcher is open to reload the plug-in.</system:String>
 </ResourceDictionary>
\ No newline at end of file

From ab0d6245dfa327a9adfe6509fdd7f9b62e1bd3d5 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 12 Feb 2023 01:58:53 +0800
Subject: [PATCH 4/6] Auto reload all bookmarks when finish editing

---
 .../Languages/en.xaml                         |  1 -
 .../Main.cs                                   | 17 ++++++----
 .../Views/CustomBrowserSetting.xaml           |  6 ++--
 .../Views/CustomBrowserSetting.xaml.cs        | 33 +++++++++----------
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index 5aee1483826..d3d7cc947db 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -27,5 +27,4 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Browser Engine</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">If you are not using Chrome, Firefox or Edge, or you are using their portable version, you need to add bookmarks data directory and select correct browser engine to make this plugin work.</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmarks data location is: "%LOCALAPPDATA%\BraveSoftware\Brave-Browser\UserData". For Firefox engine, the bookmarks directory is the folder contains the places.sqlite file.</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage03">After changing these values, close all setting windows and press F5 when Flow Launcher is open to reload the plug-in.</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
index d072a362d0e..d9a719272b5 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
@@ -17,16 +17,16 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
 {
     public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContextMenu, IDisposable
     {
-        private PluginInitContext context;
+        private static PluginInitContext context;
 
-        private List<Bookmark> cachedBookmarks = new List<Bookmark>();
-
-        private Settings _settings { get; set; }
+        private static List<Bookmark> cachedBookmarks = new List<Bookmark>();
 
+        private static Settings _settings;
+        
         public void Init(PluginInitContext context)
         {
-            this.context = context;
-
+            Main.context = context;
+            
             _settings = context.API.LoadSettingJsonStorage<Settings>();
 
             cachedBookmarks = BookmarkLoader.LoadAllBookmarks(_settings);
@@ -136,6 +136,11 @@ internal static void RegisterBookmarkFile(string path)
         }
 
         public void ReloadData()
+        {
+            ReloadAllBookmarks();
+        }
+
+        public static void ReloadAllBookmarks()
         {
             cachedBookmarks.Clear();
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index a8ecb54f9b8..392c9e0a78c 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -39,7 +39,7 @@
                     </Grid.ColumnDefinitions>
                     <Button
                         Grid.Column="4"
-                        Click="ConfirmCancelEditCustomBrowser"
+                        Click="CancelEditCustomBrowser"
                         Style="{StaticResource TitleBarCloseButtonStyle}">
                         <Path
                             Width="46"
@@ -187,13 +187,13 @@
                     x:Name="btnCancel"
                     MinWidth="145"
                     Margin="0,0,5,0"
-                    Click="ConfirmCancelEditCustomBrowser"
+                    Click="CancelEditCustomBrowser"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="btnConfirm"
                     MinWidth="145"
                     Margin="5,0,0,0"
-                    Click="ConfirmCancelEditCustomBrowser"
+                    Click="ConfirmEditCustomBrowser"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
                 </Button>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
index 0ac2199625a..81602918274 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
@@ -1,10 +1,8 @@
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
-using Microsoft.Win32;
-using System;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Forms;
+using System.Threading.Tasks;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 {
@@ -25,20 +23,19 @@ public CustomBrowserSettingWindow(CustomBrowser browser)
                 BrowserType = browser.BrowserType,
             };
         }
-
-        private void ConfirmCancelEditCustomBrowser(object sender, RoutedEventArgs e)
+        
+        private void ConfirmEditCustomBrowser(object sender, RoutedEventArgs e)
         {
-            if (DataContext is CustomBrowser editBrowser && e.Source is System.Windows.Controls.Button button)
-            {
-                if (button.Name == "btnConfirm")
-                {
-                    currentCustomBrowser.Name = editBrowser.Name;
-                    currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath;
-                    currentCustomBrowser.BrowserType = editBrowser.BrowserType;
-                    Close();
-                }
-            }
+            CustomBrowser editBrowser = (CustomBrowser)DataContext;
+            currentCustomBrowser.Name = editBrowser.Name;
+            currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath;
+            currentCustomBrowser.BrowserType = editBrowser.BrowserType;
+            _ = Task.Run(() => Main.ReloadAllBookmarks());
+            Close();
+        }
 
+        private void CancelEditCustomBrowser(object sender, RoutedEventArgs e)
+        {
             Close();
         }
 
@@ -46,7 +43,7 @@ private void WindowKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
             {
-                ConfirmCancelEditCustomBrowser(sender, e);
+                ConfirmEditCustomBrowser(sender, e);
             }
         }
 
@@ -54,8 +51,8 @@ private void OnSelectPathClick(object sender, RoutedEventArgs e)
         {
             var dialog = new FolderBrowserDialog();
             dialog.ShowDialog();
-            PathTextBox.Text = dialog.SelectedPath;
-            string folder = dialog.SelectedPath;
+            CustomBrowser editBrowser = (CustomBrowser)DataContext;
+            editBrowser.DataDirectoryPath = dialog.SelectedPath;
         }
     }
 }

From 39c4a2be2ea4bf55e2e2b8aa42058e4b8709e434 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 14 Feb 2023 16:35:06 +0800
Subject: [PATCH 5/6] Auto reload bookmarks when editing checkboxes

---
 .../Views/CustomBrowserSetting.xaml.cs        |  3 +-
 .../Views/SettingsControl.xaml                |  6 +-
 .../Views/SettingsControl.xaml.cs             | 57 ++++++++++++++++---
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
index 81602918274..bdef5bf0fc0 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
@@ -2,7 +2,6 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Forms;
-using System.Threading.Tasks;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 {
@@ -30,7 +29,7 @@ private void ConfirmEditCustomBrowser(object sender, RoutedEventArgs e)
             currentCustomBrowser.Name = editBrowser.Name;
             currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath;
             currentCustomBrowser.BrowserType = editBrowser.BrowserType;
-            _ = Task.Run(() => Main.ReloadAllBookmarks());
+            DialogResult = true;
             Close();
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 408256f4560..014deff03b6 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -18,15 +18,15 @@
                 <CheckBox
                     Margin="0,0,15,0"
                     Content="Chrome"
-                    IsChecked="{Binding Settings.LoadChromeBookmark}" />
+                    IsChecked="{Binding LoadChromeBookmark}" />
                 <CheckBox
                     Margin="0,0,15,0"
                     Content="Edge"
-                    IsChecked="{Binding Settings.LoadEdgeBookmark}" />
+                    IsChecked="{Binding LoadEdgeBookmark}" />
                 <CheckBox
                     Margin="0,0,15,0"
                     Content="Firefox"
-                    IsChecked="{Binding Settings.LoadFirefoxBookmark}" />
+                    IsChecked="{Binding LoadFirefoxBookmark}" />
                 <Button
                     Margin="0,0,15,0"
                     Click="Others_Click"
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index 479d0c7bbb4..2947c2cb56f 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -2,16 +2,46 @@
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Windows.Input;
 using System.ComponentModel;
-using System.Windows.Controls;
+using System.Threading.Tasks;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 {
     public partial class SettingsControl : INotifyPropertyChanged
     {
         public Settings Settings { get; }
-        
+
         public CustomBrowser SelectedCustomBrowser { get; set; }
-        
+
+        public bool LoadChromeBookmark
+        {
+            get => Settings.LoadChromeBookmark;
+            set
+            {
+                Settings.LoadChromeBookmark = value;
+                _ = Task.Run(() => Main.ReloadAllBookmarks());
+            }
+        }
+
+        public bool LoadFirefoxBookmark
+        {
+            get => Settings.LoadFirefoxBookmark;
+            set
+            {
+                Settings.LoadFirefoxBookmark = value;
+                _ = Task.Run(() => Main.ReloadAllBookmarks());
+            }
+        }
+
+        public bool LoadEdgeBookmark
+        {
+            get => Settings.LoadEdgeBookmark;
+            set
+            {
+                Settings.LoadEdgeBookmark = value;
+                _ = Task.Run(() => Main.ReloadAllBookmarks());
+            }
+        }
+
         public bool OpenInNewBrowserWindow
         {
             get => Settings.OpenInNewBrowserWindow;
@@ -42,6 +72,7 @@ private void NewCustomBrowser(object sender, RoutedEventArgs e)
                 })
             {
                 Settings.CustomChromiumBrowsers.Add(newBrowser);
+                _ = Task.Run(() => Main.ReloadAllBookmarks());
             }
         }
 
@@ -50,16 +81,15 @@ private void DeleteCustomBrowser(object sender, RoutedEventArgs e)
             if (CustomBrowsers.SelectedItem is CustomBrowser selectedCustomBrowser)
             {
                 Settings.CustomChromiumBrowsers.Remove(selectedCustomBrowser);
+                _ = Task.Run(() => Main.ReloadAllBookmarks());
             }
         }
+        
         private void MouseDoubleClickOnSelectedCustomBrowser(object sender, MouseButtonEventArgs e)
         {
-            if (SelectedCustomBrowser is null)
-                return;
-
-            var window = new CustomBrowserSettingWindow(SelectedCustomBrowser);
-            window.ShowDialog();
+            EditSelectedCustomBrowser();
         }
+        
         private void Others_Click(object sender, RoutedEventArgs e)
         {
 
@@ -72,12 +102,21 @@ private void Others_Click(object sender, RoutedEventArgs e)
         }
 
         private void EditCustomBrowser(object sender, RoutedEventArgs e)
+        {
+            EditSelectedCustomBrowser();
+        }
+
+        private void EditSelectedCustomBrowser()
         {
             if (SelectedCustomBrowser is null)
                 return;
 
             var window = new CustomBrowserSettingWindow(SelectedCustomBrowser);
-            window.ShowDialog();
+            var result = window.ShowDialog() ?? false;
+            if (result)
+            {
+                _ = Task.Run(() => Main.ReloadAllBookmarks());
+            }
         }
     }
 }

From 9b0cf201840d26d286addebdfa2403875d4a1707 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 14 Feb 2023 16:35:34 +0800
Subject: [PATCH 6/6] update text

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

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index d3d7cc947db..e5f3d541e11 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -26,5 +26,5 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_others">Others</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Browser Engine</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">If you are not using Chrome, Firefox or Edge, or you are using their portable version, you need to add bookmarks data directory and select correct browser engine to make this plugin work.</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmarks data location is: "%LOCALAPPDATA%\BraveSoftware\Brave-Browser\UserData". For Firefox engine, the bookmarks directory is the folder contains the places.sqlite file.</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmarks data location is: "%LOCALAPPDATA%\BraveSoftware\Brave-Browser\UserData". For Firefox engine, the bookmarks directory is the userdata folder contains the places.sqlite file.</system:String>
 </ResourceDictionary>
\ No newline at end of file