From 044fece73333de247736aa5c4474cd4c0e34bd0e Mon Sep 17 00:00:00 2001
From: Sebastian <icarito@sugarlabs.org>
Date: Sat, 05 Mar 2011 08:01:05 +0000
Subject: Added support for "new" toolbars.

---
diff --git a/Maze.activity/olpcgames/activity.py b/Maze.activity/olpcgames/activity.py
index 76b21d5..40b1623 100644
--- a/Maze.activity/olpcgames/activity.py
+++ b/Maze.activity/olpcgames/activity.py
@@ -6,7 +6,7 @@ import logging
 logging.root.setLevel(logging.WARN)
 log = logging.getLogger('olpcgames.activity')
 
-# log.setLevel( logging.INFO )
+log.setLevel( logging.DEBUG )
 
 import pygtk
 pygtk.require('2.0')
@@ -107,10 +107,32 @@ class PyGameActivity(activity.Activity):
         provide custom toolbars when running under Sugar.
         """
 
-        toolbar = activity.ActivityToolbar(self)
-        toolbar.show()
-        self.set_toolbox(toolbar)
+        #toolbar = activity.ActivityToolbar(self)
+        #toolbar.show()
+        #self.set_toolbox(toolbar)
 
+        from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
+        from sugar.activity.widgets import ActivityToolbarButton, StopButton
+
+        toolbar_box = ToolbarBox()
+        activity_button = ActivityToolbarButton(self)
+        toolbar_box.toolbar.insert(activity_button, 0)
+        activity_button.show()
+
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbar_box.toolbar.insert(separator, -1)
+        separator.show()
+
+        stop_button = StopButton(self)
+        stop_button.props.accelerator = '<Ctrl><Shift>Q'
+        toolbar_box.toolbar.insert(stop_button, -1)
+        stop_button.show()
+
+        self.set_toolbar_box(toolbar_box)
+        toolbar_box.show()
+        
         def shared_cb(*args, **kwargs):
             log.info('shared: %s, %s', args, kwargs)
             try:
@@ -146,8 +168,8 @@ class PyGameActivity(activity.Activity):
 
             joined_cb()
 
-        toolbar.title.unset_flags(gtk.CAN_FOCUS)
-        return toolbar
+        #toolbar.title.unset_flags(gtk.CAN_FOCUS)
+        return toolbar_box.toolbar
 
     PYGAME_CANVAS_CLASS = PyGameCanvas
 
--
cgit v0.9.1