Merge branch 'wintersw'

Conflicts:

	ReckonPrimer.activity/data/Collection.data
	ReckonPrimer.activity/display.py
	ReckonPrimer.activity/exstore.py
	ReckonPrimer.activity/settings.py

1 files changed, 21 insertions, 28 deletions

diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index 6ec3737..0f1c70a 100644
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -72,7 +72,8 @@ class Display:
         self.main_window = window            # Save the sugar main window
 
         # whole window with 5 lines and 2 columns
-        self.table = gtk.Table(5, 2, True)
+        #self.table = gtk.Table(5, 2, True)
+        self.table = gtk.Table(10, 2, True)
         self.table.set_row_spacings(2)
         self.table.set_col_spacings(2)
         self.main_window.set_canvas(self.table)
@@ -101,8 +102,10 @@ class Display:
 
         # Connect log_view and scrolled window
         self.scrolled_window.add(self.log_view)
-        # Insert the log_view into the upper half
-        self.table.attach(self.scrolled_window, 0, 1, 0, 3)
+        # Insert the log_view into the upper half on left side
+        # TODO make bottom depend on exercise._sett['calclines']
+        #self.table.attach(self.scrolled_window, 0, 1, 0, 3)
+        self.table.attach(self.scrolled_window, 0, 1, 0, 5)
         self.log_view.show()
         self.scrolled_window.show()
         # make empty lines such that all calcs are entered at bottom
@@ -170,10 +173,15 @@ class Display:
         self.info_table.attach(self.ex_num_label, 7, 9, 6, 7)
         self.ex_num_label.show()
         # Insert the 3 tables into the right half of the screen
-        self.table.attach(self.exercise_table,   1, 2, 0, 5)
-        self.table.attach(self.exstore_table,   1, 2, 0, 5)
-        self.table.attach(self.settings_table,  1, 2, 0, 5)
-        self.table.attach(self.info_table,  0, 1, 3, 5)
+        #self.table.attach(self.exercise_table,   1, 2, 0, 5)
+        self.table.attach(self.exercise_table,   1, 2, 0, 10)
+        #self.table.attach(self.exstore_table,   1, 2, 0, 5)
+        self.table.attach(self.exstore_table,   1, 2, 0, 10)
+        #self.table.attach(self.settings_table,  1, 2, 0, 5)
+        self.table.attach(self.settings_table,  1, 2, 0, 10)
+        #self.table.attach(self.info_table,  0, 1, 3, 5)
+        self.table.attach(self.info_table,  0, 1, 7, 10)
+
         self.exercise_table.attach(self.feedback_table,  0, 9, 11, 13)
         # show all tables, scrolled_window already shown above
         self.exstore_table.show() # treat uniformly !
@@ -237,7 +245,8 @@ class Display:
         self.settings_table = gtk.Table(14, 9, True)
         self.settings_table.set_row_spacings(2)
         self.settings_table.set_col_spacings(2)
-        self.table.attach(self.settings_table, 1, 2, 0, 5)
+        #self.table.attach(self.settings_table, 1, 2, 0, 5)
+        self.table.attach(self.settings_table, 1, 2, 0, 10)
         self.settings_table_show()
         self.exstore_table.show()
         self.info_table.show()
@@ -438,7 +447,8 @@ class Display:
         self.calc_table = gtk.Table(5, 1, True)
         self.calc_table.set_row_spacings(2)
         self.calc_table.set_col_spacings(2)
-        self.table.attach(self.calc_table, 0, 1, 0, 5)
+        #self.table.attach(self.calc_table, 0, 1, 0, 5)
+        self.table.attach(self.calc_table, 0, 1, 6, 10)
         self.calc_table.show()
 
         """display the lines of a calc with _ at all input positions"""
@@ -456,7 +466,8 @@ class Display:
         calculation, cursor = line, linepos
         self.calculation_box = gtk.HBox(True, 0)
         calc_pos = 0
-        self.calc_table.attach(self.calculation_box, 0, 1, 3 + lineno, 4 + lineno)
+        #self.calc_table.attach(self.calculation_box, 0, 1, 3 + lineno, 4 + lineno)
+        self.calc_table.attach(self.calculation_box, 0, 1, 0 + lineno, 1 + lineno)
         for i in calculation:
             if (calc_pos != cursor):
                 self.label = gtk.Label(i)
@@ -523,24 +534,6 @@ class Display:
         self.tree_scrolled_window.show()
         self.set_coll_to_learner() # set finish_learner_coll_butt + callback
 
-    '''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(14, 9, True)
-        self.settings_table.set_row_spacings(2)
-        self.settings_table.set_col_spacings(2)
-        self.table.attach(self.settings_table, 1, 2, 0, 5)
-        self.settings_table.show()
-
-        #self.feedback_table.destroy()
-        self.feedback_table = gtk.Table(14, 9, True)
-        self.feedback_table.set_row_spacings(2)
-        self.feedback_table.set_col_spacings(2)
-        self.table.attach(self.feedback_table, 1, 2, 0, 5)
-        self.feedback_table_show()
-    '''
-
     def set_select_exerc_semaphore(self, coll_key):
         """ Sets a semaphore for finish_collect_callback. """
         #print('in display.set_select_exerc_semaphore, coll_key', self._coll_key)