shifted title, descript, icon into settings

4 files changed, 11 insertions, 11 deletions

diff --git a/ReckonPrimer.activity/exaddsimp.py b/ReckonPrimer.activity/exaddsimp.py
index 9286d38..3d9df51 100755
--- a/ReckonPrimer.activity/exaddsimp.py
+++ b/ReckonPrimer.activity/exaddsimp.py
@@ -14,10 +14,12 @@ from functions import *
 
 class ExAddSimp(Exercise):
     def __init__(self, dis):
-        # Test kommentar
         self._display = dis
         self._sett = {'topic'  : 'addsub_simp',
          'title' : 'template exaddsimp',
+         'descript': 'addition and subtraction without carry, \
+                            i.e. without passing the 10 barrier. ',
+         'icon' : None,     # for quick reference of the exercise      
          'calclines': 1,    # no. of lines for calc to be input.
          'MAX'    : 30,     # maximum of calcs generated.
                             # Generate fills up by varying input.
diff --git a/ReckonPrimer.activity/exercise.py b/ReckonPrimer.activity/exercise.py
index e343cf8..0b826a6 100755
--- a/ReckonPrimer.activity/exercise.py
+++ b/ReckonPrimer.activity/exercise.py
@@ -9,14 +9,6 @@ class Exercise:
     The values of self._sett may vary from exercise to exercise.
     """
     def __init__(self):
-        """ An Exercise has a title, i.e. short textual description,
-        set by the author for display in the Collection. """
-        self._title = None
-        """ An Exercise has a detailed textual description
-        set by the author. """
-        self._description = None
-        """ An Exercise is characterized by an icon set by the author. """
-        self._icon = None
         """ An Exercise stores data on evaluation, i.e. on how often the
         Exercise has been done, what errors have been made TODO """
         self._eval = None
diff --git a/ReckonPrimer.activity/expassten.py b/ReckonPrimer.activity/expassten.py
index 681be83..a3b0ce9 100755
--- a/ReckonPrimer.activity/expassten.py
+++ b/ReckonPrimer.activity/expassten.py
@@ -13,9 +13,12 @@ from sugar.graphics import style
 
 class ExPassTen(Exercise):
     def __init__(self, dis):
-        self._title = 'template expassten'
         self._display = dis
         self._sett = {'topic'        : 'passten',
+         'title' : 'template expassten',
+         'descript': 'addition and subtraction with carry, \
+                            i.e. with passing the 10 barrier. ',
+         'icon' : None,     # for quick reference of the exercise      
          'calclines'    : 1,      # or 2 iff 'newline' : True.
          'MAX'          : 150,    # maximum of calcs generated;
                                   # TODO: Generate fills up by varying input.
diff --git a/ReckonPrimer.activity/extimesdiv.py b/ReckonPrimer.activity/extimesdiv.py
index d2454b2..6dbad17 100755
--- a/ReckonPrimer.activity/extimesdiv.py
+++ b/ReckonPrimer.activity/extimesdiv.py
@@ -13,9 +13,12 @@ from functions import *
 
 class ExTimesDiv(Exercise):
     def __init__(self, dis):
-        self._title = 'template extimesdiv'
         self._display = dis
         self._sett = {'topic'        : 'times_div',
+         'title' : 'template extimesdiv',
+         'descript': 'multiplication, division and "in" \
+                            from 2 to 19 and 20 to 190. ',
+         'icon' : None,     # for quick reference of the exercise      
          'calclines'    : 1,      # no. of lines for calc to be input.
          'MAX'          : 100,    # maximum of calcs generated;
                                   # TODO: Generate fills up by varying input.