Added command to equalize spacing of selected nodes horizontally or v…

…ertically
msawczyn · Jan 28, 2021 · bfb6fd5 · bfb6fd5
1 parent 75bf5c8
commit bfb6fd5
Show file tree

Hide file tree

Showing 16 changed files with 227 additions and 51 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Dsl xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="9987f227-3d05-49b7-b151-857879f5dfb8" Description="Entity Framework visual editor for EF6, EFCore and beyond." Name="EFModel" DisplayName="Entity Framework Visual Editor" Namespace="Sawczyn.EFDesigner.EFModel" MajorVersion="3" Build="4" Revision="2" ProductName="EFDesigner" CompanyName="Michael Sawczyn" PackageGuid="56bbe1ba-aaee-4883-848f-e3c8656f8db2" PackageNamespace="Sawczyn.EFDesigner.EFModel" xmlns="http://schemas.microsoft.com/VisualStudio/2005/DslTools/DslDefinitionModel">
+<Dsl xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="9987f227-3d05-49b7-b151-857879f5dfb8" Description="Entity Framework visual editor for EF6, EFCore and beyond." Name="EFModel" DisplayName="Entity Framework Visual Editor" Namespace="Sawczyn.EFDesigner.EFModel" MajorVersion="3" Build="4" Revision="3" ProductName="EFDesigner" CompanyName="Michael Sawczyn" PackageGuid="56bbe1ba-aaee-4883-848f-e3c8656f8db2" PackageNamespace="Sawczyn.EFDesigner.EFModel" xmlns="http://schemas.microsoft.com/VisualStudio/2005/DslTools/DslDefinitionModel">
   <Classes>
     <DomainClass Id="95532cb8-3452-4b09-a654-aeb2e2d0b3ad" Description="" Name="ModelRoot" DisplayName="Entity Model" Namespace="Sawczyn.EFDesigner.EFModel">
       <CustomTypeDescriptor>

diff --git a/src/Dsl/GeneratedCode/DomainClasses.cs b/src/Dsl/GeneratedCode/DomainClasses.cs
@@ -13432,6 +13432,6 @@ namespace Sawczyn.EFDesigner.EFModel
    /// </summary>
 	partial class ModelRoot
 	{
-		public const string DSLVersion = "3.0.4.2";
+		public const string DSLVersion = "3.0.4.3";
 	}
 }
diff --git a/src/Dsl/GeneratedCode/SerializationHelper.cs b/src/Dsl/GeneratedCode/SerializationHelper.cs
@@ -1168,7 +1168,7 @@ public virtual void WriteRootElement(DslModeling::SerializationContext serializa
 				// Only model has schema, diagram has no schema.
 				rootElementSettings.SchemaTargetNamespace = "http://schemas.microsoft.com/dsltools/EFModel";
 			}
-			rootElementSettings.Version = new global::System.Version("3.0.4.2");
+			rootElementSettings.Version = new global::System.Version("3.0.4.3");
 
 			// Carry out the normal serialization.
 			rootSerializer.Write(serializationContext, rootElement, writer, rootElementSettings);
@@ -1190,7 +1190,7 @@ protected virtual void CheckVersion(DslModeling::SerializationContext serializat
 				throw new global::System.ArgumentNullException("reader");
 			#endregion
 
-			global::System.Version expectedVersion = new global::System.Version("3.0.4.2");
+			global::System.Version expectedVersion = new global::System.Version("3.0.4.3");
 			string dslVersionStr = reader.GetAttribute("dslVersion");
 			if (dslVersionStr != null)
 			{

diff --git a/src/DslPackage/Commands.vsct b/src/DslPackage/Commands.vsct
@@ -322,6 +322,24 @@
             </Strings>
          </Button>
 
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceHoriz" priority="0x0100" type="Button">
+            <Parent guid="guidEFDiagramMenuCmdSet" id="grpidResize"/>
+            <CommandFlag>DynamicVisibility</CommandFlag>
+            <Strings>
+               <ButtonText>Equalize Spacing Horizontally</ButtonText>
+               <CommandName>EqualSpaceHoriz</CommandName>
+            </Strings>
+         </Button>
+
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceVert" priority="0x0100" type="Button">
+            <Parent guid="guidEFDiagramMenuCmdSet" id="grpidResize"/>
+            <CommandFlag>DynamicVisibility</CommandFlag>
+            <Strings>
+               <ButtonText>Equalize Spacing Vertically</ButtonText>
+               <CommandName>EqualSpaceVert</CommandName>
+            </Strings>
+         </Button>
+
          <!-- Model explorer menu -->
 
          <Button guid="guidMenuExplorerCmdSet" id="cmdidGoToCode" priority="0x0901" type="Button">
@@ -403,6 +421,8 @@
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidAlignVCenter"      context="guidEditor"/>
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidResizeWidest"      context="guidEditor"/>
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidResizeNarrowest"   context="guidEditor"/>
+      <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceHoriz"   context="guidEditor"/>
+      <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceVert"    context="guidEditor"/>
    </VisibilityConstraints>
 
    <Symbols>
@@ -457,6 +477,8 @@
          <IDSymbol name="cmdidAlignVCenter"              value="0x0010B"/>
          <IDSymbol name="cmdidResizeWidest"              value="0x0010C"/>
          <IDSymbol name="cmdidResizeNarrowest"           value="0x0010D"/>
+         <IDSymbol name="cmdidEqualSpaceHoriz"           value="0x0010E"/>
+         <IDSymbol name="cmdidEqualSpaceVert"            value="0x0010F"/>
       </GuidSymbol>
    </Symbols>
 </CommandTable>