diff --git a/CHANGELOG.md b/CHANGELOG.md index 4356dcb..7f602f1 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/JsonToolsNppPlugin/JsonToolsNppPlugin.csproj b/JsonToolsNppPlugin/JsonToolsNppPlugin.csproj index 156c520..b4bd9f6 100644 --- a/JsonToolsNppPlugin/JsonToolsNppPlugin.csproj +++ b/JsonToolsNppPlugin/JsonToolsNppPlugin.csproj @@ -275,6 +275,11 @@ + + + + + diff --git a/JsonToolsNppPlugin/Main.cs b/JsonToolsNppPlugin/Main.cs index 3e1487d..47574c8 100644 --- a/JsonToolsNppPlugin/Main.cs +++ b/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)); diff --git a/JsonToolsNppPlugin/Properties/AssemblyInfo.cs b/JsonToolsNppPlugin/Properties/AssemblyInfo.cs index 1300e58..f7f6062 100644 --- a/JsonToolsNppPlugin/Properties/AssemblyInfo.cs +++ b/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")] diff --git a/JsonToolsNppPlugin/Properties/Resources.resx b/JsonToolsNppPlugin/Properties/Resources.resx index e9b9658..88aa29c 100644 --- a/JsonToolsNppPlugin/Properties/Resources.resx +++ b/JsonToolsNppPlugin/Properties/Resources.resx @@ -121,37 +121,37 @@ ..\Resources\json compress toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\json compress toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\json compress toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\json compress toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\json path to position toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\json path to position toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\json path to position toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\json path to position toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\json pretty print toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\json pretty print toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\json pretty print toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\json pretty print toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\json tree toolbar.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\json tree toolbar1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\json tree toolbar bmp.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\json tree toolbar darkmode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/JsonToolsNppPlugin/Properties/Resources1.Designer.cs b/JsonToolsNppPlugin/Properties/Resources1.Designer.cs index 8295acb..3c0ca02 100644 --- a/JsonToolsNppPlugin/Properties/Resources1.Designer.cs +++ b/JsonToolsNppPlugin/Properties/Resources1.Designer.cs @@ -83,9 +83,9 @@ public static System.Drawing.Bitmap json_compress_toolbar_bmp { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - public static System.Drawing.Icon json_compress_toolbar1 { + public static System.Drawing.Icon json_compress_toolbar_darkmode { get { - object obj = ResourceManager.GetObject("json_compress_toolbar1", resourceCulture); + object obj = ResourceManager.GetObject("json_compress_toolbar_darkmode", resourceCulture); return ((System.Drawing.Icon)(obj)); } } @@ -113,9 +113,9 @@ public static System.Drawing.Bitmap json_path_to_position_toolbar_bmp { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - public static System.Drawing.Icon json_path_to_position_toolbar1 { + public static System.Drawing.Icon json_path_to_position_toolbar_darkmode { get { - object obj = ResourceManager.GetObject("json_path_to_position_toolbar1", resourceCulture); + object obj = ResourceManager.GetObject("json_path_to_position_toolbar_darkmode", resourceCulture); return ((System.Drawing.Icon)(obj)); } } @@ -143,9 +143,9 @@ public static System.Drawing.Bitmap json_pretty_print_toolbar_bmp { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - public static System.Drawing.Icon json_pretty_print_toolbar1 { + public static System.Drawing.Icon json_pretty_print_toolbar_darkmode { get { - object obj = ResourceManager.GetObject("json_pretty_print_toolbar1", resourceCulture); + object obj = ResourceManager.GetObject("json_pretty_print_toolbar_darkmode", resourceCulture); return ((System.Drawing.Icon)(obj)); } } @@ -173,9 +173,9 @@ public static System.Drawing.Bitmap json_tree_toolbar_bmp { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - public static System.Drawing.Icon json_tree_toolbar1 { + public static System.Drawing.Icon json_tree_toolbar_darkmode { get { - object obj = ResourceManager.GetObject("json_tree_toolbar1", resourceCulture); + object obj = ResourceManager.GetObject("json_tree_toolbar_darkmode", resourceCulture); return ((System.Drawing.Icon)(obj)); } } diff --git a/JsonToolsNppPlugin/Resources/json compress icon darkmode.PNG b/JsonToolsNppPlugin/Resources/json compress icon darkmode.PNG new file mode 100644 index 0000000..0cbc5a3 Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json compress icon darkmode.PNG differ diff --git a/JsonToolsNppPlugin/Resources/json compress toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json compress toolbar darkmode.ico new file mode 100644 index 0000000..533d681 Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json compress toolbar darkmode.ico differ diff --git a/JsonToolsNppPlugin/Resources/json compress toolbar1.ico b/JsonToolsNppPlugin/Resources/json compress toolbar1.ico deleted file mode 100644 index 4184fb0..0000000 Binary files a/JsonToolsNppPlugin/Resources/json compress toolbar1.ico and /dev/null differ diff --git a/JsonToolsNppPlugin/Resources/json path to position icon darkmode.PNG b/JsonToolsNppPlugin/Resources/json path to position icon darkmode.PNG new file mode 100644 index 0000000..4df5870 Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json path to position icon darkmode.PNG differ diff --git a/JsonToolsNppPlugin/Resources/json path to position toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json path to position toolbar darkmode.ico new file mode 100644 index 0000000..d396fac Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json path to position toolbar darkmode.ico differ diff --git a/JsonToolsNppPlugin/Resources/json path to position toolbar1.ico b/JsonToolsNppPlugin/Resources/json path to position toolbar1.ico deleted file mode 100644 index a36c353..0000000 Binary files a/JsonToolsNppPlugin/Resources/json path to position toolbar1.ico and /dev/null differ diff --git a/JsonToolsNppPlugin/Resources/json pretty print icon darkmode.PNG b/JsonToolsNppPlugin/Resources/json pretty print icon darkmode.PNG new file mode 100644 index 0000000..2f5a40a Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json pretty print icon darkmode.PNG differ diff --git a/JsonToolsNppPlugin/Resources/json pretty print toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json pretty print toolbar darkmode.ico new file mode 100644 index 0000000..0fb4557 Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json pretty print toolbar darkmode.ico differ diff --git a/JsonToolsNppPlugin/Resources/json pretty print toolbar1.ico b/JsonToolsNppPlugin/Resources/json pretty print toolbar1.ico deleted file mode 100644 index 322f2b8..0000000 Binary files a/JsonToolsNppPlugin/Resources/json pretty print toolbar1.ico and /dev/null differ diff --git a/JsonToolsNppPlugin/Resources/json tree icon.pptx b/JsonToolsNppPlugin/Resources/json tree icon.pptx deleted file mode 100644 index c95b3b7..0000000 Binary files a/JsonToolsNppPlugin/Resources/json tree icon.pptx and /dev/null differ diff --git a/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.PNG b/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.PNG new file mode 100644 index 0000000..86680da Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.PNG differ diff --git a/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.ico new file mode 100644 index 0000000..760d8a3 Binary files /dev/null and b/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.ico differ diff --git a/JsonToolsNppPlugin/Resources/json tree toolbar1.ico b/JsonToolsNppPlugin/Resources/json tree toolbar1.ico deleted file mode 100644 index c7da2b3..0000000 Binary files a/JsonToolsNppPlugin/Resources/json tree toolbar1.ico and /dev/null differ diff --git a/JsonToolsNppPlugin/Resources/json-tools icons.bat b/JsonToolsNppPlugin/Resources/json-tools icons.bat index b360270..bdf10d4 100644 --- a/JsonToolsNppPlugin/Resources/json-tools icons.bat +++ b/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" \ No newline at end of file +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" \ No newline at end of file diff --git a/JsonToolsNppPlugin/Resources/json-tools type icons.pptx b/JsonToolsNppPlugin/Resources/json-tools type icons.pptx deleted file mode 100644 index a7d5e69..0000000 Binary files a/JsonToolsNppPlugin/Resources/json-tools type icons.pptx and /dev/null differ diff --git a/JsonToolsNppPlugin/Resources/path to location icon.pptx b/JsonToolsNppPlugin/Resources/path to location icon.pptx deleted file mode 100644 index 023d133..0000000 Binary files a/JsonToolsNppPlugin/Resources/path to location icon.pptx and /dev/null differ diff --git a/docs/RemesPath.md b/docs/RemesPath.md index 607151e..502bdda 100644 --- a/docs/RemesPath.md +++ b/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. diff --git a/jsontools before after.pptx b/jsontools before after.pptx deleted file mode 100644 index f7163f9..0000000 Binary files a/jsontools before after.pptx and /dev/null differ