From fbad87ca1475ffdf27b410d42dd23032bbaee659 Mon Sep 17 00:00:00 2001
From: Joakim Wennergren <joakim.wennergren@neovici.se>
Date: Thu, 26 Aug 2021 16:02:47 +0200
Subject: [PATCH] Dark mode icons now work

---
 CsvQuery/CsvQuery.csproj                      |   3 +-
 CsvQuery/Main.cs                              |  49 +++++++++++-------
 .../DllExport/NppPlugin.DllExport.targets     |  32 ++++++++----
 CsvQuery/PluginInfrastructure/Msgs_h.cs       |   8 +++
 .../PluginInfrastructure/NotepadPPGateway.cs  |   6 +++
 CsvQuery/Properties/CSVQueryIcon.png          | Bin 682 -> 651 bytes
 CsvQuery/Properties/CsvQueryIconDark.ico      | Bin 0 -> 16958 bytes
 CsvQuery/Properties/CsvQueryIconLight.ico     | Bin 0 -> 16958 bytes
 CsvQuery/Properties/Resources.Designer.cs     |  16 ++++--
 CsvQuery/Properties/Resources.resx            |   7 ++-
 CsvQuery/Resources/CQIcon.ico                 | Bin 1150 -> 0 bytes
 11 files changed, 88 insertions(+), 33 deletions(-)
 create mode 100644 CsvQuery/Properties/CsvQueryIconDark.ico
 create mode 100644 CsvQuery/Properties/CsvQueryIconLight.ico
 delete mode 100644 CsvQuery/Resources/CQIcon.ico

diff --git a/CsvQuery/CsvQuery.csproj b/CsvQuery/CsvQuery.csproj
index 5f91b8f..429ec6a 100644
--- a/CsvQuery/CsvQuery.csproj
+++ b/CsvQuery/CsvQuery.csproj
@@ -252,7 +252,8 @@
     <Content Include="CsharpSqlite\License-CsharpSqlite-MIT.txt" />
     <Content Include="Properties\CsvQueryIcon.ico" />
     <Content Include="Properties\CSVQueryIcon.png" />
-    <None Include="Resources\CQIcon.ico" />
+    <None Include="Properties\CsvQueryIconLight.ico" />
+    <None Include="Properties\CsvQueryIconDark.ico" />
     <None Include="License.txt" />
     <None Include="gpl-3.0.txt" />
     <None Include="packages.config" />
