diff options
author | Sebastian Silva <icarito@sugarlabs.org> | 2011-03-04 08:40:47 (GMT) |
---|---|---|
committer | Sebastian Silva <icarito@sugarlabs.org> | 2011-03-04 08:40:47 (GMT) |
commit | 78151f8aec2321ea6c9de1d1b69b6d9d7570f593 (patch) | |
tree | 61c0ebcfc87c296bfe4f2c5ebf70a13db180a17a | |
parent | 84cecb86534a8475fdb14c8021aa26193ffdfc96 (diff) | |
parent | 81948542d8d240c16bba4c1cd180ffa0f4a40949 (diff) |
Merge branch 'master' of git://git.sugarlabs.org/maze/mainline
Conflicts:
Maze.activity/olpcgames/canvas.pyc
-rw-r--r-- | Maze.activity/olpcgames/activity.py | 27 | ||||
-rw-r--r-- | Maze.activity/olpcgames/canvas.pyc | bin | 4585 -> 0 bytes |
2 files changed, 23 insertions, 4 deletions
diff --git a/Maze.activity/olpcgames/activity.py b/Maze.activity/olpcgames/activity.py index 45a6a69..c12faf7 100644 --- a/Maze.activity/olpcgames/activity.py +++ b/Maze.activity/olpcgames/activity.py @@ -93,10 +93,29 @@ class PyGameActivity(activity.Activity): This is a customisation point for those games which want to provide custom toolbars when running under Sugar. """ - toolbar = activity.ActivityToolbar(self) - toolbar.show() - self.set_toolbox(toolbar) - def shared_cb(*args, **kwargs): + OLD_TOOLBAR = False + try: + from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton + from sugar.activity.widgets import ActivityToolbarButton + except ImportError: + OLD_TOOLBAR = True + + if OLD_TOOLBAR: + # toolbar = activity.ActivityToolbar(self) + # toolbar.show() + # self.set_toolbox(toolbar) + self.toolbox = ActivityToolbox(self) + self.set_toolbox(self.toolbox) + self.toolbox.show() + self.set_toolbox(self.toolbox) + else: + toolbar_box = ToolbarBox() + self.activity_button = ActivityToolbarButton(self) + toolbar_box.toolbar.insert(self.activity_button, 0) + self.set_toolbar_box(toolbar_box) + + + def shared_cb(*args, **kwargs): log.info( 'shared: %s, %s', args, kwargs ) try: mesh.activity_shared(self) diff --git a/Maze.activity/olpcgames/canvas.pyc b/Maze.activity/olpcgames/canvas.pyc Binary files differdeleted file mode 100644 index 75c6c6a..0000000 --- a/Maze.activity/olpcgames/canvas.pyc +++ /dev/null |