diff options
32 files changed, 128 insertions, 102 deletions
diff --git a/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs b/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs index dc3dd1e117..0108efab3b 100644 --- a/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs +++ b/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs @@ -129,8 +129,9 @@ namespace CBinding.ProjectPad { CProject project = (CProject)CurrentNode.GetParentDataItem ( typeof(CProject), false); - - MessageService.ShowCustomDialog (new EditPackagesDialog (project)); + + using (var dlg = new EditPackagesDialog (project)) + MessageService.ShowCustomDialog (dlg); IdeApp.ProjectOperations.Save (project); CurrentNode.Expanded = true; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs index 614ba73928..ab4093f96c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs @@ -101,9 +101,8 @@ namespace Example { void HandleButtonEditClicked (object sender, EventArgs e) { - var editDialog = new CSharpFormattingProfileDialog (policy); - MessageService.ShowCustomDialog (editDialog); - editDialog.Destroy (); + using (var editDialog = new CSharpFormattingProfileDialog (policy)) + MessageService.ShowCustomDialog (editDialog); } } } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs index bcdc528d6d..af5597e718 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs @@ -105,11 +105,12 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues { var newRule = new NameConventionRule (); newRule.Name = "New Rule"; - var diag = new NameConventionEditRuleDialog (newRule); - var result = MessageService.ShowCustomDialog (diag); - if (result == (int)ResponseType.Ok) - treeStore.AppendValues (newRule); - OnPolicyChanged (EventArgs.Empty); + using (var diag = new NameConventionEditRuleDialog (newRule)) { + var result = MessageService.ShowCustomDialog (diag); + if (result == (int)ResponseType.Ok) + treeStore.AppendValues (newRule); + OnPolicyChanged (EventArgs.Empty); + } } void EditSelectedEntry () @@ -118,11 +119,12 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues if (!treeviewConventions.Selection.GetSelected (out iter)) return; var rule = treeStore.GetValue (iter, 0) as NameConventionRule; - var diag = new NameConventionEditRuleDialog (rule); - int result = MessageService.ShowCustomDialog (diag); - treeviewConventions.QueueResize (); - if (result == (int)Gtk.ResponseType.Ok) - OnPolicyChanged (EventArgs.Empty); + using (var diag = new NameConventionEditRuleDialog (rule)) { + int result = MessageService.ShowCustomDialog (diag); + treeviewConventions.QueueResize (); + if (result == (int)Gtk.ResponseType.Ok) + OnPolicyChanged (EventArgs.Empty); + } } void RemoveSelectedEntry () diff --git a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs index e5e8b5b266..d23236c134 100644 --- a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs +++ b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs @@ -286,8 +286,8 @@ namespace MonoDevelop.ChangeLogAddIn return; } - var dlg = new AddLogEntryDialog (entries); - MessageService.ShowCustomDialog (dlg, (Window) Toplevel); + using (var dlg = new AddLogEntryDialog (entries)) + MessageService.ShowCustomDialog (dlg, (Window) Toplevel); } void OnClickOptions (object s, EventArgs args) diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs index 1f877eef1d..0c69abd6fd 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs @@ -57,9 +57,10 @@ namespace MonoDevelop.Deployment.Gui public static void ShowPackageSettings (Package package) { - EditPackageDialog dlg = new EditPackageDialog (package); - if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) - IdeApp.ProjectOperations.Save (package.ParentProject); + using (EditPackageDialog dlg = new EditPackageDialog (package)) { + if (MessageService.ShowCustomDialog (dlg) == (int)Gtk.ResponseType.Ok) + IdeApp.ProjectOperations.Save (package.ParentProject); + } } } } diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs index 009cb2e770..3d9f2fda4e 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs @@ -59,8 +59,8 @@ namespace MonoDevelop.Deployment.Gui //IFileReplacePolicy is not likely to be running in the GUI thread //so use some DispatchService magic to synchronously call the dialog in the GUI thread DispatchService.GuiSyncDispatch (delegate { - var dialog = new FileReplaceDialog (response, source, sourceModified.ToString (), target, targetModified.ToString ()); - response = (FileReplaceDialog.ReplaceResponse) MessageService.ShowCustomDialog (dialog); + using (var dialog = new FileReplaceDialog (response, source, sourceModified.ToString (), target, targetModified.ToString ())) + response = (FileReplaceDialog.ReplaceResponse) MessageService.ShowCustomDialog (dialog); }); switch (response) { diff --git a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs index edd2eebbdd..ac60b13b23 100644 --- a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs +++ b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs @@ -80,9 +80,10 @@ namespace MonoDevelop.Autotools protected virtual void OnAutofooPropertiesClicked (object sender, System.EventArgs e) { - MakefileSwitchEditor editor = new MakefileSwitchEditor (target); - editor.ShowAll (); - MonoDevelop.Ide.MessageService.ShowCustomDialog (editor, this.Toplevel as Gtk.Window); + using (MakefileSwitchEditor editor = new MakefileSwitchEditor (target)) { + editor.ShowAll (); + MonoDevelop.Ide.MessageService.ShowCustomDialog (editor, this.Toplevel as Gtk.Window); + } } } } diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs index f2b3d612d0..26bc580345 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs @@ -246,9 +246,10 @@ namespace MonoDevelop.Debugger public static void ShowValueVisualizer (ObjectValue val) { - var dlg = new ValueVisualizerDialog (); - dlg.Show (val); - MessageService.ShowCustomDialog (dlg); + using (var dlg = new ValueVisualizerDialog ()) { + dlg.Show (val); + MessageService.ShowCustomDialog (dlg); + } } public static void ShowPreviewVisualizer (ObjectValue val, MonoDevelop.Components.Control widget, Gdk.Rectangle previewButtonArea) diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs index 12b27c4d05..596e57ff27 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs @@ -584,8 +584,8 @@ namespace MonoDevelop.Debugger public void ShowDialog () { if (dialog == null) { - dialog = new ExceptionCaughtDialog (ex, this); - MessageService.ShowCustomDialog (dialog, IdeApp.Workbench.RootWindow); + using (dialog = new ExceptionCaughtDialog (ex, this)) + MessageService.ShowCustomDialog (dialog, IdeApp.Workbench.RootWindow); dialog = null; } } diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs index 9ee9194870..f69e96ea71 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs @@ -125,9 +125,10 @@ namespace MonoDevelop.DesignerSupport public void AddUserItems () { - ComponentSelectorDialog dlg = new ComponentSelectorDialog (currentConsumer); - dlg.Fill (); - MessageService.ShowCustomDialog (dlg); + using (ComponentSelectorDialog dlg = new ComponentSelectorDialog (currentConsumer)) { + dlg.Fill (); + MessageService.ShowCustomDialog (dlg); + } } void AddUserItems (IList<ItemToolboxNode> nodes) diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs index cdfdc78f73..84c81f0b19 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs @@ -121,7 +121,8 @@ namespace MonoDevelop.Gettext.NodeBuilders TranslationProject project = CurrentNode.DataItem as TranslationProject; if (project == null) return; - MessageService.ShowCustomDialog (new TranslationProjectOptionsDialog (project)); + using (var dlg = new TranslationProjectOptionsDialog (project)) + MessageService.ShowCustomDialog (dlg); IdeApp.Workspace.Save (); } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs index e509d351ec..ff92a2f132 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs @@ -40,8 +40,8 @@ namespace MonoDevelop.PackageManagement.Commands try {
var viewModels = new PackageManagementViewModels ();
IPackageManagementEvents packageEvents = PackageManagementServices.PackageManagementEvents;
- var dialog = new ManagePackagesDialog (viewModels.ManagePackagesViewModel, packageEvents);
- MessageService.ShowCustomDialog (dialog);
+ using (var dialog = new ManagePackagesDialog (viewModels.ManagePackagesViewModel, packageEvents))
+ MessageService.ShowCustomDialog (dialog);
} catch (Exception ex) {
LoggingService.LogInternalError (ex);
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs index 443d95799c..82c7dcae77 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs @@ -38,9 +38,10 @@ namespace ICSharpCode.PackageManagement {
public bool AcceptLicenses(IEnumerable<IPackage> packages)
{
- LicenseAcceptanceDialog dialog = CreateLicenseAcceptanceDialog(packages);
- int result = MessageService.ShowCustomDialog(dialog);
- return result == (int)Gtk.ResponseType.Ok;
+ using (LicenseAcceptanceDialog dialog = CreateLicenseAcceptanceDialog (packages)) {
+ int result = MessageService.ShowCustomDialog (dialog);
+ return result == (int)Gtk.ResponseType.Ok;
+ }
}
LicenseAcceptanceDialog CreateLicenseAcceptanceDialog(IEnumerable<IPackage> packages)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs index 1972cb8a03..3042569412 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs @@ -37,9 +37,10 @@ namespace ICSharpCode.PackageManagement {
public bool SelectProjects(IEnumerable<IPackageManagementSelectedProject> projects)
{
- SelectProjectsDialog dialog = CreateSelectProjectsDialog(projects);
- int result = MessageService.ShowCustomDialog(dialog);
- return result == (int)Gtk.ResponseType.Ok;
+ using (SelectProjectsDialog dialog = CreateSelectProjectsDialog (projects)) {
+ int result = MessageService.ShowCustomDialog (dialog);
+ return result == (int)Gtk.ResponseType.Ok;
+ }
}
SelectProjectsDialog CreateSelectProjectsDialog(IEnumerable<IPackageManagementSelectedProject> projects)
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs index baa31de769..2624a4fe2d 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs @@ -126,7 +126,8 @@ namespace MonoDevelop.AnalysisCore.Fixes //FIXME: performchanges should probably use a monitor too, as it can be slow var changes = Refactoring.PerformChanges (Options, Properties); if (Preview) { - MessageService.ShowCustomDialog (new RefactoringPreviewDialog (changes)); + using (var dlg = new RefactoringPreviewDialog (changes)) + MessageService.ShowCustomDialog (dlg); } else { var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Rename", null); RefactoringService.AcceptChanges (monitor, changes); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs index 7210579b65..e4498221a7 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs @@ -196,7 +196,8 @@ namespace MonoDevelop.Refactoring.Rename var properties = Properties; ((Widget)this).Destroy (); List<Change> changes = rename.PerformChanges (options, properties); - MessageService.ShowCustomDialog (new RefactoringPreviewDialog (changes)); + using (var dlg = new RefactoringPreviewDialog (changes)) + MessageService.ShowCustomDialog (dlg); } } diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs index 0569c4cea5..bedc666cc3 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs @@ -190,13 +190,15 @@ namespace MonoDevelop.Refactoring.Rename if (options.SelectedItem is IVariable) { var field = options.SelectedItem as IField; if (field != null && (field.Accessibility != Accessibility.Private || field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Parts.Count > 1)) { - MessageService.ShowCustomDialog (new RenameItemDialog (options, this)); + using (var dlg = new RenameItemDialog (options, this)) + MessageService.ShowCustomDialog (dlg); return; } var par = options.SelectedItem as IParameter; if (par != null && par.Owner != null && (par.Owner.Accessibility != Accessibility.Private || par.Owner.DeclaringTypeDefinition != null && par.Owner.DeclaringTypeDefinition.Parts.Count > 1)) { - MessageService.ShowCustomDialog (new RenameItemDialog (options, this)); + using (var dlg = new RenameItemDialog (options, this)) + MessageService.ShowCustomDialog (dlg); return; } @@ -206,7 +208,8 @@ namespace MonoDevelop.Refactoring.Rename var data = options.Document != null ? options.GetTextEditorData () : IdeApp.Workbench.ActiveDocument.Editor; var editor = data.Parent; if (editor == null) { - MessageService.ShowCustomDialog (new RenameItemDialog (options, this)); + using (var dlg = new RenameItemDialog (options, this)) + MessageService.ShowCustomDialog (dlg); return; } @@ -241,7 +244,8 @@ namespace MonoDevelop.Refactoring.Rename data.CurrentMode = tle; } } else { - MessageService.ShowCustomDialog (new RenameItemDialog (options, this)); + using (var dlg = new RenameItemDialog (options, this)) + MessageService.ShowCustomDialog (dlg); } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs index 350d80757c..621ced902e 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs @@ -84,8 +84,9 @@ namespace MonoDevelop.SourceEditor.OptionPanels void HandleButtonNewClicked (object sender, EventArgs e) { - var newShemeDialog = new NewColorShemeDialog (); - MessageService.ShowCustomDialog (newShemeDialog, dialog); + using (var newShemeDialog = new NewColorShemeDialog ()) { + MessageService.ShowCustomDialog (newShemeDialog, dialog); + } ShowStyles (); } @@ -114,10 +115,11 @@ namespace MonoDevelop.SourceEditor.OptionPanels { TreeIter selectedIter; if (styleTreeview.Selection.GetSelected (out selectedIter)) { - var editor = new ColorShemeEditor (this); - var colorScheme = (Mono.TextEditor.Highlighting.ColorScheme)this.styleStore.GetValue (selectedIter, 1); - editor.SetSheme (colorScheme); - MessageService.ShowCustomDialog (editor, dialog); + using (var editor = new ColorShemeEditor (this)) { + var colorScheme = (Mono.TextEditor.Highlighting.ColorScheme)this.styleStore.GetValue (selectedIter, 1); + editor.SetSheme (colorScheme); + MessageService.ShowCustomDialog (editor, dialog); + } } } diff --git a/main/src/addins/NUnit/Services/NUnitService.cs b/main/src/addins/NUnit/Services/NUnitService.cs index cd50722780..0e6503fb8a 100644 --- a/main/src/addins/NUnit/Services/NUnitService.cs +++ b/main/src/addins/NUnit/Services/NUnitService.cs @@ -337,7 +337,8 @@ namespace MonoDevelop.NUnit { Properties properties = new Properties (); properties.Set ("UnitTest", test); - MessageService.ShowCustomDialog (new UnitTestOptionsDialog (IdeApp.Workbench.RootWindow, properties)); + using (var dlg = new UnitTestOptionsDialog (IdeApp.Workbench.RootWindow, properties)) + MessageService.ShowCustomDialog (dlg); } void NotifyTestSuiteChanged () diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs index c253d12acb..0c23113c5d 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs @@ -125,7 +125,8 @@ namespace MonoDevelop.VersionControl.Git if (KeyHasPassphrase (dlg.SelectedFile)) { DispatchService.GuiSyncDispatch (delegate { - result = MessageService.ShowCustomDialog (new CredentialsDialog (url, types, cred)) == (int)Gtk.ResponseType.Ok; + using (var credDlg = new CredentialsDialog (url, types, cred)) + result = MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok; }); } @@ -146,7 +147,8 @@ namespace MonoDevelop.VersionControl.Git } DispatchService.GuiSyncDispatch (delegate { - result = MessageService.ShowCustomDialog (new CredentialsDialog (url, types, cred)) == (int)Gtk.ResponseType.Ok; + using (var credDlg = new CredentialsDialog (url, types, cred)) + result = MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok; }); if (result) { diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs index 3d3ae73947..e1714d82ce 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs @@ -80,8 +80,8 @@ namespace MonoDevelop.VersionControl.Git public static void ShowConfigurationDialog (GitRepository repo) { - var dlg = new GitConfigurationDialog (repo); - MessageService.ShowCustomDialog (dlg); + using (var dlg = new GitConfigurationDialog (repo)) + MessageService.ShowCustomDialog (dlg); } public static void ShowMergeDialog (GitRepository repo, bool rebasing) @@ -111,8 +111,8 @@ namespace MonoDevelop.VersionControl.Git public static void ShowStashManager (GitRepository repo) { - var dlg = new StashManagerDialog (repo); - MessageService.ShowCustomDialog (dlg); + using (var dlg = new StashManagerDialog (repo)) + MessageService.ShowCustomDialog (dlg); } public static void SwitchToBranch (GitRepository repo, string branch) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs index 56ccb60858..c93c8376a9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ErrorDialog.cs @@ -65,10 +65,11 @@ namespace MonoDevelop.Components.Extensions protected override bool RunDefault () { - var errorDialog = new MonoDevelop.Ide.Gui.Dialogs.GtkErrorDialog (TransientFor, Title, Message, Buttons); - errorDialog.AddDetails (Exception.ToString (), false); - int result = MonoDevelop.Ide.MessageService.ShowCustomDialog (errorDialog); - ResultButton = result >= 0 ? Buttons [result] : null; + using (var errorDialog = new MonoDevelop.Ide.Gui.Dialogs.GtkErrorDialog (TransientFor, Title, Message, Buttons)) { + errorDialog.AddDetails (Exception.ToString (), false); + int result = MonoDevelop.Ide.MessageService.ShowCustomDialog (errorDialog); + ResultButton = result >= 0 ? Buttons [result] : null; + } return true; } } 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 f259dfdf67..d86afb3a1a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs @@ -116,9 +116,9 @@ namespace MonoDevelop.Ide.CodeTemplates var template = GetSelectedTemplate (); if (template != null) { templatesToSave.Add (template); - var editDialog = new EditTemplateDialog (template, false); - if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok) - templatesToSave.Add (template); + using (var editDialog = new EditTemplateDialog (template, false)) + if (MessageService.ShowCustomDialog (editDialog, this.Toplevel as Gtk.Window) == (int)ResponseType.Ok) + templatesToSave.Add (template); HandleChanged (this, EventArgs.Empty); } } @@ -134,11 +134,12 @@ namespace MonoDevelop.Ide.CodeTemplates void ButtonAddClicked (object sender, EventArgs e) { 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); + using (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); + } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs index 9ba7974bee..38d4b566a4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs @@ -107,8 +107,8 @@ namespace MonoDevelop.Ide.Commands { protected override void Run () { - var dlg = new NewFileDialog (null, null); // new file seems to fail if I pass the project IdeApp.ProjectOperations.CurrentSelectedProject - MessageService.ShowCustomDialog (dlg, IdeApp.Workbench.RootWindow); + using (var dlg = new NewFileDialog (null, null)) // new file seems to fail if I pass the project IdeApp.ProjectOperations.CurrentSelectedProject + MessageService.ShowCustomDialog (dlg, IdeApp.Workbench.RootWindow); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs index 4b5a5a7ac2..abf39d117a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/ProjectCommands.cs @@ -548,8 +548,8 @@ namespace MonoDevelop.Ide.Commands protected override void Run () { - ApplyPolicyDialog dlg = new ApplyPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution); - MessageService.ShowCustomDialog (dlg); + using (ApplyPolicyDialog dlg = new ApplyPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution)) + MessageService.ShowCustomDialog (dlg); } } @@ -562,8 +562,8 @@ namespace MonoDevelop.Ide.Commands protected override void Run () { - ExportProjectPolicyDialog dlg = new ExportProjectPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution); - MessageService.ShowCustomDialog (dlg); + using (ExportProjectPolicyDialog dlg = new ExportProjectPolicyDialog ((IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolutionItem ?? (IPolicyProvider)IdeApp.ProjectOperations.CurrentSelectedSolution)) + MessageService.ShowCustomDialog (dlg); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs index de62f8902e..0c3678c3cf 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/ExecutionModeCommandService.cs @@ -123,8 +123,8 @@ namespace MonoDevelop.Ide.Execution { CommandItem item = (CommandItem) data; if (item.Mode == null) { - var dlg = new CustomExecutionModeManagerDialog (item.Context); - MessageService.ShowCustomDialog (dlg); + using (var dlg = new CustomExecutionModeManagerDialog (item.Context)) + MessageService.ShowCustomDialog (dlg); return null; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs index dbb2c446cf..4407acbb1b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution/MonoExecutionParametersWidget.cs @@ -61,8 +61,8 @@ namespace MonoDevelop.Ide.Execution protected virtual void OnButtonPreviewClicked (object sender, System.EventArgs e) { propertyGrid.CommitPendingChanges (); - var dlg = new MonoExecutionParametersPreview (config); - MessageService.ShowCustomDialog (dlg, this.Toplevel as Gtk.Window); + using (var dlg = new MonoExecutionParametersPreview (config)) + MessageService.ShowCustomDialog (dlg, this.Toplevel as Gtk.Window); } protected virtual void OnButtonResetClicked (object sender, System.EventArgs e) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs index a42caae6b0..baf4dddce3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs @@ -130,8 +130,9 @@ namespace MonoDevelop.Ide.Gui.Dialogs instance.Present (); return; } - - MessageService.ShowCustomDialog (new CommonAboutDialog ()); + + using (var dlg = new CommonAboutDialog ()) + MessageService.ShowCustomDialog (dlg); } } }
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs index 57734be375..0c42fa9d38 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs @@ -196,8 +196,8 @@ namespace MonoDevelop.Ide.Gui.Dialogs void EncodingChanged (object s, EventArgs args) { if (encodingMenu.History == selectOption) { - var dlg = new SelectEncodingsDialog (); - MessageService.ShowCustomDialog (dlg, this); + using (var dlg = new SelectEncodingsDialog ()) + MessageService.ShowCustomDialog (dlg, this); FillEncodings (); } } 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 ba22ec2043..58d6768512 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs @@ -710,10 +710,11 @@ namespace MonoDevelop.Ide.Gui } if (showDirtyDialog) { - DirtyFilesDialog dlg = new DirtyFilesDialog (); - dlg.Modal = true; - if (MessageService.ShowCustomDialog (dlg, this) != (int)Gtk.ResponseType.Ok) - return false; + using (DirtyFilesDialog dlg = new DirtyFilesDialog ()) { + dlg.Modal = true; + if (MessageService.ShowCustomDialog (dlg, this) != (int)Gtk.ResponseType.Ok) + return false; + } } if (!IdeApp.Workspace.Close (false, false)) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs index 8d9b8a1380..c29bd59b59 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs @@ -339,14 +339,15 @@ namespace MonoDevelop.Ide.ProgressMonitoring MessageService.ShowWarning (Warnings[0]); } else if (Errors.Count > 0 || Warnings.Count > 0) { - var resultDialog = new MultiMessageDialog () { + using (var resultDialog = new MultiMessageDialog () { Modal = true, - }; - foreach (string m in Errors) - resultDialog.AddError (m); - foreach (string m in Warnings) - resultDialog.AddWarning (m); - MessageService.ShowCustomDialog (resultDialog); + }) { + foreach (string m in Errors) + resultDialog.AddError (m); + foreach (string m in Warnings) + resultDialog.AddWarning (m); + MessageService.ShowCustomDialog (resultDialog); + } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs index 5b6c775c5e..63da6b4992 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs @@ -767,10 +767,11 @@ namespace MonoDevelop.Ide public bool CreateProjectFile (Project parentProject, string basePath, string selectedTemplateId) { - NewFileDialog nfd = new NewFileDialog (parentProject, basePath); - if (selectedTemplateId != null) - nfd.SelectTemplate (selectedTemplateId); - return MessageService.ShowCustomDialog (nfd) == (int) Gtk.ResponseType.Ok; + using (NewFileDialog nfd = new NewFileDialog (parentProject, basePath)) { + if (selectedTemplateId != null) + nfd.SelectTemplate (selectedTemplateId); + return MessageService.ShowCustomDialog (nfd) == (int)Gtk.ResponseType.Ok; + } } public bool AddReferenceToProject (DotNetProject project) |