sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return None when no element is active and use theme: for marking icons from the theme.

Browse Source
This commit is contained in:
Tomeu Vizoso 2007-07-03 17:08:36 +02:00
parent 13885e621b
commit 4df052e5de
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sugar/graphics/combobox.py
View File

@ -46,11 +46,23 @@ class ComboBox(gtk.ComboBox):
def do_get_property(self, pspec): def do_get_property(self, pspec):
if pspec.name == 'value': if pspec.name == 'value':
action_id, text, icon_name, is_separator = self.get_active_item() row = self.get_active_item()
return action_id if not row:
return None
return row[0]
else: else:
return gtk.ComboBox.do_get_property(self, pspec) return gtk.ComboBox.do_get_property(self, pspec)
def _get_real_name_from_theme(self, name):
icon_theme = gtk.icon_theme_get_default()
width, height = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
info = icon_theme.lookup_icon(name, width, height)
if not info:
raise ValueError("Icon '" + name + "' not found.")
fname = info.get_filename()
del info
return fname
def append_item(self, action_id, text, icon_name=None): def append_item(self, action_id, text, icon_name=None):
if not self._icon_renderer and icon_name: if not self._icon_renderer and icon_name:
self._icon_renderer = gtk.CellRendererPixbuf() self._icon_renderer = gtk.CellRendererPixbuf()
@ -65,11 +77,9 @@ class ComboBox(gtk.ComboBox):
if icon_name: if icon_name:
width, height = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU) width, height = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
if os.path.isfile(icon_name): if icon_name[0:6] == "theme:":
icon_name = self._get_real_name_from_theme(icon_name[6:])
pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(icon_name, width, height) pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(icon_name, width, height)
else:
icon_theme = gtk.icon_theme_get_default()
pixbuf = icon_theme.load_icon(icon_name, width, 0)
else: else:
pixbuf = None pixbuf = None
@ -84,8 +94,13 @@ class ComboBox(gtk.ComboBox):
index = 0 index = 0
row = self._model.iter_nth_child(None, index) row = self._model.iter_nth_child(None, index)
if not row:
return None
return self._model[row] return self._model[row]
def remove_all(self):
self._model.clear()
def _is_separator(self, model, row): def _is_separator(self, model, row):
action_id, text, icon_name, is_separator = model[row] action_id, text, icon_name, is_separator = model[row]
return is_separator return is_separator