From ed342042883d7c16d2bef28377d6770d70310bf9 Mon Sep 17 00:00:00 2001
From: Walther Neuper <neuper@neuper.(none)>
Date: Mon, 14 Dec 2009 16:17:26 +0000
Subject: collection_+feedback_table both visible, intermed 3:renamings

---
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index c256fd3..d6ba080 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -237,7 +237,7 @@ class Display:
             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("")
-            self.display_table.destroy()                 # difference from here
+            self.calc_table.destroy()                 # difference from here
             self.feedback_table_hide()
             self.settings_table.show()
             self.collection_table.show()
@@ -302,9 +302,9 @@ class Display:
     #WN090518
     def display_calc(self, lines):
     
-        self.display_table = gtk.Table(5, 1, True)    
-        self.table.attach(self.display_table, 0, 1, 0, 5)           
-        self.display_table.show()
+        self.calc_table = gtk.Table(5, 1, True)    
+        self.table.attach(self.calc_table, 0, 1, 0, 5)           
+        self.calc_table.show()
         
         """display the lines of a calc with _ at all input positions"""
         lino = 0
@@ -321,7 +321,7 @@ class Display:
         calculation, cursor = line, linepos
         self.calculation_box = gtk.HBox(True, 0)
         calc_pos = 0
-        self.display_table.attach(self.calculation_box, 0, 1, 3 + lineno, 4 + lineno)
+        self.calc_table.attach(self.calculation_box, 0, 1, 3 + lineno, 4 + lineno)
         for i in calculation:
             if (calc_pos != cursor):  
                 self.label = gtk.Label(i)      
@@ -359,7 +359,7 @@ class Display:
         self.progressbar.set_fraction(self.progressbar.get_fraction()+(float(1)/float(self.total_calcs)))
         self.correct_count = self.correct_count + 1
         self.correct_counter.set_text(str(self.correct_count))
-        self.display_table.destroy()
+        self.calc_table.destroy()
         
     def offer_coll_to_learner(self, collect):
         """TODO: get the users choice from buttons above the settings"""
--
cgit v0.9.1