Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalther Neuper <neuper@neuper.(none)>2009-12-13 13:46:55 (GMT)
committer Walther Neuper <neuper@neuper.(none)>2009-12-13 13:46:55 (GMT)
commit77aee633c3eef95e760599b45352382aece04709 (patch)
tree11a8fe36752779c4c24bb3350a4fcdae36c3a9c6
parent42d416c2a8f3449c62d054c04958d22d23b5e81b (diff)
offer_coll_to_learner(self, collect)
-rwxr-xr-xReckonPrimer.activity/coach.py3
-rwxr-xr-xReckonPrimer.activity/display.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/ReckonPrimer.activity/coach.py b/ReckonPrimer.activity/coach.py
index 4b5fbfd..7c6c026 100755
--- a/ReckonPrimer.activity/coach.py
+++ b/ReckonPrimer.activity/coach.py
@@ -62,7 +62,8 @@ class Coach:
def request_exercise(self):
""" This preliminary version just lets the Learner select. """
#print("in coach.request_exercise")
- self._dis.offer_coll_to_learner([t.get_topic() for t in self._exs])
+ #self._dis.offer_coll_to_learner([t.get_topic() for t in self._exs])
+ self._dis.offer_coll_to_learner(self._collect)
# calls back with notify('setting-done'...
def notify(self, (msg, data)):
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index 7f1e76c..5861a77 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -389,14 +389,14 @@ class Display:
self.correct_counter.set_text(str(self.correct_count))
self.display_table.destroy()
- def offer_coll_to_learner(self, topics):
+ def offer_coll_to_learner(self, collect):
"""TODO: get the users choice from buttons above the settings"""
# define_coll_gui()
# set_coll_gui()
self.topic_box = gtk.HBox(True, 0)
self.topic_table.attach(self.topic_box, 0, 6, 0, 1)
_i = 0
- for _t in topics:
+ for _t in ['addsub_simp','passten','times_div']:
_i = _i + 1
self.button = gtk.Button()
self.image = gtk.Image()