Merge pull request #823 from HicServices/transform-icon

Gave IsProperTransform CatalogueItems a custom icon
HicServices · Dec 15, 2021 · 8b6a9cd · 8b6a9cd
2 parents 240e909 + 071620a
commit 8b6a9cd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added custom icon for [CatalogueItem] that represent transforms on the underlying column (https://github.com/HicServices/RDMP/issues/818)
+
 ### Fixed
 
 ### Changed

diff --git a/Rdmp.Core/Icons/CatalogueItemTransform.png b/Rdmp.Core/Icons/CatalogueItemTransform.png
diff --git a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs b/Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs
diff --git a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx b/Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx
@@ -265,6 +265,9 @@
   <data name="CatalogueItem" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\CatalogueItem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="CatalogueItemTransform" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\CatalogueItemTransform.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="CatalogueItemIssue" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\CatalogueItemIssue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs
@@ -16,11 +16,13 @@ namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders
     public class CatalogueItemStateBasedIconProvider : IObjectStateBasedIconProvider
     {
         private readonly Bitmap basicImage;
+        private readonly Bitmap transformImage;
         private readonly IconOverlayProvider _overlayProvider;
 
         public CatalogueItemStateBasedIconProvider(IconOverlayProvider overlayProvider)
         {
             basicImage = CatalogueIcons.CatalogueItem;
+            transformImage = CatalogueIcons.CatalogueItemTransform;
             _overlayProvider = overlayProvider;
         }
 
@@ -31,9 +33,8 @@ public Bitmap GetImageIfSupportedObject(object o)
             if (ci == null)
                 return null;
 
-            Bitmap toReturn = basicImage;
-
             var ei = ci.ExtractionInformation;
+            Bitmap toReturn = ei?.IsProperTransform() ?? false ? transformImage: basicImage;
 
             //it's extractable
             if (ei != null)