collect_table --> calc; switch exerc works, start sett

1 files changed, 14 insertions, 8 deletions

diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index b664c02..0d58be5 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -97,7 +97,7 @@ class Display:
         self.table.attach(self.feedback_table,  1, 2, 0, 5) 
 
         # show all tables, scrolled_window already shown above
-        self.settings_table.show()
+        self.settings_table_show()
         self.collection_table.show()
         self.feedback_table.show()
         self.table.show() # since all other tables have been inserted
@@ -116,6 +116,17 @@ class Display:
         self.stopwatch_label.queue_draw()
         return True
         
+    def settings_table_show(self):
+        self.see_butt = gtk.Button(None, gtk.STOCK_GO_FORWARD) 
+        self.see_butt.connect("clicked", self.release_sett_callback)     
+        self.feedback_table.attach(self.see_butt, 0, 5, 14, 15)
+        self.see_alignment = self.see_butt.get_children()[0]
+        self.see_hbox = self.see_alignment.get_children()[0]
+        self.see_image, self.see_label = self.see_hbox.get_children()
+        self.see_label.set_label("feedback_table")
+        self.see_butt.show()
+
+
     def feedback_table_show(self):
         """RENAME to draw_feedback_screen"""
         # Section for stopwatch
@@ -184,7 +195,7 @@ class Display:
         self.feedback_table.attach(self.progress_total, 5, 6, 9, 10 )
         self.progress_total.show()
         
-        self.sfb_butt = gtk.Button(None, gtk.STOCK_GO_FORWARD) 
+        self.sfb_butt = gtk.Button(None, gtk.STOCK_STOP) 
         self.sfb_butt.connect("clicked", self.release_feedb_callback)     
         self.feedback_table.attach(self.sfb_butt, 0, 5, 14, 15)
         self.sfb_alignment = self.sfb_butt.get_children()[0]
@@ -347,6 +358,7 @@ class Display:
 
     def switch_exercise(self):
         """ Another exercise has been selected. """
+        #WN091215 DAS IST AB JETZT FALSCH: ex<->sett + ex<->coll moeglich
         self.settings_table.destroy()
         self.settings_table = gtk.Table(15, 6, True)
         self.table.attach(self.settings_table, 1, 2, 0, 5)
@@ -378,15 +390,9 @@ class Display:
     def finish_learner_coll_callback(self, widget):
         """ Callback on flc_butt; uses self._coll_key as semaphore
         from Collection.select_exerc_callback. """
-        #self.flc_butt.set_label(gtk.STOCK_STOP)      #stop-button
-        #self.start_alignment = self.flc_butt.get_children()[0]
-        #self.start_hbox = self.start_alignment.get_children()[0]
-        #self.start_image, self.start_label = self.start_hbox.get_children()
-        #self.start_label.set_label("")
         print('in display.finish_learner_coll_callback, _coll_key=', self._coll_key)
         if not(self._coll_key is None):
             self._co.notify(('exerc-selected', self._coll_key))
-            #self.settings_table.hide()
             self.collection_table.hide()
             self.feedback_table_show()