From ee3fec155d170b9a8a801bc28e0f6934043b185f Mon Sep 17 00:00:00 2001
From: Walther Neuper <neuper@neuper.(none)>
Date: Tue, 15 Dec 2009 17:24:32 +0000
Subject: collect_table --> calc OK, sett_tab size problems

---
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index 267f3ec..531963d 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -87,9 +87,9 @@ class Display:
         self.scrolled_window.show()
         
         # 3 tables as overlays with same 15 lines and 6 columns
-        self.settings_table = gtk.Table  (15, 6, True)
-        self.collection_table = gtk.Table(15, 6, True)
-        self.feedback_table = gtk.Table  (15, 6, True)
+        self.settings_table = gtk.Table  (14, 10, True)
+        self.collection_table = gtk.Table(14, 10, True)
+        self.feedback_table = gtk.Table  (14, 10, True)
         
         # Insert the 3 tables into the right half of the screen
         self.table.attach(self.settings_table,  1, 2, 0, 5)
@@ -116,8 +116,9 @@ class Display:
         self.stopwatch_label.queue_draw()
         return True
         
-    def settings_table_show(self): # rename to init_..
+    def settings_table_show(self): # rename to .._permanent
         """ Initialize all permanent gui-elements in settings_table. """
+        # button releasing settings_table and coach.notify('setting-done',..)
         self.see_butt = gtk.Button(None, gtk.STOCK_GO_FORWARD) 
         self.see_butt.connect("clicked", self.release_sett_callback)     
         self.settings_table.attach(self.see_butt, 0, 5, 14, 15)
@@ -126,7 +127,17 @@ class Display:
         self.see_image, self.see_label = self.see_hbox.get_children()
         self.see_label.set_label("settings_table")
         self.see_butt.show()
+        # button switching from settings_table to collect_table
+        self.sec_butt = gtk.Button("")
+        self.sec_butt.connect("clicked", self.switch_setts_to_coll_callback)
+        self.settings_table.attach(self.sec_butt, 5, 6, 14, 15)
+        self.sec_alignment = self.sec_butt.get_children()[0]
+        self.sec_butt.show()    
 
+    def switch_setts_to_coll_callback(self, widget):
+        """ Switch from settings_table to collection_table. """
+        self.settings_table.hide()
+        self.collection_table.show()
 
     def feedback_table_show(self):
         """RENAME to draw_feedback_screen"""
--
cgit v0.9.1