From 93c952b344f336b3c2405e02f21f3ec9239c72e9 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 8 Nov 2019 05:47:54 +1100
Subject: [PATCH 01/11] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 36628d4c0..d7ccabd40 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,8 @@ Features
 Installation
 ------------
 
+View new features released from this fork since Wox v1.3.524: [new releases](https://github.com/jjw24/Wox/releases)
+
 To install this fork's version of Wox, you can **download** it [here](https://github.com/jjw24/Wox/releases/latest).
 
 To install the upstream version:

From 2debabe66426417494ba1a364082326fea8dc5bd Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Sun, 10 Nov 2019 19:12:43 +1100
Subject: [PATCH 02/11] Add option to open in tab for WebSearch plugin

---
 Plugins/Wox.Plugin.WebSearch/Main.cs     | 19 +++++++++++++++--
 Plugins/Wox.Plugin.WebSearch/Settings.cs |  2 ++
 Wox.Plugin/SharedCommands/SearchWeb.cs   | 26 +++++++++++++++++++++---
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/Plugins/Wox.Plugin.WebSearch/Main.cs b/Plugins/Wox.Plugin.WebSearch/Main.cs
index ec4033ac3..095ce20e1 100644
--- a/Plugins/Wox.Plugin.WebSearch/Main.cs
+++ b/Plugins/Wox.Plugin.WebSearch/Main.cs
@@ -74,7 +74,14 @@ namespace Wox.Plugin.WebSearch
                             IcoPath = searchSource.IconPath,
                             Action = c =>
                             {
-                                searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow("");
+                                if (_settings.OpenInNewBrowser)
+                                {
+                                    searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow("");
+                                }
+                                else
+                                {
+                                    searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewTabInBrowser("");
+                                }
 
                                 return true;
                             }
@@ -132,7 +139,15 @@ namespace Wox.Plugin.WebSearch
                     IcoPath = searchSource.IconPath,
                     Action = c =>
                     {
-                        searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow("");
+                        if (_settings.OpenInNewBrowser)
+                        {
+                            searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow("");
+                        }
+                        else
+                        {
+                            searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewTabInBrowser("");
+                        }
+
                         return true;
                     }
                 });
diff --git a/Plugins/Wox.Plugin.WebSearch/Settings.cs b/Plugins/Wox.Plugin.WebSearch/Settings.cs
index 6277ab753..5f7a3913e 100644
--- a/Plugins/Wox.Plugin.WebSearch/Settings.cs
+++ b/Plugins/Wox.Plugin.WebSearch/Settings.cs
@@ -219,5 +219,7 @@ namespace Wox.Plugin.WebSearch
                 }
             }
         }
+
+        public bool OpenInNewBrowser { get; set; } = true;
     }
 }
