Merge branch 'add_browserpath_userselection' into dev

jjw24 · jjw24 · commit 8edebb9f7550 · 2019-11-12T07:22:32.000+11:00
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Main.cs b/Plugins/Wox.Plugin.BrowserBookmark/Main.cs
@@ -57,11 +57,11 @@ public List<Result> Query(Query query)
                 {
                     if (_settings.OpenInNewBrowserWindow)
                     {
-                        c.Url.NewBrowserWindow("");
+                        c.Url.NewBrowserWindow(_settings.BrowserPath);
                     }
                     else
                     {
-                        c.Url.NewTabInBrowser("");
+                        c.Url.NewTabInBrowser(_settings.BrowserPath);
                     }
 
                     return true;
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Models/Settings.cs b/Plugins/Wox.Plugin.BrowserBookmark/Models/Settings.cs
@@ -3,5 +3,7 @@
     public class Settings : BaseModel
     {
         public bool OpenInNewBrowserWindow { get; set; } = true;
+
+        public string BrowserPath { get; set; }
     }
 }
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -6,16 +6,20 @@
              mc:Ignorable="d"
              Background="White"
              d:DesignHeight="300" d:DesignWidth="500">
-    <Grid Margin="10">
+    <Grid Margin="10,10,10,0">
         <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>        
+        </StackPanel>
+        <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="41,13,0,0">
+            <Label Content="Set browser from path:" Height="28" Margin="0,0,155,0" HorizontalAlignment="Left" Width="290"/>
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" Margin="5,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
+            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="340,-33,-1,0" Width="100" Height="28" Click="OnChooseClick" FontSize="10" Content="Choose" />
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -1,3 +1,4 @@
+using Microsoft.Win32;
 using System.Windows;
 using System.Windows.Controls;
 using Wox.Plugin.BrowserBookmark.Models;
@@ -15,6 +16,7 @@ public SettingsControl(Settings settings)
         {
             InitializeComponent();
             _settings = settings;
+            browserPathBox.Text = _settings.BrowserPath;
             NewWindowBrowser.IsChecked = _settings.OpenInNewBrowserWindow;
             NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;
         }        
@@ -28,5 +30,18 @@ private void OnNewTabClick(object sender, RoutedEventArgs e)
         {
             _settings.OpenInNewBrowserWindow = false;
         }
+
+        private void OnChooseClick(object sender, RoutedEventArgs e)
+        {
+            var fileBrowserDialog = new OpenFileDialog();
+            fileBrowserDialog.Filter = "Application(*.exe)|*.exe|All files|*.*";
+            fileBrowserDialog.CheckFileExists = true;
+            fileBrowserDialog.CheckPathExists = true;
+            if (fileBrowserDialog.ShowDialog() == true)
+            {
+                browserPathBox.Text = fileBrowserDialog.FileName;
+                _settings.BrowserPath = fileBrowserDialog.FileName;
+            }
+        }
     }
 }
diff --git a/Plugins/Wox.Plugin.Url/Languages/en.xaml b/Plugins/Wox.Plugin.Url/Languages/en.xaml
@@ -10,6 +10,5 @@
 
     <system:String x:Key="wox_plugin_url_plugin_set_tip">Please set your browser path:</system:String>
     <system:String x:Key="wox_plugin_url_plugin_choose">Choose</system:String>
-    <system:String x:Key="wox_plugin_url_plugin_apply">Apply</system:String>
     <system:String x:Key="wox_plugin_url_plugin_filter">Application(*.exe)|*.exe|All files|*.*</system:String>
 </ResourceDictionary>
diff --git a/Plugins/Wox.Plugin.Url/Languages/tr.xaml b/Plugins/Wox.Plugin.Url/Languages/tr.xaml
@@ -10,6 +10,5 @@
 
     <system:String x:Key="wox_plugin_url_plugin_set_tip">Tarayıcınızın konumunu ayarlayın:</system:String>
     <system:String x:Key="wox_plugin_url_plugin_choose">Seç</system:String>
