fix for exit command

Author: RomanSoloweow

SimpleStateMachineNodeEditor/View/MainWindow.xaml.cs

@@ -51,26 +51,9 @@ object IViewFor.ViewModel
         }
         #endregion ViewModel
 
-        Dictionary<TypeMessage, System.Windows.Controls.Label> messagesLabels;
-        static Dictionary<TypeMessage, string> labelPostfix = new Dictionary<TypeMessage, string>()
-        {
-            {TypeMessage.Error, "Error" },
-            {TypeMessage.Information, "Information" },
-            {TypeMessage.Warning, "Warning" },
-            {TypeMessage.Debug, "Debug" },
-        };
-
         public MainWindow()
         {
             InitializeComponent();
-            messagesLabels = new Dictionary<TypeMessage, System.Windows.Controls.Label>()
-            {
-                {TypeMessage.Error, LabelError },
-                {TypeMessage.Information, LabelInformation },
-                {TypeMessage.Warning, LabelWarning },
-                {TypeMessage.Debug, LabelDebug },
-            };
-
             ViewModel = new ViewModelMainWindow(this.NodesCanvas.ViewModel);
             SetupSubscriptions();
             SetupBinding();
@@ -169,11 +152,10 @@ private void SetupEvents()
                 this.ErrorListExpander.Events().Collapsed.Subscribe(_=> ErrorListCollapse()).DisposeWith(disposable);
                 this.ErrorListExpander.Events().Expanded.Subscribe(_ => ErrorListExpanded()).DisposeWith(disposable);
 
-                foreach(var label in messagesLabels)
-                {
-                    label.Value.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, label.Key)).DisposeWith(disposable);
-                }
-
+                this.LabelError.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Error)).DisposeWith(disposable);
+                this.LabelWarning.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Warning)).DisposeWith(disposable);
+                this.LabelInformation.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Information)).DisposeWith(disposable);
+                this.LabelDebug.Events().PreviewMouseLeftButtonDown.Subscribe(e => SetDisplayMessageType(e, TypeMessage.Debug)).DisposeWith(disposable);
                 this.LabelErrorList.Events().PreviewMouseLeftButtonDown.Subscribe(e=> SetDisplayMessageType(e, TypeMessage.All)).DisposeWith(disposable);
                 this.LabelErrorListUpdate.Events().MouseLeftButtonDown.Subscribe(_ => NodesCanvas.ViewModel.CommandErrorListUpdate.ExecuteWithSubscribe()).DisposeWith(disposable);
             });
@@ -182,12 +164,15 @@ private void SetupEvents()
         private void UpdateLabels()
         {
            var counts =  this.NodesCanvas.ViewModel.Messages.GroupBy(x => x.TypeMessage).ToDictionary(x=>x.Key,x=>x.Count());
-          
-           foreach(var lable in messagesLabels)
-            {
-                lable.Value.Content = (counts.Keys.Contains(lable.Key) ? counts[lable.Key].ToString() : "0") +" "+ labelPostfix[lable.Key];
-            }
-
+           var countError = counts.Keys.Contains(TypeMessage.Error) ? counts[TypeMessage.Error].ToString() : "0";
+           var countWarning = counts.Keys.Contains(TypeMessage.Warning) ? counts[TypeMessage.Warning].ToString() : "0";
+           var countInformation = counts.Keys.Contains(TypeMessage.Information) ? counts[TypeMessage.Information].ToString() : "0";
+           var countDebug = counts.Keys.Contains(TypeMessage.Debug) ? counts[TypeMessage.Debug].ToString() : "0";
+
+            LabelError.Content = countError + " Error";
+            LabelWarning.Content = countWarning + " Warning";
+            LabelInformation.Content = countInformation + " Information";
+            LabelDebug.Content = countDebug + " Debug";
         }
         private void SetDisplayMessageType(MouseButtonEventArgs e, TypeMessage  typeMessage)
         {          

SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/ViewModelNodesCanvas.cs

@@ -49,22 +49,22 @@ public ViewModelNodesCanvas()
             Cutter = new ViewModelCutter(this);
             this.WhenAnyValue(x => x.Nodes.Count).Subscribe(value => UpdateCount(value));
 
-            for (int i = 1; i <= 5; i++)
-            {
-                LogError("Error " + i.ToString());
-            }
-            for (int i = 1; i <= 5; i++)
-            {
-                LogInformation("Information " + i.ToString());
-            }
-            for (int i = 1; i <= 5; i++)
-            {
-                LogWarning("Warning " + i.ToString());
-            }
-            for (int i = 1; i <= 5; i++)
-            {
-                LogDebug("Debug " + i.ToString());
-            }
+            //for (int i = 1; i <= 5; i++)
+            //{
+            //    LogError("Error " + i.ToString());
+            //}
+            //for (int i = 1; i <= 5; i++)
+            //{
+            //    LogInformation("Information " + i.ToString());
+            //}
+            //for (int i = 1; i <= 5; i++)
+            //{
+            //    LogWarning("Warning " + i.ToString());
+            //}
+            //for (int i = 1; i <= 5; i++)
+            //{
+            //    LogDebug("Debug " + i.ToString());
+            //}
 
         }
         public readonly object lockNodes = new object();

SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/ViewModelNodesCanvasCommands.cs

@@ -95,6 +95,7 @@ private void SetupCommands()
             CommandExpandDownSelected = ReactiveCommand.Create(ExpandDownSelected);
             CommandErrorListUpdate = ReactiveCommand.Create(ErrosUpdaate);
             CommandExportToJPEG = ReactiveCommand.Create(ExportToJPEG);
+            CommandNew = ReactiveCommand.Create(New);
             CommandOpen = ReactiveCommand.Create(Open);
             CommandSave = ReactiveCommand.Create(Save);
             CommandSaveAs = ReactiveCommand.Create(SaveAs);
@@ -115,7 +116,7 @@ private void SetupCommands()
             CommandAddDraggedConnect = ReactiveCommand.Create<ViewModelConnector>(AddDraggedConnect);
             CommandDeleteDraggedConnect = ReactiveCommand.Create(DeleteDraggedConnect);
 
-            CommandNew = ReactiveCommand.Create(NewScheme);
+            
             CommandPartMoveAllNode = ReactiveCommand.Create<MyPoint>(PartMoveAllNode);
             CommandPartMoveAllSelectedNode = ReactiveCommand.Create<MyPoint>(PartMoveAllSelectedNode);
 
@@ -227,7 +228,13 @@ private void ExportToJPEG()
             //"Png Image (.png)|*.png";
             JPEGPath = Dialog.FileName;
         }
-        private void NewScheme()
+        private void New()
+        {
+            if (!WithoutSaving())
+                return;
+            ClearScheme();
+        }
+        private void ClearScheme()
         {
             this.Nodes.Clear();
             this.Connects.Clear();
@@ -311,7 +318,7 @@ bool WithError<T>(string errorMessage, Action<T> action, T obj)
             void Error(string errorMessage)
             {
                 LogError("File is not valid: " + errorMessage);
-                NewScheme();
+                ClearScheme();
             }
         }
         private void Save()