\ No newline at end of file
diff --git a/Wox.Plugin/SharedCommands/SearchWeb.cs b/Wox.Plugin/SharedCommands/SearchWeb.cs
index 853fca43d..0d94bfd6d 100644
--- a/Wox.Plugin/SharedCommands/SearchWeb.cs
+++ b/Wox.Plugin/SharedCommands/SearchWeb.cs
@@ -7,7 +7,8 @@ namespace Wox.Plugin.SharedCommands
 {
     public static class SearchWeb
     {
-        /// <summary> Opens search in a new browser. If no browser path is passed in then Chrome is used. 
+        /// <summary> 
+        /// Opens search in a new browser. If no browser path is passed in then Chrome is used. 
         /// Leave browser path blank to use Chrome.
         /// </summary>
         public static void NewBrowserWindow(this string url, string browserPath)
@@ -19,11 +20,30 @@ namespace Wox.Plugin.SharedCommands
             var browser = string.IsNullOrEmpty(browserExecutableName) ? "chrome" : browserPath;
 
             // Internet Explorer will open url in new browser window, and does not take the --new-window parameter
-            var browserArguements = browserExecutableName == "iexplore.exe" ? url : "--new-window " + url;
+            var browserArguements = browserExecutableName == "iexplore.exe" ? "" : "--new-window ";
 
+            OpenWebSearch(browser, browserArguements, url);
+        }
+
+        /// <summary> 
+        /// Opens search as a tab in the default browser chosen in Windows settings.
+        /// </summary>
+        public static void NewTabInBrowser(this string url, string browserPath)
+        {
+            var browserExecutableName = browserPath?
+                                        .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
+                                        .Last();
+
+            var browser = string.IsNullOrEmpty(browserExecutableName) ? "" : browserPath;
+
+            OpenWebSearch(browser, "", url);
+        }
+
+        private static void OpenWebSearch(string chosenBrowser, string browserArguements, string url)
+        {
             try
             {
-                Process.Start(browser, browserArguements);
+                Process.Start(chosenBrowser, browserArguements + url);
             }
             catch (System.ComponentModel.Win32Exception)
             {

From b565d1ab762b92683d72d210f3927804a7f61439 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Sun, 10 Nov 2019 19:51:50 +1100
Subject: [PATCH 03/11] Update naming

---
 Wox.Plugin/SharedCommands/SearchWeb.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Wox.Plugin/SharedCommands/SearchWeb.cs b/Wox.Plugin/SharedCommands/SearchWeb.cs
index 0d94bfd6d..e40c40542 100644
--- a/Wox.Plugin/SharedCommands/SearchWeb.cs
+++ b/Wox.Plugin/SharedCommands/SearchWeb.cs
@@ -17,12 +17,12 @@ namespace Wox.Plugin.SharedCommands
                                         .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
                                         .Last();
 
-            var browser = string.IsNullOrEmpty(browserExecutableName) ? "chrome" : browserPath;
+            var selectedBrowserPath = string.IsNullOrEmpty(browserExecutableName) ? "chrome" : browserPath;
 
             // Internet Explorer will open url in new browser window, and does not take the --new-window parameter
             var browserArguements = browserExecutableName == "iexplore.exe" ? "" : "--new-window ";
 
-            OpenWebSearch(browser, browserArguements, url);
+            OpenWebSearch(selectedBrowserPath, browserArguements, url);
         }
 
         /// <summary> 
@@ -34,9 +34,9 @@ namespace Wox.Plugin.SharedCommands
                                         .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
                                         .Last();
 
-            var browser = string.IsNullOrEmpty(browserExecutableName) ? "" : browserPath;
+            var selectedBrowserPath = string.IsNullOrEmpty(browserExecutableName) ? "" : browserPath;
 
-            OpenWebSearch(browser, "", url);
+            OpenWebSearch(selectedBrowserPath, "", url);
         }
 
         private static void OpenWebSearch(string chosenBrowser, string browserArguements, string url)

From 3e292d7604690ff8fbbf492feb2f2786516d60f8 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Sun, 10 Nov 2019 20:12:45 +1100
Subject: [PATCH 04/11] Reverse changes made to new browser window call

---
 Wox.Plugin/SharedCommands/SearchWeb.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Wox.Plugin/SharedCommands/SearchWeb.cs b/Wox.Plugin/SharedCommands/SearchWeb.cs
index e40c40542..52a79a51b 100644
--- a/Wox.Plugin/SharedCommands/SearchWeb.cs
+++ b/Wox.Plugin/SharedCommands/SearchWeb.cs
@@ -11,18 +11,25 @@ namespace Wox.Plugin.SharedCommands
         /// Opens search in a new browser. If no browser path is passed in then Chrome is used. 
         /// Leave browser path blank to use Chrome.
         /// </summary>
-        public static void NewBrowserWindow(this string url, string browserPath)
+		public static void NewBrowserWindow(this string url, string browserPath)
         {
             var browserExecutableName = browserPath?
                                         .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
                                         .Last();
 
-            var selectedBrowserPath = string.IsNullOrEmpty(browserExecutableName) ? "chrome" : browserPath;
+            var browser = string.IsNullOrEmpty(browserExecutableName) ? "chrome" : browserPath;
 
             // Internet Explorer will open url in new browser window, and does not take the --new-window parameter
-            var browserArguements = browserExecutableName == "iexplore.exe" ? "" : "--new-window ";
+            var browserArguements = browserExecutableName == "iexplore.exe" ? url : "--new-window " + url;
 
-            OpenWebSearch(selectedBrowserPath, browserArguements, url);
+            try
+            {
+                Process.Start(browser, browserArguements);
+            }
+            catch (System.ComponentModel.Win32Exception)
+            {
+                Process.Start(url);
+            }
         }
 
         /// <summary> 

From adb2582856748153ee155d31025e298941eb2608 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Sun, 10 Nov 2019 20:15:14 +1100
Subject: [PATCH 05/11] Reverse out common open browser call and update open
 browser in tab

---
 Wox.Plugin/SharedCommands/SearchWeb.cs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Wox.Plugin/SharedCommands/SearchWeb.cs b/Wox.Plugin/SharedCommands/SearchWeb.cs
index 52a79a51b..f91025bff 100644
--- a/Wox.Plugin/SharedCommands/SearchWeb.cs
+++ b/Wox.Plugin/SharedCommands/SearchWeb.cs
@@ -36,22 +36,19 @@ namespace Wox.Plugin.SharedCommands
         /// Opens search as a tab in the default browser chosen in Windows settings.
         /// </summary>
         public static void NewTabInBrowser(this string url, string browserPath)
-        {
-            var browserExecutableName = browserPath?
-                                        .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
-                                        .Last();
-
-            var selectedBrowserPath = string.IsNullOrEmpty(browserExecutableName) ? "" : browserPath;
-
-            OpenWebSearch(selectedBrowserPath, "", url);
-        }
-
-        private static void OpenWebSearch(string chosenBrowser, string browserArguements, string url)
         {
             try
             {
-                Process.Start(chosenBrowser, browserArguements + url);
+                if (!string.IsNullOrEmpty(browserPath))
+                {
+                    Process.Start(browserPath, url);
+                }
+                else
+                {
+                    Process.Start(url);
+                }
             }
+            // This error may be thrown for Process.Start(browserPath, url)
             catch (System.ComponentModel.Win32Exception)
             {
                 Process.Start(url);

From 23712ce59067193272bcac6beaabb7be731e1d4c Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Sun, 10 Nov 2019 20:43:40 +1100
Subject: [PATCH 06/11] Add option in WebSearches plugin settings panel for
 user selection

---
 Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml    |  3 +++
 Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
index 01b2d25c6..fd4320e4f 100644
--- a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
@@ -23,6 +23,9 @@
                       SelectedItem="{Binding Settings.SelectedSuggestion}"
                       IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" Margin="10" />
             <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
+            <Label Content="Open search in:" Margin="40 3 0 8"/>
+            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10" />
+            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10" />
         </StackPanel>
         <ListView ItemsSource="{Binding Settings.SearchSources}"
                   SelectedItem="{Binding Settings.SelectedSearchSource}"
diff --git a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs
index 6e210c0d3..c97ad8796 100644
--- a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs
+++ b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs
@@ -18,6 +18,8 @@ namespace Wox.Plugin.WebSearch
             _context = context;
             _settings = viewModel.Settings;
             DataContext = viewModel;
+            NewWindowBrowser.IsChecked = _settings.OpenInNewBrowser;
+            NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowser;
         }
 
         private void OnAddSearchSearchClick(object sender, RoutedEventArgs e)
@@ -56,5 +58,15 @@ namespace Wox.Plugin.WebSearch
                 webSearch.ShowDialog();
             }
         }
