v3.0.0.preview3

msawczyn · Nov 23, 2020 · 4c79950 · 4c79950
1 parent 4155d30
commit 4c79950
Show file tree

Hide file tree

Showing 41 changed files with 539 additions and 4,503 deletions.
diff --git a/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix b/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix
diff --git a/src/Dsl/DslDefinition.dsl b/src/Dsl/DslDefinition.dsl
@@ -1758,7 +1758,7 @@
       <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="0" VerticalOffset="0">
         <IconDecorator Name="TransientGlyph" DisplayName="Transient Glyph" DefaultIcon="Resources\TransientClass.png" />
       </ShapeHasDecorators>
-      <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="0" VerticalOffset="0">
+      <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="0.01" VerticalOffset="0">
         <IconDecorator Name="NoGenGlyph" DisplayName="No Code Generation" DefaultIcon="Resources\No.png" />
       </ShapeHasDecorators>
       <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="0" VerticalOffset="0">
@@ -2847,6 +2847,24 @@
             </PropertyFilters>
           </VisibilityPropertyPath>
         </DecoratorMap>
+        <DecoratorMap>
+          <IconDecoratorMoniker Name="ClassShape/SQLGlyph" />
+          <VisibilityPropertyPath>
+            <DomainPropertyMoniker Name="ModelClass/GlyphType" />
+            <PropertyFilters>
+              <PropertyFilter FilteringValue="SQLGlyph" />
+            </PropertyFilters>
+          </VisibilityPropertyPath>
+        </DecoratorMap>
+        <DecoratorMap>
+          <IconDecoratorMoniker Name="ClassShape/DictionaryGlyph" />
+          <VisibilityPropertyPath>
+            <DomainPropertyMoniker Name="ModelClass/GlyphType" />
+            <PropertyFilters>
+              <PropertyFilter FilteringValue="DictionaryGlyph" />
+            </PropertyFilters>
+          </VisibilityPropertyPath>
+        </DecoratorMap>
         <CompartmentShapeMoniker Name="ClassShape" />
         <CompartmentMap DisplaysCustomString="true">
           <CompartmentMoniker Name="ClassShape/AttributesCompartment" />

diff --git a/src/Dsl/DslDefinition.dsl.diagram b/src/Dsl/DslDefinition.dsl.diagram
diff --git a/src/Dsl/GeneratedCode/Diagram.cs b/src/Dsl/GeneratedCode/Diagram.cs
@@ -403,6 +403,14 @@ public static void OnDecoratorsInitialized(object sender, global::System.EventAr
 		      propertyInfo = new DslDiagrams::AssociatedPropertyInfo(global::Sawczyn.EFDesigner.EFModel.ModelClass.GenerateCodeDomainPropertyId);
 		      propertyInfo.FilteringValues.Add("False");
 		      DslDiagrams::ShapeElement.FindDecorator(shape.Decorators, "NoGenGlyph").AssociateVisibilityWith(shape.Store, propertyInfo);
+
+		      propertyInfo = new DslDiagrams::AssociatedPropertyInfo(global::Sawczyn.EFDesigner.EFModel.ModelClass.GlyphTypeDomainPropertyId);
+		      propertyInfo.FilteringValues.Add("SQLGlyph");
+		      DslDiagrams::ShapeElement.FindDecorator(shape.Decorators, "SQLGlyph").AssociateVisibilityWith(shape.Store, propertyInfo);
+
+		      propertyInfo = new DslDiagrams::AssociatedPropertyInfo(global::Sawczyn.EFDesigner.EFModel.ModelClass.GlyphTypeDomainPropertyId);
+		      propertyInfo.FilteringValues.Add("DictionaryGlyph");
+		      DslDiagrams::ShapeElement.FindDecorator(shape.Decorators, "DictionaryGlyph").AssociateVisibilityWith(shape.Store, propertyInfo);
 		   }
 		}