From d9e9737ad9d305ff47d463793d7efd58e1262892 Mon Sep 17 00:00:00 2001 From: Nat Date: Thu, 02 Aug 2007 17:33:46 +0000 Subject: Test --- diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index c5e79a1..32515b2 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -258,7 +258,7 @@ class propsPalette(Palette): self.filterTypeLabel = gtk.Label(_('Filter Type: ')) self.filterTypeComboBox = BigComboBox() for type in [_('Lowpass'),_('Bandpass'),_('Highpass')]: - self.filterTypeComboBox.append_item(0, type, Config.TAM_TAM_ROOT + '/icons/testMenu.svg') + self.filterTypeComboBox.append_item(0, type, Config.TAM_TAM_ROOT + '/icons/testMenu.svg',(20,20)) self.filterTypeComboBox.set_active(0) self.filterTypeBox.pack_start(self.filterTypeLabel, False, False, padding = 5) self.filterTypeBox.pack_end(self.filterTypeComboBox, False, False, padding = 55) diff --git a/Util/ThemeWidgets.py b/Util/ThemeWidgets.py index f1b0105..1771edc 100644 --- a/Util/ThemeWidgets.py +++ b/Util/ThemeWidgets.py @@ -1126,7 +1126,7 @@ class BigComboBox(ComboBox): def __init__(self): ComboBox.__init__(self) - def append_item(self, action_id, text, icon_name=None): + def append_item(self, action_id, text, icon_name=None, size = None): if not self._icon_renderer and icon_name: self._icon_renderer = gtk.CellRendererPixbuf() @@ -1143,9 +1143,11 @@ class BigComboBox(ComboBox): self.add_attribute(self._text_renderer, 'text', 1) if icon_name: - size = gtk.ICON_SIZE_LARGE_TOOLBAR - - width, height = gtk.icon_size_lookup(size) + if not size: + size = gtk.ICON_SIZE_LARGE_TOOLBAR + width, height = gtk.icon_size_lookup(size) + else: + width, height = 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) -- cgit v0.9.1