+
+        private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e)
+        {
+            _settings.OpenInNewBrowser = true;
+        }
+
+        private void OnNewTabClick(object sender, RoutedEventArgs e)
+        {
+            _settings.OpenInNewBrowser = false;
+        }
     }
 }

From 3929043eec3fdc1a651ccb250388016f5e676ab2 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 11 Nov 2019 05:59:37 +1100
Subject: [PATCH 07/11] fixed enable suggestions display

---
 Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
index fd4320e4f..fb7db285f 100644
--- a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
@@ -21,7 +21,7 @@
                       Content="{DynamicResource wox_plugin_websearch_enable_suggestion}" />
             <ComboBox ItemsSource="{Binding Settings.Suggestions}"
                       SelectedItem="{Binding Settings.SelectedSuggestion}"
-                      IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" Margin="10" />
+                      IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" Margin="10,3,10,10" />
             <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
             <Label Content="Open search in:" Margin="40 3 0 8"/>
             <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10" />

From dcbd4f335662f33f178b88e200daeaf254f4bb36 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 11 Nov 2019 06:04:16 +1100
Subject: [PATCH 08/11] add option to Url plugin

---
 Plugins/Wox.Plugin.Url/Main.cs     | 9 ++++++++-
 Plugins/Wox.Plugin.Url/Settings.cs | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Plugins/Wox.Plugin.Url/Main.cs b/Plugins/Wox.Plugin.Url/Main.cs
