diff options
author | Walther Neuper <neuper@neuper.(none)> | 2009-12-17 13:08:57 (GMT) |
---|---|---|
committer | Walther Neuper <neuper@neuper.(none)> | 2009-12-17 13:08:57 (GMT) |
commit | 150ed6044e91a183aafec30fd5a8b090db9ba6a5 (patch) | |
tree | 9ace5d7a01ff68f48881a10515892aee945f37b3 /ReckonPrimer.activity/collection.py | |
parent | 7bb8d6219f7b38aad7516fd581981c73f803b1a9 (diff) | |
parent | 8edcc2f175f3aa4574479e41f7fc834a218586f3 (diff) |
debug settings_table, middle of a conflicted merge 2
Diffstat (limited to 'ReckonPrimer.activity/collection.py')
-rw-r--r-- | ReckonPrimer.activity/collection.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ReckonPrimer.activity/collection.py b/ReckonPrimer.activity/collection.py index 63b08f2..53ababe 100644 --- a/ReckonPrimer.activity/collection.py +++ b/ReckonPrimer.activity/collection.py @@ -55,10 +55,10 @@ class Collection: TODO: define once at startup of RP ?""" #WN.LV diesen Code ersetzen: collection_table.attach(self.colldata,... self.topic_box = gtk.HBox(True, 0) - self._display.collection_table.attach(self.topic_box, 0, 6, 0, 1) - #self._display.collection_table.attach(self.topic_box, 0, 6, 5, 6) + #self._display.collection_table.attach(self.topic_box, 0, 6, 0, 1) + self._display.collection_table.attach(self.topic_box, 0, 9, 5, 6) - def set_coll_gui(self): + def set_coll_gui(self, coll_data): """ Set gui-elements according to Collection.data. """ #WN.LV diesen Code ersetzen !!!!! _i = 0 @@ -83,16 +83,19 @@ class Collection: def select_exerc_callback(self, widget, coll_key): """ Callback telling the item from the collection selected. """ #WN.LV diesen Code ersetzen> statt 1..n fuer Listen kommt coll_key + print('in Collection.select_exerc_callback') if(self._active_exerc == None): # at startup self._active_exerc = coll_key - self._coach.notify(('exerc-selected', coll_key)) + self._display.set_select_exerc_semaphore(coll_key) + #self._coach.notify(('exerc-selected', coll_key)) elif(self._active_exerc == coll_key): # hit the same button once more pass elif(self._active_exerc != coll_key): # switched to another exercise self._active_exerc = coll_key - self._display.switch_exercise() - self._coach.notify(('exerc-selected', coll_key)) + self._display.switch_exercise() # TODO rename + self._display.set_select_exerc_semaphore(coll_key) + #self._coach.notify(('exerc-selected', coll_key)) |