From cbaf3adc5807709997d611097262bd7b6c321454 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 08 Mar 2011 01:21:57 +0000 Subject: Fallback to old toolbars just in case. --- diff --git a/typingturtle.py b/typingturtle.py index 5bfa31f..32dc813 100755 --- a/typingturtle.py +++ b/typingturtle.py @@ -59,7 +59,8 @@ class TypingTurtle(sugar.activity.activity.Activity): sugar.activity.activity.Activity.__init__(self, handle) self.set_title(_("Typing Turtle")) - self.build_toolbox() + if not self.build_toolbox(): + self.OLD_TOOLBAR = True self.screens = [] self.screenbox = gtk.VBox() @@ -84,6 +85,18 @@ class TypingTurtle(sugar.activity.activity.Activity): self.show_all() + if self.OLD_TOOLBAR: + # Hide the sharing button from the activity toolbar since we don't support sharing. + activity_toolbar = self.tbox.get_activity_toolbar() + activity_toolbar.share.props.visible = False + + self.editorbtn = sugar.graphics.toolbutton.ToolButton('format-justify-left') + self.editorbtn.set_tooltip(_("Edit Lessons")) + self.editorbtn.connect('clicked', self.editor_clicked_cb) + + share_idx = activity_toolbar.get_item_index(activity_toolbar.share) + activity_toolbar.insert(self.editorbtn, share_idx) + self.editorbtn.show_all() def build_toolbox(self): try: @@ -116,11 +129,18 @@ class TypingTurtle(sugar.activity.activity.Activity): self.set_toolbar_box(toolbar_box) toolbar_box.show() toolbar=toolbar_box.toolbar + + self.OLD_TOOLBAR = False + return True + except ImportError: self.tbox = sugar.activity.activity.ActivityToolbox(self) self.tbox.show_all() - self.set_toolbox(self.tbox) + + return False + + def editor_clicked_cb(self, btn): self.push_screen(editlessonlistscreen.EditLessonListScreen(self, self.mainscreen.lessons)) -- cgit v0.9.1