Author: lluis
Date: 2006-05-19 16:06:23 -0400 (Fri, 19 May 2006)
New Revision: 60877

Added:
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/icons/actiongroup.png
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/templates/ActionGroup.xft.xml
Modified:
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/Makefile.am
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Commands/GladeCommands.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/lib/libstetic.dll
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/lib/libsteticui.dll
Log:
2006-05-19  Lluis Sanchez Gual  <[EMAIL PROTECTED]>

        * MonoDevelop.GtkCore.Commands/GladeCommands.cs:
        * MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
        * MonoDevelop.GtkCore.addin.xml: Added commands for creating
          an action group and editing the project icons.
          
        * MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show local
          action groups as children of the window node.
        
        * MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
        * MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Moved
          some event subscriptions to WindowsFolder.cs
        
        * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
        * MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Open the
          corresponding file when clicking on local action groups.
          
        * Makefile.am:
        * MonoDevelop.GtkCore.mdp: Added action group template.
        
        * MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Added support 
for
          action group file templates.
        * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Notify changes in
          local action groups.
        * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show the 
actions
          tab until there is at least one action group.
        * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Don't show
          properties or signals for global actions.
        * MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added virtual 
method
          OnActiveDocumentChanged, which is called when the view is brought to 
front.
          
        * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
        * MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Use the new MemberName
          field when binding fields.
          
        * MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
        * MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Several minor 
