commenting out 0.86 "new" menu bars for now to focus on pre 0.86 bars

1 files changed, 56 insertions, 55 deletions

diff --git a/ToasterActivity.py b/ToasterActivity.py
index 570c1be..24f886d 100644
--- a/ToasterActivity.py
+++ b/ToasterActivity.py
@@ -28,23 +28,23 @@ import os.path
 
 import sugar
 from sugar.activity import activity
-try: # 0.86+ toolbar widgets
-    from sugar.bundle.activitybundle import ActivityBundle
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    from sugar.graphics.toolbarbox import ToolbarBox
-    from sugar.graphics.toolbarbox import ToolbarButton
-except ImportError:
-    pass
+#try: # 0.86+ toolbar widgets
+#    from sugar.bundle.activitybundle import ActivityBundle
+#    from sugar.activity.widgets import ActivityToolbarButton
+#    from sugar.activity.widgets import StopButton
+#    from sugar.graphics.toolbarbox import ToolbarBox
+#    from sugar.graphics.toolbarbox import ToolbarButton
+#except ImportError:
+#    pass
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.menuitem import MenuItem
 from sugar.graphics.icon import Icon
 from sugar.datastore import datastore
-try:
-    from sugar.graphics import style
-    GRID_CELL_SIZE = style.GRID_CELL_SIZE
-except:
-    GRID_CELL_SIZE = 0
+#try:
+#    from sugar.graphics import style
+#    GRID_CELL_SIZE = style.GRID_CELL_SIZE
+#except:
+GRID_CELL_SIZE = 0
 
 import logging
 _logger = logging.getLogger("toaster-activity")
@@ -98,50 +98,51 @@ class ToasterActivity(activity.Activity):
         #
         # We need some toolbars
         #
-        try:
-            # Use 0.86 toolbar design
-            toolbar_box = ToolbarBox()
-
-            # Buttons added to the Activity toolbar
-            activity_button = ActivityToolbarButton(self)
-            toolbar_box.toolbar.insert(activity_button, 0)
-            activity_button.show()
-
-            # my buttons
-
-            share_button = ShareButton(self)
-            toolbar_box.toolbar.insert(share_button, -1)
-            share_button.show()
-
-            keep_button = KeepButton(self)
-            toolbar_box.toolbar.insert(keep_button, -1)
-            keep_button.show()
-
-            separator = gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_expand(True)
-            separator.show()
-            toolbar_box.toolbar.insert(separator, -1)
-
-            # The ever-present Stop Button
-            stop_button = StopButton(self)
-            stop_button.props.accelerator = '<Ctrl>Q'
-            toolbar_box.toolbar.insert(stop_button, -1)
-            stop_button.show()
-
-            self.set_toolbar_box(toolbar_box)
-            toolbar_box.show()
-
-        except NameError:
-            # Use pre-0.86 toolbar design
-            toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(toolbox)
+        #try:
+        #    # Use 0.86 toolbar design
+        #    toolbar_box = ToolbarBox()
+        #
+        #    # Buttons added to the Activity toolbar
+        #    activity_button = ActivityToolbarButton(self)
+        #    toolbar_box.toolbar.insert(activity_button, 0)
+        #    activity_button.show()
+        #
+        #    # my buttons
+        #
+        #    share_button = ShareButton(self)
+        #    toolbar_box.toolbar.insert(share_button, -1)
+        #    share_button.show()
+        #
+        #    keep_button = KeepButton(self)
+        #    toolbar_box.toolbar.insert(keep_button, -1)
+        #    keep_button.show()
+        #
+        #    separator = gtk.SeparatorToolItem()
+        #    separator.props.draw = False
+        #    separator.set_expand(True)
+        #    separator.show()
+        #    toolbar_box.toolbar.insert(separator, -1)
+        #
+        #    # The ever-present Stop Button
+        #    stop_button = StopButton(self)
+        #    stop_button.props.accelerator = '<Ctrl>Q'
+        #    toolbar_box.toolbar.insert(stop_button, -1)
+        #    stop_button.show()
+        #
+        #    self.set_toolbar_box(toolbar_box)
+        #    toolbar_box.show()
+        #
+        #except NameError:
+        # Use pre-0.86 toolbar design
+        toolbox = activity.ActivityToolbox(self)
+        self.set_toolbox(toolbox)
 
-            self.projectToolbar = ProjectToolbar(self)
-            toolbox.add_toolbar( _('Toaster'), self.projectToolbar )
+        self.projectToolbar = ProjectToolbar(self)
+        toolbox.add_toolbar( _('Toaster'), self.projectToolbar )
 
-            toolbox.show()
-            toolbox.set_current_toolbar(1)
+        toolbox.show()
+        toolbox.set_current_toolbar(1)
+        # end of future pre-0.86 except block
 
 
         self.show_all()