diff options
author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-08-26 18:44:51 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-08-26 18:44:51 (GMT) |
commit | 405dafc90850807bb478e3a00a031e07f602f0ff (patch) | |
tree | 6d391c79874cc0a57c7980f087e04141b6dcda4c /sugar | |
parent | cf7ff39c5ad7750f71baeded213f04a89470e658 (diff) |
Adapt to changes in the icon API.
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/activity/activity.py | 4 | ||||
-rw-r--r-- | sugar/graphics/combobox.py | 15 | ||||
-rw-r--r-- | sugar/graphics/objectchooser.py | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index 3f782b5..6655b24 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -75,9 +75,9 @@ class ActivityToolbar(gtk.Toolbar): self.share = ToolComboBox(label_text='Share with:') self.share.combo.connect('changed', self._share_changed_cb) self.share.combo.append_item(None, _('Private'), - 'theme:zoom-home-mini') + 'zoom-home-mini') self.share.combo.append_item(None, _('My Neighborhood'), - 'theme:zoom-neighborhood-mini') + 'zoom-neighborhood-mini') self.insert(self.share, -1) self.share.show() diff --git a/sugar/graphics/combobox.py b/sugar/graphics/combobox.py index 3251dc2..75573f0 100644 --- a/sugar/graphics/combobox.py +++ b/sugar/graphics/combobox.py @@ -61,8 +61,8 @@ class ComboBox(gtk.ComboBox): del info return fname - def append_item(self, action_id, text, icon_name=None): - if not self._icon_renderer and icon_name: + def append_item(self, action_id, text, icon_name=None, file_name=None): + if not self._icon_renderer and (icon_name or file_name): self._icon_renderer = gtk.CellRendererPixbuf() settings = self.get_settings() @@ -77,16 +77,17 @@ class ComboBox(gtk.ComboBox): self.pack_end(self._text_renderer, True) self.add_attribute(self._text_renderer, 'text', 1) - if icon_name: + if icon_name or file_name: if text: size = gtk.ICON_SIZE_MENU else: size = gtk.ICON_SIZE_LARGE_TOOLBAR - width, height = gtk.icon_size_lookup(size) - if icon_name[0:6] == "theme:": - icon_name = self._get_real_name_from_theme(icon_name[6:], size) - pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(icon_name, width, height) + + if icon_name: + file_name = self._get_real_name_from_theme(icon_name[6:], size) + + pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(file_name, width, height) else: pixbuf = None diff --git a/sugar/graphics/objectchooser.py b/sugar/graphics/objectchooser.py index 56a5a31..4128cf3 100644 --- a/sugar/graphics/objectchooser.py +++ b/sugar/graphics/objectchooser.py @@ -150,7 +150,7 @@ class CollapsedEntry(CanvasRoundBox): self._icon_name = type.icon if not self._icon_name: - self._icon_name = 'theme:image-missing' + self._icon_name = 'image-missing' return self._icon_name |