diff --git a/CsvQuery/Main.cs b/CsvQuery/Main.cs
index 5940bb3..b5596dd 100644
--- a/CsvQuery/Main.cs
+++ b/CsvQuery/Main.cs
@@ -107,7 +107,7 @@ public static void OnNotification(ScNotification notification)
 
         public static void CommandMenuInit()
         {
-            PluginBase.AddMenuItem("Toggle query window", ToggleQueryWindow, false, new ShortcutKey(true, true, false, Keys.C));
+            PluginBase.AddMenuItem("Toggle CSV Query window", ToggleQueryWindow, false, new ShortcutKey(true, true, false, Keys.C));
             PluginBase.AddMenuItem("Manual parse settings", ParseWithManualSettings);
             PluginBase.AddMenuItem("List parsed files", ListSqliteTables);
             PluginBase.AddMenuItem("---", null);
@@ -155,22 +155,35 @@ private static void ParseWithManualSettings()
 
         public static void SetToolBarIcon()
         {
-            var icons = new toolbarIcons { hToolbarBmp = Resources.cq.GetHbitmap() };
-            using (var iconPointer = new TemporaryPointer(icons))
+            if (NotepadPPGateway.GetNppMajorVersion() < 8)
             {
-                Win32.SendMessage(PluginBase.nppData._nppHandle,
-                    (uint)NppMsg.NPPM_ADDTOOLBARICON,
-                    PluginBase.GetMenuItemId("Toggle query window"),
-                    iconPointer.Pointer);
+                // Old way - for backwards compatibility to Npp before 8.0
+                var icons = new toolbarIcons { hToolbarBmp = Resources.cq.GetHbitmap() };
+                using (var iconPointer = new TemporaryPointer(icons))
+                {
+                    Win32.SendMessage(PluginBase.nppData._nppHandle,
+                        (uint)NppMsg.NPPM_ADDTOOLBARICON,
+                        PluginBase.GetMenuItemId("Toggle CSV Query window"),
+                        iconPointer.Pointer);
+                }
+            }
+            else
+            {
+                // New way - for 8.0 and up (dark mode support)
+                var icons2 = new toolbarIconsWithDarkMode
+                {
+                    hToolbarBmp = Resources.cq.GetHbitmap(),
+                    hToolbarIcon = Resources.CsvQueryIconLight.Handle,
+                    hToolbarIconDarkMode = Resources.CsvQueryIconDark.Handle,
+                };
+                using (var iconPointer = new TemporaryPointer(icons2))
+                {
+                    Win32.SendMessage(PluginBase.nppData._nppHandle,
+                        (uint)NppMsg.NPPM_ADDTOOLBARICON_FORDARKMODE,
+                        PluginBase.GetMenuItemId("Toggle CSV Query window"),
+                        iconPointer.Pointer);
+                }
             }
-
-            //var iconPointer = Marshal.AllocHGlobal(Marshal.SizeOf(icons));
-            //Marshal.StructureToPtr(icons, iconPointer, false);
-            //Win32.SendMessage(PluginBase.nppData._nppHandle, 
-            //    (uint)NppMsg.NPPM_ADDTOOLBARICON, 
-            //    PluginBase.GetMenuItemId("Toggle query window"), 
-            //    iconPointer);
-            //Marshal.FreeHGlobal(iconPointer);
         }
 
         public static void PluginCleanUp()
@@ -322,7 +335,7 @@ public static void QueryWindowVisible(bool? show = null, bool supressAnalysis =
                 {
                     hClient = QueryWindow.Handle,
                     pszName = "CSV Query",
-                    dlgID = PluginBase.GetMenuItemId("Toggle query window"),
+                    dlgID = PluginBase.GetMenuItemId("Toggle CSV Query window"),
                     uMask = NppTbMsg.DWS_DF_CONT_BOTTOM | NppTbMsg.DWS_ICONTAB | NppTbMsg.DWS_ICONBAR,
                     hIconTab = (uint) queryWindowIcon.Handle,
                     pszModuleName = PluginName
@@ -342,7 +355,7 @@ public static void QueryWindowVisible(bool? show = null, bool supressAnalysis =
                 {
                     Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_DMMSHOW, 0, QueryWindow.Handle);
                     Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_SETMENUITEMCHECK,
-                        PluginBase.GetMenuItemId("Toggle query window"), 
+                        PluginBase.GetMenuItemId("Toggle CSV Query window"), 
                         1);
                 }
                 else
@@ -351,7 +364,7 @@ public static void QueryWindowVisible(bool? show = null, bool supressAnalysis =
                         0, QueryWindow.Handle);
                     Win32.SendMessage(PluginBase.nppData._nppHandle,
                         (uint)NppMsg.NPPM_SETMENUITEMCHECK,
-                        PluginBase.GetMenuItemId("Toggle query window"), 0);
+                        PluginBase.GetMenuItemId("Toggle CSV Query window"), 0);
                 }
             }
         }
diff --git a/CsvQuery/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets b/CsvQuery/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets
index 897e76c..b7bdd41 100644
--- a/CsvQuery/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets
+++ b/CsvQuery/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets
@@ -1,6 +1,15 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask TaskName="NppPlugin.DllExport.MSBuild.DllExportTask" AssemblyFile="NppPlugin.DllExport.MSBuild.dll"/>
-  <Target Name="AfterBuild" DependsOnTargets="GetFrameworkPaths">
+<Project
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="NppPlugin.DllExport.MSBuild.DllExportTask"
+             AssemblyFile="NppPlugin.DllExport.MSBuild.dll"/>
+  <Target Name="AfterBuild"
+          DependsOnTargets="GetFrameworkPaths"
+          >
+    <PropertyGroup>
+		<!-- LibToolPath is optional - it's needed to debug C++, but you can still debug the C# code without it
+			If you don't have the C++ toolchain installed this is missing, but then you can't' debug C++ anyway -->
+        <LibToolPath Condition="Exists('$(DevEnvDir)\..\..\VC\bin')">$(DevEnvDir)\..\..\VC\bin</LibToolPath>
+    </PropertyGroup>
     <DllExportTask Platform="$(Platform)"
                    PlatformTarget="$(PlatformTarget)"
                    CpuType="$(CpuType)"
