[PowerToys Run] Updated (plugin) icons with MDL2 (#4149)

* Updated (plugin) icons with MDL2

* Image wasn't updating

* Based on feedback, updated app icon and windowwalker icon

* Updated app icon

* Updated Window Walker icon

* Change build action / Copy to output directory to None and Do Not Copy - like it was originally

* Fix

* Fix

* Resized images

* Added theme awereness based on somil55s PR

* Added theming to Shell and WindowWalker

* Revert "Added theming to Shell and WindowWalker"

This reverts commit f492c4efdb.

* Revert "Added theme awereness based on somil55s PR"

This reverts commit 8edd3226be.

* Typo fix

* Added new theming support for the new Calculator, Shell and WindowWalker icons

* Added Unit test reference back in

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs

@@ -128,11 +128,11 @@ namespace Microsoft.Plugin.Calculator
         {
             if (theme == Theme.Light || theme == Theme.HighContrastWhite)
             {
-                IconPath = "Images/calculator_light.png";
+                IconPath = "Images/calculator.light.png";
             }
             else
             {
-                IconPath = "Images/calculator_dark.png";
+                IconPath = "Images/calculator.dark.png";
             }
         }
 
@@ -169,4 +169,4 @@ namespace Microsoft.Plugin.Calculator
             }
         }
     }
-}
+}

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj

@@ -47,13 +47,6 @@
     <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <None Include="Images\calculator_light.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  
   <ItemGroup>
     <Content Include="Languages\en.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -107,11 +100,5 @@
     <PackageReference Include="Mages" Version="1.6.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <None Update="Images\calculator_dark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 
 </Project>

src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json

@@ -8,5 +8,5 @@
     "Language":"csharp",
     "Website":"http://www.wox.one/plugin",
     "ExecuteFileName":"Microsoft.Plugin.Calculator.dll",
-    "IcoPath":"Images\\calculator.png"
+    "IcoPath":"Images\\calculator.dark.png"
 }

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs

@@ -15,10 +15,10 @@ namespace Microsoft.Plugin.Folder
 {
     public class Main : IPlugin, ISettingProvider, IPluginI18n, ISavable, IContextMenu
     {
-        public const string FolderImagePath = "Images\\folder.png";
-        public const string FileImagePath = "Images\\file.png";
-        public const string DeleteFileFolderImagePath = "Images\\deletefilefolder.png";
-        public const string CopyImagePath = "Images\\copy.png";
+        public const string FolderImagePath = "Images\\folder.dark.png";
+        public const string FileImagePath = "Images\\file.dark.png";
+        public const string DeleteFileFolderImagePath = "Images\\delete.dark.png";
+        public const string CopyImagePath = "Images\\copy.dark.png";
 
         private const string _fileExplorerProgramName = "explorer";
         private static List<string> _driverNames;

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj

@@ -54,18 +54,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <None Include="Images\copy.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\deletefilefolder.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <Content Include="Images\file.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="Images\user.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <Content Include="Languages\en.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -103,12 +91,6 @@
     <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <None Include="Images\folder.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
@@ -116,4 +98,37 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Images\copy.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\copy.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\delete.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\delete.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\file.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\file.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\folder.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\folder.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\user.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\user.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json

@@ -8,5 +8,5 @@
     "Language":"csharp",
     "Website":"http://www.wox.one/plugin",
     "ExecuteFileName":"Microsoft.Plugin.Folder.dll",
-    "IcoPath":"Images\\folder.png"
+    "IcoPath":"Images\\folder.dark.png"
 }

src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj

@@ -50,7 +50,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Images\WindowsIndexerImg.bmp">
+    <None Update="Images\indexer.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\indexer.light.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="plugin.json">

src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json

@@ -8,5 +8,5 @@
   "Language": "csharp",
   "Website": "http://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.Plugin.Indexer.dll",
-  "IcoPath": "Images\\WindowsIndexerImg.bmp"
+  "IcoPath": "Images\\indexer.dark.png"
 }

src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj

@@ -45,21 +45,6 @@
   </ItemGroup>
   
   <ItemGroup>
