Combo for shared/private in the activity menu.

sugar/graphics/toolcombobox.py

@@ -16,20 +16,45 @@
 # Boston, MA 02111-1307, USA.
 
 import gtk
+import gobject
 
 from sugar.graphics.combobox import ComboBox
 from sugar.graphics import units
+from sugar.graphics import style
 
 class ToolComboBox(gtk.ToolItem):
-    def __init__(self, combo=None):
-        gtk.ToolItem.__init__(self)
+    __gproperties__ = {
+        'label-text' : (str, None, None, None,
+                        gobject.PARAM_WRITABLE),
+    }
+
+    def __init__(self, combo=None, **kwargs):
+        self.label = None
+        self._label_text = ''
+
+        gobject.GObject.__init__(self, **kwargs)
 
         self.set_border_width(units.microgrid_to_pixels(1))
 
+        hbox = gtk.HBox(False, style.DEFAULT_SPACING)
+
+        self.label = gtk.Label(self._label_text)
+        hbox.pack_start(self.label, False)
+        self.label.show()
+
         if combo:
             self.combo = combo
         else:
             self.combo = ComboBox()
-        self.add(self.combo)
+
+        hbox.pack_start(self.combo)
         self.combo.show()
 
+        self.add(hbox)
+        hbox.show()
+
+    def do_set_property(self, pspec, value):
+        if pspec.name == 'label-text':
+            self._label_text = value
+            if self.label:
+                self.label.set_text(self._label_text)