@@ -13,20 +22,25 @@
                    ProjectDirectory="$(MSBuildProjectDirectory)"
                    InputFileName="$(TargetPath)"
                    FrameworkPath="$(TargetedFrameworkDir);$(TargetFrameworkDirectory)"
-                   LibToolPath="$(DevEnvDir)..\..\SDK\ScopeCppSDK\VC\bin"
+                   LibToolPath="$(LibToolPath)"
                    LibToolDllPath="$(DevEnvDir)"
                    SdkPath="$(SDK40ToolsPath)"/>
  
+	<!-- $(MSBuildProgramFiles32) points to the 32 bit program files dir.
+		On 32 bit windows usually C:\Program Files\
+		On 64 bit windows usually C:\Program Files (x86)\
+		$(ProgramW6432) points to the 64bit Program Files (on 32 bit windows it is blank) -->
+    <MakeDir Directories="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\') AND !Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'" />
     <Copy 
         SourceFiles="$(TargetPath)" 
-        DestinationFolder="C:\Program Files (x86)\Notepad++\plugins\CsvQuery\" 
-        Condition="Exists('C:\Program Files (x86)\Notepad++\plugins\CsvQuery\') AND '$(PlatformTarget)' == 'x86' AND '$(Configuration)' != 'Test'"
+        DestinationFolder="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" 
+        Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'"
         ContinueOnError="false" />
- 
+    <MakeDir Directories="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(ProgramW6432)\Notepad++\plugins\') AND !Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'" />
     <Copy 
         SourceFiles="$(TargetPath)" 
-        DestinationFolder="C:\Program Files\Notepad++\plugins\CsvQuery\" 
-        Condition="Exists('C:\Program Files\Notepad++\plugins\CsvQuery\') AND '$(PlatformTarget)' == 'x64' AND '$(Configuration)' != 'Test'"
+        DestinationFolder="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\" 
+        Condition="Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'"
         ContinueOnError="false" />
   </Target>
 </Project>
diff --git a/CsvQuery/PluginInfrastructure/Msgs_h.cs b/CsvQuery/PluginInfrastructure/Msgs_h.cs
index e56aeff..707756d 100644
--- a/CsvQuery/PluginInfrastructure/Msgs_h.cs
+++ b/CsvQuery/PluginInfrastructure/Msgs_h.cs
@@ -519,6 +519,14 @@ public enum NppMsg : uint
         /// </summary>
         NPPM_SAVEFILE = Constants.NPPMSG + 94,
 
+        /// <summary>
+        /// VOID NPPM_ADDTOOLBARICON_FORDARKMODE(UINT funcItem[X]._cmdID, toolbarIconsWithDarkMode iconHandles)
+        /// Use NPPM_ADDTOOLBARICON_FORDARKMODE instead obsolete NPPM_ADDTOOLBARICON which doesn't support the dark mode
+        /// 2 formats / 3 icons are needed:  1 * BMP + 2 * ICO 
+        /// All 3 handles below should be set so the icon will be displayed correctly if toolbar icon sets are changed by users, also in dark mode
+        /// </summary>
+        NPPM_ADDTOOLBARICON_FORDARKMODE = Constants.NPPMSG + 101,
+
         RUNCOMMAND_USER = Constants.WM_USER + 3000,
         NPPM_GETFULLCURRENTPATH = RUNCOMMAND_USER + FULL_CURRENT_PATH,
         NPPM_GETCURRENTDIRECTORY = RUNCOMMAND_USER + CURRENT_DIRECTORY,
