additional help, ver 7 announced

5 files changed, 27 insertions, 8 deletions

diff --git a/examples/HelpTemplate.activity/help/help.py b/examples/HelpTemplate.activity/help/help.py
index 47536cc..5bfeafc 100644
--- a/examples/HelpTemplate.activity/help/help.py
+++ b/examples/HelpTemplate.activity/help/help.py
@@ -55,7 +55,7 @@ HELP_PANE = 1
 
 # Initialize logging.
 import logging
-_logger = logging.getLogger()
+_logger = logging.getLogger('HelpTemplate')
 
 class Help(Window):
     def __init__(self, parent):
@@ -87,7 +87,7 @@ class Help(Window):
         self.toolbox.add_toolbar(_('Activity'), activitybar)
         activitybar.show_all()
         
-        self.help_toolbar = Toolbar(self._web_view)
+        self.help_toolbar = Toolbar(self._web_view, self)
         self.help_toolbar.show()
         self.toolbox.add_toolbar(_('Help'), self.help_toolbar)
         self.toolbox._notebook.set_current_page(HELP_PANE)
@@ -130,6 +130,10 @@ class Help(Window):
         else:
             _logger.debug('failed to get window')
             
+    def close (self):
+        self.goto_cb(None, 0)
+        self.parent_obj.py_stop()
+            
     def goto_cb(self, page, tab):
         _logger.debug('current_toolbar_changed event called goto_cb. tab: %s'%tab)
         if tab == HELP_PANE: return
@@ -182,10 +186,11 @@ class Help(Window):
         return root
     
 class Toolbar(gtk.Toolbar):
-    def __init__(self, web_view):
+    def __init__(self, web_view, _help):
         gobject.GObject.__init__(self)
 
         self._web_view = web_view
+        self._help = _help
 
         self._back = ToolButton('go-previous-paired')
         self._back.set_tooltip(_('Back'))
@@ -238,7 +243,7 @@ class Toolbar(gtk.Toolbar):
         
 
     def __stop_clicked_cb(self, button):
-        self._help.pydebug.py_stop()
+        self._help.close()
         
     def _location_changed_cb(self, progress_listener, uri):
         self.update_navigation_buttons()
diff --git a/examples/HelpTemplate.activity/helptemplate.py b/examples/HelpTemplate.activity/helptemplate.py
index 764e156..eb8e1d9 100755
--- a/examples/HelpTemplate.activity/helptemplate.py
+++ b/examples/HelpTemplate.activity/helptemplate.py
@@ -18,7 +18,8 @@ from gettext import gettext as _
 import gtk
 import gobject
 import logging
-_logger = logging.getLogger()
+_logger = logging.getLogger('HelpTemplate')
+_logger.setLevel(logging.DEBUG)
 
 from sugar.activity import activity
 from sugar.graphics.toolbutton import ToolButton
@@ -58,6 +59,15 @@ class HelpTemplate(activity.Activity):
             
     def set_toolbar(self,tab):
         self.toolbox.set_current_toolbar(tab)
+        
+    def py_stop(self):
+        self.__stop_clicked_cb(None)
+        
+    def __stop_clicked_cb(self,button):
+        _logger.debug('caught stop clicked call back')
+        self.close(skip_save = True)
+        
+
             
     ################  Help routines
     def help_selected(self):
diff --git a/examples/sugargame/Template.activity/TestActivity.py b/examples/sugargame/Template.activity/TestActivity.py
index ccc0e35..921818d 100644
--- a/examples/sugargame/Template.activity/TestActivity.py
+++ b/examples/sugargame/Template.activity/TestActivity.py
@@ -3,6 +3,7 @@ from gettext import gettext as _
 import sys
 import gtk
 import pygame
+from time import sleep
 
 import sugar.activity.activity
 import sugar.graphics.toolbutton
@@ -14,7 +15,7 @@ import TestGame
 
 class TestActivity(sugar.activity.activity.Activity):
     def __init__(self, handle):
-        super(TestActivity, self).__init__(handle)
+        super(TestActivity, self).__init__(handle, False)
         
         self.paused = False
 
@@ -29,6 +30,8 @@ class TestActivity(sugar.activity.activity.Activity):
         # Note that set_canvas implicitly calls read_file when resuming from the Journal.
         self.set_canvas(self._pygamecanvas)
         
+        #wait until the window is realized
+        sleep(3)
         # Start the game running.
         self._pygamecanvas.run_pygame(self.game.run)
         
diff --git a/examples/sugargame/Template.activity/sugargame/canvas.py b/examples/sugargame/Template.activity/sugargame/canvas.py
index cf99a13..c1b6b97 100644
--- a/examples/sugargame/Template.activity/sugargame/canvas.py
+++ b/examples/sugargame/Template.activity/sugargame/canvas.py
@@ -38,7 +38,7 @@ class PygameCanvas(gtk.EventBox):
         pygame.init()
         
         # Restore the default cursor.
-        self._socket.get_window().set_cursor(None)
+        self._socket.window.set_cursor(None)
 
         # Initialize the Pygame window.
         r = self.get_allocation()
diff --git a/examples/sugargame/sugargame/canvas.py b/examples/sugargame/sugargame/canvas.py
index cf99a13..ead6833 100644
--- a/examples/sugargame/sugargame/canvas.py
+++ b/examples/sugargame/sugargame/canvas.py
@@ -38,7 +38,8 @@ class PygameCanvas(gtk.EventBox):
         pygame.init()
         
         # Restore the default cursor.
-        self._socket.get_window().set_cursor(None)
+        #self._socket.get_window().set_cursor(None)
+        self._socket.window.set_cursor(None)
 
         # Initialize the Pygame window.
         r = self.get_allocation()