From e66af0f605bf7ede314948302c0066b00e189481 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Tue, 30 Nov 2021 15:37:45 -0600
Subject: [PATCH] Add ControlPanelIcon

Add Control Panel Icon to separate control panel setting and windows setting item

Co-Authored-By: Dobin Park <6903107+onesounds@users.noreply.github.com>
---
 .../Classes/WindowsSetting.cs                 |   8 ++++++-
 .../Flow.Plugin.WindowsSettings.csproj        |   7 ++----
 .../Helper/ResultHelper.cs                    |  19 ++++++++-------
 .../Helper/TranslationHelper.cs               |   2 +-
 .../Images/ControlPanel_Small.png             | Bin 0 -> 2980 bytes
 .../Main.cs                                   |  22 +++++++-----------
 6 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 Plugins/Flow.Launcher.Plugin.WindowsSettings/Images/ControlPanel_Small.png

diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Classes/WindowsSetting.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Classes/WindowsSetting.cs
index be7cd44d3..35eb8cb45 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Classes/WindowsSetting.cs
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Classes/WindowsSetting.cs
@@ -37,10 +37,16 @@ namespace Flow.Plugin.WindowsSettings.Classes
         /// </summary>
         public string Command { get; set; }
 
+        private string type = string.Empty;
+
         /// <summary>
         /// Gets or sets the type of the windows setting.
         /// </summary>
         public string Type { get; set; }
+        /// <summary>
+        /// Gets or sets the type display name of this setting.
+        /// </summary>
+        public string? DisplayType { get; set; }
 
         /// <summary>
         /// Gets or sets the alternative names of this setting.
@@ -73,4 +79,4 @@ namespace Flow.Plugin.WindowsSettings.Classes
         /// </summary>
         public uint? DeprecatedInBuild { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Plugin.WindowsSettings.csproj b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Plugin.WindowsSettings.csproj
index e65a4c62e..d6dc20dd4 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Plugin.WindowsSettings.csproj
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Plugin.WindowsSettings.csproj
@@ -70,12 +70,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Images\WindowsSettings.dark.png">
+    <Content Include="Images\*.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\WindowsSettings.light.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
index c5fd287bd..a273ea75d 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs
@@ -27,12 +27,13 @@ namespace Flow.Plugin.WindowsSettings.Helper
         /// </summary>
         /// <param name="list">The original result list to convert.</param>
         /// <param name="query">Query for specific result List</param>
-        /// <param name="iconPath">The path to the icon of each entry.</param>
+        /// <param name="windowsSettingIconPath">The path to the icon of each entry.</param>
         /// <returns>A list with <see cref="Result"/>.</returns>
         internal static List<Result> GetResultList(
             in IEnumerable<WindowsSetting> list,
             Query query,
-            string iconPath)
+            string windowsSettingIconPath,
+            string controlPanelIconPath)
         {
             var resultList = new List<Result>();
             foreach (var entry in list)
@@ -47,7 +48,7 @@ namespace Flow.Plugin.WindowsSettings.Helper
 
                 if (nameMatch.IsSearchPrecisionScoreMet())
                 {
-                    var settingResult = NewSettingResult(nameMatch.Score + highScore);
+                    var settingResult = NewSettingResult(nameMatch.Score + highScore, entry.Type);
                     settingResult.TitleHighlightData = nameMatch.MatchData;
                     result = settingResult;
                 }
@@ -56,7 +57,7 @@ namespace Flow.Plugin.WindowsSettings.Helper
                     var areaMatch = _api.FuzzySearch(query.Search, entry.Area);
                     if (areaMatch.IsSearchPrecisionScoreMet())
                     {
-                        var settingResult = NewSettingResult(areaMatch.Score + midScore);
+                        var settingResult = NewSettingResult(areaMatch.Score + midScore, entry.Type);
                         settingResult.SubTitleHighlightData = areaMatch.MatchData.Select(x => x + 6).ToList();
                         result = settingResult;
                     }
@@ -65,7 +66,7 @@ namespace Flow.Plugin.WindowsSettings.Helper
                         result = entry.AltNames?
                             .Select(altName => _api.FuzzySearch(query.Search, altName))
                             .Where(match => match.IsSearchPrecisionScoreMet())
-                            .Select(altNameMatch => NewSettingResult(altNameMatch.Score + midScore))
+                            .Select(altNameMatch => NewSettingResult(altNameMatch.Score + midScore, entry.Type))
                             .FirstOrDefault();
                     }
 
