diff options
Diffstat (limited to 'groupthink/sugar_tools.py')
| -rw-r--r-- | groupthink/sugar_tools.py | 48 |
1 files changed, 42 insertions, 6 deletions
diff --git a/groupthink/sugar_tools.py b/groupthink/sugar_tools.py index d68b616..43b5703 100644 --- a/groupthink/sugar_tools.py +++ b/groupthink/sugar_tools.py @@ -17,8 +17,27 @@ import logging import telepathy -from sugar.activity.activity import Activity -from sugar.graphics.toolbarbox import ToolbarBox +try: # Can use 'New' toolbar design? + from sugar.activity.activity import Activity + from sugar.graphics.toolbarbox import ToolbarBox + from sugar.activity.widgets import ActivityToolbarButton, StopButton + _HAVE_TOOLBOX = True + +except ImportError: + _HAVE_TOOLBOX = False + + +if _HAVE_TOOLBOX: + from sugar.activity.widgets import ActivityToolbarButton, StopButton + from sugar.graphics.toolbarbox import ToolbarButton + +from sugar.activity import activity +from sugar.graphics import style +from sugar.activity.activity import EditToolbar +from sugar.graphics.toolbutton import ToolButton +from sugar.graphics.alert import Alert +from sugar.graphics.icon import Icon + from sugar.presence import presenceservice @@ -70,10 +89,27 @@ class GroupActivity(Activity): else: self.message = self.message_preparing - # top toolbar with share and close buttons: - toolbox = ToolbarBox(self) - self.set_toolbox(toolbox) - toolbox.show() + # Top toolbar with share and close buttons: + if _HAVE_TOOLBOX: + # 'New' Sugar toolbar design + toolbox = ToolbarBox() + + activity_button = ActivityToolbarButton(self) + toolbox.toolbar.insert(activity_button, 0) + activity_button.show() + + self.set_toolbar_box(toolbox) + toolbox.show() + toolbar = toolbox.toolbar + + else: + toolbar = activity.ActivityToolbar(self) + toolbar.show() + self.set_toolbox(toolbar) + + #toolbox = ToolbarBox(self) + #self.set_toolbox(toolbox) + #toolbox.show() v = gtk.VBox() self.startup_label = gtk.Label(self.message) |