-    <system:String x:Key="wox_plugin_url_plugin_apply">Uygula</system:String>
     <system:String x:Key="wox_plugin_url_plugin_filter">Programlar (*.exe)|*.exe|Tüm Dosyalar|*.*</system:String>
 </ResourceDictionary>
diff --git a/Plugins/Wox.Plugin.Url/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.Url/Languages/zh-cn.xaml
@@ -10,6 +10,5 @@
 
     <system:String x:Key="wox_plugin_url_plugin_set_tip">请设置你的浏览器路径:</system:String>
     <system:String x:Key="wox_plugin_url_plugin_choose">选择</system:String>
-    <system:String x:Key="wox_plugin_url_plugin_apply">应用</system:String>
     <system:String x:Key="wox_plugin_url_plugin_filter">程序文件(*.exe)|*.exe|所有文件|*.*</system:String>
 </ResourceDictionary>
diff --git a/Plugins/Wox.Plugin.Url/SettingsControl.xaml b/Plugins/Wox.Plugin.Url/SettingsControl.xaml
@@ -3,29 +3,21 @@
              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" 
-             xmlns:local="clr-namespace:Wox.Plugin.Url"
-             mc:Ignorable="d" Height="300" Width="500">
-    <Grid>
+             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500">
+    <Grid Margin="10,10,10,0">
         <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition Height="0*"/>
+            <RowDefinition Height="40" />
+            <RowDefinition />
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition Width="0*"/>
-            <ColumnDefinition Width="0*"/>
-            <ColumnDefinition Width="0*"/>
-        </Grid.ColumnDefinitions>
         <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" />
+            <Label Content="Open search in:" Margin="40 3 0 8" />
+            <RadioButton x:Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10" />
+            <RadioButton x:Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10" />
         </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 VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="41,13,0,0">
+            <Label Content="{DynamicResource wox_plugin_url_plugin_set_tip}" Height="28" Margin="0,0,155,0" HorizontalAlignment="Left" Width="290" />
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" Margin="5,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668" />
+            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="340,-33,-1,0" Width="100" Height="28" 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
@@ -35,11 +35,6 @@ public SettingsControl(IPublicAPI woxAPI,Settings settings)
             NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;
         }
 
-        private void OnApplyBTClick(object sender, RoutedEventArgs e)
-        {
-            _settings.BrowserPath = browserPathBox.Text;
-        }
-
         private void OnChooseClick(object sender, RoutedEventArgs e)
         {
             var fileBrowserDialog = new OpenFileDialog();
@@ -49,6 +44,7 @@ private void OnChooseClick(object sender, RoutedEventArgs e)
             if (fileBrowserDialog.ShowDialog() == true)
             {
                 browserPathBox.Text = fileBrowserDialog.FileName;
+                _settings.BrowserPath = fileBrowserDialog.FileName;
             }
         }
 
diff --git a/Plugins/Wox.Plugin.WebSearch/Main.cs b/Plugins/Wox.Plugin.WebSearch/Main.cs
@@ -76,11 +76,11 @@ public List<Result> Query(Query query)
                             {
                                 if (_settings.OpenInNewBrowser)
                                 {
-                                    searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow("");
+                                    searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow(_settings.BrowserPath);
                                 }
                                 else
                                 {
-                                    searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewTabInBrowser("");
+                                    searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewTabInBrowser(_settings.BrowserPath);
                                 }
 
                                 return true;
@@ -141,11 +141,11 @@ private async Task<IEnumerable<Result>> Suggestions(string keyword, string subti
                     {
                         if (_settings.OpenInNewBrowser)
                         {
-                            searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow("");
+                            searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow(_settings.BrowserPath);
                         }
                         else
                         {
-                            searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewTabInBrowser("");
+                            searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewTabInBrowser(_settings.BrowserPath);
                         }
 
                         return true;
diff --git a/Plugins/Wox.Plugin.WebSearch/Settings.cs b/Plugins/Wox.Plugin.WebSearch/Settings.cs
@@ -220,6 +220,8 @@ public string Suggestion
             }
         }
 
+        public string BrowserPath { get; set; }
+
         public bool OpenInNewBrowser { get; set; } = true;
     }
 }
