* src/addins/WelcomePage/WelcomePageView.cs:

* src/addins/NUnit/Services/NUnitService.cs:
* src/addins/MonoDevelop.Autotools/Commands.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:
* src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
* src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs:
* src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
* src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
* src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs:
* src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs:
* src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs:
* src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
* src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
* src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
  More dialog placing.

* src/core/MonoDevelop.Ide/gtk-gui/objects.xml: Flush.

svn path=/trunk/monodevelop/; revision=157758

9 files changed, 36 insertions, 30 deletions

diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index 52e03c8bae..5b75c18471 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,5 +1,18 @@
 2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
 
+	* gtk-gui/objects.xml: Flush.
+
+	* MonoDevelop.Ide/MessageService.cs:
+	* MonoDevelop.Ide/ProjectOperations.cs:
+	* MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
+	* MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs:
+	* MonoDevelop.Components.Commands/LinkCommandEntry.cs:
+	* MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs:
+	* MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs:
+	  More dialog placing.
+
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
 	* MonoDevelop.Ide/ProjectOperations.cs: Don't destroy
 	  references dialog.
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs
index 8aa306233d..ec3c49e921 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs
@@ -69,11 +69,7 @@ namespace MonoDevelop.Components.Commands
 				System.Diagnostics.Process.Start (url);
 			} catch (Exception) {
 				string msg = AddinManager.CurrentLocalizer.GetString ("Could not open the url {0}", url);
-				Gtk.MessageDialog md = new Gtk.MessageDialog (null, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Error, Gtk.ButtonsType.Ok, msg);
-				if (sender != null && sender is Gtk.Widget)
-					md.TransientFor = (sender as Gtk.Widget).Toplevel as Gtk.Window;
-				md.Run ();
-				md.Hide ();
+				MonoDevelop.Ide.MessageService.ShowError (((Gtk.Widget)sender).Toplevel as Gtk.Window, msg);
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
index 067e6676e7..397647b924 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
@@ -267,13 +267,9 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 			grid.ShowToolbar = false;

 			

 			#endregion

-

-			//show and get response			

-			ResponseType response = (ResponseType) dialog.Run();
-			dialog.Destroy ();

 			

 			//if 'OK' put items back in collection

-			if (response == ResponseType.Ok)

+			if (MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, toplevel) == (int)ResponseType.Ok)

 			{
 				DesignerTransaction tran = CreateTransaction (Instance);
 				object old = collection;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
index 287073b5f9..3488ab0044 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
@@ -85,8 +85,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 			dialog.DefaultWidth = 500;
 			dialog.DefaultHeight = 400;
 			dialog.ShowAll ();
-			dialog.TransientFor = parent;
-			return dialog.Run ();
+			return MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, parent);
 		}
 		
 		public void Dispose ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
index 44cac3e255..545ea70975 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
@@ -300,19 +300,18 @@ namespace MonoDevelop.Ide.FindInFiles
 
 		void ButtonBrowsePathsClicked (object sender, EventArgs e)
 		{
-			FolderDialog folderDialog = new FolderDialog (GettextCatalog.GetString ("Select directory"));
-			try {
-				string defaultFolder = this.comboboxentryPath.Entry.Text;
-				if (string.IsNullOrEmpty (defaultFolder))
-					defaultFolder = IdeApp.ProjectOperations.ProjectsDefaultPath;
-				if (!string.IsNullOrEmpty (defaultFolder))
-					folderDialog.SetFilename (defaultFolder);
-				folderDialog.TransientFor = IdeApp.Workbench.RootWindow;
-				if (folderDialog.Run () == (int)Gtk.ResponseType.Ok)
-					this.comboboxentryPath.Entry.Text = folderDialog.Filename;
-			} finally {
-				folderDialog.Destroy ();
-			}
+			var dlg = new SelectFolderDialog (GettextCatalog.GetString ("Select directory")) {
+				TransientFor = this,
+			};
+			
+			string defaultFolder = this.comboboxentryPath.Entry.Text;
+			if (string.IsNullOrEmpty (defaultFolder))
+				defaultFolder = IdeApp.ProjectOperations.ProjectsDefaultPath;
+			if (!string.IsNullOrEmpty (defaultFolder))
+				dlg.CurrentFolder = defaultFolder;
+			
+			if (dlg.Run ())
+				this.comboboxentryPath.Entry.Text = dlg.SelectedFile;
 		}
 
 		void CheckbuttonRecursivelyDestroyed (object sender, EventArgs e)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index b0edbe68e6..8832e17bcc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -657,9 +657,7 @@ namespace MonoDevelop.Ide.Gui
 			if (showDirtyDialog) {
 				DirtyFilesDialog dlg = new DirtyFilesDialog ();
 				dlg.Modal = true;
-				dlg.TransientFor = this;
-				int response = dlg.Run ();
-				if (response != (int)Gtk.ResponseType.Ok)
+				if (MessageService.RunCustomDialog (dlg, this) != (int)Gtk.ResponseType.Ok)
 					return false;
 			}
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
index d3b53f83fb..adb54175da 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
@@ -271,6 +271,11 @@ namespace MonoDevelop.Ide
 			}
 		}
 		
+		public static int RunCustomDialog (Gtk.Dialog dialog)
+		{
+			return RunCustomDialog (dialog, rootWindow);
+		}
+		
 		/// <summary>
 		/// Places and runs a transient dialog. Does not destroy it, so values can be retrieved from its widgets.
 		/// </summary>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
index 3a5d4bd88d..48a63c20ec 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -728,7 +728,7 @@ namespace MonoDevelop.Ide
 				selDialog.SetProject (project);
 
 				if (MessageService.RunCustomDialog (selDialog) == (int)Gtk.ResponseType.Ok) {
-					ProjectReferenceCollection newRefs = selDialog.ReferenceInformations;
+					var newRefs = selDialog.ReferenceInformations;
 					
 					ArrayList toDelete = new ArrayList ();
 					foreach (ProjectReference refInfo in project.References)
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
index 37803f3d07..0c7342e6e4 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
@@ -115,7 +115,7 @@
         <property name="DialogTitle" />
         <property name="DefaultFilter" />
         <property name="EntryIsEditable" />
-        <property name="AllowInvalidValues" />
+        <property name="VerifyFileExistsInProject" />
       </itemgroup>
     </itemgroups>
     <signals />