remove blank card support

2 files changed, 9 insertions, 19 deletions

diff --git a/cardsort.py b/cardsort.py
index 70e7b00..a9c6d80 100755
--- a/cardsort.py
+++ b/cardsort.py
@@ -45,9 +45,11 @@ class CardSortMain:
         self.win.connect("delete_event", lambda w,e: gtk.main_quit())
 
         menu = gtk.Menu()
+        """
         menu_items = gtk.MenuItem(_("Toggle blank card"))
         menu.append(menu_items)
         menu_items.connect("activate", self._toggle_card_cb)
+        """
         menu_items = gtk.MenuItem(_("Apply rotation sets"))
         menu.append(menu_items)
         menu_items.connect("activate", self._apply_rotation_sets_cb)
@@ -84,17 +86,16 @@ class CardSortMain:
     def set_title(self, title):
         self.win.set_title(title)
 
-    # Print a string when a menu item is selected
+    """
     def _toggle_card_cb(self, widget):
         self.tw.grid.toggle_blank()
         sprites.redrawsprites(self.tw)
+    """
 
     def _apply_rotation_sets_cb(self, widget):
         self.rotation_sets = get_rotation_sets()
         i = self.r
         for j in range(9):
-            # if the blank card (9) is in the grid,
-            # then the index for the card it replaced will fail
             try: 
                 self.tw.grid.card_table[self.tw.grid.grid.index(j)]\
                     .set_orientation(self.rotation_sets[i][j])
@@ -105,15 +106,6 @@ class CardSortMain:
         if self.r == 64:
             self.r = 0
 
-    def _solve_cb_x(self, widget):
-        self.tw.grid.set_grid([8,7,6,5,4,3,2,1,0,9])
-        self.tw.grid.print_grid()
-
-        self.tw.grid.set_orientation([0,90,180,270,0,90,180,270,0,90])
-        self.tw.grid.print_orientations()
-        sprites.redrawsprites(self.tw)
-        return True
-
     def _solve_cb(self, widget):
         self.rotation_sets = get_rotation_sets()
         counter = 0
@@ -133,13 +125,13 @@ class CardSortMain:
             for r in range(9):
                 self.tw.grid.card_table[self.tw.grid.grid.index(r)]\
                     .set_orientation(self.rotation_sets[o][r],False)
-            if self.tw.grid.test() is True:
+            if self.tw.test() is True:
                 print _("You solved the puzzle.")
                 self.tw.grid.print_grid()
                 self.tw.grid.print_orientations()
                 self.tw.win.set_title(_("CardSort") + ": " + \
                                       _("You solved the puzzle."))
-                self.tw.grid.reset(self.tw)
+                self.tw.grid.reset3x3(self.tw)
                 self.tw.grid.set_grid(g)
                 for r in range(9):
                     self.tw.grid.card_table[self.tw.grid.grid.index(r)]\
diff --git a/window.py b/window.py
index 628fefa..de7b30e 100644
--- a/window.py
+++ b/window.py
@@ -76,6 +76,8 @@ def new_window(canvas, path, parent=None):
 
     # Initialize the grid
     tw.grid = Grid(tw)
+    tw.mode = "3x3"
+    tw.test = tw.grid.test3x3
 
     # Start solving the puzzle
     tw.press = -1
@@ -128,7 +130,7 @@ def _button_release_cb(win, event, tw):
     redrawsprites(tw)
     tw.press = -1
     tw.release = -1
-    if tw.grid.test() == True:
+    if tw.test() == True:
         if tw.sugar is True:
             tw.activity.results_label.set_text(_("You solved the puzzle."))
             tw.activity.results_label.show()
@@ -162,9 +164,5 @@ def _expose_cb(win, event, tw):
 #
 # callbacks
 #
-def _toggle_cb(win, event, tw):
-    self.tw.grid.toggle_blank()
-    redrawsprites(self.tw)
-
 def _destroy_cb(win, event, tw):
     gtk.main_quit()