diff --git a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
@@ -11,6 +11,7 @@
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="40" />
+            <RowDefinition Height="48" />
             <RowDefinition />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
@@ -27,9 +28,14 @@
             <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>
+        <StackPanel Grid.Row="1" HorizontalAlignment="Left" Margin="0,3,0,17" Width="480">
+            <Label Content="Set browser from path:" Height="28" Margin="0,0,350,0" HorizontalAlignment="Left" Width="130"/>
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="21" Margin="138,-25,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="214" RenderTransformOrigin="0.502,-1.668"/>
+            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="381,-30,0,0" Width="58" Height="25" Click="OnChooseClick" FontSize="10" Content="Choose" />
+        </StackPanel>
         <ListView ItemsSource="{Binding Settings.SearchSources}"
                   SelectedItem="{Binding Settings.SelectedSearchSource}"
-                  Grid.Row="1">
+                  Grid.Row="2">
             <ListView.View>
                 <GridView>
                     <GridViewColumn Header="{DynamicResource wox_plugin_websearch_action_keyword}">
@@ -49,7 +55,7 @@
                 </GridView>
             </ListView.View>
         </ListView>
-        <StackPanel Grid.Row="2" HorizontalAlignment="Right" Orientation="Horizontal">
+        <StackPanel Grid.Row="3" HorizontalAlignment="Right" Orientation="Horizontal">
             <Button Click="OnDeleteSearchSearchClick" Width="100" Margin="10"
                     Content="{DynamicResource wox_plugin_websearch_delete}" />
             <Button Click="OnEditSearchSourceClick" Width="100" Margin="10"
diff --git a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs
@@ -1,3 +1,4 @@
+using Microsoft.Win32;
 using System.Windows;
 using System.Windows.Controls;
 using Wox.Core.Plugin;
@@ -18,6 +19,7 @@ public SettingsControl(PluginInitContext context, SettingsViewModel viewModel)
             _context = context;
             _settings = viewModel.Settings;
             DataContext = viewModel;
+            browserPathBox.Text = _settings.BrowserPath;
             NewWindowBrowser.IsChecked = _settings.OpenInNewBrowser;
             NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowser;
         }
@@ -68,5 +70,18 @@ private void OnNewTabClick(object sender, RoutedEventArgs e)
         {
             _settings.OpenInNewBrowser = false;
         }
