DynamoDS
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_bottom.png
Copy file name to clipboard
357 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_bottom.png
Copy file name to clipboard
357 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_left.png
Copy file name to clipboard
336 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_left.png
Copy file name to clipboard
336 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_right.png
Copy file name to clipboard
355 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_right.png
Copy file name to clipboard
355 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_top.png
Copy file name to clipboard
324 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_top.png
Copy file name to clipboard
324 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_x_average.png
Copy file name to clipboard
494 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_x_average.png
Copy file name to clipboard
494 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_x_distribute.png
Copy file name to clipboard
459 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_x_distribute.png
Copy file name to clipboard
459 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_y_average.png
Copy file name to clipboard
505 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_y_average.png
Copy file name to clipboard
505 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/Alignment/align_y_distribute.png
Copy file name to clipboard
424 Bytes b/‎src/DynamoCoreWpf/UI/Images/Alignment/align_y_distribute.png
Copy file name to clipboard
424 Bytes
diff --git a/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml
Copy file name to clipboard
+72-25Lines changed: 72 additions & 25 deletions b/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml
Copy file name to clipboard
+72-25Lines changed: 72 additions & 25 deletions
@@ -13,6 +13,14 @@
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
   </PropertyGroup>
   <ItemGroup>
+    <None Remove="UI\Images\Alignment\align_bottom.png" />
+    <None Remove="UI\Images\Alignment\align_left.png" />
+    <None Remove="UI\Images\Alignment\align_right.png" />
+    <None Remove="UI\Images\Alignment\align_top.png" />
+    <None Remove="UI\Images\Alignment\align_x_average.png" />
+    <None Remove="UI\Images\Alignment\align_x_distribute.png" />
+    <None Remove="UI\Images\Alignment\align_y_average.png" />
+    <None Remove="UI\Images\Alignment\align_y_distribute.png" />
     <None Remove="UI\Images\NodeStates\alert-64px.png" />
     <None Remove="UI\Images\NodeStates\error-64px.png" />
     <None Remove="UI\Images\NodeStates\frozen-64px.png" />
@@ -627,6 +635,14 @@
     <EmbeddedResource Include="UI\GuidedTour\DynamoOnboardingGuide_HouseCreationDS.dyn">
 	</EmbeddedResource>
     <None Include="ViewModels\Watch3D\shaderSource\CompileShaders.bat" />
+    <Resource Include="UI\Images\Alignment\align_bottom.png" />
+    <Resource Include="UI\Images\Alignment\align_left.png" />
+    <Resource Include="UI\Images\Alignment\align_right.png" />
+    <Resource Include="UI\Images\Alignment\align_top.png" />
+    <Resource Include="UI\Images\Alignment\align_x_average.png" />
+    <Resource Include="UI\Images\Alignment\align_x_distribute.png" />
+    <Resource Include="UI\Images\Alignment\align_y_average.png" />
+    <Resource Include="UI\Images\Alignment\align_y_distribute.png" />
     <Resource Include="UI\Images\caret_up.png" />
     <EmbeddedResource Include="Views\GuidedTour\HtmlPages\Resources\ArtifaktElement-Regular.woff" />
     <Resource Include="UI\Images\cursors.psd" />
 
@@ -432,31 +432,78 @@
                         <!--<MenuItem Focusable="False" Header="{x:Static p:Resources.DynamoViewEditMenuSelectNeighbours}" Command="{Binding Path=ExpandSelectionCommand}"  Name="expandSelect" InputGestureText="Tab"/>-->
                         <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignSelection}"
                                    Name="Align">
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="HorizontalCenter"/>
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignLeft}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="HorizontalLeft"
-                                       Focusable="False" />
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignRight}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="HorizontalRight"/>
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignYAverage}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="VerticalCenter"/>
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignTop}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="VerticalTop"/>
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlighBottom}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="VerticalBottom"/>
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignYDistribute}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="VerticalDistribute"/>
-                            <MenuItem  Header="{x:Static p:Resources.DynamoViewEditMenuAlignXDistribute}"
-                                       Command="{Binding AlignSelectedCommand}"
-                                       CommandParameter="HorizontalDistribute"/>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="HorizontalCenter">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_x_average.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignXAverage}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="HorizontalLeft">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_left.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignLeft}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="HorizontalRight">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_right.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignRight}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="VerticalCenter">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_y_average.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignYAverage}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="VerticalTop">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_top.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignTop}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="VerticalBottom">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_bottom.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlighBottom}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="VerticalDistribute">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_y_distribute.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignYDistribute}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AlignSelectedCommand}"
+                                  CommandParameter="HorizontalDistribute">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Width="14" Height="14" Source="/DynamoCoreWpf;component/UI/Images/Alignment/align_X_distribute.png" />
+                                        <Label Content="{x:Static p:Resources.DynamoViewEditMenuAlignXDistribute}" Foreground="White"/>
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
                         </MenuItem>
                         <Separator />
                         <MenuItem Header="{x:Static p:Resources.DynamoViewEditMenuCleanupLayout}"