index 1c3a708c8..ed4e55b86 100644
--- a/Plugins/Wox.Plugin.Url/Main.cs
+++ b/Plugins/Wox.Plugin.Url/Main.cs
@@ -79,7 +79,14 @@ namespace Wox.Plugin.Url
                             }
                             try
                             {
-                                raw.NewBrowserWindow(_settings.BrowserPath);
+                                if (_settings.OpenInNewBrowserWindow)
+                                {
+                                    raw.NewBrowserWindow(_settings.BrowserPath);
+                                }
+                                else
+                                {
+                                    raw.NewTabInBrowser(_settings.BrowserPath);
+                                }
                                 
                                 return true;
                             }
diff --git a/Plugins/Wox.Plugin.Url/Settings.cs b/Plugins/Wox.Plugin.Url/Settings.cs
index 8dce1770d..9ee074afc 100644
--- a/Plugins/Wox.Plugin.Url/Settings.cs
+++ b/Plugins/Wox.Plugin.Url/Settings.cs
@@ -9,5 +9,7 @@ namespace Wox.Plugin.Url
     public class Settings
     {
         public string BrowserPath { get; set; }
+
+        public bool OpenInNewBrowserWindow { get; set; } = true;
     }
 }

From c83edc16898761625d1aafef8c9b8bf55d6104d2 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 11 Nov 2019 06:49:17 +1100
Subject: [PATCH 09/11] Add user selection option to url plugin

---
 Plugins/Wox.Plugin.Url/SettingsControl.xaml    | 17 ++++++++++++-----
 Plugins/Wox.Plugin.Url/SettingsControl.xaml.cs | 12 ++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Plugins/Wox.Plugin.Url/SettingsControl.xaml b/Plugins/Wox.Plugin.Url/SettingsControl.xaml
index ea607cdc5..4c031a9ee 100644
--- a/Plugins/Wox.Plugin.Url/SettingsControl.xaml
+++ b/Plugins/Wox.Plugin.Url/SettingsControl.xaml
@@ -16,10 +16,17 @@
             <ColumnDefinition Width="0*"/>
             <ColumnDefinition Width="0*"/>
         </Grid.ColumnDefinitions>
-        <Label HorizontalAlignment="Left" Margin="99,22,0,0" VerticalAlignment="Top" Height="43" Width="318" FontSize="20" Content="{DynamicResource wox_plugin_url_plugin_set_tip}"/>
-        <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" Margin="35,90,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="311"/>
-        <Button x:Name="setButton" HorizontalAlignment="Left" Margin="356,247,0,0" VerticalAlignment="Top" Width="110" Height="33" FontSize="20" Click="OnApplyBTClick" Content="{DynamicResource wox_plugin_url_plugin_apply}"/>
-        <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="369,90,0,0" VerticalAlignment="Top" Width="86" Height="34" Click="OnChooseClick" FontSize="20" Content="{DynamicResource wox_plugin_url_plugin_choose}"/>
-
+        <StackPanel Orientation="Horizontal" Grid.Row="0">
+            <Label Content="Open search in:" Margin="40,3,0,272"/>
+            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10,10,10,272" />
+            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10,10,10,272" />
+        </StackPanel>
+        <StackPanel VerticalAlignment="Center">
+            
+            <Label Content="{DynamicResource wox_plugin_url_plugin_set_tip}" Height="42" Margin="0,0,155,0" HorizontalAlignment="Right" Width="310"/>
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" Margin="35,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
+            <Button x:Name="setButton" HorizontalAlignment="Left" Margin="272,5,0,0" Width="73" Height="25" FontSize="10" Click="OnApplyBTClick" Content="{DynamicResource wox_plugin_url_plugin_apply}" />
+            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="180,-25,0,0" Width="73" Height="25" Click="OnChooseClick" FontSize="10" Content="{DynamicResource wox_plugin_url_plugin_choose}" />
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/Plugins/Wox.Plugin.Url/SettingsControl.xaml.cs b/Plugins/Wox.Plugin.Url/SettingsControl.xaml.cs
index ea6fa26d6..fd71170e8 100644
--- a/Plugins/Wox.Plugin.Url/SettingsControl.xaml.cs
+++ b/Plugins/Wox.Plugin.Url/SettingsControl.xaml.cs
@@ -31,6 +31,8 @@ namespace Wox.Plugin.Url
             _settings = settings;
             _woxAPI = woxAPI;
             browserPathBox.Text = _settings.BrowserPath;
