Permalink
Browse files

Minor fixes

  • Loading branch information...
RSuter committed Feb 4, 2016
1 parent 2536945 commit 913194b07735b1745ad72c41e06abf151c8aabd4
Showing with 2,597 additions and 2,600 deletions.
  1. +21 −21 LICENSE.md
  2. +13 −13 README.md
  3. +5 −5 assets/ApplicationIcon.metrop
  4. +5 −5 assets/FileIcon.metrop
  5. +5 −5 src/.nuget/NuGet.Config
  6. +144 −144 src/.nuget/NuGet.targets
  7. +87 −87 src/VisualJsonEditor.Installer/Product.wxs
  8. +61 −61 src/VisualJsonEditor.Installer/VisualJsonEditor.Installer.wixproj
  9. +44 −44 src/VisualJsonEditor.sln
  10. +8 −8 src/VisualJsonEditor/App.xaml
  11. +104 −104 src/VisualJsonEditor/App.xaml.cs
  12. +45 −45 src/VisualJsonEditor/ApplicationConfiguration.cs
  13. +72 −72 src/VisualJsonEditor/Controls/ExpandingGroupBox.cs
  14. +63 −63 src/VisualJsonEditor/Controls/JsonObjectTypeTemplateSelector.cs
  15. +29 −29 src/VisualJsonEditor/Converters/DateConverter.cs
  16. +28 −28 src/VisualJsonEditor/Converters/DoubleUpDownRangeConverter.cs
  17. +28 −28 src/VisualJsonEditor/Converters/IndexConverter.cs
  18. +33 −33 src/VisualJsonEditor/Converters/IntegerConverter.cs
  19. +31 −31 src/VisualJsonEditor/Converters/IntegerUpDownRangeConverter.cs
  20. +34 −34 src/VisualJsonEditor/Converters/NumberConverter.cs
  21. +34 −34 src/VisualJsonEditor/Converters/TimeConverter.cs
  22. +34 −34 src/VisualJsonEditor/Localization/LocalizationHelper.cs
  23. +443 −443 src/VisualJsonEditor/Localization/Strings.Designer.cs
  24. +247 −247 src/VisualJsonEditor/Localization/Strings.resx
  25. +26 −26 src/VisualJsonEditor/Messages/OpenJsonDocumentMessage.cs
  26. +25 −25 src/VisualJsonEditor/Messages/SaveJsonDocumentMessage.cs
  27. +180 −180 src/VisualJsonEditor/Models/JsonDocumentModel.cs
  28. +37 −37 src/VisualJsonEditor/Models/JsonTokenModel.cs
  29. +49 −49 src/VisualJsonEditor/Models/JsonValueModel.cs
  30. +71 −71 src/VisualJsonEditor/Properties/Resources.Designer.cs
  31. +116 −116 src/VisualJsonEditor/Properties/Resources.resx
  32. +30 −30 src/VisualJsonEditor/Properties/Settings.Designer.cs
  33. +6 −6 src/VisualJsonEditor/Properties/Settings.settings
  34. +57 −57 src/VisualJsonEditor/Themes/Generic.xaml
  35. +94 −94 src/VisualJsonEditor/Utilities/JsonApplicationConfiguration.cs
  36. +51 −51 src/VisualJsonEditor/Views/AboutWindow.xaml
  37. +37 −37 src/VisualJsonEditor/Views/AboutWindow.xaml.cs
  38. +198 −198 src/VisualJsonEditor/Views/MainWindow.xaml
  39. +2 −5 src/VisualJsonEditor/Views/MainWindow.xaml.cs
