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] 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 816029182..bdef5bf0f 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 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views
             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 408256f45..014deff03 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 479d0c7bb..2947c2cb5 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 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views
                 })
             {
                 Settings.CustomChromiumBrowsers.Add(newBrowser);
+                _ = Task.Run(() => Main.ReloadAllBookmarks());
             }
         }
 
@@ -50,16 +81,15 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views
             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 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views
         }
 
         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());
+            }
         }
     }
 }