diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json index 8a4629ef93..2bfa6343b5 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json @@ -1,6 +1,6 @@ { "ID":"CEA0FDFC6D3B4085823D60DC76F28855", - "ActionKeyword":"*", + "ActionKeywords": [ "*", "=" ], "Name":"Calculator", "Description":"Provide mathematical calculations.(Try 5*3-2 in PowerToys)", "Author":"cxfksword", diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json index 8d1bce3e96..686f8566af 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json @@ -1,6 +1,6 @@ { "ID":"B4D3B69656E14D44865C8D818EAE47C4", - "ActionKeyword":"*", + "ActionKeyword": "*", "Name":"Folder", "Description":"Searcn and open folders", "Author":"qianlifeng", diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json index 147e81d886..8c9dd6772f 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json @@ -1,6 +1,6 @@ { "ID": "2140FC9819AD43A3A616E2735815C27C", - "ActionKeyword": "*", + "ActionKeywords": [ "*", "?" ], "Name": "Windows Indexer", "Description": "Search for files and folders", "Author": "Microsoft", diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json index 97d23aa4a8..25a917f2ce 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json @@ -1,6 +1,6 @@ { "ID":"791FC278BA414111B8D1886DFE447410", - "ActionKeyword":"*", + "ActionKeywords": [ "*", "."], "Name":"Program", "Description":"Search for programs", "Author":"qianlifeng", diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/plugin.json index 38347f46b0..836f3fa317 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/plugin.json @@ -1,6 +1,6 @@ { "ID": "03276A39D4E9417C8FFD200B0EE5E871", - "ActionKeyword": "*", + "ActionKeywords": [ "*", "//" ], "Name": "Windows Uri Handler", "Description": "Handles urls", "Author": "Microsoft", diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs index 4e7cbca161..3056e3df87 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs @@ -32,7 +32,7 @@ namespace Microsoft.Plugin.WindowWalker } OpenWindows.Instance.UpdateOpenWindowsList(); - SearchController.Instance.UpdateSearchText(query.RawQuery).Wait(); + SearchController.Instance.UpdateSearchText(query.Search).Wait(); return _results.Select(x => new Result() { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json index 3293c76320..c8f54664dc 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json @@ -1,6 +1,6 @@ { "ID":"F737A9223560B3C6833B5FFB8CDF78E5", - "ActionKeyword":"*", + "ActionKeywords": [ "*", "<"], "Name":"Window Walker", "Description":"Alt-Tab alternative enabling searching through your windows.", "Author":"betadele", diff --git a/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs b/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs index d9976e4752..a915fef3ee 100644 --- a/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs +++ b/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs @@ -59,12 +59,20 @@ namespace Wox.Core.Plugin } } - var globalplugins = PluginManager.GlobalPlugins; - - foreach (PluginPair globalPlugin in PluginManager.GlobalPlugins) + // If the user has specified a matching action keyword, then do not + // add the global plugins to the list. + if (pluginQueryPair.Count == 0) { - var query = new Query(rawQuery, rawQuery, terms, string.Empty); - pluginQueryPair.Add(globalPlugin, query); + var globalplugins = PluginManager.GlobalPlugins; + + foreach (PluginPair globalPlugin in PluginManager.GlobalPlugins) + { + if (!pluginQueryPair.ContainsKey(globalPlugin)) + { + var query = new Query(rawQuery, rawQuery, terms, string.Empty); + pluginQueryPair.Add(globalPlugin, query); + } + } } return pluginQueryPair;