Setup argument stock_id for SweetenerItem constructor.

9 files changed, 25 insertions, 32 deletions

diff --git a/desktop/sweetener/basic_options.py b/desktop/sweetener/basic_options.py
index 34ef892..b8b656f 100644
--- a/desktop/sweetener/basic_options.py
+++ b/desktop/sweetener/basic_options.py
@@ -34,21 +34,17 @@ class BasicOptions(ItemGroup):
         ItemGroup.__init__(self, box, _('_File'), None)
 
         if activity.save_type != CONFIG:
-            new = Item(True)
-            new.set_stock_id(gtk.STOCK_NEW)
+            new = Item(gtk.STOCK_NEW, True)
             new.connect('activate', lambda w: activity.new())
             self.append_item(new)
-            _open = Item(True)
-            _open.set_stock_id(gtk.STOCK_OPEN)
+            _open = Item(gtk.STOCK_OPEN, True)
             _open.connect('activate', lambda w: activity.open())
             self.append_item(_open)
             self.append_separator()
-            save_option = Item(True)
-            save_option.set_stock_id(gtk.STOCK_SAVE)
+            save_option = Item(gtk.STOCK_SAVE, True)
             save_option.connect('activate', lambda w: activity.save())
             self.append_item(save_option)
-            save_as_option = Item(False)
-            save_as_option.set_stock_id(gtk.STOCK_SAVE_AS)
+            save_as_option = Item(gtk.STOCK_SAVE_AS)
             save_as_option.connect('activate', lambda w: activity.save_as())
             self.append_item(save_as_option)
             if export_formats != None:
@@ -57,13 +53,11 @@ class BasicOptions(ItemGroup):
                                     _('Export as %s') % export_formats[0][0],
                                     None, export_formats[0][1].replace('/',
                                         '-'))
-                    export = Item(False)
+                    export = Item('sweetener-%s' % export_formats[0][1])
                     export.connect('activate', activity.export,
                                             export_formats[0])
-                    export.set_stock_id('sweetener-%s' % export_formats[0][1])
                     self.append_item(export)
             self.append_separator()
-            _quit = Item(False)
-            _quit.set_stock_id(gtk.STOCK_QUIT)
+            _quit = Item(gtk.STOCK_QUIT)
             _quit.connect('activate', lambda w: activity.stop())
             self.append_item(_quit)
diff --git a/desktop/sweetener/coloritem.py b/desktop/sweetener/coloritem.py
index 3aaaf89..b755c8a 100644
--- a/desktop/sweetener/coloritem.py
+++ b/desktop/sweetener/coloritem.py
@@ -32,10 +32,9 @@ class ColorItem(Item):
     __gsignals__ = {'updated': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
                                 (gobject.TYPE_STRING,))}
 
-    def __init__(self, important, parent):
-        Item.__init__(self, important)
+    def __init__(self, parent=None, important=False):
+        Item.__init__(self, gtk.STOCK_SELECT_COLOR, important)
         self.parent = parent
-        self.set_stock_id(gtk.STOCK_SELECT_COLOR)
         self.color = '#FFFFFF'
 
     def _color_changed_cb(self, widget):
diff --git a/desktop/sweetener/help.py b/desktop/sweetener/help.py
index 0c23aa5..d214392 100644
--- a/desktop/sweetener/help.py
+++ b/desktop/sweetener/help.py
@@ -29,9 +29,8 @@ import info
 
 class AboutItem(Item):
     def __init__(self, parent):
-        Item.__init__(self, False)
+        Item.__init__(self, gtk.STOCK_ABOUT)
         self.parent = parent
-        self.set_stock_id(gtk.STOCK_ABOUT)
 
     def do_activate(self):
         dialog = gtk.AboutDialog()
@@ -53,10 +52,9 @@ class Help(ItemGroup):
     def __init__(self, box):
         title = gtk.stock_lookup(gtk.STOCK_HELP)[1]
         ItemGroup.__init__(self, box, title, 'toolbar-help')
-        contents = Item(False)
         stock.register('sweetener-help-contents', _('Contents'),
                        'F1', 'gtk-help')
-        contents.set_stock_id('sweetener-help-contents')
+        contents = Item('sweetener-help-contents')
         contents.connect('activate', lambda w: gtk.show_uri(None,
                                                          info.documentation,
                                                 gtk.get_current_event_time()))
