From f5fa189aa2f72d37e687d615fd0f098b0859c0b2 Mon Sep 17 00:00:00 2001 From: Marius Ungureanu Date: Mon, 23 Nov 2015 09:34:29 +0200 Subject: [Ide] Cleanup more API --- .../MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index c08d33c374..73752b1ff8 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -30,6 +30,7 @@ using System; using System.Linq; using Gtk; +using MonoDevelop.Components; using MonoDevelop.Core; using MonoDevelop.Ide.Gui.Content; using MonoDevelop.Ide.Gui; @@ -87,7 +88,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder public bool HasPage (Gtk.Widget page) { - return tabs.Any (p => p.Control == page); + return tabs.Any (p => p.Control.GetNativeWidget () == page); } public void RemoveButton (Gtk.Widget page) @@ -178,7 +179,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder content.Load (ContentName); } - public override Gtk.Widget Control { + public override Control Control { get { return control; } } @@ -291,7 +292,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder } #endregion - public override Widget Control { + public override Control Control { get { return content; } -- cgit v1.2.3 From 883443b892b5c0bf59f3b728f85932d31e0a0d34 Mon Sep 17 00:00:00 2001 From: Marius Ungureanu Date: Mon, 23 Nov 2015 12:23:03 +0200 Subject: [Ide] Switch OptionsPanel to Control. --- .../MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs | 4 ++-- .../MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs index cce24542b0..41f1b27042 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs @@ -26,7 +26,7 @@ using System; using MonoDevelop.GtkCore.GuiBuilder; -using Gtk; +using MonoDevelop.Components; using MonoDevelop.Ide.Gui.Dialogs; namespace MonoDevelop.GtkCore.Dialogs @@ -35,7 +35,7 @@ namespace MonoDevelop.GtkCore.Dialogs { GtkDesignerOptionsPanelWidget widget; - public override Widget CreatePanelWidget () + public override Control CreatePanelWidget () { widget = new GtkDesignerOptionsPanelWidget (); widget.AutoSwitchLayout = GuiBuilderService.AutoSwitchGuiLayout; diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs index 4fb717ece7..794b08476b 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs @@ -29,7 +29,8 @@ using Gtk; - + +using MonoDevelop.Components; using MonoDevelop.Core; using MonoDevelop.Projects; using MonoDevelop.Ide.Gui.Dialogs; @@ -121,7 +122,7 @@ namespace MonoDevelop.GtkCore.Dialogs WidgetBuilderOptionPanelWidget widget; - public override Widget CreatePanelWidget() + public override Control CreatePanelWidget() { return (widget = new WidgetBuilderOptionPanelWidget (ConfiguredProject)); } -- cgit v1.2.3 From b9bd40261ad463772a2740328ca23b6ddd8ef1e7 Mon Sep 17 00:00:00 2001 From: Marius Ungureanu Date: Wed, 25 Nov 2015 16:48:45 +0200 Subject: [Ide] Internalize CommandRouterContainer. --- .../MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index 73752b1ff8..d4107e6ae2 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -60,7 +60,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder content.DirtyChanged += new EventHandler (OnTextDirtyChanged); CommandRouterContainer crc = new CommandRouterContainer (content.Control, content, true); - crc.Show (); + crc.GetNativeWidget ().Show (); control = crc; IdeApp.Workbench.ActiveDocumentChanged += new EventHandler (OnActiveDocumentChanged); -- cgit v1.2.3 From a5a5c98a94932812d69fb674a06c2ff47b983916 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 18 Nov 2015 00:25:25 +0100 Subject: Converted content interfaces to classes The new BaseViewContent class replaces IBaseViewContent, IAttachableViewContent, AbstractBaseViewContent and AbstractAttachableViewContent. The ViewContent class replaces IViewContent and AbstractViewContent. --- .../ActionGroupDisplayBinding.cs | 2 +- .../ActionGroupView.cs | 2 +- .../CombinedDesignView.cs | 26 ++++------------------ .../GuiBuilderDisplayBinding.cs | 2 +- .../GuiBuilderView.cs | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs index b122cf3de6..5eae8f19fd 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs @@ -81,7 +81,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder return db != null; } - public IViewContent CreateContent (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject) + public ViewContent CreateContent (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject) { excludeThis = true; var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject); diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs index 3e16e11f17..9d1af20768 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs @@ -50,7 +50,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder Stetic.ActionGroupInfo groupInfo; string groupName; - public ActionGroupView (IViewContent content, Stetic.ActionGroupInfo group, GuiBuilderProject project): base (content) + public ActionGroupView (ViewContent content, Stetic.ActionGroupInfo group, GuiBuilderProject project): base (content) { groupName = group.Name; this.project = project; diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index d4107e6ae2..6c4404fd00 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -41,13 +41,13 @@ using MonoDevelop.Ide.Editor; namespace MonoDevelop.GtkCore.GuiBuilder { - public class CombinedDesignView : AbstractViewContent + public class CombinedDesignView : ViewContent { - IViewContent content; + ViewContent content; Gtk.Widget control; List tabs = new List (); - public CombinedDesignView (IViewContent content) + public CombinedDesignView (ViewContent content) { this.content = content; /* This code causes that chagnes in a version control view always select the source code view. @@ -256,7 +256,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder } } - class TabView: AbstractBaseViewContent, IAttachableViewContent + class TabView: BaseViewContent { string label; Gtk.Widget content; @@ -274,24 +274,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder return base.GetContent (type); } - #region IAttachableViewContent implementation - public virtual void Selected () - { - } - - public virtual void Deselected () - { - } - - public virtual void BeforeSave () - { - } - - public virtual void BaseContentChanged () - { - } - #endregion - public override Control Control { get { return content; diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs index 65cde80d96..c9f93016f6 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs @@ -68,7 +68,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder return db != null; } - public IViewContent CreateContent (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject) + public ViewContent CreateContent (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject) { excludeThis = true; var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject); diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs index a472231a22..b99dba9b3a 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs @@ -63,7 +63,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder string rootName; object designerStatus; - public GuiBuilderView (IViewContent content, GuiBuilderWindow window): base (content) + public GuiBuilderView (ViewContent content, GuiBuilderWindow window): base (content) { rootName = window.Name; -- cgit v1.2.3 From d804ac2110c412f444528960a66f2e835a8ec88b Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 18 Nov 2015 12:15:04 +0100 Subject: [Ide] Sanitize the ViewContentApi Removed innecessary methods and events. Added convenience overloads. --- .../ActionGroupView.cs | 2 -- .../CombinedDesignView.cs | 35 ++++++++++------------ .../GuiBuilderView.cs | 14 ++++----- 3 files changed, 23 insertions(+), 28 deletions(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs index 9d1af20768..120eb0bda4 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs @@ -189,8 +189,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder void OnGroupModified (object s, EventArgs a) { - if (designer.Modified) - OnContentChanged (a); IsDirty = designer.Modified; } diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index 6c4404fd00..9228dc6d1a 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -56,7 +56,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder ShowPage (0); }; }*/ - content.ContentChanged += new EventHandler (OnTextContentChanged); content.DirtyChanged += new EventHandler (OnTextDirtyChanged); CommandRouterContainer crc = new CommandRouterContainer (content.Control, content, true); @@ -109,17 +108,21 @@ namespace MonoDevelop.GtkCore.GuiBuilder ShowPage (0);*/ } - public override MonoDevelop.Projects.Project Project { - get { return base.Project; } - set { - base.Project = value; - content.Project = value; + protected override void OnSetProject (Projects.Project project) + { + base.OnSetProject (project); + content.Project = project; + } + + public override ProjectReloadCapability ProjectReloadCapability { + get { + return content.ProjectReloadCapability; } } - protected override void OnWorkbenchWindowChanged (EventArgs e) + protected override void OnWorkbenchWindowChanged () { - base.OnWorkbenchWindowChanged (e); + base.OnWorkbenchWindowChanged (); content.WorkbenchWindow = WorkbenchWindow; if (WorkbenchWindow != null) { foreach (TabView view in tabs) { @@ -162,7 +165,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder public override void Dispose () { - content.ContentChanged -= new EventHandler (OnTextContentChanged); content.DirtyChanged -= new EventHandler (OnTextDirtyChanged); IdeApp.Workbench.ActiveDocumentChanged -= new EventHandler (OnActiveDocumentChanged); content.Dispose (); @@ -212,14 +214,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder { } - void OnTextContentChanged (object s, EventArgs args) - { - OnContentChanged (args); - } - void OnTextDirtyChanged (object s, EventArgs args) { - OnDirtyChanged (args); + OnDirtyChanged (); } void OnActiveDocumentChanged (object s, EventArgs args) @@ -232,7 +229,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder { } - public override object GetContent (Type type) + protected override object OnGetContent (Type type) { // if (type == typeof(IEditableTextBuffer)) { // // Intercept the IPositionable interface, since we need to @@ -243,7 +240,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder // return null; // } // - return base.GetContent (type) ?? (content !=null ? content.GetContent (type) : null); + return base.OnGetContent (type) ?? (content !=null ? content.GetContent (type) : null); } public void JumpTo (int line, int column) @@ -267,11 +264,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder this.content = content; } - public override object GetContent (Type type) + protected override object OnGetContent (Type type) { if (type.IsInstanceOfType (Control)) return Control; - return base.GetContent (type); + return base.OnGetContent (type); } public override Control Control { diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs index b99dba9b3a..6597262092 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs @@ -48,7 +48,7 @@ using Microsoft.CodeAnalysis; namespace MonoDevelop.GtkCore.GuiBuilder { - public class GuiBuilderView : CombinedDesignView, ISupportsProjectReload + public class GuiBuilderView : CombinedDesignView { Stetic.WidgetDesigner designer; Stetic.ActionGroupDesigner actionsBox; @@ -86,14 +86,16 @@ namespace MonoDevelop.GtkCore.GuiBuilder LoadDesigner (); } - ProjectReloadCapability ISupportsProjectReload.ProjectReloadCapability { + public override ProjectReloadCapability ProjectReloadCapability { get { return ProjectReloadCapability.Full; } } - - void ISupportsProjectReload.Update (MonoDevelop.Projects.Project project) + + protected override void OnSetProject (Projects.Project project) { + base.OnSetProject (project); + if (gproject != null && gproject.Project == project) return; @@ -296,9 +298,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder void OnWindowModifiedChanged (object s, EventArgs args) { - if (IsDirty) - OnContentChanged (args); - OnDirtyChanged (args); + OnDirtyChanged (); } void OnBindWidgetField (object o, EventArgs a) -- cgit v1.2.3 From 74881948086cfe253d389d074d44d12f9149fc60 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 18 Nov 2015 15:14:03 +0100 Subject: Asynchronize document load and save operations --- .../MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs | 10 +++++----- .../MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs | 7 ++++--- .../MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 9 +++++---- .../MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs | 4 ++-- .../MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs | 15 ++++++++------- .../ActionGroupNodeBuilder.cs | 6 +++--- .../MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs | 4 ++-- 7 files changed, 29 insertions(+), 26 deletions(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs index 120eb0bda4..ba794c06f8 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs @@ -37,7 +37,7 @@ using MonoDevelop.Components.Commands; using MonoDevelop.DesignerSupport; using Microsoft.CodeAnalysis; using MonoDevelop.Ide; - +using System.Threading.Tasks; namespace MonoDevelop.GtkCore.GuiBuilder { @@ -140,11 +140,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder codeBinder.TargetObject = designer.RootComponent; } - public override void Save (FileSaveInformation fileSaveInformation) + public override async Task Save (FileSaveInformation fileSaveInformation) { string oldBuildFile = GuiBuilderService.GetBuildCodeFileName (project.Project, groupInfo.Name); - base.Save (fileSaveInformation); + await base.Save (fileSaveInformation); if (designer == null) return; @@ -202,10 +202,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder codeBinder.UpdateSignal (a.OldSignal, a.Signal); } - void OnBindField (object s, EventArgs args) + async void OnBindField (object s, EventArgs args) { if (designer.SelectedAction != null) { - codeBinder.BindToField (designer.SelectedAction); + await codeBinder.BindToField (designer.SelectedAction); } } } diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs index 6e49af37e2..3076ef4d8d 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs @@ -47,6 +47,7 @@ using MonoDevelop.CSharp.Refactoring; using MonoDevelop.Refactoring; using System.Xml.XPath; using System.IO; +using System.Threading.Tasks; namespace MonoDevelop.GtkCore.GuiBuilder { @@ -212,7 +213,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder } /// Adds a field to the class - public void BindToField (Stetic.Component obj) + public async Task BindToField (Stetic.Component obj) { if (targetObject == null) return; @@ -224,11 +225,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder return; var location = GetSourceLocation(cls); - var doc = IdeApp.Workbench.OpenDocument (location.SourceTree.FilePath, project, true); + var doc = await IdeApp.Workbench.OpenDocument (location.SourceTree.FilePath, project, true); var editor = doc.Editor; if (editor != null) { - CodeGenerationService.AddNewMember (project, cls, cls.Locations.First (), GetFieldCode (cls, obj, name)); + await CodeGenerationService.AddNewMember (project, cls, cls.Locations.First (), GetFieldCode (cls, obj, name)); } } diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index 9228dc6d1a..ad1b5a8310 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -38,6 +38,7 @@ using MonoDevelop.Components.Commands; using MonoDevelop.Ide; using System.Collections.Generic; using MonoDevelop.Ide.Editor; +using System.Threading.Tasks; namespace MonoDevelop.GtkCore.GuiBuilder { @@ -175,19 +176,19 @@ namespace MonoDevelop.GtkCore.GuiBuilder base.Dispose (); } - public override void Load (FileOpenInformation fileOpenInformation) + public override Task Load (FileOpenInformation fileOpenInformation) { ContentName = fileOpenInformation.FileName; - content.Load (ContentName); + return content.Load (ContentName); } public override Control Control { get { return control; } } - public override void Save (FileSaveInformation fileSaveInformation) + public override Task Save (FileSaveInformation fileSaveInformation) { - content.Save (fileSaveInformation); + return content.Save (fileSaveInformation); } public override bool IsDirty { diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs index 2c2f22d28a..7f67ec9185 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs @@ -168,7 +168,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder } } - public static ActionGroupView OpenActionGroup (Project project, Stetic.ActionGroupInfo group) + public static async Task OpenActionGroup (Project project, Stetic.ActionGroupInfo group) { GuiBuilderProject p = GtkDesignInfo.FromProject (project).GuiBuilderProject ; string file = p != null ? p.GetSourceCodeFile (group) : null; @@ -176,7 +176,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder file = ActionGroupDisplayBinding.BindToClass (project, group); } - Document doc = IdeApp.Workbench.OpenDocument (file, true); + Document doc = await IdeApp.Workbench.OpenDocument (file, true); if (doc != null) { ActionGroupView view = doc.GetContent (); if (view != null) { diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs index 6597262092..c0ae7f6a29 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs @@ -38,13 +38,14 @@ using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Commands; using MonoDevelop.Components.Commands; using MonoDevelop.Projects; -using MonoDevelop.DesignerSupport.Toolbox; +using MonoDevelop.DesignerSupport.Toolbox; using MonoDevelop.DesignerSupport; using Gtk; using Gdk; using MonoDevelop.Ide; using Microsoft.CodeAnalysis; +using System.Threading.Tasks; namespace MonoDevelop.GtkCore.GuiBuilder { @@ -301,16 +302,16 @@ namespace MonoDevelop.GtkCore.GuiBuilder OnDirtyChanged (); } - void OnBindWidgetField (object o, EventArgs a) + async void OnBindWidgetField (object o, EventArgs a) { if (designer.Selection != null) - codeBinder.BindToField (designer.Selection); + await codeBinder.BindToField (designer.Selection); } - void OnBindActionField (object o, EventArgs a) + async void OnBindActionField (object o, EventArgs a) { if (actionsBox.SelectedAction != null) - codeBinder.BindToField (actionsBox.SelectedAction); + await codeBinder.BindToField (actionsBox.SelectedAction); } void OnSignalAdded (object sender, Stetic.ComponentSignalEventArgs args) @@ -327,9 +328,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder codeBinder.UpdateSignal (args.OldSignal, args.Signal); } - public override void Save (FileSaveInformation fileSaveInformation) + public override async Task Save (FileSaveInformation fileSaveInformation) { - base.Save (fileSaveInformation); + await base.Save (fileSaveInformation); if (designer == null) return; diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs index 5b0fd87a2f..ad6f2b722b 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs @@ -86,14 +86,14 @@ namespace MonoDevelop.GtkCore.NodeBuilders class ActionGroupCommandHandler: NodeCommandHandler { - public override void ActivateItem () + public override async void ActivateItem () { GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.GetParentDataItem (typeof(GuiBuilderWindow), false); if (w != null) { if (w.SourceCodeFile == FilePath.Null && !w.BindToClass ()) return; - Document doc = IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true); + Document doc = await IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true); if (doc != null) { GuiBuilderView view = doc.GetContent (); if (view != null) @@ -103,7 +103,7 @@ namespace MonoDevelop.GtkCore.NodeBuilders else { Project project = (Project) CurrentNode.GetParentDataItem (typeof(Project), false); Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) CurrentNode.DataItem; - GuiBuilderService.OpenActionGroup (project, group); + await GuiBuilderService.OpenActionGroup (project, group); } } diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs index c0d692977c..c2710e2cf2 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs @@ -114,13 +114,13 @@ namespace MonoDevelop.GtkCore.NodeBuilders class GladeWindowCommandHandler: NodeCommandHandler { - public override void ActivateItem () + public override async void ActivateItem () { GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.DataItem; if (w.SourceCodeFile == FilePath.Null && !w.BindToClass ()) return; - Document doc = IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true); + Document doc = await IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true); if (doc != null) { GuiBuilderView view = doc.GetContent (); if (view != null) -- cgit v1.2.3 From d6cc04b01e811783cfa64d7893f239d5f9840599 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 18 Nov 2015 15:38:43 +0100 Subject: ViewContent now creates Controls instead of GTK widgets --- .../MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index ad1b5a8310..65dc06e292 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -272,7 +272,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder return base.OnGetContent (type); } +<<<<<<< d31689b2197378846e127fd9c38d594f7c7f85e1 public override Control Control { +======= + public override Components.Control Control { +>>>>>>> ViewContent now creates Controls instead of GTK widgets get { return content; } -- cgit v1.2.3 From 30e7d9486dfe4058b6fdf1dbb2ed0f59128ac174 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 25 Nov 2015 15:41:21 +0100 Subject: Fix incorrect merges --- .../MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index 65dc06e292..ad1b5a8310 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -272,11 +272,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder return base.OnGetContent (type); } -<<<<<<< d31689b2197378846e127fd9c38d594f7c7f85e1 public override Control Control { -======= - public override Components.Control Control { ->>>>>>> ViewContent now creates Controls instead of GTK widgets get { return content; } -- cgit v1.2.3 From 0af4abe88e300e1d06ef232ab0a239307ea4eadf Mon Sep 17 00:00:00 2001 From: Marius Ungureanu Date: Wed, 25 Nov 2015 19:48:48 +0200 Subject: [Ide] Make Control with widget constructor private. --- .../MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index ad1b5a8310..2961eb94ca 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -60,7 +60,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder content.DirtyChanged += new EventHandler (OnTextDirtyChanged); CommandRouterContainer crc = new CommandRouterContainer (content.Control, content, true); - crc.GetNativeWidget ().Show (); + crc.Show (); control = crc; IdeApp.Workbench.ActiveDocumentChanged += new EventHandler (OnActiveDocumentChanged); -- cgit v1.2.3