View
@@ -1,21 +1,21 @@
The MIT License (MIT)
Copyright (c) 2015 Rico Suter
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
The MIT License (MIT)
Copyright (c) 2015 Rico Suter
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
View
@@ -1,13 +1,13 @@
# Visual JSON Editor
[![Build status](https://ci.appveyor.com/api/projects/status/x25686ex1dp8smax?svg=true)](https://ci.appveyor.com/project/rsuter/visualjsoneditor)
Visual JSON Editor is a JSON schema based file editor for Windows: When opening a JSON file, the application auto-generates an editor GUI based on the provided JSON schema. The goal is to make JSON editing more effective and easier for users.
**[Article describing a usage scenario](http://blog.rsuter.com/?p=795)**
Visual JSON Editor is developed by [Rico Suter](http://rsuter.com) using the [MyToolkit](http://mytoolkit.io) and [NJsonSchema](http://njsonschema.org) libraries.
![](http://rsuter.com/Projects/VisualJsonEditor/Screenshot02.png)
![](http://rsuter.com/Projects/VisualJsonEditor/Screenshot01.png)
# Visual JSON Editor
[![Build status](https://ci.appveyor.com/api/projects/status/x25686ex1dp8smax?svg=true)](https://ci.appveyor.com/project/rsuter/visualjsoneditor)
Visual JSON Editor is a JSON schema based file editor for Windows: When opening a JSON file, the application auto-generates an editor GUI based on the provided JSON schema. The goal is to make JSON editing more effective and easier for users.
**[Article describing a usage scenario](http://blog.rsuter.com/?p=795)**
Visual JSON Editor is developed by [Rico Suter](http://rsuter.com) using the [MyToolkit](http://mytoolkit.io) and [NJsonSchema](http://njsonschema.org) libraries.
![](http://rsuter.com/Projects/VisualJsonEditor/Screenshot02.png)
![](http://rsuter.com/Projects/VisualJsonEditor/Screenshot01.png)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<IconProject Version="2.0" Name="ApplicationIcon">
<Icon Name="Data-Information" HasCharacterMap="false" GroupName="Application" Location="Application" IsDirty="false" ExportCommand="MetroGraphicsPackage.IconCommand" Data="M3.5234711,42.273001L52.841671,42.273001C54.779186,42.273001,56.365002,43.860291,56.365002,45.7953L56.365002,52.841398C56.365002,54.779009,54.779186,56.365,52.841671,56.365L3.5234711,56.365C1.5860441,56.365,0,54.779009,0,52.841398L0,45.7953C0,43.860291,1.5860441,42.273001,3.5234711,42.273001z M3.5234711,21.136999L52.841675,21.136999C54.77919,21.136999,56.365002,22.724289,56.365002,24.660475L56.365002,31.704525C56.365002,33.64221,54.77919,35.227999,52.841675,35.227999L3.5234711,35.227999C1.5860442,35.227999,0,33.64221,0,31.704525L0,24.660475C0,22.724289,1.5860442,21.136999,3.5234711,21.136999z M3.5234711,0L52.841671,0C54.779186,0,56.365002,1.5872574,56.365002,3.5233898L56.365002,10.56885C56.365002,12.504922,54.779186,14.090999,52.841671,14.091L3.5234711,14.091C1.5860441,14.090999,0,12.504922,0,10.56885L0,3.5233898C0,1.5872574,1.5860441,0,3.5234711,0z">
<Settings MainWidth="256" MainHeight="256" FlipX="1" FlipY="1" CustomSize="256" IconShape="Square" BackgroundBrush="#FF135DA1" ContentWidth="124" ContentHeight="124" Angle="45" IsRect="false" SizeIndex="6" CustomWidth="256" CustomHeight="256" IsLinked="false" Padding="66" MaximumPadding="79" SldierValueChanged="MetroGraphicsPackage.IconCommand" IconBrush="#FFFFFFFF" FontFamily="Webdings" Character="&gt;" FlipCommand="MetroGraphicsPackage.IconCommand" IsBackgroundVisible="true" />
</Icon>
<?xml version="1.0" encoding="utf-8"?>
<IconProject Version="2.0" Name="ApplicationIcon">
<Icon Name="Data-Information" HasCharacterMap="false" GroupName="Application" Location="Application" IsDirty="false" ExportCommand="MetroGraphicsPackage.IconCommand" Data="M3.5234711,42.273001L52.841671,42.273001C54.779186,42.273001,56.365002,43.860291,56.365002,45.7953L56.365002,52.841398C56.365002,54.779009,54.779186,56.365,52.841671,56.365L3.5234711,56.365C1.5860441,56.365,0,54.779009,0,52.841398L0,45.7953C0,43.860291,1.5860441,42.273001,3.5234711,42.273001z M3.5234711,21.136999L52.841675,21.136999C54.77919,21.136999,56.365002,22.724289,56.365002,24.660475L56.365002,31.704525C56.365002,33.64221,54.77919,35.227999,52.841675,35.227999L3.5234711,35.227999C1.5860442,35.227999,0,33.64221,0,31.704525L0,24.660475C0,22.724289,1.5860442,21.136999,3.5234711,21.136999z M3.5234711,0L52.841671,0C54.779186,0,56.365002,1.5872574,56.365002,3.5233898L56.365002,10.56885C56.365002,12.504922,54.779186,14.090999,52.841671,14.091L3.5234711,14.091C1.5860441,14.090999,0,12.504922,0,10.56885L0,3.5233898C0,1.5872574,1.5860441,0,3.5234711,0z">
<Settings MainWidth="256" MainHeight="256" FlipX="1" FlipY="1" CustomSize="256" IconShape="Square" BackgroundBrush="#FF135DA1" ContentWidth="124" ContentHeight="124" Angle="45" IsRect="false" SizeIndex="6" CustomWidth="256" CustomHeight="256" IsLinked="false" Padding="66" MaximumPadding="79" SldierValueChanged="MetroGraphicsPackage.IconCommand" IconBrush="#FFFFFFFF" FontFamily="Webdings" Character="&gt;" FlipCommand="MetroGraphicsPackage.IconCommand" IsBackgroundVisible="true" />
</Icon>
</IconProject>
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<IconProject Version="2.0" Name="DocumentIcon">
<Icon Name="FileIcon" HasCharacterMap="false" GroupName="Office" Location="Office" IsDirty="true" ExportCommand="MetroGraphicsPackage.IconCommand" Data="M10.00997,48.16L38.009968,48.16 38.009968,52.212002 10.00997,52.212002z M19.459968,38.040001L38.014969,38.040001 38.014969,42.088001 19.459968,42.088001z M6.7500123,5.3901367C6.0100211,5.3901367,5.4000343,6,5.4000338,6.7402344L5.4000338,57.25C5.4000343,58,6.0100211,58.600098,6.7500123,58.600098L44.529987,58.600098C45.279987,58.600098,45.890098,58,45.890098,57.25L45.890098,24.42041 35.820011,24.380371C27.22002,25.060059,26.99004,17.260254,26.99004,17.260254L26.99004,5.3901367z M6.7500123,0L29.480034,0 34.400085,5.1904297 34.470032,5.1904297 46.370079,17.810059 46.380089,17.830078 51.279999,23 51.279999,57.25C51.279999,60.97998,48.260097,64,44.529987,64L6.7500123,64C3.0299131,64,3.9343649E-07,60.97998,0,57.25L0,6.7402344C3.9343649E-07,3.0200195,3.0299131,0,6.7500123,0z">
<Settings MainWidth="256" MainHeight="256" FlipX="1" FlipY="1" CustomSize="256" IconShape="Square" BackgroundBrush="#FF0060A5" ContentWidth="180" ContentHeight="180" Angle="0" IsRect="false" SizeIndex="6" CustomWidth="256" CustomHeight="256" IsLinked="false" Padding="38" MaximumPadding="79" SldierValueChanged="MetroGraphicsPackage.IconCommand" IconBrush="#FFFFFFFF" FontFamily="Webdings" Character="&gt;" FlipCommand="MetroGraphicsPackage.IconCommand" IsBackgroundVisible="true" />
</Icon>
<?xml version="1.0" encoding="utf-8"?>
<IconProject Version="2.0" Name="DocumentIcon">
<Icon Name="FileIcon" HasCharacterMap="false" GroupName="Office" Location="Office" IsDirty="true" ExportCommand="MetroGraphicsPackage.IconCommand" Data="M10.00997,48.16L38.009968,48.16 38.009968,52.212002 10.00997,52.212002z M19.459968,38.040001L38.014969,38.040001 38.014969,42.088001 19.459968,42.088001z M6.7500123,5.3901367C6.0100211,5.3901367,5.4000343,6,5.4000338,6.7402344L5.4000338,57.25C5.4000343,58,6.0100211,58.600098,6.7500123,58.600098L44.529987,58.600098C45.279987,58.600098,45.890098,58,45.890098,57.25L45.890098,24.42041 35.820011,24.380371C27.22002,25.060059,26.99004,17.260254,26.99004,17.260254L26.99004,5.3901367z M6.7500123,0L29.480034,0 34.400085,5.1904297 34.470032,5.1904297 46.370079,17.810059 46.380089,17.830078 51.279999,23 51.279999,57.25C51.279999,60.97998,48.260097,64,44.529987,64L6.7500123,64C3.0299131,64,3.9343649E-07,60.97998,0,57.25L0,6.7402344C3.9343649E-07,3.0200195,3.0299131,0,6.7500123,0z">
<Settings MainWidth="256" MainHeight="256" FlipX="1" FlipY="1" CustomSize="256" IconShape="Square" BackgroundBrush="#FF0060A5" ContentWidth="180" ContentHeight="180" Angle="0" IsRect="false" SizeIndex="6" CustomWidth="256" CustomHeight="256" IsLinked="false" Padding="38" MaximumPadding="79" SldierValueChanged="MetroGraphicsPackage.IconCommand" IconBrush="#FFFFFFFF" FontFamily="Webdings" Character="&gt;" FlipCommand="MetroGraphicsPackage.IconCommand" IsBackgroundVisible="true" />
</Icon>
</IconProject>
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
</configuration>
Oops, something went wrong.

0 comments on commit 913194b

Please sign in to comment.