DynamoDS
diff --git a/‎src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions b/‎src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+20-14Lines changed: 20 additions & 14 deletions b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+20-14Lines changed: 20 additions & 14 deletions
@@ -122,6 +122,31 @@ public static MessageBoxResult Show(string messageBoxText, string caption, Messa
             dynamoMessageBox.ShowDialog();
             return dynamoMessageBox.CustomDialogResult;
         }
+        /// <summary>
+        /// Displays a dialog to the user and returns their choice as a MessageBoxResult.
+        /// </summary>
+        /// <param name="owner">owner window</param>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        /// <param name="button"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(Window owner,string messageBoxText, string caption, MessageBoxButton button,
+            MessageBoxImage icon)
+        {
+            var dynamoMessageBox = new DynamoMessageBox
+            {
+                BodyText = messageBoxText,
+                TitleText = caption,
+                MessageBoxButton = button,
+                MessageBoxImage = icon,
+                Owner = owner
+            };
+
+            dynamoMessageBox.ConfigureButtons(button);
+            dynamoMessageBox.ShowDialog();
+            return dynamoMessageBox.CustomDialogResult;
+        }
 
         /// <summary>
         /// Displays a dialog to the user and returns their choice as a MessageBoxResult.
 
@@ -10,6 +10,7 @@ internal class MessageBoxService {
         internal interface IMessageBox
         {
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, MessageBoxImage img);
+            MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img);
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);
         }
 
@@ -21,6 +22,12 @@ MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton but
             {
                 return DynamoMessageBox.Show(msg, title, button, img);
             }
+
+            public MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, MessageBoxImage img)
+            {
+                return DynamoMessageBox.Show(owner,msg, title, button, img);
+            }
+
             MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)
             {
                 return DynamoMessageBox.Show(msg, title, button,buttonNames, img);
@@ -36,6 +43,10 @@ internal static MessageBoxResult Show(string msg, string title, MessageBoxButton
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, img);
         }
+        internal static MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img)
+        {
+            return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner,msg, title, button, img);
+        }
         internal static MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, buttonNames, img);
 
@@ -187,6 +187,8 @@ public class PackageManagerClientViewModel : NotificationObject, IPackageInstall
 
         #region Properties/Fields
 
