From 5ceda38732c57211d3f38e6cbbd7b8a521a0a9e5 Mon Sep 17 00:00:00 2001
From: Daniel Francis <francis@sugarlabs.org>
Date: Wed, 03 Oct 2012 00:23:16 +0000
Subject: Start sugarizing; use Gtk3

---
(limited to 'desktop/sweetener/item.py')

diff --git a/desktop/sweetener/item.py b/desktop/sweetener/item.py
index 1b5fc8e..80a2984 100644
--- a/desktop/sweetener/item.py
+++ b/desktop/sweetener/item.py
@@ -21,21 +21,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
@@ -52,9 +52,10 @@ class Item(gobject.GObject):
     stock_id = property(get_stock_id, set_stock_id)
 
     def get_menu_item(self):
-        self.menuitem = gtk.ImageMenuItem(self._stock_id)
+        self.menuitem = Gtk.ImageMenuItem.new_from_stock(self._stock_id,
+                                                         self.accel_group)
         self.menuitem.connect('activate', self.activate_cb)
-        self.setup_accelerator()
+        #self.setup_accelerator()
         return self.menuitem
 
     def activate_cb(self, widget):
@@ -66,10 +67,10 @@ class Item(gobject.GObject):
         if accelerator[1] > 0:
             self.menuitem.add_accelerator('activate',
                             self.accel_group, accelerator[1], accelerator[0],
-                            gtk.ACCEL_VISIBLE)
+                            Gtk.AccelFlags.VISIBLE)
 
     def get_tool_item(self):
-        self.toolitem = gtk.ToolButton(self._stock_id)
+        self.toolitem = Gtk.ToolButton(self._stock_id)
         self.toolitem.connect('clicked', self.activate_cb)
         self.setup_tooltip()
         return self.toolitem
@@ -78,7 +79,7 @@ class Item(gobject.GObject):
         if self.tooltip:
             self.toolitem.set_tooltip_text(self.tooltip)
         else:
-            text = gtk.stock_lookup(self.stock_id)[1]
+            text = Gtk.stock_lookup(self.stock_id).label
             self.toolitem.set_tooltip_text(text.replace('_', ''))
 
     def emit_signal(self, widget, signal_name):
--
cgit v0.9.1