diff --git a/CsvQuery/PluginInfrastructure/NotepadPPGateway.cs b/CsvQuery/PluginInfrastructure/NotepadPPGateway.cs
index 23e4ed1..de32811 100644
--- a/CsvQuery/PluginInfrastructure/NotepadPPGateway.cs
+++ b/CsvQuery/PluginInfrastructure/NotepadPPGateway.cs
@@ -61,6 +61,12 @@ public static IntPtr GetCurrentBufferId()
             return Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_GETCURRENTBUFFERID, Unused, Unused);
         }
 
+		public static int GetNppMajorVersion()
+        {
+			var version = Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_GETNPPVERSION, Unused, Unused).ToInt32();
+			return version >> 16;
+		}
+
 	    public void OpenFileInNpp(string filename)
 	    {
             // NPPM_DOOPEN
diff --git a/CsvQuery/Properties/CSVQueryIcon.png b/CsvQuery/Properties/CSVQueryIcon.png
index 62ceb20b3bf771874f44bea39fff0fbf43705709..24908ac30d9e506b938ab116ddeaad5b917e0609 100644
GIT binary patch
delta 589
zcmV-T0<!(81&alcNq@os01m<d6(~x80006YNkl<ZI8T+5IcQ>06o#)$Tu@NZB#_2J
z5J4M@fLIFCgn$SkGXX&?Ed&iVVigdCG}ckjS`g7L#SocQf`w>fAr@k#0Y!{U-2Qp@
z!~|!e#eDGVyT|i>&vF@n&w_pm`d_{Z`XmxQelx~wf)s*2Fn^!V+5P=Jdw6(YN~Mxr
zUS2Yrji<AzpdY+~zgVx=n<rp28o}*$Ln@U*r_<r!-~bAR0=KufSglr+^TA-7a5xN=
zN`+i5hv(;K)a!Meo}Q9nCX=C@y#|xX1c!%*@Or(Q$SY4zPcWHGI668)uh)Z^H?xb`
zY(|pH<(tSWdVjs1-Q3(T!HAVgCH7vya=Apa*+i{Y!*n{O9_@BJ{ZpsY*<=BakB<n2
zLJ)~Wuv)FJEp)qGoSmIPCX+!Tk-*__U_2h9P$*C$Kll56GKk0HFc=Ip2am@Cz9u-G
zP8=T}BbiL%?(Po7Vv&;hMk0|2nHr5o1cO1iTrP;kVt+)VQTm;g%Vi4W^LcvdUlxl6
z(&;pntJP{@u~?8wrKn{N%Vx7=P^nZX@CLsFe!m}yM1sz|(!pRr-<-Gm!m8CO83Y1>
z_shX~d3nLf$q6nlE;f<fFkTApiw}jD`exE<wV+n3aeaMF=Y7x?+U+*XW;1QU=kp;J
zi_y?{1xDK|+yyuIE@;Y4uCA_VP#TQ}=jZ2WG#Zq&hnb)<H*gF3#v^<%!{Ly$J&!&7
b0`TPz5_0HHd7~Q>00000NkvXXu0mjf{a+Ia

delta 620
zcmV-y0+aoV1*!#*Nq@rt01m?e$8V@)0000QbVXQnQ*UN;cVTj608n9RZgehAMN}Ym
zGcGkQF)%Rna-jeK0vSm}K~y+TwUWQ9l2I7PuRprORYN2d3=)w-(4dAy9Gip&5hYr}
za1h*74DtR0j!sc3xO5E%2VI&Pf`*VLZ3r@latcW^f8~$YZ-3wOrWegiwDiE2!#VHs
z{haeY&vSJ2KLUV~x=w|L!{I~5>B-5-6W*1jZvXYp^?H4i##hvGG#Vig2tch?!(cE-
zDwS$Q^Ne~-DGxw2-KBm|a->ozXfzsBt5uB0W3*Z=I2?`vjZ5m$9)S5*sovH+olapi
z8W9eMw@32Y>wooNGMT>7{FO4EL-;MXo7wO8q0{LQjYjtXVpA@cf6}<7?#lq4saLDj
zr*^xIX0wUeYz9e^;PH6GZRmEp=a5FDfkYw!g+d_!?_~fFZuoq@<?-<`SSWbCUQ8wv
z)M_=6DDTCKL}asBSglr(C(-&`_%AVDo6Y8Rp-@0RpMOWaUYC>E5o9tM8EUuN5s$~=
z_xqt#DiI6@-_WZN01qXdot=F?_*v1*<r1Y*2`-lldc7V_rxV3u5%c-{!M1>+5K^U5
zdAbV_GZ2f#kjwq9?P9UOU@(wZMxU>{vIX1{0QUPC3-@sg;SI1@EC_`{7d<S#I|C|i
zYGOFtZe{l=Azy@})9FB~)gqZp?gFGuyAP)D8UY`uIZfqAB=Xi~v#rDnHZ7df_>Kzh
zP2V3I0eL}*QT@)&yiBLl_h`C9i77pt{R?QKEtfa?C&MqR-^l#4xzh~*0000<MNUMn
GLSTXx1|Z1*

diff --git a/CsvQuery/Properties/CsvQueryIconDark.ico b/CsvQuery/Properties/CsvQueryIconDark.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c9c4ce872352435369c2357c137a256c13c3f934
GIT binary patch
literal 16958
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
P)ajTZ=vH%d!v6dZC@0TM

