From 768c44567ada5bbfdbdecaa850efa9ad75946767 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 20 Sep 2022 19:22:13 +0900
Subject: [PATCH 1/3] Add Checkboxes and Adjust layout

---
 Flow.Launcher.sln                             |  5 +-
 .../Languages/en.xaml                         |  1 +
 .../Views/SettingsControl.xaml                | 69 +++++++++++--------
 .../Views/SettingsControl.xaml.cs             | 13 +++-
 4 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index ec4a29ee78d..f8457dd1adf 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29806.167
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Test", "Flow.Launcher.Test\Flow.Launcher.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -80,7 +80,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index 8f5396dd7a2..7c88708f502 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -21,4 +21,5 @@
     <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_removeBrowserBookmark">Delete</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_others">Others</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 09ad2101bd6..a614cbfc28d 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -8,40 +8,51 @@
     d:DesignWidth="500"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     mc:Ignorable="d">
-    <Grid Margin="10">
+    <Grid Margin="60,0,10,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
-        <StackPanel Margin="0,0,0,0" Orientation="Vertical">
-            <TextBlock Margin="10" Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" />
-            <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}" />
-                    </GridView>
-                </ListView.View>
-            </ListView>
-            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <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" />
+                <CheckBox Margin="0,0,15,0" Content="Edge" />
+                <CheckBox Margin="0,0,15,0" Content="Firefox" />
                 <Button
-                    MinWidth="120"
-                    Margin="10"
-                    Click="NewCustomBrowser"
-                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
-                <Button
-                    MinWidth="120"
+                    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"
-                    Click="DeleteCustomBrowser"
-                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
+                    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}" />
+                        </GridView>
+                    </ListView.View>
+                </ListView>
+                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                    <Button
+                        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}" />
+                </StackPanel>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index 5f5d3246cc0..e67c73923f6 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -1,7 +1,8 @@
-using System.Windows;
+using System.Windows;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Windows.Input;
 using System.ComponentModel;
+using System.Windows.Controls;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 {
@@ -59,5 +60,15 @@ private void MouseDoubleClickOnSelectedCustomBrowser(object sender, MouseButtonE
             var window = new CustomBrowserSettingWindow(SelectedCustomBrowser);
             window.ShowDialog();
         }
+        private void Others_Click(object sender, RoutedEventArgs e)
+        {
+
+            if (CustomBrowsersList.Visibility == Visibility.Collapsed)
+            {
+                CustomBrowsersList.Visibility = Visibility.Visible;
+            }
+            else
+                CustomBrowsersList.Visibility = Visibility.Collapsed;
+        }
     }
 }

From 2189eaaa0ca56f9bbb2e145e8d37d7f3d966766d Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Wed, 12 Oct 2022 16:11:15 -0500
Subject: [PATCH 2/3] Allow user to disable loading bookmark from certain
 browser

---
 .../Commands/BookmarkLoader.cs                | 29 ++++---
 .../Models/Settings.cs                        |  4 +
 .../Views/SettingsControl.xaml                | 80 ++++++++++---------
 3 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs
index 40d10b26f8a..77d9c64a0ea 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs
@@ -19,21 +19,28 @@ internal static MatchResult MatchProgram(Bookmark bookmark, string queryString)
 
         internal static List<Bookmark> LoadAllBookmarks(Settings setting)
         {
-
-            var chromeBookmarks = new ChromeBookmarkLoader();
-            var mozBookmarks = new FirefoxBookmarkLoader();
-            var edgeBookmarks = new EdgeBookmarkLoader();
-
             var allBookmarks = new List<Bookmark>();
 
-            // Add Firefox bookmarks
-            allBookmarks.AddRange(mozBookmarks.GetBookmarks());
+            if (setting.LoadChromeBookmark)
+            {
+                // Add Chrome bookmarks
+                var chromeBookmarks = new ChromeBookmarkLoader();
+                allBookmarks.AddRange(chromeBookmarks.GetBookmarks());
+            }
 
-            // Add Chrome bookmarks
-            allBookmarks.AddRange(chromeBookmarks.GetBookmarks());
+            if (setting.LoadFirefoxBookmark)
+            {
+                // Add Firefox bookmarks
+                var mozBookmarks = new FirefoxBookmarkLoader();
+                allBookmarks.AddRange(mozBookmarks.GetBookmarks());
+            }
 
-            // Add Edge (Chromium) bookmarks
-            allBookmarks.AddRange(edgeBookmarks.GetBookmarks());
+            if (setting.LoadEdgeBookmark)
+            {
+                // Add Edge (Chromium) bookmarks
+                var edgeBookmarks = new EdgeBookmarkLoader();
+                allBookmarks.AddRange(edgeBookmarks.GetBookmarks());
+            }
 
             foreach (var browser in setting.CustomChromiumBrowsers)
             {
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
index 5080ad30127..17b794e03b9 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
@@ -10,6 +10,10 @@ public class Settings : BaseModel
 
         public string BrowserPath { get; set; }
 
+        public bool LoadChromeBookmark { get; set; } = true;
+        public bool LoadFirefoxBookmark { get; set; } = true;
+        public bool LoadEdgeBookmark { get; set; } = true;
+
         public ObservableCollection<CustomBrowser> CustomChromiumBrowsers { get; set; } = new();
     }
 }
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index a614cbfc28d..12a84cb5a31 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -1,57 +1,65 @@
 <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" />
-                <CheckBox Margin="0,0,15,0" Content="Edge" />
-                <CheckBox Margin="0,0,15,0" Content="Firefox" />
+                <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 Name, Mode=OneWay}"
+                                            Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}"/>
+                            <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}"
+                                            Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}"/>
                         </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="120"
+                            Margin="10"
+                            Click="DeleteCustomBrowser"
+                            Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}"/>
                 </StackPanel>
             </StackPanel>
         </StackPanel>

From c5b384e4df3ad2bfdfb223adcb115818fafd32f2 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Fri, 25 Nov 2022 19:26:15 +0900
Subject: [PATCH 3/3] Update Flow.Launcher.sln

---
 Flow.Launcher.sln | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index f8457dd1adf..1d403c5a1f7 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -80,6 +80,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x86.ActiveCfg = Debug|Any CPU