prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev'

Browse source
This commit is contained in:
bao-qian 2016-03-24 21:46:26 +00:00
commit b9c83ca06d
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Plugins/Wox.Plugin.WebSearch/Languages/en.xaml
View file

@ -10,8 +10,7 @@
<system:String x:Key="wox_plugin_websearch_search">Search</system:String>
<system:String x:Key="wox_plugin_websearch_enable_suggestion">Enable search suggestions</system:String>
<system:String x:Key="wox_plugin_websearch_pls_select_web_search">Please select a web search</system:String>
<system:String x:Key="wox_plugin_websearch_delete_warning">Are your sure to delete {0}?</system:String>
<system:String x:Key="wox_plugin_websearch_delete_warning">Are you sure you want to delete {0}?</system:String>
<!--web search edit-->
<system:String x:Key="wox_plugin_websearch_title">Title</system:String>
@ -20,13 +19,13 @@
<system:String x:Key="wox_plugin_websearch_icon">Icon</system:String>
<system:String x:Key="wox_plugin_websearch_cancel">Cancel</system:String>
<system:String x:Key="wox_plugin_websearch_invalid_web_search">Invalid web search</system:String>
<system:String x:Key="wox_plugin_websearch_input_title">Please input title</system:String>
<system:String x:Key="wox_plugin_websearch_input_action_keyword">Please input action keyword</system:String>
<system:String x:Key="wox_plugin_websearch_input_url">Please input URL</system:String>
<system:String x:Key="wox_plugin_websearch_action_keyword_exist">ActionKeyword has existed, please input a new one</system:String>
<system:String x:Key="wox_plugin_websearch_succeed">Succeed</system:String>
<system:String x:Key="wox_plugin_websearch_input_title">Please enter a title</system:String>
<system:String x:Key="wox_plugin_websearch_input_action_keyword">Please enter an action keyword</system:String>
<system:String x:Key="wox_plugin_websearch_input_url">Please enter a URL</system:String>
<system:String x:Key="wox_plugin_websearch_action_keyword_exist">ActionKeyword exists, please enter a different one</system:String>
<system:String x:Key="wox_plugin_websearch_succeed">Success</system:String>
<system:String x:Key="wox_plugin_websearch_plugin_name">Web Searches</system:String>
<system:String x:Key="wox_plugin_websearch_plugin_description">Provide the web search ability</system:String>
<system:String x:Key="wox_plugin_websearch_plugin_description">Provides web search ability</system:String>
</ResourceDictionary>

8
Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs
View file

@ -17,11 +17,11 @@ namespace Wox.Plugin.WebSearch
private bool _isUpdate;
private WebSearch _updateWebSearch;
private readonly PluginInitContext _context;
private readonly WebSearchPlugin _plguin;
private readonly WebSearchPlugin _plugin;
public WebSearchSetting(WebSearchesSetting settingWidow)
{
_plguin = settingWidow.Plugin;
_plugin = settingWidow.Plugin;
_context = settingWidow.Context;
_settingWindow = settingWidow;
InitializeComponent();
@ -85,7 +85,7 @@ namespace Wox.Plugin.WebSearch
{
try
{
_plguin.NotifyActionKeywordsUpdated(_updateWebSearch.ActionKeyword, newActionKeyword);
_plugin.NotifyActionKeywordsUpdated(_updateWebSearch.ActionKeyword, newActionKeyword);
}
catch (WoxPluginException exception)
{
@ -103,7 +103,7 @@ namespace Wox.Plugin.WebSearch
{
try
{
_plguin.NotifyActionKeywordsAdded(newActionKeyword);
_plugin.NotifyActionKeywordsAdded(newActionKeyword);
}
catch (WoxPluginException exception)
{