+            NewWindowBrowser.IsChecked = _settings.OpenInNewBrowserWindow;
+            NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;
         }
 
         private void OnApplyBTClick(object sender, RoutedEventArgs e)
@@ -49,5 +51,15 @@ namespace Wox.Plugin.Url
                 browserPathBox.Text = fileBrowserDialog.FileName;
             }
         }
+
+        private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e)
+        {
+            _settings.OpenInNewBrowserWindow = true;
+        }
+
+        private void OnNewTabClick(object sender, RoutedEventArgs e)
+        {
+            _settings.OpenInNewBrowserWindow = false;
+        }
     }
 }

From 91e9bdfc3116ce693c5a47a2602644908e2b8757 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 11 Nov 2019 07:36:58 +1100
Subject: [PATCH 10/11] update

---
 Plugins/Wox.Plugin.Url/SettingsControl.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Plugins/Wox.Plugin.Url/SettingsControl.xaml b/Plugins/Wox.Plugin.Url/SettingsControl.xaml
index 4c031a9ee..d127f84ae 100644
--- a/Plugins/Wox.Plugin.Url/SettingsControl.xaml
+++ b/Plugins/Wox.Plugin.Url/SettingsControl.xaml
@@ -22,7 +22,6 @@
             <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10,10,10,272" />
         </StackPanel>
         <StackPanel VerticalAlignment="Center">
-            
             <Label Content="{DynamicResource wox_plugin_url_plugin_set_tip}" Height="42" Margin="0,0,155,0" HorizontalAlignment="Right" Width="310"/>
             <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" Margin="35,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
             <Button x:Name="setButton" HorizontalAlignment="Left" Margin="272,5,0,0" Width="73" Height="25" FontSize="10" Click="OnApplyBTClick" Content="{DynamicResource wox_plugin_url_plugin_apply}" />

From c17eb5fce5c6ccfff58d219ca036b8b2a1af0006 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 11 Nov 2019 08:00:31 +1100
Subject: [PATCH 11/11] Add user selection option for browserbookmark plugin

---
 Plugins/Wox.Plugin.BrowserBookmark/Main.cs    | 41 ++++++++++++++++---
 .../Models/Settings.cs                        |  7 ++++
 .../Views/SettingsControl.xaml                | 21 ++++++++++
 .../Views/SettingsControl.xaml.cs             | 32 +++++++++++++++
 .../Wox.Plugin.BrowserBookmark.csproj         | 13 ++++++
 5 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 Plugins/Wox.Plugin.BrowserBookmark/Models/Settings.cs
 create mode 100644 Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml
 create mode 100644 Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs

diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Main.cs b/Plugins/Wox.Plugin.BrowserBookmark/Main.cs
index cb1f0d654..4b3bcff12 100644
--- a/Plugins/Wox.Plugin.BrowserBookmark/Main.cs
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Main.cs
@@ -1,21 +1,34 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Controls;
+using Wox.Infrastructure.Storage;
 using Wox.Plugin.BrowserBookmark.Commands;
