From aba311ff102a9628dae9a76cf2ec8fc4c0b07e28 Mon Sep 17 00:00:00 2001
From: Alan Aguiar <alanjas@hotmail.com>
Date: Tue, 07 Jan 2014 00:00:30 +0000
Subject: update toolbars

---
diff --git a/activity.py b/activity.py
index 684906d..c336503 100755
--- a/activity.py
+++ b/activity.py
@@ -1,10 +1,85 @@
+# -*- coding: utf-8 -*-
+
+import logging
 import olpcgames
-from olpcgames import activity
+import pygame
+import gtk
+
+from olpcgames import mesh
+from olpcgames import util
+
+from sugar.activity.widgets import ActivityToolbarButton
+from sugar.activity.widgets import StopButton
+from sugar.graphics.toolbarbox import ToolbarBox
 from gettext import gettext as _
 
-class Activity(activity.PyGameActivity):
+class SpaceTagActivity(olpcgames.PyGameActivity):
     game_name = 'spacetag'
     game_title = _('Space Tag')
-    game_size = None
+    game_size = None    # Let olpcgames pick a nice size for us
+
+    def __init__(self, handle):
+        super(SpaceTagActivity, self).__init__(handle)
+
+        # This code was copied from olpcgames.activity.PyGameActivity
+        def shared_cb(*args, **kwargs):
+            logging.info('shared: %s, %s', args, kwargs)
+            try:
+                mesh.activity_shared(self)
+            except Exception, err:
+                logging.error('Failure signaling activity sharing'
+                              'to mesh module: %s', util.get_traceback(err))
+            else:
+                logging.info('mesh activity shared message sent,'
+                             ' trying to grab focus')
+            try:
+                self._pgc.grab_focus()
+            except Exception, err:
+                logging.warn('Focus failed: %s', err)
+            else:
+                logging.info('asserting focus')
+                assert self._pgc.is_focus(), \
+                    'Did not successfully set pygame canvas focus'
+            logging.info('callback finished')
+
+        def joined_cb(*args, **kwargs):
+            logging.info('joined: %s, %s', args, kwargs)
+            mesh.activity_joined(self)
+            self._pgc.grab_focus()
+        self.connect('shared', shared_cb)
+        self.connect('joined', joined_cb)
+
+        if self.get_shared():
+            # if set at this point, it means we've already joined (i.e.,
+            # launched from Neighborhood)
+            joined_cb()
+
+    def build_toolbar(self):
+        """Build our Activity toolbar for the Sugar system."""
+
+        toolbar_box = ToolbarBox()
+
+        activity_button = ActivityToolbarButton(self)
+        toolbar_box.toolbar.insert(activity_button, -1)
+        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)
+        toolbar_box.toolbar.insert(stop_button, -1)
+        stop_button.show()
+
+        self.set_toolbar_box(toolbar_box)
+        toolbar_box.show_all()
+
+        self.connect("destroy", self.__stop_pygame)
+
+        return toolbar_box
+
+    def __stop_pygame(self, widget):
+        pygame.quit()
 
-    
diff --git a/activity/activity.info b/activity/activity.info
index c34d0e0..593c43f 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,4 +3,4 @@ name = SpaceTag
 activity_version = 1
 bundle_id = edu.centenary.SpaceTag
 icon = SpaceTag
-exec = sugar-activity activity.Activity
+exec = sugar-activity activity.SpaceTagActivity
--
cgit v0.9.1