Merge pull request #1185 from TestCentric/issue-1183

Add cancel button to 'Do you want to save?' message box
TestCentric · Feb 14, 2025 · f04915e · f04915e
2 parents 7633063 + 1eed8fe
commit f04915e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/src/TestCentric/testcentric.gui/IMessageDisplay.cs b/src/TestCentric/testcentric.gui/IMessageDisplay.cs
@@ -18,6 +18,25 @@ public interface IMessageDisplay
 
         bool YesNo(string message);
 
+        MessageBoxResult YesNoCancel(string message);
+
         bool OkCancel(string message);
     }
+
+    /// <summary>
+    /// Enum representing the return value of a MessageBox
+    /// It contains the identical values in same order as the DialogResult enum from Windows Forms
+    /// It has the same intention as the interface <see cref="IMessageDisplay"/> to hide any implementation details to the caller.
+    /// </summary>
+    public enum MessageBoxResult
+    { 
+        None,
+        OK,
+        Cancel,
+        Abort,
+        Retry,
+        Ignore,
+        Yes,
+        No,
+    }
 }
diff --git a/src/TestCentric/testcentric.gui/MessageBoxDisplay.cs b/src/TestCentric/testcentric.gui/MessageBoxDisplay.cs
@@ -59,6 +59,13 @@ public static bool YesNo(string message, string caption)
             return MessageBox.Show(message, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes;
         }
 
+        public static MessageBoxResult YesNoCancel(string message, string caption)
+        {
+            DialogResult dialogResult = MessageBox.Show(message, caption, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+            return dialogResult == DialogResult.Yes ? MessageBoxResult.Yes : 
+                   dialogResult == DialogResult.No ? MessageBoxResult.No : MessageBoxResult.Cancel;
+        }
+
         public static bool OkCancel(string message)
         {
             return OkCancel(message, DEFAULT_CAPTION);
@@ -88,6 +95,11 @@ bool IMessageDisplay.YesNo(string message)
             return YesNo(message, _caption);
         }
 
+        MessageBoxResult IMessageDisplay.YesNoCancel(string message)
+        {
+            return YesNoCancel(message, _caption);
+        }
+
         bool IMessageDisplay.OkCancel(string message)
         {
             return OkCancel(message, _caption);

diff --git a/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs b/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs
@@ -346,9 +346,8 @@ void OnRunFinished(ResultNode result)
                         _model.StopTestRun(true);
                     }
 
-                    CloseProject();
-                    //if (CloseProject() == DialogResult.Cancel)
-                    //    e.Cancel = true;
+                    if (CloseProject() == MessageBoxResult.Cancel)
+                        e.Cancel = true;
                 }
 
                 if (!e.Cancel)
@@ -684,15 +683,20 @@ private void SaveProject()
 
         #region Close Methods
 
-        public void CloseProject()
+        public MessageBoxResult CloseProject()
         {
-            if (!_options.Unattended && _model.TestCentricProject.IsDirty &&
-                _view.MessageDisplay.YesNo($"Do you want to save {_model.TestCentricProject.Name}?"))
+            MessageBoxResult messageBoxResult = MessageBoxResult.OK;
+            if (!_options.Unattended && _model.TestCentricProject.IsDirty)
             {
-                SaveProject();
+                messageBoxResult = _view.MessageDisplay.YesNoCancel($"Do you want to save {_model.TestCentricProject.Name}?");
+                if (messageBoxResult == MessageBoxResult.Yes)
+                    SaveProject();
             }
 
-            _model.CloseProject();
+            if (messageBoxResult != MessageBoxResult.Cancel)
+                _model.CloseProject();
+
+            return messageBoxResult;
         }
 
         #endregion