Author: lluis
Date: 2007-07-20 13:45:17 -0400 (Fri, 20 Jul 2007)
New Revision: 82378

Modified:
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs
   
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/lib/libstetic.dll
   trunk/monodevelop/Extras/MonoDevelop.GtkCore/lib/libsteticui.dll
Log:
* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
  Don't try to use the CurrentNode property after adding the file,
  since it may have changed. Should fix bug #82123.
* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
  Fixes bugs #81846 and #82144.
* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix window
  source file lookup.
* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Use the new methods
  for checking clipboard operations on the current selection.
* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Include the
  current project in the list of libraries to show in the toolbox.
  Fixes bug #82125.

Modified: trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog      2007-07-20 
17:45:02 UTC (rev 82377)
+++ trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog      2007-07-20 
17:45:17 UTC (rev 82378)
@@ -1,3 +1,18 @@
+2007-07-20  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
+         Don't try to use the CurrentNode property after adding the file,
+         since it may have changed. Should fix bug #82123.
+       * lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
+         Fixes bugs #81846 and #82144.
+       * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix window
+         source file lookup.
+       * MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Use the new methods
+         for checking clipboard operations on the current selection.
+       * MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Include the
+         current project in the list of libraries to show in the toolbox.
+         Fixes bug #82125.
+
 2007-07-10  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * lib/libsteticui.dll, lib/libstetic.dll: Updated. Fixes bugs 81977,

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
    2007-07-20 17:45:02 UTC (rev 82377)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
    2007-07-20 17:45:17 UTC (rev 82378)
@@ -448,17 +448,11 @@
                public string GetSourceCodeFile (Stetic.ProjectItemInfo obj, 
bool getUserClass)
                {
                        IClass cls = GetClass (obj, getUserClass);
-                       GtkDesignInfo info = GtkCoreService.GetGtkInfo 
(project);
                        
-                       if (cls != null) {
-                               // Ignore partial classes located at the 
gtk-gui folder
-                               foreach (IClass pc in cls.Parts) {
-                                       if (!pc.Region.FileName.StartsWith 
(info.GtkGuiFolder)) {
-                                               return pc.Region.FileName;
-                                       }
-                               }
-                       }
-                       return null;
+                       if (cls != null)
+                               return cls.Region.FileName;
+                       else
+                               return null;
                }
                
                IClass GetClass (Stetic.ProjectItemInfo obj, bool getUserClass)
@@ -479,7 +473,7 @@
                        IClass[] classes = ctx.GetProjectContents ();
                        foreach (IClass cls in classes) {
                                if (cls.FullyQualifiedName == className) {
-                                       if (getUserClass) {
+                                       if (getUserClass && cls.Parts.Length > 
1) {
                                                // Return this class only if it 
is declared outside the gtk-gui
                                                // folder. Generated partial 
classes will be ignored.
                                                foreach (IClass part in 
cls.Parts) {

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
       2007-07-20 17:45:02 UTC (rev 82377)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
       2007-07-20 17:45:17 UTC (rev 82378)
@@ -488,7 +488,7 @@
                [CommandUpdateHandler (EditCommands.Delete)]
                protected void OnUpdateDelete (CommandInfo cinfo)
                {
-                       cinfo.Enabled = designer.Selection != null && 
designer.Selection.CanCut;
+                       cinfo.Enabled = designer.CanDeleteSelection;
                }
                
                [CommandHandler (EditCommands.Copy)]
@@ -500,7 +500,7 @@
                [CommandUpdateHandler (EditCommands.Copy)]
                protected void OnUpdateCopy (CommandInfo cinfo)
                {
-                       cinfo.Enabled = designer.Selection != null && 
designer.Selection.CanCopy;
+                       cinfo.Enabled = designer.CanCopySelection;
                }
                
                [CommandHandler (EditCommands.Cut)]
@@ -512,7 +512,7 @@
                [CommandUpdateHandler (EditCommands.Cut)]
                protected void OnUpdateCut (CommandInfo cinfo)
                {
-                       cinfo.Enabled = designer.Selection != null && 
designer.Selection.CanCut;
+                       cinfo.Enabled = designer.CanCutSelection;
                }
                
                [CommandHandler (EditCommands.Paste)]
@@ -536,7 +536,7 @@
                [CommandUpdateHandler (EditCommands.Paste)]
                protected void OnUpdatePaste (CommandInfo cinfo)
                {
-                       cinfo.Enabled = designer.Selection == null || 
designer.Selection.CanPaste;
+                       cinfo.Enabled = designer.CanPasteToSelection;
                }
                
                [CommandUpdateHandler (EditCommands.Undo)]

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs
      2007-07-20 17:45:02 UTC (rev 82377)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs
      2007-07-20 17:45:17 UTC (rev 82378)
@@ -31,16 +31,18 @@
                                return null;
                                
                        Hashtable refs = new Hashtable ();
+                       string of = Runtime.FileService.GetFullPath 
(view.Project.GetOutputFileName ());
+                       refs [of] = of;
                        foreach (ProjectReference pr in 
view.Project.ProjectReferences)
                                foreach (string f in pr.GetReferencedFileNames 
()) {
-                                       refs[f] = f;
+                                       refs[Runtime.FileService.GetFullPath 
(f)] = f;
                                }
                        
                        List<ItemToolboxNode> list = new List<ItemToolboxNode> 
();
                        foreach (ComponentType type in types) {
                                if (type.Category == "window")
                                        continue;
-                               if (type.ClassName == "Gtk.Action" || 
refs.Contains (type.Library)) {
+                               if (type.ClassName == "Gtk.Action" || 
refs.Contains (Runtime.FileService.GetFullPath (type.Library))) {
                                        ComponentToolboxNode node = new 
ComponentToolboxNode (type);
                                        list.Add (node);
                                }

Modified: 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
  2007-07-20 17:45:02 UTC (rev 82377)
+++ 
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
  2007-07-20 17:45:17 UTC (rev 82378)
@@ -172,6 +172,8 @@
                        if (project == null)
                                return;
                        
+                       object dataItem = CurrentNode.DataItem;
+                       
                        ProjectFolder folder = CurrentNode.GetParentDataItem 
(typeof(ProjectFolder), true) as ProjectFolder;
                        
                        if (GtkCoreService.SupportsPartialTypes (project))
@@ -186,7 +188,10 @@
                        IdeApp.ProjectOperations.CreateProjectFile (project, 
path, id);
                        
                        IdeApp.ProjectOperations.SaveProject (project);
-                       CurrentNode.Expanded = true;
+                       
+                       ITreeNavigator nav = Tree.GetNodeAtObject (dataItem);
+                       if (nav != null)
+                               nav.Expanded = true;
                }
        }
 }

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

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

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

Reply via email to