Merge pull request #8943 from mono/master-vscfixParenting

Fixes VSTS Bug 1002571: Regression: VSC checkout message dialogs shown below progress dialog window.

Author: slluis

main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs

@@ -240,12 +240,17 @@ public bool Run (AlertDialogData data)
 							NSApplication.SharedApplication.StopModal ();
 						});
 
-						// pass parent and not alert so that the Runloop will change
-						// and processing will stop until the sheet is closed.
-						// If we pass alert, then it will run until a second alert is created
-						// which will be shown as a dialog and then the runloop changes and
-						// processing stops
-						NSApplication.SharedApplication.RunModalForWindow (parent);
+						if (IdeApp.Workbench.RootWindow?.Visible == true) {
+							// pass parent and not alert so that the Runloop will change
+							// and processing will stop until the sheet is closed.
+							// If we pass alert, then it will run until a second alert is created
+							// which will be shown as a dialog and then the runloop changes and
+							// processing stops
+							NSApplication.SharedApplication.RunModalForWindow (parent);
+						} else {
+							// fixes message dialog below other dialogs issue when no main window is present (at start)
+							NSApplication.SharedApplication.RunModalForWindow (alert.Window);
+						}
 					}
 				}
 

main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Threading;
+using System;
 
 namespace MonoDevelop.VersionControl
 {
@@ -47,17 +48,25 @@ protected override string GetDescription ()
 				return GettextCatalog.GetString ("Checking out {0}...", path);
 			}
 
+			Ide.ProgressMonitoring.MessageDialogProgressMonitor messageDialogProgressMonitor;
+
 			protected override ProgressMonitor CreateProgressMonitor ()
 			{
 				return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
 					base.CreateProgressMonitor (),
-					new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
+					messageDialogProgressMonitor = new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
 				);
 			}
 
+			protected override void ReportError (string primaryText, string message, Exception exception)
+			{
+				MessageService.ShowError (messageDialogProgressMonitor.ProgressDialog, primaryText, message, exception);
+			}
+
 			AlertButton AskForCheckoutPath ()
 			{
 				return MessageService.AskQuestion (
+					messageDialogProgressMonitor.ProgressDialog,
 					GettextCatalog.GetString ("Checkout path is not empty. Do you want to delete its contents?"),
 					path,
 					AlertButton.Cancel,

main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs

@@ -57,10 +57,11 @@ public Task StartAsync ()
 						var msg = GettextCatalog.GetString ("The operation could not be completed because a shared library is missing: ");
 						tracker.ReportError (msg + exception.Message, null);
 						LoggingService.LogError ("Version Control command failed: ", exception);
-					} else if (exception is VersionControlException) {
-						ReportError (exception.Message, exception);
 					} else {
-						ReportError (exception.Message, exception);
+						string msg = GettextCatalog.GetString ("Version control operation failed");
+						tracker.ReportError ($"{msg}: {exception.Message}", exception);
+						if (IdeApp.Workbench.RootWindow?.Visible == false)
+							ReportError (msg, exception.Message, exception);
 					}
 				}
 				Wakeup ();
@@ -84,12 +85,9 @@ protected void Warn(string logtext) {
 			tracker.ReportWarning(logtext);
 		}
 
-		void ReportError (string message, Exception exception)
+		protected virtual void ReportError (string primaryText, string message, Exception exception)
 		{
-			string msg = GettextCatalog.GetString ("Version control operation failed");
-			tracker.ReportError ($"{msg}: {message}", exception);
-			if (IdeApp.Workbench.RootWindow?.Visible == false)
-				MessageService.ShowError (msg, message, exception);
+			MessageService.ShowError (primaryText, message, exception);
 		}
 	}
 }

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MessageDialogProgressMonitor.cs

@@ -39,7 +39,9 @@ public class MessageDialogProgressMonitor: ProgressMonitor
 		ProgressDialog dialog;
 		bool hideWhenDone;
 		bool showDetails;
-		
+
+		public ProgressDialog ProgressDialog => dialog;
+
 		public MessageDialogProgressMonitor (): this (false)
 		{
 		}

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs

@@ -263,34 +263,58 @@ public static bool Confirm (ConfirmationMessage message)
 			return messageService.GenericAlert (null, message) == message.ConfirmButton;
 		}
 		#endregion
-		
+
 		#region AskQuestion
-		public static AlertButton AskQuestion (string primaryText, params AlertButton[] buttons)
+		public static AlertButton AskQuestion (string primaryText, params AlertButton [] buttons)
 		{
 			return AskQuestion (primaryText, null, buttons);
 		}
-		
-		public static AlertButton AskQuestion (string primaryText, string secondaryText, params AlertButton[] buttons)
+
+		public static AlertButton AskQuestion (string primaryText, string secondaryText, params AlertButton [] buttons)
 		{
 			return GenericAlert (MonoDevelop.Ide.Gui.Stock.Question, primaryText, secondaryText, buttons);
 		}
-		public static AlertButton AskQuestion (string primaryText, int defaultButton, params AlertButton[] buttons)
+		public static AlertButton AskQuestion (string primaryText, int defaultButton, params AlertButton [] buttons)
 		{
 			return AskQuestion (primaryText, null, defaultButton, buttons);
 		}
-		
-		public static AlertButton AskQuestion (string primaryText, string secondaryText, int defaultButton, params AlertButton[] buttons)
+
+		public static AlertButton AskQuestion (string primaryText, string secondaryText, int defaultButton, params AlertButton [] buttons)
 		{
 			return GenericAlert (MonoDevelop.Ide.Gui.Stock.Question, primaryText, secondaryText, defaultButton, buttons);
 		}
-		
+
 		public static AlertButton AskQuestion (QuestionMessage message)
 		{
 			return messageService.GenericAlert (null, message);
 		}
-		
+
+		public static AlertButton AskQuestion (Window parent, string primaryText, params AlertButton [] buttons)
+		{
+			return AskQuestion (parent, primaryText, null, buttons);
+		}
+
+		public static AlertButton AskQuestion (Window parent, string primaryText, string secondaryText, params AlertButton [] buttons)
+		{
+			return GenericAlert (parent, MonoDevelop.Ide.Gui.Stock.Question, primaryText, secondaryText, buttons);
+		}
+		public static AlertButton AskQuestion (Window parent, string primaryText, int defaultButton, params AlertButton [] buttons)
+		{
+			return AskQuestion (parent, primaryText, null, defaultButton, buttons);
+		}
+
+		public static AlertButton AskQuestion (Window parent, string primaryText, string secondaryText, int defaultButton, params AlertButton [] buttons)
+		{
+			return GenericAlert (parent, MonoDevelop.Ide.Gui.Stock.Question, primaryText, secondaryText, defaultButton, buttons);
+		}
+
+		public static AlertButton AskQuestion (Window parent, QuestionMessage message)
+		{
+			return messageService.GenericAlert (parent, message);
+		}
+
 		#endregion
-		
+
 		/// <summary>
 		/// Places, runs and destroys a transient dialog.
 		/// </summary>