diff options
Diffstat (limited to 'item.py')
| -rw-r--r-- | item.py | 43 |
1 files changed, 23 insertions, 20 deletions
@@ -18,21 +18,21 @@ import logging logger = logging.getLogger('option') -import gobject -import gtk +from gi.repository import GObject +from gi.repository import Gtk import stock -class Item(gobject.GObject): - __gsignals__ = {'activate': (gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, +class Item(GObject.GObject): + __gsignals__ = {'activate': (GObject.SignalFlags.RUN_LAST, + None, tuple())} menuitem = None toolitem = None def __init__(self, stock_id=None, important=False): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self._stock_id = stock_id self.accel_group = None self.important = important @@ -51,7 +51,7 @@ class Item(gobject.GObject): def get_menu_item(self): sensitive = self.sensitive if stock.stock_items[self.stock_id]['has_icon'] is not None: - self.menuitem = gtk.ImageMenuItem() + self.menuitem = Gtk.ImageMenuItem() self.menuitem.set_label(stock.get_label(self.stock_id, False)) self.menuitem.set_use_underline(True) self.menuitem.set_sensitive(sensitive) @@ -59,7 +59,7 @@ class Item(gobject.GObject): self.setup_accelerator() self.setup_menu_icon() else: - self.menuitem = gtk.MenuItem(stock.get_label(self.stock_id, False)) + self.menuitem = Gtk.MenuItem(stock.get_label(self.stock_id, False)) self.menuitem.set_use_underline(True) self.menuitem.set_sensitive(sensitive) self.menuitem.connect('activate', self.activate_cb) @@ -74,11 +74,11 @@ class Item(gobject.GObject): logger.debug(str(accelerator)) if accelerator[1] > 0: self.menuitem.add_accelerator('activate', - self.accel_group, accelerator[1], accelerator[0], - gtk.ACCEL_VISIBLE) + self.accel_group, accelerator[0], accelerator[1], + Gtk.AccelFlags.VISIBLE) def get_tool_item(self): - self.toolitem = gtk.ToolButton() + self.toolitem = Gtk.ToolButton() self.setup_tool_icon() self.toolitem.connect('clicked', self.activate_cb) self.toolitem.set_sensitive(self.sensitive) @@ -90,24 +90,27 @@ class Item(gobject.GObject): iconset = stock.stock_items[self.stock_id]['has_icon'] if iconset is not None: try: - pixbuf = iconset.render_icon(mstyle, gtk.TEXT_DIR_NONE, - gtk.STATE_NORMAL, - gtk.ICON_SIZE_MENU) - image = gtk.image_new_from_pixbuf(pixbuf) + pixbuf = iconset.render_icon(mstyle, Gtk.TextDirection.NONE, + Gtk.StateType.NORMAL, + Gtk.IconSize.MENU, + self.menuitem, + None) + image = Gtk.Image.new_from_pixbuf(pixbuf) self.menuitem.set_image(image) except Exception, err: logger.debug(self.stock_id) logger.error(err) def setup_tool_icon(self): - mstyle = self.menuitem.get_style() + mstyle = self.toolitem.get_style() iconset = stock.stock_items[self.stock_id]['has_icon'] if iconset is not None: try: - pixbuf = iconset.render_icon(mstyle, gtk.TEXT_DIR_NONE, - gtk.STATE_NORMAL, - gtk.ICON_SIZE_LARGE_TOOLBAR) - image = gtk.image_new_from_pixbuf(pixbuf) + pixbuf = iconset.render_icon(mstyle, Gtk.TextDirection.NONE, + Gtk.StateType.NORMAL, + Gtk.IconSize.LARGE_TOOLBAR, + self.toolitem, None) + image = Gtk.Image.new_from_pixbuf(pixbuf) image.show() self.toolitem.set_icon_widget(image) except Exception, err: |