+
+        private void OnChooseClick(object sender, RoutedEventArgs e)
+        {
+            var fileBrowserDialog = new OpenFileDialog();
+            fileBrowserDialog.Filter = "Application(*.exe)|*.exe|All files|*.*";
+            fileBrowserDialog.CheckFileExists = true;
+            fileBrowserDialog.CheckPathExists = true;
+            if (fileBrowserDialog.ShowDialog() == true)
+            {
+                browserPathBox.Text = fileBrowserDialog.FileName;
+                _settings.BrowserPath = fileBrowserDialog.FileName;
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ public List<Result> Query(Query query)`
`57`	`57`	`{`
`58`	`58`	`if (_settings.OpenInNewBrowserWindow)`
`59`	`59`	`{`
`60`		`- c.Url.NewBrowserWindow("");`
	`60`	`+ c.Url.NewBrowserWindow(_settings.BrowserPath);`
`61`	`61`	`}`
`62`	`62`	`else`
`63`	`63`	`{`
`64`		`- c.Url.NewTabInBrowser("");`
	`64`	`+ c.Url.NewTabInBrowser(_settings.BrowserPath);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,7 @@`
`3`	`3`	`public class Settings : BaseModel`
`4`	`4`	`{`
`5`	`5`	`public bool OpenInNewBrowserWindow { get; set; } = true;`
	`6`	`+`
	`7`	`+ public string BrowserPath { get; set; }`
`6`	`8`	`}`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using Microsoft.Win32;`
`1`	`2`	`using System.Windows;`
`2`	`3`	`using System.Windows.Controls;`
`3`	`4`	`using Wox.Plugin.BrowserBookmark.Models;`
`@@ -15,6 +16,7 @@ public SettingsControl(Settings settings)`
`15`	`16`	`{`
`16`	`17`	`InitializeComponent();`
`17`	`18`	`_settings = settings;`
	`19`	`+ browserPathBox.Text = _settings.BrowserPath;`
`18`	`20`	`NewWindowBrowser.IsChecked = _settings.OpenInNewBrowserWindow;`
`19`	`21`	`NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;`
`20`	`22`	`}`
`@@ -28,5 +30,18 @@ private void OnNewTabClick(object sender, RoutedEventArgs e)`
`28`	`30`	`{`
`29`	`31`	`_settings.OpenInNewBrowserWindow = false;`
`30`	`32`	`}`
	`33`	`+`
	`34`	`+ private void OnChooseClick(object sender, RoutedEventArgs e)`
	`35`	`+ {`
	`36`	`+ var fileBrowserDialog = new OpenFileDialog();`
	`37`	`+ fileBrowserDialog.Filter = "Application(.exe)\|.exe\|All files\|.";`
	`38`	`+ fileBrowserDialog.CheckFileExists = true;`
	`39`	`+ fileBrowserDialog.CheckPathExists = true;`
	`40`	`+ if (fileBrowserDialog.ShowDialog() == true)`
	`41`	`+ {`
	`42`	`+ browserPathBox.Text = fileBrowserDialog.FileName;`
	`43`	`+ _settings.BrowserPath = fileBrowserDialog.FileName;`
	`44`	`+ }`
	`45`	`+ }`
`31`	`46`	`}`
`32`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,6 @@ public SettingsControl(IPublicAPI woxAPI,Settings settings)`
`35`	`35`	`NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;`
`36`	`36`	`}`
`37`	`37`
`38`		`- private void OnApplyBTClick(object sender, RoutedEventArgs e)`
`39`		`- {`
`40`		`- _settings.BrowserPath = browserPathBox.Text;`
`41`		`- }`
`42`		`-`
`43`	`38`	`private void OnChooseClick(object sender, RoutedEventArgs e)`
`44`	`39`	`{`
`45`	`40`	`var fileBrowserDialog = new OpenFileDialog();`
`@@ -49,6 +44,7 @@ private void OnChooseClick(object sender, RoutedEventArgs e)`
`49`	`44`	`if (fileBrowserDialog.ShowDialog() == true)`
`50`	`45`	`{`
`51`	`46`	`browserPathBox.Text = fileBrowserDialog.FileName;`
	`47`	`+ _settings.BrowserPath = fileBrowserDialog.FileName;`
`52`	`48`	`}`
`53`	`49`	`}`
`54`	`50`
Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ public List<Result> Query(Query query)`
`76`	`76`	`{`
`77`	`77`	`if (_settings.OpenInNewBrowser)`
`78`	`78`	`{`
`79`		`- searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow("");`
	`79`	`+ searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow(_settings.BrowserPath);`
`80`	`80`	`}`
`81`	`81`	`else`
`82`	`82`	`{`
`83`		`- searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewTabInBrowser("");`
	`83`	`+ searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewTabInBrowser(_settings.BrowserPath);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`return true;`
`@@ -141,11 +141,11 @@ private async Task<IEnumerable<Result>> Suggestions(string keyword, string subti`
`141`	`141`	`{`
`142`	`142`	`if (_settings.OpenInNewBrowser)`
`143`	`143`	`{`
`144`		`- searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow("");`
	`144`	`+ searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow(_settings.BrowserPath);`
`145`	`145`	`}`
`146`	`146`	`else`
`147`	`147`	`{`
`148`		`- searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewTabInBrowser("");`
	`148`	`+ searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewTabInBrowser(_settings.BrowserPath);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`return true;`