From ee38fc80adaa8fc3bb7c2509006f20200a303300 Mon Sep 17 00:00:00 2001
From: Walther Neuper <neuper@neuper.(none)>
Date: Sun, 13 Dec 2009 11:41:18 +0000
Subject: offer_topics --> offer_coll_to_learner

---
diff --git a/ReckonPrimer.activity/coach.py b/ReckonPrimer.activity/coach.py
index 078c767..ceb785f 100755
--- a/ReckonPrimer.activity/coach.py
+++ b/ReckonPrimer.activity/coach.py
@@ -75,9 +75,7 @@ class Coach:
     def request_exercise(self):
         """ This preliminary version just lets the Learner select."""
         print("in Coach.get_setting")
-        # WN090624 self._dis.offer_topics(['addsub_simp',
-        # 'passten', 'times_div'])
-        self._dis.offer_topics([t.get_topic() for t in self._exs])
+        self._dis.offer_coll_to_learner([t.get_topic() for t in self._exs])
         # calls back with notify('setting-done'...
 
     def notify(self, (msg, data)):
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index b3c2dfe..78e2900 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -223,8 +223,8 @@ class Display:
         self.progress_total.hide()
         
     def offer_setting(self,ex):
-        self._ex = ex
-        self._sett = self._ex.get_setting()
+        self._ex = ex          #WN.LV either drop this or self.current_exercise
+        self._sett = self._ex.get_setting() #WN.LV make _sett local
         
         ### START BUTTON BEGIN ###
         self.start_button = gtk.Button(None, gtk.STOCK_GO_FORWARD) 
@@ -237,7 +237,7 @@ class Display:
         self.start_button.show()
         ### START BUTTON END ###
         
-        self.current_exercise = ex
+        self.current_exercise = ex #WN.LV either drop this or self._ex
         print('in Display.offer_setting, 241 self._sett=', self._sett)
         self.current_exercise.define_buttons()
         self.current_exercise.set_buttons(self._sett)
@@ -390,7 +390,7 @@ class Display:
         self.display_table.destroy()
 
         
-    def offer_topics(self, topics):
+    def offer_coll_to_learner(self, topics):
         """TODO: get the users choice from buttons above the settings"""
         self.topic_box = gtk.HBox(True, 0)
         self.topic_table.attach(self.topic_box, 0, 6, 0, 1)
--
cgit v0.9.1