make darkmode icons darker

hopefully they're still legible enough
unfortunately the weird issue where icons disappear
    when switching from light to dark mode is still there.
Also removed a bunch of Powerpoint presentations
    that I was using to make my icons and before/after pic,
    but somehow got broken during the git commit process.

CHANGELOG.md

@@ -39,8 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### To Be Changed
 
 - If there's a validation error inside of an `anyOf` list of schemas (i.e. JSON doesn't validate under *any* of the schemas), the error message is rather uninformative, and says only "the JSON didn't validate under any of the schemas", but not *why* it didn't validate.
-- *(Note to future devs)*: Resist the temptation to fool around with the StringBuilder initial capacity for the ToString method of `Dtype.STR` JNodes. I tried, and it doesn't help performance. 
-- Mark dark mode icons that look less out of place
+- *(Note to future devs)*: Resist the temptation to fool around with the StringBuilder initial capacity for the ToString method of `Dtype.STR` JNodes. I tried, and it doesn't help performance.
 
 ### To Be Fixed
 
@@ -66,6 +65,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 1. The [`ifelse` vectorized function in RemesPath](/docs/RemesPath.md#vectorized-functions) now uses conditional execution.
 2. Add [`and` and `or` non-vectorized functions in RemesPath](/docs/RemesPath.md#non-vectorized-functions), which both use conditional excution.
 3. Add optional arguments [to `stringify` non-vectorized function in RemesPath](/docs/RemesPath.md#non-vectorized-functions), so that users can control the format of the output.
+4. Make dark mode icons darker.
 
 ### Fixed
 

JsonToolsNppPlugin/JsonToolsNppPlugin.csproj

@@ -275,6 +275,11 @@
   <ItemGroup>
     <!-- icons and such -->
     <Content Include="Properties\star_bmp.bmp" />
+    <None Include="Resources\json tree toolbar darkmode.ico" />
+    <None Include="Resources\json pretty print toolbar darkmode.ico" />
+    <None Include="Resources\json path to position toolbar darkmode.ico" />
+    <None Include="Resources\json compress toolbar darkmode.ico" />
+    <None Include="Resources\json_compress_toolbar_darkmode.ico" />
     <None Include="Resources\json tree toolbar1.ico" />
     <None Include="Resources\json pretty print toolbar1.ico" />
     <None Include="Resources\json path to position toolbar1.ico" />

JsonToolsNppPlugin/Main.cs

@@ -145,10 +145,10 @@ static internal void SetToolBarIcons()
             string iconsToUseChars = settings.toolbar_icons.ToLower();
             var iconInfo = new (Bitmap bmp, Icon icon, Icon iconDarkMode, int id, char representingChar)[]
             {
-                (PluginNetResources.json_tree_toolbar_bmp, PluginNetResources.json_tree_toolbar, PluginNetResources.json_tree_toolbar1,jsonTreeId, 't'),
-                (PluginNetResources.json_compress_toolbar_bmp, PluginNetResources.json_compress_toolbar, PluginNetResources.json_compress_toolbar1, compressId, 'c'),
-                (PluginNetResources.json_pretty_print_toolbar_bmp, PluginNetResources.json_pretty_print_toolbar, PluginNetResources.json_pretty_print_toolbar1, prettyPrintId, 'p'),
-                (PluginNetResources.json_path_to_position_toolbar_bmp, PluginNetResources.json_path_to_position_toolbar, PluginNetResources.json_path_to_position_toolbar1, pathToPositionId, 'o'),
+                (PluginNetResources.json_tree_toolbar_bmp, PluginNetResources.json_tree_toolbar, PluginNetResources.json_tree_toolbar_darkmode,jsonTreeId, 't'),
+                (PluginNetResources.json_compress_toolbar_bmp, PluginNetResources.json_compress_toolbar, PluginNetResources.json_compress_toolbar_darkmode, compressId, 'c'),
+                (PluginNetResources.json_pretty_print_toolbar_bmp, PluginNetResources.json_pretty_print_toolbar, PluginNetResources.json_pretty_print_toolbar_darkmode, prettyPrintId, 'p'),
+                (PluginNetResources.json_path_to_position_toolbar_bmp, PluginNetResources.json_path_to_position_toolbar, PluginNetResources.json_path_to_position_toolbar_darkmode, pathToPositionId, 'o'),
             }
                 .Where(x => iconsToUseChars.IndexOf(x.representingChar) >= 0)
                 .OrderBy(x => iconsToUseChars.IndexOf(x.representingChar));

JsonToolsNppPlugin/Properties/AssemblyInfo.cs

@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("6.1.1.6")]
-[assembly: AssemblyFileVersion("6.1.1.6")]
+[assembly: AssemblyVersion("6.1.1.7")]
+[assembly: AssemblyFileVersion("6.1.1.7")]

JsonToolsNppPlugin/Properties/Resources.resx

@@ -121,37 +121,37 @@
   <data name="json_compress_toolbar" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json compress toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="json_compress_toolbar1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\json compress toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="json_compress_toolbar_bmp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json compress toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="json_compress_toolbar_darkmode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\json compress toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="json_path_to_position_toolbar" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json path to position toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="json_path_to_position_toolbar1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\json path to position toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="json_path_to_position_toolbar_bmp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json path to position toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="json_path_to_position_toolbar_darkmode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\json path to position toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="json_pretty_print_toolbar" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json pretty print toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="json_pretty_print_toolbar1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\json pretty print toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="json_pretty_print_toolbar_bmp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json pretty print toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="json_pretty_print_toolbar_darkmode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\json pretty print toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="json_tree_toolbar" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json tree toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="json_tree_toolbar1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\json tree toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="json_tree_toolbar_bmp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\json tree toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="json_tree_toolbar_darkmode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\json tree toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

JsonToolsNppPlugin/Resources/json-tools icons.bat

@@ -20,7 +20,7 @@ magick "json path to position icon.png" -resize 20x20 "json path to position too
 magick "json tree icon.png" -resize 20x20 "json tree toolbar.ico"
 
 : add darkmode icons
-magick "json pretty print icon.png" -resize 20x20 "json pretty print toolbar1.ico"
-magick "json compress icon.png" -resize 20x20 "json compress toolbar1.ico"
-magick "json path to position icon.png" -resize 20x20 "json path to position toolbar1.ico"
-magick "json tree icon.png" -resize 20x20 "json tree toolbar1.ico"
+magick "json pretty print icon darkmode.png" -resize 20x20 "json pretty print toolbar darkmode.ico"
+magick "json compress icon darkmode.png" -resize 20x20 "json compress toolbar darkmode.ico"
+magick "json path to position icon darkmode.png" -resize 20x20 "json path to position toolbar darkmode.ico"
+magick "json tree toolbar darkmode.png" -resize 20x20 "json tree toolbar darkmode.ico"

docs/RemesPath.md

@@ -625,7 +625,7 @@ When called with one argument, `stringify` differs from `str` in two regards:
 
 *Added in [v5.5.0](/CHANGELOG.md#550---2023-08-13).*
 
-__The optional arguments did not exist before [v6.2](/CHANGELOG.md#620---unreleased-yyyy-mm-dd).__ In that version, they work as follows:
+__The optional arguments did not exist before [v6.2](/CHANGELOG.md#620---unreleased-yyyy-mm-dd).__ Since that version, they work as follows:
 
 If the third argument (`sort_keys`, default true) is false, object keys are not sorted.