Skip to content

Commit 43a62d0

Browse files
onesoundsonesounds
committed
- add netflix / youtube music
- add netflix / youtube music icon - change list array order - remove findicon.com - add search source setting guide string
1 parent 89e2edb commit 43a62d0

File tree

6 files changed

+56
-88
lines changed

6 files changed

+56
-88
lines changed

‎Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png

1.5 KB
Loading

‎Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png

2.2 KB
Loading

‎Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<system:String x:Key="flowlauncher_plugin_websearch_enable_suggestion_provider">Autocomplete Data from: </system:String>
2020
<system:String x:Key="flowlauncher_plugin_websearch_pls_select_web_search">Please select a web search</system:String>
2121
<system:String x:Key="flowlauncher_plugin_websearch_delete_warning">Are you sure you want to delete {0}?</system:String>
22+
<system:String x:Key="flowlauncher_plugin_websearch_guide_1">If you have a web search on the service you want to use, you can add it to the Flow. For example, You can check the following formats in the address bar when you search 'casino' on Netflix . "https://www.netflix.com/search?q=Casino" So, you change the search word area as follows.</system:String>
23+
<system:String x:Key="flowlauncher_plugin_websearch_guide_2">https://www.netflix.com/search?q={q}</system:String>
24+
<system:String x:Key="flowlauncher_plugin_websearch_guide_3">And add it to the place URL in this window, then you can search Netflix in Flow.</system:String>
25+
2226

2327
<!--web search edit-->
2428
<system:String x:Key="flowlauncher_plugin_websearch_title">Title</system:String>

‎Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml

Lines changed: 9 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,60 +6,9 @@
66
xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
77
mc:Ignorable="d" ResizeMode="NoResize"
88
WindowStartupLocation="CenterScreen"
9-
Title="{DynamicResource flowlauncher_plugin_websearch_window_title}" Height="425" Width="550"
9+
Title="{DynamicResource flowlauncher_plugin_websearch_window_title}" Height="590" Width="550"
1010
d:DataContext="{d:DesignInstance vm:SearchSourceViewModel}" Background="#F3F3F3" BorderBrush="#cecece">
1111
<Grid>
12-
<!--
13-
<Grid.RowDefinitions>
14-
<RowDefinition />
15-
<RowDefinition />
16-
<RowDefinition />
17-
<RowDefinition />
18-
<RowDefinition Height="60" />
19-
<RowDefinition />
20-
</Grid.RowDefinitions>
21-
<Grid.ColumnDefinitions>
22-
<ColumnDefinition Width="120" />
23-
<ColumnDefinition />
24-
</Grid.ColumnDefinitions>
25-
<TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
26-
HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
27-
<TextBox Text="{Binding SearchSource.Title}" Margin="10" Grid.Row="0" Width="300" Grid.Column="1"
28-
VerticalAlignment="Center"
29-
HorizontalAlignment="Left" />
30-
31-
<TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
32-
HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
33-
<TextBox Text="{Binding SearchSource.Url}" Margin="10" Grid.Row="1" Width="300" Grid.Column="1"
34-
VerticalAlignment="Center"
35-
HorizontalAlignment="Left" />
36-
37-
<TextBlock Margin="10" FontSize="14" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center"
38-
HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
39-
<TextBox Text="{Binding SearchSource.ActionKeyword}" Margin="10" Grid.Row="2" Width="300" Grid.Column="1"
40-
VerticalAlignment="Center" HorizontalAlignment="Left" />
41-
42-
<TextBlock Margin="10" FontSize="14" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center"
43-
HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
44-
<CheckBox IsChecked="{Binding SearchSource.Enabled}" Margin="10" Grid.Row="3" Grid.Column="1"
45-
VerticalAlignment="Center" />
46-
47-
<TextBlock Margin="10" FontSize="14" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"
48-
HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
49-
<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1" Margin="10">
50-
<Image Name="imgPreviewIcon" Width="24" Height="24" Margin="0 0 20 0" />
51-
<Button Click="OnSelectIconClick" Height="35"
52-
Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
53-
</StackPanel>
54-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="5" Grid.Column="1">
55-
<Button Click="OnCancelButtonClick"
56-
Margin="10 0 10 0" Width="80" Height="35"
57-
Content="{DynamicResource flowlauncher_plugin_websearch_cancel}" />
58-
<Button Click="OnConfirmButtonClick"
59-
Margin="10 0 10 0" Width="80" Height="35"
60-
Content="{DynamicResource flowlauncher_plugin_websearch_confirm}" />
61-
</StackPanel>
62-
-->
6312
<Grid.RowDefinitions>
6413
<RowDefinition />
6514
<RowDefinition Height="80"/>
@@ -71,6 +20,14 @@
7120
<TextBlock Grid.Column="0" Text="{DynamicResource flowlauncher_plugin_websearch_window_title}" FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
7221
Margin="0 0 0 0" />
7322
</StackPanel>
23+
<StackPanel Orientation="Vertical">
24+
<TextBlock
25+
Text="{DynamicResource flowlauncher_plugin_websearch_guide_1}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
26+
<TextBlock
27+
Text="{DynamicResource flowlauncher_plugin_websearch_guide_2}" FontWeight="SemiBold" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Center" Margin="0 12 0 12"/>
28+
<TextBlock
29+
Text="{DynamicResource flowlauncher_plugin_websearch_guide_3}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left" Margin="0 0 0 14"/>
30+
</StackPanel>
7431
<StackPanel Orientation="Horizontal">
7532
<TextBlock Margin="10" FontSize="14" VerticalAlignment="Center" Width="100"
7633
HorizontalAlignment="Stretch" Text="{DynamicResource flowlauncher_plugin_websearch_title}" />

