added restart

2 files changed, 26 insertions, 68 deletions

diff --git a/VisualMatchActivity.py b/VisualMatchActivity.py
index b76c674..1d9b30a 100644
--- a/VisualMatchActivity.py
+++ b/VisualMatchActivity.py
@@ -69,20 +69,12 @@ class VisualMatchActivity(activity.Activity):
 
             # Button 1
             self.button1 = ToolButton( "button1off" )
-            self.button1.set_tooltip(_('Button 1'))
+            self.button1.set_tooltip(_('New game'))
             self.button1.props.sensitive = True
-            self.button1.connect('clicked', self._button1_cb)
+            self.button1.connect('clicked', self._button1_cb, self)
             toolbar_box.toolbar.insert(self.button1, -1)
             self.button1.show()
 
-            # Button 2
-            self.button2 = ToolButton( "button2on" )
-            self.button2.set_tooltip(_('Button 2'))
-            self.button2.props.sensitive = True
-            self.button2.connect('clicked', self._button2_cb)
-            toolbar_box.toolbar.insert(self.button2, -1)
-            self.button2.show()
-
             separator = gtk.SeparatorToolItem()
             separator.show()
             toolbar_box.toolbar.insert(separator, -1)
@@ -95,19 +87,6 @@ class VisualMatchActivity(activity.Activity):
             toolbar_box.toolbar.insert(results_toolitem,-1)
 
             separator = gtk.SeparatorToolItem()
-            separator.props.draw = True
-            separator.set_expand(False)
-            separator.show()
-            toolbar_box.toolbar.insert(separator, -1)
-
-            self.button3 = ToolButton( "button3on" )
-            self.button3.set_tooltip(_('Button 3'))
-            self.button3.props.sensitive = True
-            self.button3.connect('clicked', self._button3_cb)
-            toolbar_box.toolbar.insert(self.button3, -1)
-            self.button3.show()
-
-            separator = gtk.SeparatorToolItem()
             separator.props.draw = False
             separator.set_expand(True)
             separator.show()
@@ -141,6 +120,16 @@ class VisualMatchActivity(activity.Activity):
 
             self.toolbox.show()
 
+        # Read the mode from the Journal
+        try:
+            if self.metadata['status'] == 'one':
+                self.show_button1()
+            elif self.metadata['status'] == 'two':
+                self.show_button2()
+        except:
+            self.metadata['status'] = "two"
+
+
         # Create a canvas
         canvas = gtk.DrawingArea()
         canvas.set_size_request(gtk.gdk.screen_width(), \
@@ -155,46 +144,21 @@ class VisualMatchActivity(activity.Activity):
                                                  'images/card-'), \
                                     self)
 
-        # Read the mode from the Journal
-        try:
-            if self.metadata['status'] == 'one':
-                self.show_button1()
-            elif self.metadata['status'] == 'two':
-                self.show_button2()
-        except:
-            self.metadata['status'] = "two"
-
-
     #
     # Button callbacks
     #
-    def _button1_cb(self, button):
-        self.show_button1()
+    def _button1_cb(self, button, activity):
+        self.show_button1(activity.tw)
         return True
 
-    def show_button1(self):
+    def show_button1(self, tw):
         self.button1.set_icon("button1on")
         self.button2.set_icon("button2off")
         self.metadata['status'] = "one"
+        tw.deck.shuffle()
+        tw.deck.deal(tw)
         # do something here
 
-    def _button2_cb(self, button):
-        self.show_button2()
-        return True
-
-    def show_button2(self):
-        self.button1.set_icon("button1off")
-        self.button2.set_icon("button2on")
-        self.metadata['status'] = "two"
-        # do something here
-
-    def _button3_cb(self, button):
-        self.show_button2()
-        return True
-
-    def show_button3(self):
-        self.button3.set_icon("button2on")
-
     def _journal_cb(self, button, path):
         title_alert = NamingAlert(self, path)
         title_alert.set_transient_for(self.get_toplevel())
@@ -221,26 +185,14 @@ class ProjectToolbar(gtk.Toolbar):
         self.activity.button1 = ToolButton( "button1off" )
         self.activity.button1.set_tooltip(_('Button 1'))
         self.activity.button1.props.sensitive = True
-        self.activity.button1.connect('clicked', self.activity._button1_cb)
+        self.activity.button1.connect('clicked', self.activity._button1_cb, 
+                                      self.activity)
         self.insert(self.activity.button1, -1)
         self.activity.button1.show()
 
-        # Button 2
-        self.activity.button2 = ToolButton( "button2on" )
-        self.activity.button2.set_tooltip(_('Button 2'))
-        self.activity.button2.props.sensitive = True
-        self.activity.button2.connect('clicked', self.activity._button2_cb)
-        self.insert(self.activity.button2, -1)
-        self.activity.button2.show()
-
-        separator = gtk.SeparatorToolItem()
-        separator.set_draw(True)
-        self.insert(separator, -1)
-        separator.show()
-
         # Label for showing status
         self.activity.results_label = gtk.Label(\
-            _("say something here"))
+            _("look for a set"))
         self.activity.results_label.show()
         self.activity.results_toolitem = gtk.ToolItem()
         self.activity.results_toolitem.add(self.activity.results_label)
diff --git a/grid.py b/grid.py
index fb842fd..2c1653e 100644
--- a/grid.py
+++ b/grid.py
@@ -68,10 +68,16 @@ class Grid:
 
     # shuffle the deck
     def shuffle(self):
+        # hide all the cards
+        for c in self.deck:
+            self.deck[c].hide_card()
+        # randomize the deck
         for n in range(0,532):
             i = random.randrange(108)
             j = random.randrange(108)
             self.swap_cards(i,j)            
+        # reset the index to the beginning of the deck after a shuffle
+        self.index = 0
         return
 
     def swap_cards(self,i,j):