Merge branch 'master' of git://git.sugarlabs.org/rp/mainline

6 files changed, 22 insertions, 12 deletions

diff --git a/ReckonPrimer.activity/ReckonPrimerActivity.py b/ReckonPrimer.activity/ReckonPrimerActivity.py
index 813a838..ef875d2 100755
--- a/ReckonPrimer.activity/ReckonPrimerActivity.py
+++ b/ReckonPrimer.activity/ReckonPrimerActivity.py
@@ -8,7 +8,7 @@ from sugar.activity import activity
 from sugar.datastore import datastore
 from sugar import profile
 from session import Session
-from toolbar import Toolbar
+#from toolbar import Toolbar
 
 class ReckonPrimerActivity(activity.Activity):
 
@@ -16,8 +16,11 @@ class ReckonPrimerActivity(activity.Activity):
     
         activity.Activity.__init__(self, handle)
 
-        toolbar = Toolbar(self)
-        toolbar.show()
+	toolbox = activity.ActivityToolbox(self)
+	self.set_toolbox(toolbox)
+	toolbox.show()
+        #toolbar = Toolbar(self)
+        #toolbar.show()
         
         file_location = activity.get_activity_root() + \
                         "/data/reckonprimer_report.txt" 
diff --git a/ReckonPrimer.activity/collection.py b/ReckonPrimer.activity/collection.py
index 4a45bd1..adc6f2e 100644
--- a/ReckonPrimer.activity/collection.py
+++ b/ReckonPrimer.activity/collection.py
@@ -10,6 +10,7 @@ from sugar.graphics import style
 from settings import Settings
 from coach import Coach
 
+from exercises.exaddsimp import ExAddSimp
 from exercises import *
 from exercises.exercise import Exercise
 
@@ -38,8 +39,8 @@ class Collection:
             raise Exception('Collection#select: Wrong key. To register an exercise see exercises/__init__.py')
     
         klass = Exercise.EXERCISES[exercise_label]
-        package = __import__("exercises." + klass)
-        module = getattr(package, klass)
+        package = __import__("exercises." + klass.lower())
+        module = getattr(package, klass.lower())
         return getattr(module, klass)(self._display, (_sett, _errors))    
 
 
diff --git a/ReckonPrimer.activity/exercises/__init__.py b/ReckonPrimer.activity/exercises/__init__.py
index 461e7d2..34239d3 100644
--- a/ReckonPrimer.activity/exercises/__init__.py
+++ b/ReckonPrimer.activity/exercises/__init__.py
@@ -13,4 +13,6 @@ Exercise.EXERCISES = {   'addsub_simp':  "ExAddSimp",    \
                          'times_div':    "ExTimesDiv" }
 
 
-__all__ = Exercise.EXERCISES.values()
+__all__ = []
+for file_name in Exercise.EXERCISES.values():
+  __all__.append(file_name.lower())
diff --git a/ReckonPrimer.activity/exercises/exaddsimp.py b/ReckonPrimer.activity/exercises/exaddsimp.py
index 3b76590..2ec1d88 100755
--- a/ReckonPrimer.activity/exercises/exaddsimp.py
+++ b/ReckonPrimer.activity/exercises/exaddsimp.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-#(c) Julia Schönhart
-#(c) Daniela Zierler
+#(c) Julia Schönhart 2009
+#(c) Daniela Zierler 2009
 
 import gtk
 import pygtk
diff --git a/ReckonPrimer.activity/toolbar.py b/ReckonPrimer.activity/toolbar.py
index e243a05..d4eff8e 100644
--- a/ReckonPrimer.activity/toolbar.py
+++ b/ReckonPrimer.activity/toolbar.py
@@ -1,9 +1,12 @@
 import gtk
 
-from sugar.activity.widgets import ActivityToolbarButton
-from sugar.activity.widgets import StopButton
+try:
+    from sugar.activity.widgets import ActivityToolbarButton
+    from sugar.activity.widgets import StopButton
+    from sugar.graphics.toolbarbox import ToolbarButton, ToolbarBox
+except ImportError:
+    pass
 from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toolbarbox import ToolbarButton, ToolbarBox
 
 class Toolbar:
     
@@ -38,4 +41,4 @@ class Toolbar:
         toolbar_box.toolbar.insert(stop, -1)
         
         toolbar_box.show_all()
-        self._parent.set_toolbar_box(toolbar_box)
\ No newline at end of file
+        self._parent.set_toolbar_box(toolbar_box)
diff --git a/ReckonPrimer.tests/README.txt b/ReckonPrimer.tests/README.txt
index 7bc9fd7..afc42b8 100755
--- a/ReckonPrimer.tests/README.txt
+++ b/ReckonPrimer.tests/README.txt
@@ -38,6 +38,7 @@ all directories involved need to be in the PYTHONPATH:
 # which is ....
 
 > PYTHONPATH=$PYTHONPATH:/home/neuper/Activities/ReckonPrimer.activity
+> PYTHONPATH=$PYTHONPATH:/home/neuper/Activities/ReckonPrimer.activity/exercises
 
 > PYTHONPATH=$PYTHONPATH:/home/neuper/Activities/ReckonPrimer.activity:/home/neuper/Activities/ReckonPrimer.tests:/home/neuper/Activities/ReckonPrimer.tests/ReckonPrimerActivity:/home/neuper/Activities/ReckonPrimer.tests/addsubsimp:/home/neuper/Activities/ReckonPrimer.tests/author:/home/neuper/Activities/ReckonPrimer.tests/coach:/home/neuper/Activities/ReckonPrimer.tests/collection:/home/neuper/Activities/ReckonPrimer.tests/display:/home/neuper/Activities/ReckonPrimer.tests/exercise:/home/neuper/Activities/ReckonPrimer.tests/learner:/home/neuper/Activities/ReckonPrimer.tests/passten:/home/neuper/Activities/ReckonPrimer.tests/session:/home/neuper/Activities/ReckonPrimer.tests/timer:/home/neuper/Activities/ReckonPrimer.tests/timesdiv