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

Adapt to Gtk.icon_size_lookup*() API changes

Browse Source 
In PyGTK, icon_size_lookup*() returned just the icon size as a 2-tuple [1].
In GTK3+pygi, an additional boolean value indicating whether the passed-in
value was valid is returned. [3,4]

[1] http://developer.gnome.org/pygtk/stable/class-gtkiconsource.html#function-gtk--icon-size-lookup
[2] http://developer.gnome.org/pygtk/stable/class-gtkiconsource.html#function-gtk--icon-size-lookup-for-settings
[3] http://developer.gnome.org/gtk/stable/gtk-Themeable-Stock-Images.html#gtk-icon-size-lookup
[4] http://developer.gnome.org/gtk/stable/gtk-Themeable-Stock-Images.html#gtk-icon-size-lookup-for-settings

Signed-off-by: Simon Schampijer <simon@schampijer.de>
[marked unused local variables, fixed overlong line]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
This commit is contained in:
Simon Schampijer 2011-11-04 09:30:01 +01:00
parent 8efb7c3f93
commit 0d827e7e66
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sugar3/graphics/combobox.py
View File

@ -62,7 +62,7 @@ class ComboBox(Gtk.ComboBox):
def _get_real_name_from_theme(self, name, size):
icon_theme = Gtk.IconTheme.get_default()
width, height = Gtk.icon_size_lookup(size)
valid_, width, height = Gtk.icon_size_lookup(size)
info = icon_theme.lookup_icon(name, max(width, height), 0)
if not info:
raise ValueError('Icon %r not found.' % name)
@ -91,8 +91,8 @@ class ComboBox(Gtk.ComboBox):
self._icon_renderer = Gtk.CellRendererPixbuf()
settings = self.get_settings()
w, h = Gtk.icon_size_lookup_for_settings(
settings, Gtk.IconSize.MENU)
valid_, w, h = Gtk.icon_size_lookup_for_settings(
settings, Gtk.IconSize.MENU)
self._icon_renderer.props.stock_size = max(w, h)
self.pack_start(self._icon_renderer, False)
@ -108,7 +108,7 @@ class ComboBox(Gtk.ComboBox):
size = Gtk.IconSize.MENU
else:
size = Gtk.IconSize.LARGE_TOOLBAR
width, height = Gtk.icon_size_lookup(size)
valid_, width, height = Gtk.icon_size_lookup(size)
if icon_name:
file_name = self._get_real_name_from_theme(icon_name, size)

2
src/sugar3/graphics/icon.py
View File

@ -346,7 +346,7 @@ class Icon(Gtk.Image):
self._buffer.file_name = self.props.file
if self.props.pixel_size == -1:
width, height = Gtk.icon_size_lookup(self.props.icon_size)
valid_, width, height = Gtk.icon_size_lookup(self.props.icon_size)
else:
width = height = self.props.pixel_size
if self._buffer.width != width or self._buffer.height != height:

3
src/sugar3/graphics/notebook.py
View File

@ -80,7 +80,8 @@ class Notebook(Gtk.Notebook):
Gtk.Button.set_relief(button, Gtk.ReliefStyle.NONE)
settings = Gtk.Widget.get_settings(button)
w, h = Gtk.icon_size_lookup_for_settings(settings, Gtk.IconSize.MENU)
valid_, w, h = Gtk.icon_size_lookup_for_settings(settings,
Gtk.IconSize.MENU)
Gtk.Widget.set_size_request(button, w + 4, h + 4)
image.show()
icon_box.pack_start(image, True, False, 0)