diff --git a/Analogy.CommonControls/Analogy.CommonControls.csproj b/Analogy.CommonControls/Analogy.CommonControls.csproj index 7dc0739c..2020009f 100644 --- a/Analogy.CommonControls/Analogy.CommonControls.csproj +++ b/Analogy.CommonControls/Analogy.CommonControls.csproj @@ -347,7 +347,7 @@ - + diff --git a/Analogy.CommonControls/Properties/Resources.Designer.cs b/Analogy.CommonControls/Properties/Resources.Designer.cs index 8594ce67..a8428943 100644 --- a/Analogy.CommonControls/Properties/Resources.Designer.cs +++ b/Analogy.CommonControls/Properties/Resources.Designer.cs @@ -320,6 +320,16 @@ internal static System.Drawing.Bitmap ArrangeGroups_32x32 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Array { + get { + object obj = ResourceManager.GetObject("Array", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -360,6 +370,16 @@ internal static System.Drawing.Bitmap binance64x64alpha { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Boolean { + get { + object obj = ResourceManager.GetObject("Boolean", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -480,6 +500,16 @@ internal static System.Drawing.Bitmap Database_on { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Date { + get { + object obj = ResourceManager.GetObject("Date", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -600,6 +630,16 @@ internal static System.Drawing.Bitmap FitNone_16x16 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Float { + get { + object obj = ResourceManager.GetObject("Float", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -680,6 +720,16 @@ internal static System.Drawing.Bitmap gRPC32x32 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Guid { + get { + object obj = ResourceManager.GetObject("Guid", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -750,6 +800,16 @@ internal static System.Drawing.Bitmap Insert_32x32 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Integer { + get { + object obj = ResourceManager.GetObject("Integer", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -790,6 +850,16 @@ internal static System.Drawing.Bitmap jsonfile32x32 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap light_brown { + get { + object obj = ResourceManager.GetObject("light_brown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -900,6 +970,16 @@ internal static System.Drawing.Bitmap nlog { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap None { + get { + object obj = ResourceManager.GetObject("None", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -910,6 +990,26 @@ internal static System.Drawing.Bitmap NotOk_32x32 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Null { + get { + object obj = ResourceManager.GetObject("Null", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Object { + get { + object obj = ResourceManager.GetObject("Object", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1360,6 +1460,16 @@ internal static System.Drawing.Bitmap SingleMasterFilter_32x32 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap String { + get { + object obj = ResourceManager.GetObject("String", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1420,6 +1530,16 @@ internal static System.Drawing.Bitmap Time2_32x32 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap TimeSpan { + get { + object obj = ResourceManager.GetObject("TimeSpan", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1430,6 +1550,16 @@ internal static System.Drawing.Bitmap TwoColumns { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Undefined { + get { + object obj = ResourceManager.GetObject("Undefined", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Analogy.CommonControls/Properties/Resources.resx b/Analogy.CommonControls/Properties/Resources.resx index d69e91de..67b2d682 100644 --- a/Analogy.CommonControls/Properties/Resources.resx +++ b/Analogy.CommonControls/Properties/Resources.resx @@ -196,6 +196,9 @@ ..\Resources\ArrangeGroups_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Array.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Article_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,6 +211,9 @@ ..\Resources\binance64x64alpha1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Boolean.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ChartsShowLegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -244,6 +250,9 @@ ..\Resources\Database_on.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Date.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\DecreaseFontSize_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,6 +289,9 @@ ..\Resources\FitNone_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Float.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\FullscreenBlue16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -304,6 +316,9 @@ ..\Resources\gRPC32x32.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Guid.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\IDE_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,6 +340,9 @@ ..\Resources\Insert_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Integer.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\json.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -337,6 +355,9 @@ ..\Resources\jsonfile32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\light brown.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Line_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -370,9 +391,18 @@ ..\Resources\nlog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\None.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\NotOk_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Null.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Object.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\OK_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -508,6 +538,9 @@ ..\Resources\SingleMasterFilter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\String.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Sutotal_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -526,9 +559,15 @@ ..\Resources\Time2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\TimeSpan.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\TwoColumns.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Undefined.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\upload16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Analogy.CommonControls/Resources/Array.bmp b/Analogy.CommonControls/Resources/Array.bmp new file mode 100644 index 00000000..037a26b5 Binary files /dev/null and b/Analogy.CommonControls/Resources/Array.bmp differ diff --git a/Analogy.CommonControls/Resources/Boolean.jpg b/Analogy.CommonControls/Resources/Boolean.jpg new file mode 100644 index 00000000..7ca7c3d9 Binary files /dev/null and b/Analogy.CommonControls/Resources/Boolean.jpg differ diff --git a/Analogy.CommonControls/Resources/Date.jpg b/Analogy.CommonControls/Resources/Date.jpg new file mode 100644 index 00000000..029a722a Binary files /dev/null and b/Analogy.CommonControls/Resources/Date.jpg differ diff --git a/Analogy.CommonControls/Resources/Float.jpg b/Analogy.CommonControls/Resources/Float.jpg new file mode 100644 index 00000000..545a38ed Binary files /dev/null and b/Analogy.CommonControls/Resources/Float.jpg differ diff --git a/Analogy.CommonControls/Resources/Guid.jpg b/Analogy.CommonControls/Resources/Guid.jpg new file mode 100644 index 00000000..ba5ea0c9 Binary files /dev/null and b/Analogy.CommonControls/Resources/Guid.jpg differ diff --git a/Analogy.CommonControls/Resources/Integer.jpg b/Analogy.CommonControls/Resources/Integer.jpg new file mode 100644 index 00000000..3e2fc798 Binary files /dev/null and b/Analogy.CommonControls/Resources/Integer.jpg differ diff --git a/Analogy.CommonControls/Resources/None.jpg b/Analogy.CommonControls/Resources/None.jpg new file mode 100644 index 00000000..5b09bc15 Binary files /dev/null and b/Analogy.CommonControls/Resources/None.jpg differ diff --git a/Analogy.CommonControls/Resources/Null.jpg b/Analogy.CommonControls/Resources/Null.jpg new file mode 100644 index 00000000..5b09bc15 Binary files /dev/null and b/Analogy.CommonControls/Resources/Null.jpg differ diff --git a/Analogy.CommonControls/Resources/Object.bmp b/Analogy.CommonControls/Resources/Object.bmp new file mode 100644 index 00000000..3fb60f76 Binary files /dev/null and b/Analogy.CommonControls/Resources/Object.bmp differ diff --git a/Analogy.CommonControls/Resources/String.jpg b/Analogy.CommonControls/Resources/String.jpg new file mode 100644 index 00000000..380af802 Binary files /dev/null and b/Analogy.CommonControls/Resources/String.jpg differ diff --git a/Analogy.CommonControls/Resources/TimeSpan.jpg b/Analogy.CommonControls/Resources/TimeSpan.jpg new file mode 100644 index 00000000..029a722a Binary files /dev/null and b/Analogy.CommonControls/Resources/TimeSpan.jpg differ diff --git a/Analogy.CommonControls/Resources/Undefined.jpg b/Analogy.CommonControls/Resources/Undefined.jpg new file mode 100644 index 00000000..12e713e8 Binary files /dev/null and b/Analogy.CommonControls/Resources/Undefined.jpg differ diff --git a/Analogy.CommonControls/Resources/light brown.jpg b/Analogy.CommonControls/Resources/light brown.jpg new file mode 100644 index 00000000..f177c4be Binary files /dev/null and b/Analogy.CommonControls/Resources/light brown.jpg differ diff --git a/Analogy.CommonControls/Tools/JsonTreeView.cs b/Analogy.CommonControls/Tools/JsonTreeView.cs index 1ab5a8a0..6a307ecc 100644 --- a/Analogy.CommonControls/Tools/JsonTreeView.cs +++ b/Analogy.CommonControls/Tools/JsonTreeView.cs @@ -3,6 +3,7 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; +using Analogy.CommonControls.Properties; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -41,19 +42,71 @@ private void LoadImgaeList() { ImageList treeImages = new ImageList(); treeImages.ImageSize = new Size(16, 16); - ComponentResourceManager images = new ComponentResourceManager(typeof(JsonNodeImages)); - foreach (var type in Enum.GetNames(typeof(JTokenType))) + foreach (JTokenType type in Enum.GetValues(typeof(JTokenType))) { - try + Bitmap image; + switch (type) { - treeImages.Images.Add(type, (Bitmap)images.GetObject(type)); + case JTokenType.None: + image = Resources.None; + break; + case JTokenType.Object: + image = Resources.Object; + break; + case JTokenType.Array: + image = Resources.Array; + break; + case JTokenType.Constructor: + image = Resources.None; + break; + case JTokenType.Property: + image = Resources.None; + break; + case JTokenType.Comment: + image = Resources.None; + break; + case JTokenType.Integer: + image = Resources.Integer; + break; + case JTokenType.Float: + image = Resources.Float; + break; + case JTokenType.String: + image = Resources.String; + break; + case JTokenType.Boolean: + image = Resources.Boolean; + break; + case JTokenType.Null: + image = Resources.None; + break; + case JTokenType.Undefined: + image = Resources.Undefined; + break; + case JTokenType.Date: + image = Resources.Date; + break; + case JTokenType.Raw: + image = Resources.Object; + break; + case JTokenType.Bytes: + image = Resources.Object; + break; + case JTokenType.Guid: + image = Resources.Guid; + break; + case JTokenType.Uri: + image = Resources.Object; + break; + case JTokenType.TimeSpan: + image = Resources.TimeSpan; + break; + default: + throw new ArgumentOutOfRangeException(); } - catch (Exception) - { - treeImages.Images.Add(type, (Bitmap)images.GetObject("Undefined")); - } - } + treeImages.Images.Add(type.ToString(), image ?? Resources.Undefined); + } ImageList = treeImages; } diff --git a/Analogy.UnitTests/Analogy.UnitTests.csproj b/Analogy.UnitTests/Analogy.UnitTests.csproj index d07eaed5..70455d48 100644 --- a/Analogy.UnitTests/Analogy.UnitTests.csproj +++ b/Analogy.UnitTests/Analogy.UnitTests.csproj @@ -33,8 +33,8 @@ - - + + diff --git a/Analogy/Analogy.csproj b/Analogy/Analogy.csproj index c32ed7ea..71e9a98d 100644 --- a/Analogy/Analogy.csproj +++ b/Analogy/Analogy.csproj @@ -48,7 +48,7 @@ - + diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs index 9b340407..c3146c6c 100644 --- a/Analogy/CommonChangeLog.cs +++ b/Analogy/CommonChangeLog.cs @@ -11,6 +11,7 @@ public static IEnumerable GetChangeLog() { return new List { + new AnalogyChangeLog("V4.8.5 - Bump Markdig from 0.28.1 to 0.30.2 #1262",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2022,04,27)), new AnalogyChangeLog("V4.8.5 - [DevExpress] Update version to V21.2.7 #1259",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2022,04,27)), new AnalogyChangeLog("V4.8.5 - [UI] Add counter callback for messages read (User Settings) #1219",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2022,04,04)), new AnalogyChangeLog("V4.8.5 - Add counter callback for messages read #1218",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2022,04,04)),