1 files changed, 68 insertions, 53 deletions
diff --git a/activity.py b/activity.py
index fdaa0f9..50c17a1 100755
--- a/activity.py
+++ b/activity.py
@@ -1,53 +1,68 @@
-# activity.py
-# my standard link between sugar and my activity
-
-from gettext import gettext as _
-
-import gtk
-import pygame
-from sugar.activity import activity
-from sugar.graphics.toolbutton import ToolButton
-import gobject
-import sugargame.canvas
-import load_save
-import FollowMe
-
-class PeterActivity(activity.Activity):
-    def __init__(self, handle):
-        super(PeterActivity, self).__init__(handle)
-
-        # Build the activity toolbar.
-        toolbox = activity.ActivityToolbox(self)
-        activity_toolbar = toolbox.get_activity_toolbar()
-        activity_toolbar.keep.props.visible = False
-        activity_toolbar.share.props.visible = False
-
-        toolbox.show()
-        self.set_toolbox(toolbox)
-
-        # Create the game instance.
-        self.game = FollowMe.FollowMe()
-
-        # Build the Pygame canvas.
-        self._pygamecanvas = \
-            sugargame.canvas.PygameCanvas(self)
-        # Note that set_canvas implicitly calls
-        # read_file when resuming from the Journal.
-        self.set_canvas(self._pygamecanvas)
-        self.game.canvas=self._pygamecanvas
-
-        # Start the game running.
-        self._pygamecanvas.run_pygame(self.game.run)
-
-    def read_file(self, file_path):
-        try:
-            f = open(file_path, 'r')
-        except:
-            return #****
-        load_save.load(f)
-        f.close()
-
-    def write_file(self, file_path):
-        f = open(file_path, 'w')
-        load_save.save(f)
-        f.close()
+# activity.py
+# my standard link between sugar and my activity
+
+from gettext import gettext as _
+import pygame
+
+import gi
+from gi.repository import Gtk
+
+from sugar3.activity import activity
+from sugar3.graphics.toolbarbox import ToolbarBox
+
+from sugar3.activity.widgets import StopButton
+from sugar3.activity.widgets import ActivityToolbarButton
+
+
+import sugargame.canvas
+import load_save
+import FollowMe
+
+class PeterActivity(activity.Activity):
+    def __init__(self, handle):
+        super(PeterActivity, self).__init__(handle)
+
+        toolbar_box = ToolbarBox()
+        
+        activity_button = ActivityToolbarButton(self)
+        toolbar_box.toolbar.insert(activity_button, 0)
+
+        separator = Gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbar_box.toolbar.insert(separator, -1)
+
+        stop_button = StopButton(self)
+        stop_button.props.accelerator = '<Ctrl><Shift>Q'
+        toolbar_box.toolbar.insert(stop_button, -1)
+
+        self.set_toolbar_box(toolbar_box)
+        
+        # Create the game instance.
+        self.game = FollowMe.FollowMe()
+
+        # Build the Pygame canvas.
+        self._pygamecanvas = sugargame.canvas.PygameCanvas(self)
+        
+        # Note that set_canvas implicitly calls
+        # read_file when resuming from the Journal.
+        self.set_canvas(self._pygamecanvas)
+        self.game.canvas=self._pygamecanvas
+        
+        self.show_all()
+        
+        # Start the game running.
+        self._pygamecanvas.run_pygame(self.game.run)
+    
+    def read_file(self, file_path):
+        try:
+            f = open(file_path, 'r')
+        except:
+            return #****
+        load_save.load(f)
+        f.close()
+
+    def write_file(self, file_path):
+        f = open(file_path, 'w')
+        load_save.save(f)
+        f.close()