Merge lp:~unity-team/unity/unity.visibility-indicators-label-image into lp:unity

[Jay Taoko]

Listen to "visible" property of the label and image in the indicators. Hide/show them accordingly.

[Mirco Müller (macslow)]

Approved

review: Approve

=== modified file 'unity-private/panel/panel-indicator-object-entry-view.vala'
--- unity-private/panel/panel-indicator-object-entry-view.vala	2010-06-08 22:55:07 +0000
+++ unity-private/panel/panel-indicator-object-entry-view.vala	2010-06-24 03:15:42 +0000
@@ -66,7 +66,6 @@
         {
           image = new Ctk.Image (22);
           add_actor (image);
-          image.show ();
 
           if (entry.image.icon_name != null)
             {
@@ -78,6 +77,30 @@
               image.pixbuf = entry.image.pixbuf;
               image.size = entry.image.pixbuf.width;
             }
+
+          if ((entry.image.get_flags () & Gtk.WidgetFlags.VISIBLE) != 0)
+            {
+              image.show ();
+            }
+          else
+            {
+              image.hide ();
+            }
+            
+          entry.image.notify["visible"].connect (() =>
+            {
+              if (entry.image != null)
+                {
+                  if ((entry.image.get_flags () & Gtk.WidgetFlags.VISIBLE) != 0)
+                    {
+                      image.show ();
+                    }
+                  else
+                    {
+                      image.hide ();
+                    }
+                }
+            });
         }
 
       entry.image.notify["pixbuf"].connect (() =>
@@ -110,7 +133,6 @@
           text = new Ctk.Text ("");
           text.color = { 233, 216, 200, 255 };
           add_actor (text);
-          text.show ();
 
           text.text = entry.label.label;
 
@@ -118,6 +140,30 @@
             {
               text.text = entry.label.label;
             });
+            
+          if ((entry.label.get_flags () & Gtk.WidgetFlags.VISIBLE) != 0)
+            {
+              text.show ();
+            }
+          else
+            {
+              text.hide ();
+            }
+            
+          entry.label.notify["visible"].connect (() =>
+            {
+              if (entry.label != null)
+                {
+                  if ((entry.label.get_flags () & Gtk.WidgetFlags.VISIBLE) != 0)
+                    {
+                      text.show ();
+                    }
+                  else
+                    {
+                      text.hide ();
+                    }
+                }
+            });            
         }
     }