From b489e54da4b82c88346f1e8ec1ed584d68d1118c Mon Sep 17 00:00:00 2001 From: Ioannis G Date: Tue, 9 Dec 2014 17:42:20 +0200 Subject: [PATCH 1/2] display plugin icons in 'activate plugin' query --- Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs | 2 +- Wox.Plugin/PluginMetadata.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs b/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs index 7fe360b7b8..686ff74dd0 100644 --- a/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs +++ b/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs @@ -35,7 +35,7 @@ namespace Wox.Plugin.SystemPlugins Title = metadata.ActionKeyword, SubTitle = string.Format("Activate {0} plugin", metadata.Name), Score = 100, - IcoPath = "Images/work.png", + IcoPath = metadata.FullIcoPath, Action = (c) => { context.API.ChangeQuery(metadataCopy.ActionKeyword + " "); diff --git a/Wox.Plugin/PluginMetadata.cs b/Wox.Plugin/PluginMetadata.cs index 0abc104242..2c83eb4454 100644 --- a/Wox.Plugin/PluginMetadata.cs +++ b/Wox.Plugin/PluginMetadata.cs @@ -52,7 +52,9 @@ namespace Wox.Plugin { get { - if (string.IsNullOrEmpty(IcoPath)) return string.Empty; + // Return the default icon if IcoPath is empty + if (string.IsNullOrEmpty(IcoPath)) + return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Images\\work.png"); if (IcoPath.StartsWith("data:")) { From 374ed12811ad20215a8c1022a9f5915e0de0f9ed Mon Sep 17 00:00:00 2001 From: Ioannis G Date: Tue, 9 Dec 2014 17:45:23 +0200 Subject: [PATCH 2/2] display plugin icons in 'wpm list/uninstall' --- Plugins/Wox.Plugin.PluginManagement/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Wox.Plugin.PluginManagement/Main.cs b/Plugins/Wox.Plugin.PluginManagement/Main.cs index ff5081424a..432d6a7362 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Main.cs +++ b/Plugins/Wox.Plugin.PluginManagement/Main.cs @@ -209,7 +209,7 @@ namespace Wox.Plugin.PluginManagement { Title = plugin.Name, SubTitle = plugin.Description, - IcoPath = "Images\\plugin.png", + IcoPath = plugin.FullIcoPath, Action = e => { UnInstalledPlugins(plugin); @@ -239,7 +239,7 @@ namespace Wox.Plugin.PluginManagement { Title = plugin.Name + " - " + plugin.ActionKeyword, SubTitle = plugin.Description, - IcoPath = "Images\\plugin.png" + IcoPath = plugin.FullIcoPath }); } return results;