+using Wox.Plugin.BrowserBookmark.Models;
+using Wox.Plugin.BrowserBookmark.Views;
 using Wox.Plugin.SharedCommands;
 
 namespace Wox.Plugin.BrowserBookmark
 {
-    public class Main : IPlugin, IReloadable, IPluginI18n
+    public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, ISavable
     {
         private PluginInitContext context;
         
-        private List<Bookmark> cachedBookmarks = new List<Bookmark>(); 
+        private List<Bookmark> cachedBookmarks = new List<Bookmark>();
+
+        private readonly Settings _settings;
+        private readonly PluginJsonStorage<Settings> _storage;
+
+        public Main()
+        {
+            _storage = new PluginJsonStorage<Settings>();
+            _settings = _storage.Load();
+
+            cachedBookmarks = Bookmarks.LoadAllBookmarks();
+        }
 
         public void Init(PluginInitContext context)
         {
             this.context = context;
-
-            cachedBookmarks = Bookmarks.LoadAllBookmarks();
         }
 
         public List<Result> Query(Query query)
@@ -42,8 +55,15 @@ namespace Wox.Plugin.BrowserBookmark
                 Score = 5,
                 Action = (e) =>
                 {
-                    context.API.HideApp();
-                    c.Url.NewBrowserWindow("");
+                    if (_settings.OpenInNewBrowserWindow)
+                    {
+                        c.Url.NewBrowserWindow("");
+                    }
+                    else
+                    {
+                        c.Url.NewTabInBrowser("");
+                    }
+
                     return true;
                 }
             }).ToList();
@@ -66,5 +86,14 @@ namespace Wox.Plugin.BrowserBookmark
             return context.API.GetTranslation("wox_plugin_browserbookmark_plugin_description");
         }
 
+        public Control CreateSettingPanel()
+        {
+            return new SettingsControl(_settings);
+        }
+
+        public void Save()
+        {
+            _storage.Save();
+        }
     }
 }
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Models/Settings.cs b/Plugins/Wox.Plugin.BrowserBookmark/Models/Settings.cs
new file mode 100644
index 000000000..27189d82f
--- /dev/null
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Models/Settings.cs
@@ -0,0 +1,7 @@
+namespace Wox.Plugin.BrowserBookmark.Models
+{
+    public class Settings : BaseModel
+    {
+        public bool OpenInNewBrowserWindow { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml
new file mode 100644
index 000000000..84fe812ee
--- /dev/null
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -0,0 +1,21 @@
+<UserControl x:Class="Wox.Plugin.BrowserBookmark.Views.SettingsControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             Background="White"
+             d:DesignHeight="300" d:DesignWidth="500">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition />
+            <RowDefinition Height="40" />
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal" Grid.Row="0">
+            <Label Content="Open bookmark in:" Margin="40 3 0 8"/>
+            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10" />
+            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10" />
+        </StackPanel>        
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
new file mode 100644
index 000000000..68095bff1
--- /dev/null
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -0,0 +1,32 @@
+using System.Windows;
+using System.Windows.Controls;
+using Wox.Plugin.BrowserBookmark.Models;
+
+namespace Wox.Plugin.BrowserBookmark.Views
+{
+    /// <summary>
+    /// Interaction logic for BrowserBookmark.xaml
+    /// </summary>
+    public partial class SettingsControl : UserControl
+    {
+        private readonly Settings _settings;
+
+        public SettingsControl(Settings settings)
+        {
+            InitializeComponent();
+            _settings = settings;
+            NewWindowBrowser.IsChecked = _settings.OpenInNewBrowserWindow;
+            NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;
+        }        
+
+        private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e)
+        {
+            _settings.OpenInNewBrowserWindow = true;
+        }
+
+        private void OnNewTabClick(object sender, RoutedEventArgs e)
+        {
+            _settings.OpenInNewBrowserWindow = false;
+        }
+    }
+}
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj b/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
index 0be10b913..b7d0690ab 100644
--- a/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
@@ -44,6 +44,7 @@
       <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -57,6 +58,7 @@
     <Reference Include="System.Data.SQLite.Linq, Version=1.0.111.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Data.SQLite.Linq.1.0.111.0\lib\net451\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xaml" />
     <Reference Include="UnidecodeSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\UnidecodeSharp.1.0.0.0\lib\net35\UnidecodeSharp.dll</HintPath>
       <Private>True</Private>
@@ -69,7 +71,11 @@
     <Compile Include="Commands\Bookmarks.cs" />
     <Compile Include="FirefoxBookmarks.cs" />
     <Compile Include="Main.cs" />
+    <Compile Include="Models\Settings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Views\SettingsControl.xaml.cs">
+      <DependentUpon>SettingsControl.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -111,6 +117,13 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\SettingsControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.111.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.111.0\build\net451\System.Data.SQLite.Core.targets')" />