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/itemgroup.py')

diff --git a/desktop/sweetener/itemgroup.py b/desktop/sweetener/itemgroup.py
index 3e4780e..16ac46c 100644
--- a/desktop/sweetener/itemgroup.py
+++ b/desktop/sweetener/itemgroup.py
@@ -18,18 +18,18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-import gobject
-import gtk
+from gi.repository import GObject
+from gi.repository import Gtk
 
 
-class ItemGroup(gobject.GObject):
+class ItemGroup(GObject.GObject):
     def __init__(self, box, name=None, icon=None):
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
         self.items = []
         self.first_important = True
-        self.item = gtk.MenuItem(name)
+        self.item = Gtk.MenuItem.new_with_mnemonic(name)
         box.menubar.append(self.item)
-        self.menu = gtk.Menu()
+        self.menu = Gtk.Menu()
         self.item.set_submenu(self.menu)
         self.menu.show()
         self.item.show()
@@ -44,9 +44,10 @@ class ItemGroup(gobject.GObject):
         self.menu.append(menuitem)
         if item.important:
             if self.first_important and len(self.toolbar):
-                separator = gtk.SeparatorToolItem()
+                separator = Gtk.SeparatorToolItem()
                 separator.show()
                 self.toolbar.insert(separator, -1)
+            self.toolbar.show()
             self.first_important = False
             tool_item = item.get_tool_item()
             self.toolbar.insert(tool_item, -1)
@@ -54,11 +55,11 @@ class ItemGroup(gobject.GObject):
         self.items.append(item)
 
     def append_separator(self, important=False):
-        menuitem = gtk.SeparatorMenuItem()
+        menuitem = Gtk.SeparatorMenuItem()
         menuitem.show()
         self.menu.append(menuitem)
         if important:
-            toolitem = gtk.SeparatorToolItem()
+            toolitem = Gtk.SeparatorToolItem()
             toolitem.show()
             self.toolbar.insert(toolitem, -1)
             return toolitem
@@ -72,11 +73,11 @@ class GhostGroup(ItemGroup):
 
 class SubGroup(ItemGroup):
     def __init__(self, group, name=None):
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
         self.items = []
-        self.item = gtk.MenuItem(name)
+        self.item = Gtk.MenuItem(name)
         group.menu.append(self.item)
-        self.menu = gtk.Menu()
+        self.menu = Gtk.Menu()
         self.item.set_submenu(self.menu)
         self.menu.show()
         self.item.show()
--
cgit v0.9.1