Add user selection option for browserbookmark plugin

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();
+        }
     }
 }

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;
+    }
+}

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>

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;
+        }
+    }
+}

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')" />