diff options
| author | Walter Bender <walter@walter-laptop.(none)> | 2010-01-09 22:40:36 (GMT) |
|---|---|---|
| committer | Walter Bender <walter@walter-laptop.(none)> | 2010-01-09 22:40:36 (GMT) |
| commit | fa72ac393255ea200d47cc7732128b96bebd076d (patch) | |
| tree | bbc41eaddddd4b0ee34660d33b32ca43f9671e56 /visualmatch.py | |
| parent | cca045ab7da98c79440128276c7680b5ca7503fe (diff) | |
forgot to update to new Class structure
Diffstat (limited to 'visualmatch.py')
| -rwxr-xr-x | visualmatch.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/visualmatch.py b/visualmatch.py index 92d4fb8..f0f8914 100755 --- a/visualmatch.py +++ b/visualmatch.py @@ -165,7 +165,7 @@ class VisualMatchMain: self.win.show_all() # Join the activity - self.vmw = window.new_window(canvas, \ + self.vmw = window.VisualMatchWindow(canvas, \ os.path.join(os.path.abspath('.'), \ 'images/')) self.vmw.win = self.win @@ -180,7 +180,7 @@ class VisualMatchMain: self.vmw.robot_matches = 0 self.load_score() - window.new_game(self.vmw, self.vmw.cardtype) + self.vmw.new_game() def load_score(self): try: @@ -203,14 +203,13 @@ class VisualMatchMain: self.win.set_title(title) def _new_game_cb(self, widget, game): - window.new_game(self.vmw, game) + self.vmw.cardtype = game + self.vmw.new_game() return True def _level_cb(self, widget): - cardtype = self.vmw.cardtype - self.vmw.cardtype = '' self.vmw.level = 1-self.vmw.level - window.new_game(self.vmw, cardtype) + self.vmw.new_game() def _robot_cb(self, widget): if self.vmw.robot is True: @@ -226,16 +225,16 @@ class VisualMatchMain: gencards.generate_number_cards(self.vmw.path, self.vmw.numberO, self.vmw.numberC) - self.vmw.cardtype = '' - window.new_game(self.vmw, 'number') + self.vmw.cardtype = 'number' + self.vmw.new_game() def _number_card_C_cb(self, widget, numberC): self.vmw.numberC = numberC gencards.generate_number_cards(self.vmw.path, self.vmw.numberO, self.vmw.numberC) - self.vmw.cardtype = '' - window.new_game(self.vmw, 'number') + self.vmw.cardtype = 'number' + self.vmw.new_game() def main(): gtk.main() |