+        public PackageManagerSearchView Owner { get; set; }
+
         ObservableCollection<PackageUploadHandle> _uploads = new ObservableCollection<PackageUploadHandle>();
         public ObservableCollection<PackageUploadHandle> Uploads
         {
@@ -421,10 +423,11 @@ private void ShowNodePublishInfo(ICollection<Tuple<CustomNodeInfo, CustomNodeDef
 
                 if (pkg != null)
                 {
-                    var m = Dynamo.Wpf.Utilities.MessageBoxService.Show(String.Format(Resources.MessageSubmitSameNamePackage,
-                            DynamoViewModel.BrandingResourceProvider.ProductName, pkg.Name),
-                            Resources.PackageWarningMessageBoxTitle,
-                            MessageBoxButton.YesNo, MessageBoxImage.Question);
+                    var m = Dynamo.Wpf.Utilities.MessageBoxService.Show(Owner, 
+                        String.Format(Resources.MessageSubmitSameNamePackage,
+                        DynamoViewModel.BrandingResourceProvider.ProductName, pkg.Name),
+                        Resources.PackageWarningMessageBoxTitle,
+                        MessageBoxButton.YesNo, MessageBoxImage.Question);
 
                     if (m == MessageBoxResult.Yes)
                     {
@@ -520,15 +523,15 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                     {
                         var message = string.Format(Resources.MessageSamePackageSameVersInBuiltinPackages, packageToDownload);
 
-                        MessageBoxService.Show(message, Resources.CannotDownloadPackageMessageBoxTitle,
+                        MessageBoxService.Show(Owner, message, Resources.CannotDownloadPackageMessageBoxTitle,
                             MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                     else
                     {
                         var message = string.Format(Resources.MessageSamePackageDiffVersInBuiltinPackages, packageToDownload, dupPkg,
                             DynamoViewModel.BrandingResourceProvider.ProductName);
 
-                        MessageBoxService.Show(message, Resources.CannotDownloadPackageMessageBoxTitle,
+                        MessageBoxService.Show(Owner, message, Resources.CannotDownloadPackageMessageBoxTitle,
                             MessageBoxButton.OK, MessageBoxImage.Exclamation);
                     }
                     Analytics.TrackEvent(Actions.BuiltInPackageConflict, Categories.PackageManagerOperations, packageToDownload);
@@ -538,7 +541,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                 if (package.version == duplicatePackage.VersionName)
                 {
                     var message = string.Format(Resources.MessageSamePackageSameVersInLocalPackages, packageToDownload);
-                    MessageBoxService.Show(message, Resources.CannotDownloadPackageMessageBoxTitle,
+                    MessageBoxService.Show(Owner, message, Resources.CannotDownloadPackageMessageBoxTitle,
                     MessageBoxButton.OK, MessageBoxImage.Information);
 
                     return false;
@@ -548,7 +551,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                     MessageBoxResult dialogResult;
 
                     if (duplicatePackage.InUse(DynamoViewModel.Model))
-                    {// Loaded assemblies or pacakge in use in workspace
+                    {// Loaded assemblies or package in use in workspace
                         dialogResult = MessageBoxService.Show(string.Format(Resources.MessageSamePackageDiffVersInLocalPackages, packageToDownload, dupPkg, DynamoViewModel.BrandingResourceProvider.ProductName),
                             Resources.LoadedPackagesConflictMessageBoxTitle,
                             MessageBoxButton.OKCancel, new string[] { Resources.UninstallLoadedPackage, Resources.GenericTaskDialogOptionCancel }, MessageBoxImage.Exclamation);
@@ -612,7 +615,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                 var message = string.Format(Resources.MessagePackageDepsInBuiltinPackages, packageToDownload,
                         JoinPackageNames(builtinPackages));
                 Analytics.TrackEvent(Actions.BuiltInPackageConflict, Categories.PackageManagerOperations, packageToDownload);
-                var dialogResult = MessageBoxService.Show(message,
+                var dialogResult = MessageBoxService.Show(Owner, message,
                     Resources.BuiltInPackageConflictMessageBoxTitle,
                     MessageBoxButton.OKCancel, MessageBoxImage.Exclamation);
 
@@ -625,7 +628,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                 var message = string.Format(Resources.MessageForceInstallOrUninstallToContinue, packageToDownload, conflictingPkgs,
                     DynamoViewModel.BrandingResourceProvider.ProductName);
 
-                var dialogResult = MessageBoxService.Show(message,
+                var dialogResult = MessageBoxService.Show(Owner, message,
                     Resources.PackagesInUseConflictMessageBoxTitle,
                     MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
 
@@ -659,7 +662,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                     DynamoViewModel.BrandingResourceProvider.ProductName,
                     JoinPackageNames(immediateUninstalls), packageToDownload);
 
-                var dialogResult = MessageBoxService.Show(message,
+                var dialogResult = MessageBoxService.Show(Owner, message,
                     Resources.DownloadWarningMessageBoxTitle, MessageBoxButton.OKCancel, MessageBoxImage.Warning);
                 if (dialogResult == MessageBoxResult.Cancel || dialogResult == MessageBoxResult.None)
                 {
@@ -675,7 +678,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 String.Format(Resources.MessageConfirmToInstallPackage, name, package.version) :
                 String.Format(Resources.MessageConfirmToInstallPackageToFolder, name, package.version, installPath);
 
-            var result = MessageBoxService.Show(msg,
+            var result = MessageBoxService.Show(Owner, msg,
                 Resources.PackageDownloadConfirmMessageBoxTitle,
                 MessageBoxButton.OKCancel, MessageBoxImage.Question);
 
@@ -702,6 +705,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                     catch
                     {
                         MessageBoxService.Show(
+                            Owner,
                             String.Format(Resources.MessageFailedToDownloadPackageVersion, depVersion, dep._id),
                             Resources.PackageDownloadErrorMessageBoxTitle,
                             MessageBoxButton.OK, MessageBoxImage.Error);
@@ -792,7 +796,8 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 // if any do, notify user and allow cancellation
                 if (containsBinariesOrPythonScripts)
                 {
-                    var res = MessageBoxService.Show(Resources.MessagePackageContainPythonScript,
+                    var res = MessageBoxService.Show(Owner, 
+                        Resources.MessagePackageContainPythonScript,
                         Resources.PackageDownloadMessageBoxTitle,
                         MessageBoxButton.OKCancel, MessageBoxImage.Exclamation);
 
@@ -808,7 +813,8 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 // allowing them to cancel the package download
                 if (futureDeps.Any())
                 {
-                    var res = MessageBoxService.Show(string.Format(Resources.MessagePackageNewerDynamo, DynamoViewModel.BrandingResourceProvider.ProductName),
+                    var res = MessageBoxService.Show(Owner,
+                        string.Format(Resources.MessagePackageNewerDynamo, DynamoViewModel.BrandingResourceProvider.ProductName),
                         string.Format(Resources.PackageUseNewerDynamoMessageBoxTitle, DynamoViewModel.BrandingResourceProvider.ProductName),
                         MessageBoxButton.OKCancel,
                         MessageBoxImage.Warning);
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ internal class MessageBoxService {`
`10`	`10`	`internal interface IMessageBox`
`11`	`11`	`{`
`12`	`12`	`MessageBoxResult Show(string msg, string title, MessageBoxButton button, MessageBoxImage img);`
	`13`	`+ MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img);`
`13`	`14`	`MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);`
`14`	`15`	`}`
`15`	`16`
`@@ -21,6 +22,12 @@ MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton but`
`21`	`22`	`{`
`22`	`23`	`return DynamoMessageBox.Show(msg, title, button, img);`
`23`	`24`	`}`
	`25`	`+`
	`26`	`+ public MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, MessageBoxImage img)`
	`27`	`+ {`
	`28`	`+ return DynamoMessageBox.Show(owner,msg, title, button, img);`
	`29`	`+ }`
	`30`	`+`
`24`	`31`	`MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)`
`25`	`32`	`{`
`26`	`33`	`return DynamoMessageBox.Show(msg, title, button,buttonNames, img);`
`@@ -36,6 +43,10 @@ internal static MessageBoxResult Show(string msg, string title, MessageBoxButton`
`36`	`43`	`{`
`37`	`44`	`return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, img);`
`38`	`45`	`}`
	`46`	`+ internal static MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img)`
	`47`	`+ {`
	`48`	`+ return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner,msg, title, button, img);`
	`49`	`+ }`
`39`	`50`	`internal static MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)`
`40`	`51`	`{`
`41`	`52`	`return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, buttonNames, img);`