← Back to branch summary

~ubuntu-branches/debian/squeeze/f-spot/squeeze

« back to all changes in this revision

Viewing changes to src/Extensions/MenuNode.cs

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane, Mirco Bauer, Iain Lane
  • Date: 2009-02-07 20:23:32 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20090207202332-oc93rfjo1st0571s
Tags: 0.5.0.3-2
https://launchpad.net/bugs/293305
http://bugs.debian.org/514457
[ Mirco Bauer]
* Upload to unstable.
* debian/control:
  + Lowered GNOME# build-deps to 2.0 ABI as that transition didn't happen
    yet in unstable.

[ Iain Lane ]
* debian/patches/svn-r4545_locales-import.dpatch: Patch backported from SVN
  trunk revision 4545 - initialize the translation catalog earlier (LP: #293305)
  (Closes: #514457). Thanks to Florian Heinle for finding the patch and to
  Chris Coulson for preparing the update.
* debian/control: Build-depend on libmono-dev (>= 1.2.4) to match configure
  checks.
* debian/rules: Pass CSC=/usr/bin/csc to configure for gio-sharp to fix FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Extensions/MenuNode.cs
24
24
        [ExtensionNodeChild (typeof (ComplexMenuItemNode))]
25
25
        public class SubmenuNode : MenuNode
26
26
        {
27
 
                public override Gtk.MenuItem GetMenuItem ()
 
27
                public override Gtk.MenuItem GetMenuItem (object parent)
28
28
                {
29
 
                        Gtk.MenuItem item = base.GetMenuItem ();
 
29
                        Gtk.MenuItem item = base.GetMenuItem (parent);
30
30
 
31
 
                        Gtk.Menu submenu = GetSubmenu ();
 
31
                        Gtk.Menu submenu = GetSubmenu (parent);
32
32
 
33
33
                        if (item.Submenu != null)
34
34
                                item.Submenu.Dispose ();        
39
39
 
40
40
                public Gtk.Menu GetSubmenu ()
41
41
                {
 
42
                        return GetSubmenu (null);
 
43
                }
 
44
 
 
45
                public Gtk.Menu GetSubmenu (object parent)
 
46
                {
42
47
                        Gtk.Menu submenu = new Gtk.Menu ();
43
48
 
44
49
                        foreach (MenuNode node in ChildNodes)
45
 
                                submenu.Insert (node.GetMenuItem (), -1);
 
50
                                submenu.Insert (node.GetMenuItem (parent), -1);
46
51
 
47
52
                        return submenu;                         
48
53
                }
56
61
 
57
62
                private IMenuGenerator menu_generator;
58
63
 
59
 
                public override Gtk.MenuItem GetMenuItem ()
 
64
                public override Gtk.MenuItem GetMenuItem (object parent)
60
65
                {
61
 
                        Gtk.MenuItem item = base.GetMenuItem ();
 
66
                        Gtk.MenuItem item = base.GetMenuItem (parent);
62
67
                        menu_generator = (IMenuGenerator) Addin.CreateInstance (command_type); 
63
68
                        item.Submenu = menu_generator.GetMenu ();
64
69
                        item.Activated += menu_generator.OnActivated;
69
74
        [ExtensionNode ("MenuItem")]
70
75
        public class MenuItemNode : MenuNode
71
76
        {
72
 
                public override Gtk.MenuItem GetMenuItem ()
 
77
                public override Gtk.MenuItem GetMenuItem (object parent)
73
78
                {
74
 
                        Gtk.MenuItem item = base.GetMenuItem ();
 
79
                        Gtk.MenuItem item = base.GetMenuItem (parent);
75
80
                        item.Activated += OnActivated;
76
81
                        return item;
77
82
                }
84
89
        [ExtensionNode ("MenuSeparator")]
85
90
        public class MenuSeparatorNode : MenuNode
86
91
        {
87
 
                public override Gtk.MenuItem GetMenuItem ()
 
92
                public override Gtk.MenuItem GetMenuItem (object parent)
88
93
                {
89
94
                        return new Gtk.SeparatorMenuItem ();
90
95
                }
98
103
                [NodeAttribute]
99
104
                protected string icon;
100
105
 
101
 
                public virtual Gtk.MenuItem GetMenuItem ()
 
106
                public virtual Gtk.MenuItem GetMenuItem (object parent)
102
107
                {
103
108
                        Gtk.MenuItem item;
104
109
                        if (icon == null)