fixes.
          
        * lib/*: Updated.
          

        * Initial support for the menu editor. Still very unstable!!
        


Modified: trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog      2006-05-19 
19:33:35 UTC (rev 60876)
+++ trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog      2006-05-19 
20:06:23 UTC (rev 60877)
@@ -1,5 +1,49 @@
+2006-05-19  Lluis Sanchez Gual  <[EMAIL PROTECTED]>
+
+       * MonoDevelop.GtkCore.Commands/GladeCommands.cs:
+       * MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
+       * MonoDevelop.GtkCore.addin.xml: Added commands for creating
+         an action group and editing the project icons.
+         
+       * MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show local
+         action groups as children of the window node.
+       
+       * MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
+       * MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Moved
+         some event subscriptions to WindowsFolder.cs
+       
+       * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
+       * MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Open the
+         corresponding file when clicking on local action groups.
+         
+       * Makefile.am:
+       * MonoDevelop.GtkCore.mdp: Added action group template.
+       
+       * MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Added support 
for
+         action group file templates.
+       * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Notify changes in
+         local action groups.
+       * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show the 
actions
+         tab until there is at least one action group.
+       * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Don't show
+         properties or signals for global actions.
+       * MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added virtual 
method
+         OnActiveDocumentChanged, which is called when the view is brought to 
front.
+         
+       * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
+       * MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Use the new MemberName
+         field when binding fields.
+         
+       * MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
+       * MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Several minor 
fixes.
+         
+       * lib/*: Updated.
+         
+
 2006-05-12 Lluis Sanchez Gual  <[EMAIL PROTECTED]>
 
+       * Initial support for the menu editor. Still very unstable!!
+       
        * lib/*: Updated from Stetic module.
        * MonoDevelop.GtkCore.addin.xml: Register a node builder and and
          display binding for action groups.

Modified: trunk/monodevelop/Extras/MonoDevelop.GtkCore/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.GtkCore/Makefile.am    2006-05-19 
19:33:35 UTC (rev 60876)
+++ trunk/monodevelop/Extras/MonoDevelop.GtkCore/Makefile.am    2006-05-19 
20:06:23 UTC (rev 60877)
@@ -64,6 +64,8 @@
 icons/dialog.png \
 icons/widget.png \
 icons/window.png \
+icons/actiongroup.png \
+templates/ActionGroup.xft.xml \
 templates/Window.xft.xml \
 templates/Widget.xft.xml \
 templates/Dialog.xft.xml

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
   2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
   2006-05-19 20:06:23 UTC (rev 60877)
@@ -97,22 +97,39 @@
                        };
 
                        XmlElement widgetElem = steticTemplate ["widget"];
-                       if (widgetElem == null)
-                               throw new InvalidOperationException ("Widget 
element not found in widget template.");
-
-                       string content = widgetElem.OuterXml;
-                       content = sps.Parse (content, tags);
+                       if (widgetElem != null) {
+                               string content = widgetElem.OuterXml;
+                               content = sps.Parse (content, tags);
+                               
+                               XmlDocument doc = new XmlDocument ();
+                               doc.LoadXml (content);
+                               
+                               Gtk.Widget widget = 
Stetic.WidgetUtils.ImportWidget (gproject.SteticProject, doc.DocumentElement);
+                               
+                               gproject.SteticProject.AddWidget (widget);
+                               gproject.Save ();
+                               
+                               if (!(widget is Gtk.Window))
+                                       info.AddExportedWidget (fullName);
+                               return;
+                       }
                        
-                       XmlDocument doc = new XmlDocument ();
-                       doc.LoadXml (content);
+                       widgetElem = steticTemplate ["action-group"];
+                       if (widgetElem != null) {
+                               string content = widgetElem.OuterXml;
+                               content = sps.Parse (content, tags);
+                               
+                               XmlDocument doc = new XmlDocument ();
+                               doc.LoadXml (content);
+                               
+                               Stetic.Wrapper.ActionGroup group = new 
Stetic.Wrapper.ActionGroup ();
+                               group.Read (gproject.SteticProject, 
doc.DocumentElement);
+                               gproject.SteticProject.ActionGroups.Add (group);
+                               gproject.Save ();
+                               return;
+                       }
                        
-                       Gtk.Widget widget = Stetic.WidgetUtils.ImportWidget 
(gproject.SteticProject, doc.DocumentElement);
-                       
-                       gproject.SteticProject.AddWidget (widget);
-                       gproject.Save ();
-                       
-                       if (!(widget is Gtk.Window))
-                               info.AddExportedWidget (fullName);
+                       throw new InvalidOperationException ("<widget> or 
<action-group> element not found in widget template.");
                }
                
                public override void Show ()

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Commands/GladeCommands.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Commands/GladeCommands.cs
  2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Commands/GladeCommands.cs
  2006-05-19 20:06:23 UTC (rev 60877)
@@ -33,6 +33,8 @@
                AddNewDialog,
                AddNewWindow,
                AddNewWidget,
-               ImportGladeFile
+               AddNewActionGroup,
+               ImportGladeFile,
+               EditIcons,
        }
 }

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
      2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
      2006-05-19 20:06:23 UTC (rev 60877)
@@ -38,7 +38,7 @@
        public class ActionGroupView: CombinedDesignView
        {
                Stetic.Editor.ActionGroupEditor editor;
-               Gtk.Widget designer;
+               Stetic.PreviewBox designer;
                Hashtable actionCopyMap = new Hashtable ();
                Stetic.Wrapper.ActionGroup groupCopy;
                Stetic.Wrapper.ActionGroup group;
@@ -53,7 +53,7 @@
                        this.project = project;
                        
                        vbox = new Gtk.VBox ();
-                       toolbar = new MonoDevelopActionGroupToolbar (group);
+                       toolbar = new MonoDevelopActionGroupToolbar (true);
                        toolbar.BindField += new EventHandler (OnBindField);
                        vbox.PackStart (toolbar, false, false, 0);
                        vbox.ShowAll ();
@@ -64,13 +64,13 @@
                        AddButton (GettextCatalog.GetString ("Actions"), vbox);
                        
                        editor = new Stetic.Editor.ActionGroupEditor ();
-                       toolbar.Bind (editor);
                        
-                       designer = Stetic.EmbedWindow.Wrap (editor, 1, 1);
+                       designer = Stetic.EmbedWindow.Wrap (editor, -1, -1);
                        b.Add (designer);
+                       toolbar.Bind (editor);
                        Load (group);
                        editor.GroupModified += new EventHandler 
(OnGroupModified);
-                       
+
                        codeBinder = new CodeBinder (project.Project, new 
OpenDocumentFileProvider (), groupCopy);
                }
                
@@ -95,7 +95,7 @@
                        groupCopy.Changed += new EventHandler (UpdateName);
                        groupCopy.SignalAdded += new Stetic.SignalEventHandler 
(OnSignalAdded);
                        groupCopy.SignalChanged += new 
Stetic.SignalChangedEventHandler (OnSignalChanged);
-                       editor.ActionGroup = groupCopy;
+                       toolbar.ActiveGroup = groupCopy;
                }
                
                public override void Save (string fileName)
@@ -143,6 +143,19 @@
                        ShowPage (1);
                }
                
+               public void SelectAction (Stetic.Wrapper.Action action)
+               {
+                       foreach (DictionaryEntry e in actionCopyMap) {
+                               if (e.Value == action)
+                                       editor.SelectedAction = 
(Stetic.Wrapper.Action) e.Key;
+                       }
+               }
+               
+               protected override void OnDocumentActivated ()
+               {
+                       designer.UpdateObjectViewers ();
+               }
+               
                void UpdateName (object s, EventArgs a)
                {
                }

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
   2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
   2006-05-19 20:06:23 UTC (rev 60877)
@@ -183,7 +183,7 @@
                /// Adds a field to the class
                public void BindToField (Stetic.ObjectWrapper obj)
                {
-                       string name = GetObjectName (obj);
+                       string name = GetMemberName (obj);
                        IClass cls = GetClass ();
                        
                        if (FindField (cls, name) != null)
@@ -323,6 +323,15 @@
                        return GetObjectName (obj);
                }
                
+               public static string GetMemberName (object obj)
+               {
+                       Stetic.Wrapper.Widget w = GetWrapper (obj) as 
Stetic.Wrapper.Widget;
+                       if (w != null)
+                               return w.MemberName;
+                       else
+                               return GetObjectName (obj);
+               }
+               
                public static string GetObjectName (object obj)
                {
                        Stetic.Wrapper.Widget w = GetWrapper (obj) as 
Stetic.Wrapper.Widget;
@@ -340,6 +349,15 @@
                        }
                }
                
+               public static void SetMemberName (object obj, string name)
+               {
+                       Stetic.Wrapper.Widget w = GetWrapper (obj) as 
Stetic.Wrapper.Widget;
+                       if (w != null) {
+                               w.Wrapped.Name = name;
+                       } else
+                               SetObjectName (obj, name);
+               }
+               
                public static void SetObjectName (object obj, string name)
                {
                        Stetic.Wrapper.Widget w = GetWrapper (obj) as 
Stetic.Wrapper.Widget;

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
   2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
   2006-05-19 20:06:23 UTC (rev 60877)
@@ -84,6 +84,8 @@
                        box.PackStart (toolbar, false, false, 0);
                        
                        box.Show ();
+                       
+                       IdeApp.Workbench.ActiveDocumentChanged += new 
EventHandler (OnActiveDocumentChanged);
                }
                
                protected ToggleToolButton AddButton (string label, Gtk.Widget 
page)
@@ -143,6 +145,7 @@
                {
                        content.ContentChanged -= new EventHandler 
(OnTextContentChanged);
                        content.DirtyChanged -= new EventHandler 
(OnTextDirtyChanged);
+                       IdeApp.Workbench.ActiveDocumentChanged -= new 
EventHandler (OnActiveDocumentChanged);
                        base.Dispose ();
                }
                
@@ -195,6 +198,16 @@
                        OnDirtyChanged (args);
                }
                
+               void OnActiveDocumentChanged (object s, EventArgs args)
+               {
+                       if (IdeApp.Workbench.ActiveDocument.Content == this)
+                               OnDocumentActivated ();
+               }
+               
+               protected virtual void OnDocumentActivated ()
+               {
+               }
+               
                /* IEditableTextBuffer **********************/
                
                public IClipboardHandler ClipboardHandler {

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs
        2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs
        2006-05-19 20:06:23 UTC (rev 60877)
@@ -57,8 +57,15 @@
                public GuiBuilderEditSession (GuiBuilderWindow win, 
ITextFileProvider textFileProvider)
                {
                        this.window = win;
+                       
+                       // Create a local project and load into it the widget 
being edited.
+                       // When saving the file, this project will be merged 
with the main project.
                        gproject = new Stetic.Project ();
+                       
+                       // Reuse the action groups and icon factory of the main 
project
                        gproject.ActionGroups = 
win.Project.SteticProject.ActionGroups;
+                       gproject.IconFactory = 
win.Project.SteticProject.IconFactory;
+                       
                        XmlElement data = Stetic.WidgetUtils.ExportWidget 
(win.RootWidget.Wrapped);
                        Gtk.Widget w = Stetic.WidgetUtils.ImportWidget 
(gproject, data);
                        gproject.AddWidget (w);
@@ -66,7 +73,7 @@
                        
                        codeBinder = new CodeBinder (win.Project.Project, 
textFileProvider, rootWidget);
                        
-                       gproject.WidgetNameChanged += new 
Stetic.Wrapper.WidgetNameChangedHandler (OnWidgetNameChanged);
+                       gproject.WidgetMemberNameChanged += new 
Stetic.Wrapper.WidgetNameChangedHandler (OnWidgetNameChanged);
                        gproject.ModifiedChanged += new EventHandler 
(OnModifiedChanged);
                        
                        gproject.SignalAdded += new Stetic.SignalEventHandler 
(OnSignalAdded);
@@ -110,11 +117,16 @@
                
                public void Dispose ()
                {
-                       gproject.WidgetNameChanged -= new 
Stetic.Wrapper.WidgetNameChangedHandler (OnWidgetNameChanged);
+                       gproject.WidgetMemberNameChanged -= new 
Stetic.Wrapper.WidgetNameChangedHandler (OnWidgetNameChanged);
                        GuiBuilderService.ActiveProject = null;
                        gproject.Dispose ();
                }
                
+               public void SetDesignerActive ()
+               {
+                       widget.UpdateObjectViewers ();
+               }
+               
                public bool Modified {
                        get { return gproject.Modified; }
                }
@@ -135,8 +147,12 @@
                
                public void BindCurrentWidget ()
                {
-                       if (gproject.Selection != null)
-                               codeBinder.BindToField 
(Stetic.Wrapper.Widget.Lookup (gproject.Selection));
+                       if (gproject.Selection != null) {
+                               Stetic.Wrapper.Widget w = 
Stetic.Wrapper.Widget.Lookup (gproject.Selection);
+                               if (w.MemberName.Length == 0)
+                                       w.MemberName = w.Wrapped.Name;
+                               codeBinder.BindToField (w);
+                       }
                }
                
                public void BindAction (Stetic.Wrapper.Action action)

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs
      2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs
      2006-05-19 20:06:23 UTC (rev 60877)
@@ -30,17 +30,21 @@
 using System;
 using Gtk;
 using MonoDevelop.Core;
+using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Commands;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
-       public class GuiBuilderPropertiesPad: AbstractPadContent
+       public class GuiBuilderPropertiesPad: AbstractPadContent, 
Stetic.IObjectViewer
        {
                Stetic.WidgetPropertyTree grid;
                Stetic.SignalsEditor signalsEditor;
+               Gtk.EventBox infoBox;
                Gtk.Widget widget;
+               Stetic.Wrapper.Action currentAction;
+               Notebook tabs;
                
                public GuiBuilderPropertiesPad (): base ("")
                {
@@ -50,7 +54,7 @@
                        
                        DefaultPlacement = 
"MonoDevelop.GtkCore.GuiBuilder.GuiBuilderPalettePad/bottom; right";
                        
-                       Notebook tabs = new Notebook ();
+                       tabs = new Notebook ();
                        
                        ScrolledWindow sw = new ScrolledWindow ();
                        sw.AddWithViewport (grid);
@@ -60,10 +64,18 @@
                        signalsEditor.SignalActivated += new EventHandler 
(OnSignalActivated);
                        tabs.AppendPage (signalsEditor, new Label 
(GettextCatalog.GetString ("Signals")));
                        
+                       infoBox = new Gtk.EventBox ();
+                       tabs.AppendPage (infoBox, new Gtk.Label (""));
+                       
                        widget = tabs;
                        
                        widget.ShowAll ();
+                       infoBox.Hide ();
+                       
                        tabs.Page = 0;
+                       
+                       Stetic.UserInterface.DefaultPropertyViewer = this;
+                       Stetic.UserInterface.DefaultSignalsViewer = this;
                }
                
                public override Gtk.Widget Control {
@@ -81,6 +93,92 @@
                        GuiBuilderService.JumpToSignalHandler 
(signalsEditor.SelectedSignal);
                }
                
+               public object TargetObject { 
+                       get {
+                               return grid.TargetObject;
+                       }
+                       set {
+                               Stetic.Wrapper.Action action = 
Stetic.ObjectWrapper.Lookup (value) as Stetic.Wrapper.Action;
+                               if (action != null) {
+                                       // Don't allow editing of global actions
+                                       if (grid.Project != null && 
grid.Project.ActionGroups.IndexOf (action.ActionGroup) != -1) {
+                                               if (infoBox.Child != null)
+                                                       infoBox.Remove 
(infoBox.Child);
+                                               infoBox.Add 
(CreateGlobalActionInfo (action));
+                                               infoBox.ShowAll ();
+                                               tabs.Page = 2;
+                                               tabs.ShowTabs = false;
+                                               grid.Hide ();
+                                               signalsEditor.Hide ();
+                                               return;
+                                       }
+                               }
+                               
+                               if (!grid.Visible) {
+                                       tabs.ShowTabs = true;
+                                       grid.Show ();
+                                       signalsEditor.Show ();
+                                       tabs.Page = 0;
+                                       infoBox.Hide ();
+                               }
+                                               
+                               grid.TargetObject = value;
+                               signalsEditor.TargetObject = value;
+                       }
+               }
+               
+               Gtk.Widget CreateGlobalActionInfo (Stetic.Wrapper.Action action)
+               {
+                       currentAction = action;
+                       
+                       Gtk.HBox hbox = new Gtk.HBox ();
+                       hbox.BorderWidth = 12;
+                       Gtk.Image img = new Gtk.Image (Gtk.Stock.DialogInfo, 
Gtk.IconSize.Menu);
+                       img.Yalign = 0;
+                       hbox.PackStart (img, false, false, 0);
+                       
+                       Gtk.VBox box = new Gtk.VBox ();
+                       Gtk.Label info = new Gtk.Label 
(GettextCatalog.GetString ("The action '{0}' belongs to the global action group 
'{1}'. To modify it, open the action group file.", action.MenuLabel, 
action.ActionGroup.Name));
+                       info.Xalign = 0;
+                       info.WidthRequest = 200;
+                       info.LineWrap = true;
+                       box.PackStart (info, false, false, 0);
+                       
+                       HBox bb = new HBox ();
+                       Gtk.Button but = new Gtk.Button 
(GettextCatalog.GetString ("Open Action Group"));
+                       but.Clicked += new EventHandler (OnOpenGroup);
+                       bb.PackStart (but, false, false, 0);
+                       box.PackStart (bb, false, false, 12);
+                       
+                       hbox.PackStart (box, true, true, 12);
+                       hbox.ShowAll ();
+                       return hbox;
+               }
+               
+               void OnOpenGroup (object s, EventArgs args)
+               {
+                       Project prj = GetProjectFromDesign 
(currentAction.ActionGroup);
+                       if (prj != null) {
+                               ActionGroupView view = 
GuiBuilderService.OpenActionGroup (prj, currentAction.ActionGroup);
+                               if (view != null)
+                                       view.SelectAction (currentAction);
+                       }
+               }
+
+               public static Project GetProjectFromDesign 
(Stetic.Wrapper.ActionGroup group)
+               {
+                       if (IdeApp.ProjectOperations.CurrentOpenCombine == null)
+                               return null;
+                               
+                       foreach (Project prj in 
IdeApp.ProjectOperations.CurrentOpenCombine.GetAllProjects ()) {
+                               GtkDesignInfo info = GtkCoreService.GetGtkInfo 
(prj);
+                               if (info != null && info.GuiBuilderProject != 
null && info.GuiBuilderProject.SteticProject.ActionGroups.IndexOf (group) != -1)
+                                       return prj;
+                       }
+                       return null;
+               }
+               
+               
 //             [CommandHandler (EditCommands.Copy)]
 //             void 
        }

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
    2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
    2006-05-19 20:06:23 UTC (rev 60877)
@@ -75,12 +75,30 @@
                        set { widgetTreePad = value; }
                }
                
+               public static ActionGroupView OpenActionGroup (Project project, 
Stetic.Wrapper.ActionGroup group)
+               {
+                       string file = CodeBinder.GetSourceCodeFile (project, 
group);
+                       if (file == null) {
+                               file = ActionGroupDisplayBinding.BindToClass 
(project, group);
+                       }
+                       
+                       Document doc = IdeApp.Workbench.OpenDocument (file, 
true);
+                       if (doc != null) {
+                               ActionGroupView view = doc.Content as 
ActionGroupView;
+                               if (view != null) {
+                                       view.ShowDesignerView ();
+                                       return view;
+                               }
+                       }
+                       return null;
+               }
+               
                static void OnActiveDocumentChanged (object s, EventArgs args)
                {
                        NotifyWidgetLibraryChange ();
 
                        if (IdeApp.Workbench.ActiveDocument == null) {
-                               ActiveProject = EmptyProject;
+                               ActiveProject = null;
                                if (widgetTreePad != null)
                                        widgetTreePad.Fill (null);
                                RestoreLayout ();
@@ -95,7 +113,7 @@
                                SetDesignerLayout ();
                        }
                        else {
-                               ActiveProject = EmptyProject;
+                               ActiveProject = null;
                                if (widgetTreePad != null)
                                        widgetTreePad.Fill (null);
                                RestoreLayout ();
@@ -252,8 +270,8 @@
                        get { return activeProject; }
                        set {
                                activeProject = value;
-                               if (activeProject == null)
-                                       activeProject = EmptyProject;
+//                             if (activeProject == null)
+//                                     activeProject = EmptyProject;
 
                                if (ActiveProjectChanged != null)
                                        ActiveProjectChanged (null, null);
@@ -273,6 +291,19 @@
                        }
                }
                
+               public static Project GetProjectFromDesign (Stetic.Project 
project)
+               {
+                       if (IdeApp.ProjectOperations.CurrentOpenCombine == null)
+                               return null;
+                               
+                       foreach (Project prj in 
IdeApp.ProjectOperations.CurrentOpenCombine.GetAllProjects ()) {
+                               GtkDesignInfo info = GtkCoreService.GetGtkInfo 
(prj);
+                               if (info != null && info.GuiBuilderProject != 
null && info.GuiBuilderProject.SteticProject == project)
+                                       return prj;
+                       }
+                       return null;
+               }
+               
                public static void NotifyWidgetLibraryChange ()
                {
                        if (WidgetLibrariesChanged != null)

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
       2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
       2006-05-19 20:06:23 UTC (rev 60877)
@@ -78,8 +78,6 @@
                        actionsBox.PackStart (groupDesign, true, true, 3);
                        actionsBox.ShowAll ();
                        
-                       AddButton (GettextCatalog.GetString ("Actions"), 
actionsBox);
-                       
                        // Widget toolbar
                        widgetBar = new MonoDevelopWidgetActionBar 
(editSession.RootWidget);
                        widgetBar.BorderWidth = 3;
@@ -95,9 +93,26 @@
                        
                        currentDesigner = editSession.WrapperWidget;
                        
+                       if (editSession.RootWidget.LocalActionGroups.Count > 0)
+                               AddButton (GettextCatalog.GetString 
("Actions"), actionsBox);
+                       else {
+                               
editSession.RootWidget.LocalActionGroups.ActionGroupAdded += new 
Stetic.Wrapper.ActionGroupEventHandler (OnActionGroupAdded);
+                       }
+                       
                        editSession.RootWidgetChanged += new EventHandler 
(OnRootWidgetChanged);
                }
                
+               protected override void OnDocumentActivated ()
+               {
+                       editSession.SetDesignerActive ();
+               }
+               
+               void OnActionGroupAdded (object s, 
Stetic.Wrapper.ActionGroupEventArgs args)
+               {
+                       AddButton (GettextCatalog.GetString ("Actions"), 
actionsBox);
+                       
editSession.RootWidget.LocalActionGroups.ActionGroupAdded -= new 
Stetic.Wrapper.ActionGroupEventHandler (OnActionGroupAdded);
+               }
+               
                void OnWindowChanged (object s, EventArgs args)
                {
                        OnContentChanged (args);
@@ -172,6 +187,15 @@
                        ShowPage (1);
                }
                
+               public void ShowActionDesignerView (string name)
+               {
+                       ShowPage (2);
+                       foreach (Stetic.Wrapper.ActionGroup grp in 
editSession.RootWidget.LocalActionGroups) {
+                               if (grp.Name == name)
+                                       groupToolbar.ActiveGroup = grp;
+                       }
+               }
+               
                /* Commands *********************************/
                
                [CommandHandler (EditCommands.Delete)]

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
     2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
     2006-05-19 20:06:23 UTC (rev 60877)
@@ -53,6 +53,7 @@
                GuiBuilderProject fproject;
                
                public event WindowEventHandler NameChanged;
+               public event WindowEventHandler Changed;
                
                internal GuiBuilderWindow (GuiBuilderProject fproject, 
Stetic.Project gproject, Stetic.Wrapper.Widget rootWidget)
                {
@@ -61,6 +62,8 @@
                        this.gproject = gproject;
                        gproject.WidgetNameChanged += new 
Stetic.Wrapper.WidgetNameChangedHandler (OnWidgetNameChanged);
                        gproject.ProjectReloaded += new EventHandler 
(OnProjectReloaded);
+                       rootWidget.LocalActionGroups.ActionGroupAdded += new 
Stetic.Wrapper.ActionGroupEventHandler (OnGroupsChanged);
+                       rootWidget.LocalActionGroups.ActionGroupRemoved += new 
Stetic.Wrapper.ActionGroupEventHandler (OnGroupsChanged);
                }
                
                void OnProjectReloaded (object s, EventArgs a)
@@ -104,11 +107,15 @@
                {
                        fproject.UpdatingWindow = true;
                        string oldName = rootWidget.Wrapped.Name;
+                       rootWidget.LocalActionGroups.ActionGroupAdded -= new 
Stetic.Wrapper.ActionGroupEventHandler (OnGroupsChanged);
+                       rootWidget.LocalActionGroups.ActionGroupRemoved -= new 
Stetic.Wrapper.ActionGroupEventHandler (OnGroupsChanged);
                        
                        try {
                                rootWidget.Delete ();
                                Gtk.Widget w = Stetic.WidgetUtils.ImportWidget 
(gproject, data);
                                rootWidget = Stetic.Wrapper.Container.Lookup 
(w);
+                               rootWidget.LocalActionGroups.ActionGroupAdded 
+= new Stetic.Wrapper.ActionGroupEventHandler (OnGroupsChanged);
+                               rootWidget.LocalActionGroups.ActionGroupRemoved 
+= new Stetic.Wrapper.ActionGroupEventHandler (OnGroupsChanged);
                                gproject.AddWidget ((Gtk.Widget) 
rootWidget.Wrapped);
                        } finally {
                                fproject.UpdatingWindow = false;
@@ -134,10 +141,23 @@
                        if (!InsideWindow (args.Widget))
                                return;
                        
-                       if (args.Widget == rootWidget && NameChanged != null)
+                       if (args.Widget == rootWidget && NameChanged != null) {
                                NameChanged (this, new WindowEventArgs (this));
+                       }
+                       OnChanged ();
                }
                
+               void OnGroupsChanged (object s, 
Stetic.Wrapper.ActionGroupEventArgs args)
+               {
+                       OnChanged ();
+               }
+               
+               protected virtual void OnChanged ()
+               {
+                       if (Changed != null)
+                               Changed (this, new WindowEventArgs (this));
+               }
+               
                public IClass GetClass ()
                {
                        return GetClass (rootWidget.Wrapped.Name);

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs
        2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs
        2006-05-19 20:06:23 UTC (rev 60877)
@@ -37,7 +37,7 @@
        {
                public event EventHandler BindField;
                
-               public MonoDevelopActionGroupToolbar 
(Stetic.Wrapper.ActionGroup actionGroup): base (actionGroup)
+               public MonoDevelopActionGroupToolbar (bool singleMode): base 
(singleMode)
                {
                }
                

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
     2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
     2006-05-19 20:06:23 UTC (rev 60877)
@@ -59,7 +59,7 @@
                {
                        Stetic.Wrapper.ActionGroup group = 
(Stetic.Wrapper.ActionGroup) dataObject;
                        label = group.Name;
-                       icon = IdeApp.Services.Resources.GetIcon 
("md-gtkcore-widget");
+                       icon = IdeApp.Services.Resources.GetIcon 
("md-gtkcore-actiongroup");
                }
                
                public override void OnNodeAdded (object dataObject)
@@ -86,19 +86,22 @@
        {
                public override void ActivateItem ()
                {
-                       Project project = (Project) 
CurrentNode.GetParentDataItem (typeof(Project), false);
-                       
-                       Stetic.Wrapper.ActionGroup group = 
(Stetic.Wrapper.ActionGroup) CurrentNode.DataItem;
-                       string file = CodeBinder.GetSourceCodeFile (project, 
group);
-                       if (file == null) {
-                               file = ActionGroupDisplayBinding.BindToClass 
(project, group);
+                       GuiBuilderWindow w = (GuiBuilderWindow) 
CurrentNode.GetParentDataItem (typeof(GuiBuilderWindow), false);
+                       if (w != null) {
+                               if (w.SourceCodeFile == null && !w.BindToClass 
())
+                                       return;
+                               
+                               Document doc = IdeApp.Workbench.OpenDocument 
(w.SourceCodeFile, true);
+                               if (doc != null) {
+                                       GuiBuilderView view = doc.Content as 
GuiBuilderView;
+                                       if (view != null)
+                                               view.ShowActionDesignerView 
(((Stetic.Wrapper.ActionGroup) CurrentNode.DataItem).Name);
+                               }
                        }
-                       
-                       Document doc = IdeApp.Workbench.OpenDocument (file, 
true);
-                       if (doc != null) {
-                               ActionGroupView view = doc.Content as 
ActionGroupView;
-                               if (view != null)
-                                       view.ShowDesignerView ();
+                       else {
+                               Project project = (Project) 
CurrentNode.GetParentDataItem (typeof(Project), false);
+                               Stetic.Wrapper.ActionGroup group = 
(Stetic.Wrapper.ActionGroup) CurrentNode.DataItem;
+                               GuiBuilderService.OpenActionGroup (project, 
group);
                        }
                }
        }

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
  2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
  2006-05-19 20:06:23 UTC (rev 60877)
@@ -84,6 +84,12 @@
                        AddNewWindow ("WidgetFileTemplate");
                }
                
+               [CommandHandler 
(MonoDevelop.GtkCore.GtkCommands.AddNewActionGroup)]
+               public void AddNewActionGroupToProject()
+               {
+                       AddNewWindow ("ActionGroupFileTemplate");
+               }
+               
                [CommandHandler (GtkCommands.ImportGladeFile)]
                protected void OnImportGladeFile ()
                {
@@ -91,6 +97,16 @@
                        GuiBuilderService.ImportGladeFile (project);
                }
                
+               [CommandHandler (GtkCommands.EditIcons)]
+               protected void OnEditIcons ()
+               {
+                       Project project = CurrentNode.GetParentDataItem 
(typeof(Project), true) as Project;
+                       Stetic.Project sp = GtkCoreService.GetGtkInfo 
(project).GuiBuilderProject.SteticProject;
+                       using (Stetic.Editor.EditIconFactoryDialog dlg = new 
Stetic.Editor.EditIconFactoryDialog (null, sp, sp.IconFactory)) {
+                               dlg.Run ();
+                       }
+               }
+               
                public void AddNewWindow (string id)
                {
                        Project project = CurrentNode.GetParentDataItem 
(typeof(Project), true) as Project;

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
  2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
  2006-05-19 20:06:23 UTC (rev 60877)
@@ -44,6 +44,13 @@
 {
        public class WidgetNodeBuilder: TypeNodeBuilder
        {
+               WindowEventHandler onChanged;
+               
+               public WidgetNodeBuilder ()
+               {
+                       onChanged = new WindowEventHandler (OnChanged);
+               }
+               
                public override Type CommandHandlerType {
                        get { return typeof(GladeWindowCommandHandler); }
                }
@@ -74,23 +81,37 @@
                                icon = IdeApp.Services.Resources.GetIcon 
("md-gtkcore-widget");
                }
                
+               public override void BuildChildNodes (ITreeBuilder builder, 
object dataObject)
+               {
+                       GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
+                       foreach (Stetic.Wrapper.ActionGroup agroup in 
win.RootWidget.LocalActionGroups) {
+                               builder.AddChild (agroup);
+                       }
+               }
+               
+               public override bool HasChildNodes (ITreeBuilder builder, 
object dataObject)
+               {
+                       GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
+                       return win.RootWidget.LocalActionGroups.Count > 0;
+               }
+               
                public override void OnNodeAdded (object dataObject)
                {
                        GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
-                       win.NameChanged += new WindowEventHandler 
(OnNameChanged);
+                       win.Changed += onChanged;
                }
                
                public override void OnNodeRemoved (object dataObject)
                {
                        GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
-                       win.NameChanged -= new WindowEventHandler 
(OnNameChanged);
+                       win.Changed -= onChanged;
                }
                
-               void OnNameChanged (object s, WindowEventArgs a)
+               void OnChanged (object s, WindowEventArgs a)
                {
                        ITreeBuilder tb = Context.GetTreeBuilder (a.Window);
                        if (tb != null)
-                               tb.Update ();
+                               tb.UpdateAll ();
                }
        }
        

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
      2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
      2006-05-19 20:06:23 UTC (rev 60877)
@@ -26,8 +26,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-
+using System;
 using MonoDevelop.Projects;
+using MonoDevelop.GtkCore.GuiBuilder;
 
 namespace MonoDevelop.GtkCore.NodeBuilders
 {
@@ -35,11 +36,43 @@
        {
                Project project;
                
+               public event EventHandler Changed;
+               
                public WindowsFolder (Project project)
                {
                        this.project = project;
+                       GtkDesignInfo info = GtkCoreService.GetGtkInfo 
(project);
+                       WindowEventHandler updateDelegate = new 
WindowEventHandler (OnUpdateFiles);
+                       info.GuiBuilderProject.WindowAdded += updateDelegate;
+                       info.GuiBuilderProject.WindowRemoved += updateDelegate;
+                       
+                       Stetic.Wrapper.ActionGroupEventHandler updateDelegate2 
= new Stetic.Wrapper.ActionGroupEventHandler (OnUpdateFiles);
+                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupAdded += 
updateDelegate2;
+                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupRemoved += 
updateDelegate2;
                }
                
+               public void Dispose ()
+               {
+                       GtkDesignInfo info = GtkCoreService.GetGtkInfo 
(project);
+                       WindowEventHandler updateDelegate = new 
WindowEventHandler (OnUpdateFiles);
+                       info.GuiBuilderProject.WindowAdded -= updateDelegate;
+                       info.GuiBuilderProject.WindowRemoved -= updateDelegate;
+                       
+                       Stetic.Wrapper.ActionGroupEventHandler updateDelegate2 
= new Stetic.Wrapper.ActionGroupEventHandler (OnUpdateFiles);
+                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupAdded -= 
updateDelegate2;
+                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupRemoved -= 
updateDelegate2;
+               }
+               
+               void OnUpdateFiles (object s, WindowEventArgs args)
+               {
+                       if (Changed != null) Changed (this, EventArgs.Empty);
+               }
+               
+               void OnUpdateFiles (object s, 
Stetic.Wrapper.ActionGroupEventArgs args)
+               {
+                       if (Changed != null) Changed (this, EventArgs.Empty);
+               }
+               
                public Project Project {
                        get { return project; }
                }

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
   2006-05-19 19:33:35 UTC (rev 60876)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
   2006-05-19 20:06:23 UTC (rev 60877)
@@ -43,13 +43,11 @@
 {
        public class WindowsFolderNodeBuilder: TypeNodeBuilder
        {
-               WindowEventHandler updateDelegate;
-               Stetic.Wrapper.ActionGroupEventHandler updateDelegate2;
+               EventHandler updateDelegate;
                
                public WindowsFolderNodeBuilder ()
                {
-                       updateDelegate = (WindowEventHandler) 
MonoDevelop.Core.Gui.Services.DispatchService.GuiDispatch (new 
WindowEventHandler (OnUpdateFiles));
-                       updateDelegate2 = 
(Stetic.Wrapper.ActionGroupEventHandler) 
MonoDevelop.Core.Gui.Services.DispatchService.GuiDispatch (new 
Stetic.Wrapper.ActionGroupEventHandler (OnUpdateFiles));
+                       updateDelegate = (EventHandler) 
MonoDevelop.Core.Gui.Services.DispatchService.GuiDispatch (new EventHandler 
(OnUpdateFiles));
                }
                
                public override Type NodeDataType {
@@ -105,39 +103,21 @@
 
                public override void OnNodeAdded (object dataObject)
                {
-                       Project p = ((WindowsFolder)dataObject).Project;
-                       GtkDesignInfo info = GtkCoreService.GetGtkInfo (p);
-                       info.GuiBuilderProject.WindowAdded += updateDelegate;
-                       info.GuiBuilderProject.WindowRemoved += updateDelegate;
-                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupAdded += 
updateDelegate2;
-                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupRemoved += 
updateDelegate2;
+                       WindowsFolder w = (WindowsFolder) dataObject;
+                       w.Changed += updateDelegate;
                }
                
                public override void OnNodeRemoved (object dataObject)
                {
-                       Project p = ((WindowsFolder)dataObject).Project;
-                       GtkDesignInfo info = GtkCoreService.GetGtkInfo (p);
-                       info.GuiBuilderProject.WindowAdded -= updateDelegate;
-                       info.GuiBuilderProject.WindowRemoved -= updateDelegate;
-                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupAdded -= 
updateDelegate2;
-                       
info.GuiBuilderProject.SteticProject.ActionGroups.ActionGroupRemoved -= 
updateDelegate2;
+                       WindowsFolder w = (WindowsFolder)dataObject;
+                       w.Changed -= updateDelegate;
+                       w.Dispose ();
                }
                
-               void OnUpdateFiles (object s, WindowEventArgs args)
+               void OnUpdateFiles (object s, EventArgs args)
                {
-                       ITreeBuilder tb = Context.GetTreeBuilder 
(args.Window.Project.Project);
+                       ITreeBuilder tb = Context.GetTreeBuilder (s);
                        if (tb != null) {
-                               if (tb.MoveToChild ("UserInterface", 
typeof(WindowsFolder))) {
-                                       tb.UpdateAll ();
-                               }
-                       }
-               }
-               
-               void OnUpdateFiles (object s, 
Stetic.Wrapper.ActionGroupEventArgs args)
-               {
-                       ITreeBuilder tb = Context.GetTreeBuilder 
(args.ActionGroup);
-                       if (tb != null) {
-                               tb.MoveToParent ();
                                tb.UpdateAll ();
                        }
                }

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml  
2006-05-19 19:33:35 UTC (rev 60876)
+++ trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml  
2006-05-19 20:06:23 UTC (rev 60877)
@@ -47,6 +47,7 @@
                <FileTemplate id = "DialogFileTemplate" resource = 
"Dialog.xft.xml"/>
                <FileTemplate id = "WindowFileTemplate" resource = 
"Window.xft.xml"/>
                <FileTemplate id = "WidgetFileTemplate" resource = 
"Widget.xft.xml"/>
+               <FileTemplate id = "ActionGroupFileTemplate" resource = 
"ActionGroup.xft.xml"/>
        </Extension>
        
        <Extension path = 
"/SharpDevelop/Views/GladeFileNodeBuilder/ContextMenu">
@@ -74,8 +75,13 @@
                <Command id = "MonoDevelop.GtkCore.GtkCommands.AddNewWidget"
                                icon = "md-gtkcore-widget"
                                _label = "New Widget..." />
+               <Command id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewActionGroup"
+                               icon = "md-gtkcore-actiongroup"
+                               _label = "New Action Group..." />
                <Command id = "MonoDevelop.GtkCore.GtkCommands.ImportGladeFile"
                                _label = "Import Glade file..." />
+               <Command id = "MonoDevelop.GtkCore.GtkCommands.EditIcons"
+                               _label = "Edit Project Icons..." />
        </Extension>
        
        <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectBrowserNode/Add">
@@ -83,6 +89,7 @@
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewDialog" />
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewWindow" />
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewWidget" />
+               <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewActionGroup" />
        </Extension>
        
        <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/DefaultDirectoryNode/Add">
@@ -90,13 +97,16 @@
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewDialog" />
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewWindow" />
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewWidget" />
+               <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewActionGroup" />
        </Extension>
        
        <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/WidgetsNode">
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewDialog" />
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewWindow" />
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewWidget" />
+               <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.AddNewActionGroup" />
                <SeparatorItem />
+               <CommandItem id = "MonoDevelop.GtkCore.GtkCommands.EditIcons" />
                <CommandItem id = 
"MonoDevelop.GtkCore.GtkCommands.ImportGladeFile" />
        </Extension>
        
@@ -136,6 +146,7 @@
                <StockIcon stockid = "md-gtkcore-window" resource = 
"window.png" />
                <StockIcon stockid = "md-gtkcore-dialog" resource = 
"dialog.png" />
                <StockIcon stockid = "md-gtkcore-widget" resource = 
"widget.png" />
+               <StockIcon stockid = "md-gtkcore-actiongroup" resource = 
"actiongroup.png" />
        </Extension>
 </AddIn>
 

Modified: trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp        
2006-05-19 19:33:35 UTC (rev 60876)
+++ trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.mdp        
2006-05-19 20:06:23 UTC (rev 60877)
@@ -70,6 +70,7 @@
     <File name="./MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs" subtype="Code" 
buildaction="Compile" />
     <File 
name="./MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs" 
subtype="Code" buildaction="Compile" />
     <File 
name="./MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs" 
subtype="Code" buildaction="Compile" />
+    <File name="./templates/ActionGroup.xft.xml" subtype="Code" 
buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Core" 
/>

Added: trunk/monodevelop/Extras/MonoDevelop.GtkCore/icons/actiongroup.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/icons/actiongroup.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/monodevelop/Extras/MonoDevelop.GtkCore/lib/libstetic.dll
===================================================================
(Binary files differ)

Modified: trunk/monodevelop/Extras/MonoDevelop.GtkCore/lib/libsteticui.dll
===================================================================
(Binary files differ)

Added: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/templates/ActionGroup.xft.xml
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.GtkCore/templates/ActionGroup.xft.xml  
2006-05-19 19:33:35 UTC (rev 60876)
+++ trunk/monodevelop/Extras/MonoDevelop.GtkCore/templates/ActionGroup.xft.xml  
2006-05-19 20:06:23 UTC (rev 60877)
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<Template Originator="Lluis Sanchez" Created="3/09/2001" 
LastModified="3/09/2001">
+       
+       <TemplateConfiguration>
+               <_Name>ActionGroup</_Name>
+               <Icon>md-empty-file-icon</Icon>
+               <Category>Gtk</Category>
+               <LanguageName>*</LanguageName>
+               <_Description>Creates a global Action Group.</_Description>
+       </TemplateConfiguration>
+       
+       <TemplateFiles>
+               <Widget DefaultName="${Name}">
+                       <SteticTemplate>
+                         <action-group name="${FullName}">
+                         </action-group>                       
+                       </SteticTemplate>
+                       <CodeDomFile>
+                               <CompileUnit>
+                                       <Namespaces>
+                                               <Namespace Name="">
+                                                       <Imports>
+                                                               
<NamespaceImport Namespace="System" />
+                                                       </Imports>
+                                               </Namespace>
+                                               <Namespace Name="${Namespace}">
+                                                       <Types>
+                                                               
<TypeDeclaration Name="${Name}" IsClass="true">
+                                                                       
<BaseTypes>
+                                                                               
<TypeReference BaseType="Gtk.ActionGroup" />
+                                                                       
</BaseTypes>
+                                                                       
<Members>
+                                                                               
<Constructor Attributes="Public, Final">
+                                                                               
        <Statements>
+                                                                               
                <MethodInvokeExpression>
+                                                                               
                        <Method>
+                                                                               
                                <MethodReferenceExpression MethodName="Build">
+                                                                               
                                        <TargetObject>
+                                                                               
                                                <TypeReferenceExpression 
Type="Stetic.Gui" />
+                                                                               
                                        </TargetObject>
+                                                                               
                                </MethodReferenceExpression>
+                                                                               
                        </Method>
+                                                                               
                        <Parameters>
+                                                                               
                                <ThisReferenceExpression/>
+                                                                               
                                <TypeOfExpression Type="${FullName}" />
+                                                                               
                        </Parameters>
+                                                                               
                </MethodInvokeExpression>
+                                                                               
        </Statements>
+                                                                               
</Constructor>
+                                                                       
</Members>
+                                                               
</TypeDeclaration>
+                                                       </Types>
+                                               </Namespace>
+                                       </Namespaces>
+                               </CompileUnit>
+                       </CodeDomFile>
+               </Widget>
+       </TemplateFiles>
+       
+       <FileOptions/>
+       
+</Template>

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to