Merge branch 'develop'

Author: RomanSoloweow

SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj

@@ -21,7 +21,8 @@
 Some optimization
 Feature with opacity
 Custom for drag and drop textbox
-Undo - Redo for renaming</PackageReleaseNotes>
+Undo - Redo for renaming
+Validating for exists Nodes without connects</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

SimpleStateMachineNodeEditor/View/MainWindow.xaml

@@ -45,11 +45,11 @@
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Export" x:Name="ItemExport" Style="{DynamicResource StyleMenuItem}">
-                            <MenuItem.Icon>
-                                <Rectangle Fill="{DynamicResource IconExportScheme}" Height="15" Width="15"/>
-                            </MenuItem.Icon>
-                            <!--<MenuItem Header="Export to PNG" x:Name="ItemExportToPNG" Style="{DynamicResource StyleMenuItem}"/>-->
-                            <MenuItem Header="Export to PNG" x:Name="ItemExportToPNG" Style="{DynamicResource StyleMenuItem}"/>
+                        <MenuItem.Icon>
+                            <Rectangle Fill="{DynamicResource IconExportScheme}" Height="15" Width="15"/>
+                        </MenuItem.Icon>
+                        <MenuItem Header="Export to PNG" x:Name="ItemExportToPNG" Style="{DynamicResource StyleMenuItem}"/>
+                        <MenuItem Header="Export to JPEG" x:Name="ItemExportToJPEG" Style="{DynamicResource StyleMenuItem}"/>
                         </MenuItem>
                         <Separator Background="{DynamicResource ColorSeparator}"/>
                         <MenuItem Header="Exit"  x:Name="ItemExit" InputGestureText="Alt+F4"   Style="{DynamicResource StyleMenuItem}">

SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs

@@ -93,6 +93,7 @@ private void SetupBinding()
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToPNG, x => x.ButtonExportToPNG).DisposeWith(disposable);
 
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToJPEG, x => x.BindingExportToJPEG).DisposeWith(disposable);
+                this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandExportToJPEG, x => x.ItemExportToJPEG).DisposeWith(disposable);
 
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandNew, x => x.BindingNew).DisposeWith(disposable);
                 this.BindCommand(this.ViewModel, x => x.NodesCanvas.CommandNew, x => x.ItemNew).DisposeWith(disposable);