‎Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</GridViewColumn>
8686
<GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_url}"
8787
DisplayMemberBinding="{Binding Url}"
88-
Width="Auto">
88+
Width="400">
8989
<GridViewColumn.CellTemplate>
9090
<DataTemplate>
9191
<TextBlock Text="{Binding Url}"/>

‎Plugins/Flow.Launcher.Plugin.WebSearch/setting.json

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,55 @@
77
"Url": "https://www.google.com/search?q={q}",
88
"Enabled": true
99
},
10+
{
11+
"Title": "Youtube",
12+
"ActionKeyword": "youtube",
13+
"IconPath": "Images\\youtube.png",
14+
"Url": "http://www.youtube.com/results?search_query={q}",
15+
"Enabled": true
16+
},
17+
{
18+
"Title": "Netflix",
19+
"ActionKeyword": "netflix",
20+
"IconPath": "Images\\netflix.png",
21+
"Url": "https://www.netflix.com/search?q={q}",
22+
"Enabled": true
23+
},
24+
{
25+
"Title": "Google Translate",
26+
"ActionKeyword": "translate",
27+
"IconPath": "Images\\google_translate.png",
28+
"Url": "http://translate.google.com/#auto|en|{q}",
29+
"Enabled": true
30+
},
31+
{
32+
"Title": "Gmail",
33+
"ActionKeyword": "gmail",
34+
"IconPath": "Images\\gmail.png",
35+
"Url": "https://mail.google.com/mail/ca/u/0/#apps/{q}",
36+
"Enabled": true
37+
},
38+
{
39+
"Title": "Google Drive",
40+
"ActionKeyword": "drive",
41+
"IconPath": "Images\\google_drive.png",
42+
"Url": "http://drive.google.com/?hl=en&tab=bo#search/{q}",
43+
"Enabled": true
44+
},
45+
{
46+
"Title": "Youtube Music",
47+
"ActionKeyword": "ytmusic",
48+
"IconPath": "Images\\youtubemusic.png",
49+
"Url": "https://music.youtube.com/search?q={q}",
50+
"Enabled": true
51+
},
1052
{
1153
"Title": "Wikipedia",
1254
"ActionKeyword": "wiki",
1355
"IconPath": "Images\\wiki.png",
1456
"Url": "http://en.wikipedia.org/wiki/{q}",
1557
"Enabled": true
1658
},
17-
{
18-
"Title": "FindIcon",
19-
"ActionKeyword": "findicon",
20-
"IconPath": "Images\\pictures.png",
21-
"Url": "http://findicons.com/search/{q}",
22-
"Enabled": true
23-
},
2459
{
2560
"Title": "Facebook",
2661
"ActionKeyword": "facebook",
@@ -42,13 +77,6 @@
4277
"Url": "http://maps.google.com/maps?q={q}",
4378
"Enabled": true
4479
},
45-
{
46-
"Title": "Google Translate",
47-
"ActionKeyword": "translate",
48-
"IconPath": "Images\\google_translate.png",
49-
"Url": "http://translate.google.com/#auto|en|{q}",
50-
"Enabled": true
51-
},
5280
{
5381
"Title": "Duckduckgo",
5482
"ActionKeyword": "duckduckgo",
@@ -70,20 +98,6 @@
7098
"Url": "https://gist.github.com/search?q={q}",
7199
"Enabled": true
72100
},
73-
{
74-
"Title": "Gmail",
75-
"ActionKeyword": "gmail",
76-
"IconPath": "Images\\gmail.png",
77-
"Url": "https://mail.google.com/mail/ca/u/0/#apps/{q}",
78-
"Enabled": true
79-
},
80-
{
81-
"Title": "Google Drive",
82-
"ActionKeyword": "drive",
83-
"IconPath": "Images\\google_drive.png",
84-
"Url": "http://drive.google.com/?hl=en&tab=bo#search/{q}",
85-
"Enabled": true
86-
},
87101
{
88102
"Title": "Wolframalpha",
89103
"ActionKeyword": "wolframalpha",
@@ -112,13 +126,6 @@
112126
"Url": "https://www.google.com/search?q={q}&tbm=isch",
113127
"Enabled": true
114128
},
115-
{
116-
"Title": "Youtube",
117-
"ActionKeyword": "youtube",
118-
"IconPath": "Images\\youtube.png",
119-
"Url": "http://www.youtube.com/results?search_query={q}",
120-
"Enabled": true
121-
},
122129
{
123130
"Title": "Bing",
124131
"ActionKeyword": "bing",

0 commit comments

Comments
 (0)