From a183ea646cd12c6ff4f7280a4ccacc873bcb29ab Mon Sep 17 00:00:00 2001 From: Cristhofer Travieso Date: Tue, 21 May 2013 22:18:45 +0000 Subject: Finish the v1 Signed-off-by: Cristhofer Travieso --- diff --git a/canvas.py b/canvas.py index 6d4acb8..11d26d4 100644 --- a/canvas.py +++ b/canvas.py @@ -26,18 +26,57 @@ class Canvas(Gtk.VBox): self.add(self.entry) table = Gtk.Table() - - number = [] - for i in range(0, 10): - button = Gtk.Button(i) - button.connect('clicked', self.add_character) - number.append(button) - - sign = [] - for i in ['+', '-', '*', '/']: - button = Gtk.Button(i) - button.connect('clicked', self.add_character) - sign.append(button) + self.add(table) + + b0 = Gtk.Button('0') + b0.connect('clicked', self.add_character) + b00 = Gtk.Button('00') + b00.connect('clicked', self.add_character) + b1 = Gtk.Button('1') + b1.connect('clicked', self.add_character) + b2 = Gtk.Button('2') + b2.connect('clicked', self.add_character) + b3 = Gtk.Button('3') + b3.connect('clicked', self.add_character) + b4 = Gtk.Button('4') + b4.connect('clicked', self.add_character) + b5 = Gtk.Button('5') + b5.connect('clicked', self.add_character) + b6 = Gtk.Button('6') + b6.connect('clicked', self.add_character) + b7 = Gtk.Button('7') + b7.connect('clicked', self.add_character) + b8 = Gtk.Button('8') + b8.connect('clicked', self.add_character) + b9 = Gtk.Button('9') + b9.connect('clicked', self.add_character) + b_dot = Gtk.Button('.') + b_dot.connect('clicked', self.add_character) + b_plus = Gtk.Button('+') + b_plus.connect('clicked', self.add_character) + b_minus = Gtk.Button('-') + b_minus.connect('clicked', self.add_character) + b_times = Gtk.Button('*') + b_times.connect('clicked', self.add_character) + b_divided = Gtk.Button('/') + b_divided.connect('clicked', self.add_character) + + table.attach(b7, 0, 1, 0, 1) + table.attach(b4, 0, 1, 1, 2) + table.attach(b1, 0, 1, 2, 3) + table.attach(b0, 0, 1, 3, 4) + table.attach(b8, 1, 2, 0, 1) + table.attach(b5, 1, 2, 1, 2) + table.attach(b2, 1, 2, 2, 3) + table.attach(b_dot, 1, 2, 3, 4) + table.attach(b9, 2, 3, 0, 1) + table.attach(b6, 2, 3, 1, 2) + table.attach(b3, 2, 3, 2, 3) + table.attach(b00, 2, 3, 3, 4) + table.attach(b_divided, 3, 4, 0, 1) + table.attach(b_times, 3, 4, 1, 2) + table.attach(b_minus, 3, 4, 2, 3) + table.attach(b_plus, 3, 4, 3, 4) equals_button = Gtk.Button('=') equals_button.connect('clicked', self.work) -- cgit v0.9.1