disable toolbar (pre 0.86)

2 files changed, 13 insertions, 7 deletions

diff --git a/ReckonPrimer.activity/ReckonPrimerActivity.py b/ReckonPrimer.activity/ReckonPrimerActivity.py
index 813a838..ef875d2 100755
--- a/ReckonPrimer.activity/ReckonPrimerActivity.py
+++ b/ReckonPrimer.activity/ReckonPrimerActivity.py
@@ -8,7 +8,7 @@ from sugar.activity import activity
 from sugar.datastore import datastore
 from sugar import profile
 from session import Session
-from toolbar import Toolbar
+#from toolbar import Toolbar
 
 class ReckonPrimerActivity(activity.Activity):
 
@@ -16,8 +16,11 @@ class ReckonPrimerActivity(activity.Activity):
     
         activity.Activity.__init__(self, handle)
 
-        toolbar = Toolbar(self)
-        toolbar.show()
+	toolbox = activity.ActivityToolbox(self)
+	self.set_toolbox(toolbox)
+	toolbox.show()
+        #toolbar = Toolbar(self)
+        #toolbar.show()
         
         file_location = activity.get_activity_root() + \
                         "/data/reckonprimer_report.txt" 
diff --git a/ReckonPrimer.activity/toolbar.py b/ReckonPrimer.activity/toolbar.py
index e243a05..d4eff8e 100644
--- a/ReckonPrimer.activity/toolbar.py
+++ b/ReckonPrimer.activity/toolbar.py
@@ -1,9 +1,12 @@
 import gtk
 
-from sugar.activity.widgets import ActivityToolbarButton
-from sugar.activity.widgets import StopButton
+try:
+    from sugar.activity.widgets import ActivityToolbarButton
+    from sugar.activity.widgets import StopButton
+    from sugar.graphics.toolbarbox import ToolbarButton, ToolbarBox
+except ImportError:
+    pass
 from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toolbarbox import ToolbarButton, ToolbarBox
 
 class Toolbar:
     
@@ -38,4 +41,4 @@ class Toolbar:
         toolbar_box.toolbar.insert(stop, -1)
         
         toolbar_box.show_all()
-        self._parent.set_toolbar_box(toolbar_box)
\ No newline at end of file
+        self._parent.set_toolbar_box(toolbar_box)