* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:

* src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ViewCommands.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs:
* src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AddinLoadErrorDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/CustomExecutionModeManagerDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/SolutionItemConfigurationsPanel.cs:
  More dialog placement cleanup.

* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/MonoRuntimePanel.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CustomCommandWidget.cs:
  Use platform dialog.

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

1 files changed, 4 insertions, 10 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
index 4e7b9ff689..64073788c7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -125,10 +125,8 @@ namespace MonoDevelop.Ide.CodeTemplates
 			if (template != null) {
 				templatesToSave.Add (template);
 				var editDialog = new EditTemplateDialog (template, false);
-				editDialog.TransientFor = this.Toplevel as Gtk.Window;
-				if (ResponseType.Ok == (ResponseType)editDialog.Run ())
+				if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok)
 					templatesToSave.Add (template);
-				editDialog.Destroy ();
 			}
 		}
 		
@@ -142,17 +140,13 @@ namespace MonoDevelop.Ide.CodeTemplates
 
 		void ButtonAddClicked (object sender, EventArgs e)
 		{
-			CodeTemplate newTemplate = new CodeTemplate ();
-			EditTemplateDialog editDialog = new EditTemplateDialog (newTemplate, true);
-			
-			editDialog.Parent = parent;
-			editDialog.TransientFor = this.Toplevel as Gtk.Window;
-			if (ResponseType.Ok == (ResponseType)editDialog.Run ()) {
+			var newTemplate = new CodeTemplate ();
+			var editDialog = new EditTemplateDialog (newTemplate, true);
+			if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok) {
 				InsertTemplate (newTemplate);
 				templates.Add (newTemplate);
 				templatesToSave.Add (newTemplate);
 			}
-			editDialog.Destroy ();
 		}
 		
 		public void Store ()