literal 0
HcmV?d00001

diff --git a/CsvQuery/Properties/CsvQueryIconLight.ico b/CsvQuery/Properties/CsvQueryIconLight.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c42c55087e62812b5d194c477f88beaca9088406
GIT binary patch
literal 16958
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
ayO%!29F*`$!YAs?bmK*LvrL;@fBp*<fS{8A

literal 0
HcmV?d00001

diff --git a/CsvQuery/Properties/Resources.Designer.cs b/CsvQuery/Properties/Resources.Designer.cs
index 653161d..b95a769 100644
--- a/CsvQuery/Properties/Resources.Designer.cs
+++ b/CsvQuery/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace CsvQuery.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -73,9 +73,19 @@ internal static System.Drawing.Bitmap cq {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon CQIcon {
+        internal static System.Drawing.Icon CsvQueryIconDark {
             get {
-                object obj = ResourceManager.GetObject("CQIcon", resourceCulture);
+                object obj = ResourceManager.GetObject("CsvQueryIconDark", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon CsvQueryIconLight {
+            get {
+                object obj = ResourceManager.GetObject("CsvQueryIconLight", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
diff --git a/CsvQuery/Properties/Resources.resx b/CsvQuery/Properties/Resources.resx
index e8bd9b3..091b98c 100644
--- a/CsvQuery/Properties/Resources.resx
+++ b/CsvQuery/Properties/Resources.resx
@@ -127,7 +127,10 @@
   <data name="Title_MessagBox" xml:space="preserve">
     <value>CSV Query</value>
   </data>
-  <data name="CQIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CQIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CsvQueryIconDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>CsvQueryIconDark.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CsvQueryIconLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>CsvQueryIconLight.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/CsvQuery/Resources/CQIcon.ico b/CsvQuery/Resources/CQIcon.ico
deleted file mode 100644
index 10119324e20c16240a2c965af9cb8fb3f94750a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmcJOK@Ng25JiV*;!;+wS-SKHrl;r;JPCKebSDS#26zZ{i*DGK`AsINRh(jC$>*0c
zZ)Qj-QNdSP5|4@wOQH?Wwk#}FtRmcr_WbT&V;BZMM`<5mjWJn5>=gg(AO4$AL*uQr
zA%{5fffLvGW7CBA_SC-hqSe1&Zyt3K2fuXPOAd{fZ;yMIzQwiv5r;k`SM0g<V<w*G
z@Q48uJLaOC{?nSm)^&~j@8|qKDa-tBikH~bopY$$v8t5CGp}ps2W&XypZH(bJfEcV
MVy0Fcza|1Z0!7vmEdT%j