diff --git a/desktop/sweetener/item.py b/desktop/sweetener/item.py
index 2cf5b91..1b5fc8e 100644
--- a/desktop/sweetener/item.py
+++ b/desktop/sweetener/item.py
@@ -34,9 +34,9 @@ class Item(gobject.GObject):
     menuitem = None
     toolitem = None
 
-    def __init__(self, important):
+    def __init__(self, stock_id=None, important=False):
         gobject.GObject.__init__(self)
-        self._stock_id = None  # Change with gtk.STOCK_APPLY for debug
+        self._stock_id = stock_id
         self.accel_group = None
         self.important = important
         self.connection = None
diff --git a/desktop/sweetener/radioitem.py b/desktop/sweetener/radioitem.py
index a8bf237..ed97fdc 100644
--- a/desktop/sweetener/radioitem.py
+++ b/desktop/sweetener/radioitem.py
@@ -25,8 +25,9 @@ from toggleitem import ToggleItem
 
 
 class RadioItem(ToggleItem):
-    def __init__(self, important, default_value, group):
-        ToggleItem.__init__(self, important, default_value)
+    def __init__(self, group, default_value=True,
+                  stock_id=None, important=False):
+        ToggleItem.__init__(self, default_value, stock_id, important)
         self.group = group
 
     def get_menu_item(self):
diff --git a/desktop/sweetener/settingsitem.py b/desktop/sweetener/settingsitem.py
index 48708fa..a690597 100644
--- a/desktop/sweetener/settingsitem.py
+++ b/desktop/sweetener/settingsitem.py
@@ -31,8 +31,8 @@ class SettingsItem(Item):
     __gsignals__ = {'closed': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
                                 tuple())}
 
-    def __init__(self, important, parent):
-        Item.__init__(self, important)
+    def __init__(self, parent=None, stock_id=None, important=False):
+        Item.__init__(self, stock_id, important)
         self.content = gtk.EventBox()
         self.parent = parent
         # For toggleoptions
diff --git a/desktop/sweetener/settingsradioitem.py b/desktop/sweetener/settingsradioitem.py
index fb8c632..b8c8a9f 100644
--- a/desktop/sweetener/settingsradioitem.py
+++ b/desktop/sweetener/settingsradioitem.py
@@ -30,9 +30,10 @@ class SettingsRadioItem(SettingsItem, RadioItem):
     __gsignals__ = {'toggled': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
                                 (gobject.TYPE_BOOLEAN,))}
 
-    def __init__(self, important, parent, default_value, group):
-        SettingsItem.__init__(self, important, parent)
-        RadioItem.__init__(self, important, default_value, group)
+    def __init__(self, group, default_value=True, parent=None,
+                 stock_id=None, important=False):
+        SettingsItem.__init__(self, parent, stock_id, important)
+        RadioItem.__init__(self, group, default_value, stock_id, important)
 
     def get_menu_item(self):
         RadioItem.get_menu_item(self)
diff --git a/desktop/sweetener/shortcontentitem.py b/desktop/sweetener/shortcontentitem.py
index ebcf117..7b4a5f4 100644
--- a/desktop/sweetener/shortcontentitem.py
+++ b/desktop/sweetener/shortcontentitem.py
@@ -29,8 +29,8 @@ from item import Item
 
 class ShortContentItem(Item):
 
-    def __init__(self, important, parent):
-        Item.__init__(self, important)
+    def __init__(self, parent=None, stock_id=None, important=False):
+        Item.__init__(self, stock_id, important)
         self.content = gtk.EventBox()
         self.parent = parent
         self.separator = None
diff --git a/desktop/sweetener/toggleitem.py b/desktop/sweetener/toggleitem.py
index 9bb503f..e28e87a 100644
--- a/desktop/sweetener/toggleitem.py
+++ b/desktop/sweetener/toggleitem.py
@@ -29,8 +29,8 @@ class ToggleItem(Item):
     __gsignals__ = {'toggled': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
                                 (gobject.TYPE_BOOLEAN,))}
 
-    def __init__(self, important, default_value):
-        Item.__init__(self, important)
+    def __init__(self, default_value=True, stock_id=None, important=False):
+        Item.__init__(self, stock_id, important)
         self.default_value = default_value
         self.active = default_value