@@ -79,7 +80,7 @@ namespace Flow.Plugin.WindowsSettings.Helper
                                 .SelectMany(x => x)
                                 .Contains(x, StringComparer.CurrentCultureIgnoreCase))
                         )
-                            result = NewSettingResult(midScore);
+                            result = NewSettingResult(midScore, entry.Type);
                     }
                 }
 
@@ -90,10 +91,10 @@ namespace Flow.Plugin.WindowsSettings.Helper
 
                 resultList.Add(result);
 
-                Result NewSettingResult(int score) => new()
+                Result NewSettingResult(int score, string type) => new()
                 {
                     Action = _ => DoOpenSettingsAction(entry),
-                    IcoPath = iconPath,
+                    IcoPath = type == "AppSettingsApp" ? windowsSettingIconPath : controlPanelIconPath,
                     SubTitle = $"{Resources.Area} \"{entry.Area}\" {Resources.SubtitlePreposition} {entry.Type}",
                     Title = entry.Name + entry.glyph,
                     ContextData = entry,
@@ -150,7 +151,7 @@ namespace Flow.Plugin.WindowsSettings.Helper
             ProcessStartInfo processStartInfo;
 
             var command = entry.Command;
-            
+
             command = Environment.ExpandEnvironmentVariables(command);
 
             if (command.Contains(' '))
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/TranslationHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/TranslationHelper.cs
index 529fae0a3..73ac76bf6 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/TranslationHelper.cs
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/TranslationHelper.cs
@@ -84,7 +84,7 @@ namespace Flow.Plugin.WindowsSettings.Helper
                 {
                     Area = area ?? settings.Area,
                     Name = name ?? settings.Name,
-                    Type = type ?? settings.Type,
+                    DisplayType = type ?? settings.Type,
                     AltNames = translatedAltNames
                 };
 
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Images/ControlPanel_Small.png b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Images/ControlPanel_Small.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a8a41aeb8f370ac29e8164a6e31f2133ffbff53
GIT binary patch
literal 2980
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

literal 0
HcmV?d00001

diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs
index 491bb903f..6afb3fb09 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs
@@ -18,16 +18,6 @@ namespace Flow.Plugin.WindowsSettings
     /// </summary>
     public sealed class Main : IPlugin, IContextMenu, IPluginI18n, IDisposable
     {
-        /// <summary>
-        /// The path to the symbol for a light theme.
-        /// </summary>
-        private const string _lightSymbol = "Images/WindowsSettings.light.png";
-
-        /// <summary>
-        /// The path to the symbol for a dark theme.
-        /// </summary>
-        private const string _darkSymbol = "Images/WindowsSettings.dark.png";
-
         /// <summary>
         /// The name of this assembly.
         /// </summary>
@@ -39,9 +29,14 @@ namespace Flow.Plugin.WindowsSettings
         private PluginInitContext? _context;
 
         /// <summary>
-        /// The path to the icon for each result.
+        /// The path to the icon for windows setting result.
         /// </summary>
-        private string _defaultIconPath;
+        private const string windowSettingsIconPath = "Images/WindowsSettings.light.png";
+
+        /// <summary>
+        /// The path to the icon for control panel result.
+        /// </summary>
+        private const string controlPanelIconPath = "Images/ControlPanel_Small.png";
 
         /// <summary>
         /// Indicate that the plugin is disposed.
@@ -64,7 +59,6 @@ namespace Flow.Plugin.WindowsSettings
         public Main()
         {
             _assemblyName = Assembly.GetExecutingAssembly().GetName().Name ?? Name;
-            _defaultIconPath = _lightSymbol;
         }
 
         /// <summary>
@@ -101,7 +95,7 @@ namespace Flow.Plugin.WindowsSettings
         /// <returns>A filtered list, can be empty when nothing was found.</returns>
         public List<Result> Query(Query query)
          {
-            var newList = ResultHelper.GetResultList(_translatedSettingList, query, _defaultIconPath);
+            var newList = ResultHelper.GetResultList(_translatedSettingList, query, windowSettingsIconPath, controlPanelIconPath);
             return newList;