Merge lp:~jconti/unity-greeter/hide-hidden-indicators into lp:~robert-ancell/unity-greeter/trunk

[Jason Conti]

indicator-power hides its entry image if no battery information is available. This branch adds support to show/hide an indicator menuitem based on the visibility of its entry image/label. Uses a method similar to the indicator-applet.

This is related to lp:830175

[Robert Ancell (robert-ancell)]

Hi Jason,

Thanks very much for that!

Unity greeter requires contributions to be give under the Canonical contributor agreement [1]. Could you please have a look at that and sign it if you agree?

Thanks again,
--Robert

[1] http://www.canonical.com/contributors

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-08-30 04:41:21 +0000
+++ src/user-list.vala	2011-08-30 22:08:24 +0000
@@ -39,6 +39,64 @@
     }
 }
 
+private class IndicatorMenuItem : Gtk.MenuItem
+{
+    private Gtk.HBox  _hbox;
+    private Gtk.Image _image = null;
+    private Gtk.Label _label = null;
+
+    public IndicatorMenuItem ()
+    {
+        this._hbox = new Gtk.HBox (false, 3);
+        this.add (this._hbox);
+        this._hbox.show ();
+    }
+
+    public Gtk.Image entry_image
+    {
+        get { return this._image; }
+        set
+        {
+            if (value != null && this._image == null)
+            {
+                this._image = value;
+                this._image.show.connect (this.visibility_changed_cb);
+                this._image.hide.connect (this.visibility_changed_cb);
+                this._hbox.pack_start (this._image, false, false, 0);
+            }
+        }
+    }
+
+    public Gtk.Label entry_label
+    {
+        get { return this._label; }
+        set
+        {
+            if (value != null && this._label == null)
+            {
+                this._label = value;
+                this._label.show.connect (this.visibility_changed_cb);
+                this._label.hide.connect (this.visibility_changed_cb);
+                this._hbox.pack_start (this._label, false, false, 0);
+            }
+        }
+    }
+
+    public bool has_visible_child ()
+    {
+        return (this._image != null && this._image.get_visible ()) ||
+               (this._label != null && this._label.get_visible ());
+    }
+
+    public void visibility_changed_cb (Gtk.Widget widget)
+    {
+        if (this.has_visible_child ())
+            this.show ();
+        else
+            this.hide ();
+    }
+}
+
 private class SessionMenuItem : Gtk.RadioMenuItem
 {
     public string session_name;
@@ -403,20 +461,17 @@
 
     private void indicator_added_cb (Indicator.ObjectEntry entry)
     {
-        var menuitem = new Gtk.MenuItem ();
-        menuitem.show ();
-
-        var hbox = new Gtk.HBox (false, 3);
-        menuitem.add (hbox);
-        hbox.show ();
-
-        if (entry.image != null)
-            hbox.pack_start (entry.image, false, false, 0);
-        if (entry.label != null)
-            hbox.pack_start (entry.label, false, false, 0);
+        var menuitem = new IndicatorMenuItem ();
+
+        menuitem.entry_image = entry.image;
+        menuitem.entry_label = entry.label;
+
         if (entry.menu != null)
             menuitem.submenu = entry.menu;
-
+ 
+        if (menuitem.has_visible_child ())
+            menuitem.show();
+ 
         menubar.insert (menuitem, (int) menubar.get_children ().length () - 2);
     }