-    <None Include="Images\program.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\cmd.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\folder.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\disable.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\user.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <Content Include="Languages\en.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -108,10 +93,41 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
   
-<ItemGroup>
+  <ItemGroup>
+    <None Update="Images\app.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\app.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\disable.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\disable.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\folder.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\folder.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\shell.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\shell.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\user.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\user.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Microsoft.Plugin.Program.UnitTests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
-
 </Project>

src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json

@@ -8,5 +8,5 @@
     "Language":"csharp",
     "Website":"http://www.wox.one/plugin",
     "ExecuteFileName":"Microsoft.Plugin.Program.dll",
-    "IcoPath":"Images\\program.png"
+    "IcoPath":"Images\\app.dark.png"
 }

src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs

@@ -24,7 +24,7 @@ namespace Microsoft.Plugin.Shell
 {
     public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, ISavable
     {
-        private const string Image = "Images/shell.png";
+        private string IconPath { get; set; }
         private PluginInitContext _context;
         private bool _winRStroked;
         private readonly KeyboardSimulator _keyboardSimulator = new KeyboardSimulator(new InputSimulator());
@@ -87,7 +87,7 @@ namespace Microsoft.Plugin.Shell
                         results.AddRange(autocomplete.ConvertAll(m => new Result
                         {
                             Title = m,
-                            IcoPath = Image,
+                            IcoPath = IconPath,
                             Action = c =>
                             {
                                 Execute(Process.Start, PrepareProcessStartInfo(m));
@@ -120,7 +120,7 @@ namespace Microsoft.Plugin.Shell
                     {
                         Title = m.Key,
                         SubTitle = "Shell: " + string.Format(_context.API.GetTranslation("wox_plugin_cmd_cmd_has_been_executed_times"), m.Value),
-                        IcoPath = Image,
+                        IcoPath = IconPath,
                         Action = c =>
                         {
                             Execute(Process.Start, PrepareProcessStartInfo(m.Key));
@@ -139,7 +139,7 @@ namespace Microsoft.Plugin.Shell
                 Title = cmd,
                 Score = 5000,
                 SubTitle = "Shell: " + _context.API.GetTranslation("wox_plugin_cmd_execute_through_shell"),
-                IcoPath = Image,
+                IcoPath = IconPath,
                 Action = c =>
                 {
                     Execute(Process.Start, PrepareProcessStartInfo(cmd));
@@ -157,7 +157,7 @@ namespace Microsoft.Plugin.Shell
                 {
                     Title = m.Key,
                     SubTitle = "Shell: " + string.Format(_context.API.GetTranslation("wox_plugin_cmd_cmd_has_been_executed_times"), m.Value),
-                    IcoPath = Image,
+                    IcoPath = IconPath,
                     Action = c =>
                     {
                         Execute(Process.Start, PrepareProcessStartInfo(m.Key));
@@ -288,6 +288,26 @@ namespace Microsoft.Plugin.Shell
         public void Init(PluginInitContext context)
         {
             this._context = context;
+            _context.API.ThemeChanged += OnThemeChanged;
+            UpdateIconPath(_context.API.GetCurrentTheme());
+        }
+
+        // Todo : Update with theme based IconPath
+        private void UpdateIconPath(Theme theme)
+        {
+            if (theme == Theme.Light || theme == Theme.HighContrastWhite)
+            {
+                IconPath = "Images/shell.light.png";
+            }
+            else
+            {
+                IconPath = "Images/shell.dark.png";
+            }
+        }
+
+        private void OnThemeChanged(Theme _, Theme newTheme)
+        {
+            UpdateIconPath(newTheme);
         }
 
         bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)

src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj

@@ -38,9 +38,6 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <None Include="Images\user.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <Content Include="Languages\en.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -74,12 +71,6 @@
     </None>
   </ItemGroup>
   
-  <ItemGroup>
-    <None Include="Images\shell.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  
   <ItemGroup>
     <Content Include="Languages\pl.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -103,5 +94,20 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Update="Images\shell.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\shell.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\user.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\user.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>

src/modules/launcher/Plugins/Microsoft.Plugin.Shell/plugin.json

@@ -8,5 +8,5 @@
     "Language":"csharp",
     "Website":"http://www.wox.one/plugin",
     "ExecuteFileName":"Microsoft.Plugin.Shell.dll",
-    "IcoPath":"Images\\shell.png"
+    "IcoPath":"Images\\shell.dark.png"
 }

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs

@@ -8,7 +8,7 @@ namespace Microsoft.Plugin.WindowWalker
     public class Main : IPlugin, IPluginI18n
     {
         private static List<SearchResult> _results = new List<SearchResult>();
-        private static string IcoPath = "Images/windowwalker.png";
+        private string IconPath { get; set; }
         private PluginInitContext Context { get; set; }
 
         static Main()
@@ -24,7 +24,7 @@ namespace Microsoft.Plugin.WindowWalker
             return _results.Select(x => new Result()
             {
                 Title = x.Result.Title,
-                IcoPath = IcoPath,
+                IcoPath = IconPath,
                 SubTitle = "Running: " + x.Result.ProcessName,
                 Action = c =>
                 {
@@ -37,7 +37,27 @@ namespace Microsoft.Plugin.WindowWalker
 
         public void Init(PluginInitContext context)
         {
-            Context = context;
+            Context = context;
+            Context.API.ThemeChanged += OnThemeChanged;
+            UpdateIconPath(Context.API.GetCurrentTheme());
+        }
+
+        // Todo : Update with theme based IconPath
+        private void UpdateIconPath(Theme theme)
+        {
+            if (theme == Theme.Light || theme == Theme.HighContrastWhite)
+            {
+                IconPath = "Images/windowwalker.light.png";
+            }
+            else
+            {
+                IconPath = "Images/windowwalker.dark.png";
+            }
+        }
+
+        private void OnThemeChanged(Theme _, Theme newTheme)
+        {
+            UpdateIconPath(newTheme);
         }
 
         public string GetTranslatedPluginTitle()

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj

@@ -48,12 +48,6 @@
     <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
   </ItemGroup>
   
-  <ItemGroup>
-    <None Include="Images\windowwalker.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  
   <ItemGroup>
     <Content Include="Languages\en.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -67,5 +61,14 @@
     <PackageReference Include="Mages" Version="1.6.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Update="Images\windowwalker.dark.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\windowwalker.light.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json

@@ -8,5 +8,5 @@
     "Language":"csharp",
     "Website":"http://www.windowwalker.com/",
     "ExecuteFileName":"Microsoft.Plugin.WindowWalker.dll",
-    "IcoPath":"Images\\windowwalker.png"
+    "IcoPath":"Images\\windowwalker.dark.png"
 }

src/modules/launcher/PowerLauncher/MainWindow.xaml

@@ -14,7 +14,7 @@
         WindowStartupLocation="Manual"
         AllowDrop="True"
         ShowInTaskbar="False"
-        Icon="Images/app.png"
+        Icon="Images/app.dark.png"
         AllowsTransparency="True"
         Loaded="OnLoaded"
         Closing="OnClosing"

src/modules/launcher/PowerLauncher/PowerLauncher.csproj

@@ -55,6 +55,33 @@
   <ItemGroup>
     <ApplicationDefinition Remove="App.xaml" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="app.png" />
+    <None Remove="Images\app.dark.png" />
+    <None Remove="Images\app.light.png" />
+    <None Remove="Images\app.light1.png" />
+    <None Remove="Images\app_error.dark.png" />
+    <None Remove="Images\app_error.light.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="app.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\app.dark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\app.light.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\app_error.dark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\app_error.light.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   
   <ItemGroup>
     <Page Include="App.xaml" />
@@ -101,15 +128,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Images\app.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Resource Include="Images\app.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
-    <None Update="Images\app_error.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Images\Browser.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/modules/launcher/Wox.Infrastructure/Wox.cs

@@ -38,7 +38,7 @@ namespace Wox.Infrastructure
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
 
         public static readonly int ThumbnailSize = 64;
-        public static readonly string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.png");
-        public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.png");
+        public static readonly string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.dark.png");
+        public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.dark.png");
     }
 }