diff options
Diffstat (limited to 'ReckonPrimer.activity/views/feedback_view.py')
| -rw-r--r-- | ReckonPrimer.activity/views/feedback_view.py | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/ReckonPrimer.activity/views/feedback_view.py b/ReckonPrimer.activity/views/feedback_view.py index 39d42c0..5816c1b 100644 --- a/ReckonPrimer.activity/views/feedback_view.py +++ b/ReckonPrimer.activity/views/feedback_view.py @@ -5,11 +5,11 @@ import gobject from sugar import profile # TODO remove dep. -class FeedbackView: +class FeedbackView(gtk.Table): def __init__(self): + gtk.Table.__init__(self, 14, 9, True) self.total_number_of_calculations = 99 - self.table = gtk.Table(14, 9, True) self.build_view() @@ -36,8 +36,6 @@ class FeedbackView: self.correct_count = self.correct_count + 1 self.correct_counter.set_text(str(self.correct_count)) - def hide(self): - self.table.hide() # self.progressbar.set_fraction(0) # self.stopwatch_label.hide() # self.name_label.hide() @@ -48,8 +46,6 @@ class FeedbackView: # self.progress_total.hide() # self.sfb_butt.hide() - def show(self): - self.table.show() def build_view(self): """RENAME to draw_feedback_screen""" @@ -57,15 +53,15 @@ class FeedbackView: self.stopwatch = Timer() self.stopwatch_label = gtk.Label("00:00") self.stopwatch_label.modify_font(pango.FontDescription("sans 16")) - #self.table.attach(self.stopwatch_label, 3, 5, 12, 13) - self.table.attach(self.stopwatch_label, 4, 6, 12, 13) + #self.attach(self.stopwatch_label, 3, 5, 12, 13) + self.attach(self.stopwatch_label, 4, 6, 12, 13) # Section for nickname - self.name = profile.get_nick_name() - self.name_label = gtk.Label(self.name) + name = profile.get_nick_name() + self.name_label = gtk.Label(name) self.name_label.modify_font(pango.FontDescription("sans 16")) - #self.table.attach(self.name_label, 0, 6, 13, 14) - self.table.attach(self.name_label, 0, 9, 13, 14) + #self.attach(self.name_label, 0, 6, 13, 14) + self.attach(self.name_label, 0, 9, 13, 14) # Section for progress bar self.progressbar = gtk.ProgressBar(adjustment=None) @@ -75,12 +71,12 @@ class FeedbackView: style.bg[gtk.STATE_PRELIGHT] = gtk.gdk.color_parse("green") self.progressbar.set_style (style) self.progressbar.set_fraction(0) - self.table.attach(self.progressbar, 0, 9, 8, 9) + self.attach(self.progressbar, 0, 9, 8, 9) # Labels for progress bar self.progress0 = gtk.Label("0") self.progress0.modify_font(pango.FontDescription("sans 16")) - self.table.attach(self.progress0, 0, 1, 9, 10 ) + self.attach(self.progress0, 0, 1, 9, 10 ) # Labels for status update self.correct_count = 0 @@ -93,8 +89,8 @@ class FeedbackView: attr.insert(fg_color) self.correct_counter.set_attributes(attr) - #self.table.attach(self.correct_counter, 2, 4, 9, 10 ) - self.table.attach(self.correct_counter, 3, 5, 9, 10 ) + #self.attach(self.correct_counter, 2, 4, 9, 10 ) + self.attach(self.correct_counter, 3, 5, 9, 10 ) self.false_count = 0 self.false_counter = gtk.Label(str(self.false_count)) @@ -106,8 +102,8 @@ class FeedbackView: attr.insert(fg_color) self.false_counter.set_attributes(attr) - #self.table.attach(self.false_counter, 2, 4, 10, 11 ) - self.table.attach(self.false_counter, 3, 5, 10, 11 ) + #self.attach(self.false_counter, 2, 4, 10, 11 ) + self.attach(self.false_counter, 3, 5, 10, 11 ) self.stopwatch_label.show() gobject.timeout_add(1000, self.update_time) @@ -120,13 +116,13 @@ class FeedbackView: self.progress_total = gtk.Label(str(self.total_number_of_calculations)) self.progress_total.modify_font(pango.FontDescription("sans 16")) - #self.table.attach(self.progress_total, 5, 6, 9, 10 ) - self.table.attach(self.progress_total, 8, 9, 9, 10 ) + #self.attach(self.progress_total, 5, 6, 9, 10 ) + self.attach(self.progress_total, 8, 9, 9, 10 ) self.progress_total.show() self.sfb_butt = gtk.Button(None, gtk.STOCK_STOP) # self.sfb_butt.connect("clicked", self.display.release_feedb_callback) - self.table.attach(self.sfb_butt, 0, 9, 13, 14) + self.attach(self.sfb_butt, 0, 9, 13, 14) self.sfb_alignment = self.sfb_butt.get_children()[0] self.sfb_hbox = self.sfb_alignment.get_children()[0] self.sfb_image, self.sfb_label = self.sfb_hbox.get_children() |