renamed Display.tables

2 files changed, 23 insertions, 23 deletions

diff --git a/ReckonPrimer.activity/collection.py b/ReckonPrimer.activity/collection.py
index fd2298d..4264400 100644
--- a/ReckonPrimer.activity/collection.py
+++ b/ReckonPrimer.activity/collection.py
@@ -54,7 +54,7 @@ class Collection:
         """ Define gui-elements for presenting the collcetion. """
         #WN.LV diesen Code ersetzen !!!!!
         self.topic_box = gtk.HBox(True, 0)
-        self._display.topic_table.attach(self.topic_box, 0, 6, 0, 1)
+        self._display.collection_table.attach(self.topic_box, 0, 6, 0, 1)
 
     def set_coll_gui(self):
         """ Set gui-elements according to Collection.data. """
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index 2b92c8a..517897e 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -39,11 +39,11 @@ class Display:
         #0+-------------------------+------------------------+
         # |                         |                        |
         #1|                         |  OVERLAYS OF           |
-        # |  scrolled_window        |    topic_table         |
+        # |  scrolled_window        |    collection_table         |
         #2|                         |  OR                    |
         # |                         |    settings_table      |
         #3+-------------------------+  OR                    |
-        # |                         |    table_with_start    |
+        # |                         |    feedback_table    |
         #4|  empty for calcs etc    |                        |
         # |                         |                        |
         #5+-------------------------+------------------------+
@@ -85,18 +85,18 @@ class Display:
         
         # 3 tables as overlays with same 15 lines and 6 columns
         self.settings_table = gtk.Table(15, 6, True)
-        self.topic_table = gtk.Table(15, 6, True)
-        self.table_with_start = gtk.Table(15, 6, True)
+        self.collection_table = gtk.Table(15, 6, True)
+        self.feedback_table = gtk.Table(15, 6, True)
         
         # Insert the 3 tables into the right half of the screen
         self.table.attach(self.settings_table,  1, 2, 0, 5)
-        self.table.attach(self.topic_table,     1, 2, 0, 5)
-        self.table.attach(self.table_with_start,1, 2, 0, 5) 
+        self.table.attach(self.collection_table,     1, 2, 0, 5)
+        self.table.attach(self.feedback_table,1, 2, 0, 5) 
 
         # show all tables, scrolled_window already shown above
         self.settings_table.show()
-        self.topic_table.show()
-        self.table_with_start.show()
+        self.collection_table.show()
+        self.feedback_table.show()
         self.table.show() # since all other tables have been inserted
         
     def update_time(self):
@@ -119,13 +119,13 @@ class Display:
         self.stopwatch = Timer()
         self.stopwatch_label = gtk.Label("00:00")
         self.stopwatch_label.modify_font(pango.FontDescription("sans 16"))
-        self.table_with_start.attach(self.stopwatch_label, 3, 5, 12, 13)
+        self.feedback_table.attach(self.stopwatch_label, 3, 5, 12, 13)
         
         # Section for nickname
         self.name = profile.get_nick_name()
         self.name_label = gtk.Label(self.name)
         self.name_label.modify_font(pango.FontDescription("sans 16"))
-        self.table_with_start.attach(self.name_label, 0, 6, 13, 14)
+        self.feedback_table.attach(self.name_label, 0, 6, 13, 14)
         
         # Section for progress bar
         self.progressbar = gtk.ProgressBar(adjustment=None)
@@ -135,12 +135,12 @@ class Display:
         style.bg[gtk.STATE_PRELIGHT] = gtk.gdk.color_parse("green")
         self.progressbar.set_style (style)
         self.progressbar.set_fraction(0)      
-        self.table_with_start.attach(self.progressbar, 0, 6, 8, 9)
+        self.feedback_table.attach(self.progressbar, 0, 6, 8, 9)
 
         # Labels for progress bar
         self.progress0 = gtk.Label("0")
         self.progress0.modify_font(pango.FontDescription("sans 16"))
-        self.table_with_start.attach(self.progress0, 0, 1, 9, 10 )
+        self.feedback_table.attach(self.progress0, 0, 1, 9, 10 )
         
         # Labels for status update
         self.correct_count = 0
@@ -154,7 +154,7 @@ class Display:
         attr.insert(fg_color) 
         self.correct_counter.set_attributes(attr)
 
-        self.table_with_start.attach(self.correct_counter, 2, 4, 9, 10 ) 
+        self.feedback_table.attach(self.correct_counter, 2, 4, 9, 10 ) 
         
         self.false_count = 0
         self.false_counter = gtk.Label(str(self.false_count))
@@ -166,7 +166,7 @@ class Display:
         attr.insert(fg_color) 
         self.false_counter.set_attributes(attr)
         
-        self.table_with_start.attach(self.false_counter, 2, 4, 10, 11 )
+        self.feedback_table.attach(self.false_counter, 2, 4, 10, 11 )
         
         self.stopwatch_label.show()
         gobject.timeout_add(1000, self.update_time)
@@ -179,7 +179,7 @@ class Display:
         self.total_calcs = self._ex.count()
         self.progress_total = gtk.Label(str(self.total_calcs))
         self.progress_total.modify_font(pango.FontDescription("sans 16"))
-        self.table_with_start.attach(self.progress_total, 5, 6, 9, 10 )
+        self.feedback_table.attach(self.progress_total, 5, 6, 9, 10 )
         self.progress_total.show()
         
     def hide_result_screen(self):
@@ -199,7 +199,7 @@ class Display:
         ### START BUTTON BEGIN ###
         self.start_button = gtk.Button(None, gtk.STOCK_GO_FORWARD) 
         self.start_button.connect("clicked", self.clicked_start_callback)     
-        self.table_with_start.attach(self.start_button, 0, 6, 14, 15)
+        self.feedback_table.attach(self.start_button, 0, 6, 14, 15)
         self.start_alignment = self.start_button.get_children()[0]
         self.start_hbox = self.start_alignment.get_children()[0]
         self.start_image, self.start_label = self.start_hbox.get_children()
@@ -222,7 +222,7 @@ class Display:
             self.start_label.set_label("")  
             self._co.notify(('setting-done', self._sett))
             self.settings_table.hide()
-            self.topic_table.hide()
+            self.collection_table.hide()
             self.draw_result_screen()
         elif( self.running == True):
             self.protocol('----------------------------------------', 0, 'OK')
@@ -235,7 +235,7 @@ class Display:
             self.display_table.destroy()      
             self.hide_result_screen()
             self.settings_table.show()
-            self.topic_table.show()
+            self.collection_table.show()
 
     def init_calc(self):
         """
@@ -371,8 +371,8 @@ class Display:
         self.table.attach(self.settings_table, 1, 2, 0, 5)
         self.settings_table.show()
         
-        self.table_with_start.destroy()
-        self.table_with_start = gtk.Table(15, 6, True)
-        self.table.attach(self.table_with_start, 1, 2, 0, 5)
-        self.table_with_start.show()
+        self.feedback_table.destroy()
+        self.feedback_table = gtk.Table(15, 6, True)
+        self.table.attach(self.feedback_table, 1, 2, 0, 5)
+        self.feedback_table.show()