Skip to content

Commit 11948c1

Browse files
committed
Add browser selection to WebSearch plugin
1 parent d7e6f97 commit 11948c1

File tree

4 files changed

+28
-6
lines changed

4 files changed

+28
-6
lines changed

Plugins/Wox.Plugin.WebSearch/Main.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public List<Result> Query(Query query)
7676
{
7777
if (_settings.OpenInNewBrowser)
7878
{
79-
searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow("");
79+
searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewBrowserWindow(_settings.BrowserPath);
8080
}
8181
else
8282
{
83-
searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewTabInBrowser("");
83+
searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)).NewTabInBrowser(_settings.BrowserPath);
8484
}
8585

8686
return true;
@@ -141,11 +141,11 @@ private async Task<IEnumerable<Result>> Suggestions(string keyword, string subti
141141
{
142142
if (_settings.OpenInNewBrowser)
143143
{
144-
searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow("");
144+
searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewBrowserWindow(_settings.BrowserPath);
145145
}
146146
else
147147
{
148-
searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewTabInBrowser("");
148+
searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)).NewTabInBrowser(_settings.BrowserPath);
149149
}
150150

151151
return true;

Plugins/Wox.Plugin.WebSearch/Settings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ public string Suggestion
220220
}
221221
}
222222

223+
public string BrowserPath { get; set; }
224+
223225
public bool OpenInNewBrowser { get; set; } = true;
224226
}
225227
}

Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<Grid Margin="10">
1212
<Grid.RowDefinitions>
1313
<RowDefinition Height="40" />
14+
<RowDefinition Height="48" />
1415
<RowDefinition />
1516
<RowDefinition Height="40" />
1617
</Grid.RowDefinitions>
@@ -27,9 +28,14 @@
2728
<RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10" />
2829
<RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10" />
2930
</StackPanel>
31+
<StackPanel Grid.Row="1" HorizontalAlignment="Left" Margin="0,3,0,17" Width="480">
32+
<Label Content="Set browser from path:" Height="28" Margin="0,0,350,0" HorizontalAlignment="Left" Width="130"/>
33+
<TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="21" Margin="138,-25,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="214" RenderTransformOrigin="0.502,-1.668"/>
34+
<Button x:Name="viewButton" HorizontalAlignment="Left" Margin="381,-30,0,0" Width="58" Height="25" Click="OnChooseClick" FontSize="10" Content="Choose" />
35+
</StackPanel>
3036
<ListView ItemsSource="{Binding Settings.SearchSources}"
3137
SelectedItem="{Binding Settings.SelectedSearchSource}"
32-
Grid.Row="1">
38+
Grid.Row="2">
3339
<ListView.View>
3440
<GridView>
3541
<GridViewColumn Header="{DynamicResource wox_plugin_websearch_action_keyword}">
@@ -49,7 +55,7 @@
4955
</GridView>
5056
</ListView.View>
5157
</ListView>
52-
<StackPanel Grid.Row="2" HorizontalAlignment="Right" Orientation="Horizontal">
58+
<StackPanel Grid.Row="3" HorizontalAlignment="Right" Orientation="Horizontal">
5359
<Button Click="OnDeleteSearchSearchClick" Width="100" Margin="10"
5460
Content="{DynamicResource wox_plugin_websearch_delete}" />
5561
<Button Click="OnEditSearchSourceClick" Width="100" Margin="10"

Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Microsoft.Win32;
12
using System.Windows;
23
using System.Windows.Controls;
34
using Wox.Core.Plugin;
@@ -68,5 +69,18 @@ private void OnNewTabClick(object sender, RoutedEventArgs e)
6869
{
6970
_settings.OpenInNewBrowser = false;
7071
}
72+
73+
private void OnChooseClick(object sender, RoutedEventArgs e)
74+
{
75+
var fileBrowserDialog = new OpenFileDialog();
76+
fileBrowserDialog.Filter = "Application(*.exe)|*.exe|All files|*.*";
77+
fileBrowserDialog.CheckFileExists = true;
78+
fileBrowserDialog.CheckPathExists = true;
79+
if (fileBrowserDialog.ShowDialog() == true)
80+
{
81+
browserPathBox.Text = fileBrowserDialog.FileName;
82+
_settings.BrowserPath = fileBrowserDialog.FileName;
83+
}
84+
}
7185
}
7286
}

0 commit comments

Comments
 (0)