← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric-updates

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2009-02-18 08:40:51 UTC
  • mfrom: (1.2.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090218084051-gh8m6ukvokbwj7cf
Tags: 1.9.2+dfsg-1ubuntu1
https://launchpad.net/bugs/330519
* Merge from Debian Experimental (LP: #330519), remaining Ubuntu changes:
  + debian/control:
    - Update for Gnome# 2.24
    - Add libmono-cairo1.0-cil to build-deps to fool pkg-config check

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
38
38
using MonoDevelop.Ide.Commands;
39
39
using MonoDevelop.Ide.Gui.Pads.ProjectPad;
40
40
using MonoDevelop.GtkCore.GuiBuilder;
 
41
using MonoDevelop.Ide.Gui.Components;
41
42
 
42
43
namespace MonoDevelop.GtkCore.NodeBuilders
43
44
{
70
71
                public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, ref string label, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf closedIcon)
71
72
                {
72
73
                        Project p = ((WindowsFolder)dataObject).Project;
73
 
                        GtkDesignInfo info = GtkCoreService.GetGtkInfo (p);
74
 
                        if (info != null && info.GuiBuilderProject.HasError) {
 
74
                        GtkDesignInfo info = GtkDesignInfo.FromProject (p);
 
75
                        if (info.GuiBuilderProject.HasError) {
75
76
                                label = GettextCatalog.GetString ("User Interface (GUI project load failed)");
76
77
                        } else {
77
78
                                label = GettextCatalog.GetString ("User Interface");
83
84
                public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
84
85
                {
85
86
                        Project p = ((WindowsFolder)dataObject).Project;
86
 
                        GtkDesignInfo info = GtkCoreService.GetGtkInfo (p);
87
 
                        if (info != null && !info.GuiBuilderProject.HasError) {
 
87
                        GtkDesignInfo info = GtkDesignInfo.FromProject (p);
 
88
                        if (!info.GuiBuilderProject.HasError) {
88
89
                                builder.AddChild (new StockIconsNode (p));
89
90
                                foreach (GuiBuilderWindow fi in info.GuiBuilderProject.Windows)
90
91
                                        builder.AddChild (fi);
100
101
                
101
102
                public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
102
103
                {
103
 
                        if (otherNode.DataItem is ResourceFolder || otherNode.DataItem is ProjectReferenceCollection)
 
104
                        if (otherNode.DataItem is ProjectReferenceCollection)
104
105
                                return 1;
105
106
                        else
106
107
                                return -1;