naming consistancy

5 files changed, 23 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index 55e0d6d..2d01b4b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+12
+
+* reverting to 3 colors to simplify game play
+* experimenting with different style number games
+* adding bold, italic to word cards
+* refactoring of sprites library
+
+11
+
+* add check for match on first deal
+* fixed bug in extra card positions
+
 10
 
 * es, fr translation
diff --git a/activity/activity.info b/activity/activity.info
index 22d273e..c500400 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Visual Match
-activity_version = 10
+activity_version = 12
 license = GPLv3
 bundle_id = org.sugarlabs.VisualMatchActivity
 exec = sugar-activity VisualMatchActivity.VisualMatchActivity
diff --git a/card.py b/card.py
index 373464e..8694afe 100644
--- a/card.py
+++ b/card.py
@@ -64,7 +64,7 @@ class Card:
                                               width, height))
 
     def show_card(self):
-        self.spr.setlayer(2000)
+        self.spr.set_layer(2000)
         self.spr.draw()
 
     def hide_card(self):
diff --git a/sprites.py b/sprites.py
index 9f69f08..72551b6 100644
--- a/sprites.py
+++ b/sprites.py
@@ -57,14 +57,14 @@ class Sprites:
         if spr in self.list:
             self.list.remove(spr)
 
-    def findsprite(self, pos):
+    def find_sprite(self, pos):
         list = self.list
         list.reverse()
         for spr in list:
             if spr.hit(pos): return spr
         return None
 
-    def redrawsprites(self):
+    def redraw_sprites(self):
         for spr in self.list:
             spr.draw()
 
@@ -74,11 +74,11 @@ class Sprite:
         self.x = x
         self.y = y
         self.layer = 100
-        self.setimage(image)
+        self.set_image(image)
         self.sprites = sprites
         self.sprites.append_to_list(self)
 
-    def setimage(self, image):
+    def set_image(self, image):
         self.image = image
         if isinstance(self.image,gtk.gdk.Pixbuf):
             self.width = self.image.get_width()
@@ -91,12 +91,12 @@ class Sprite:
         self.x,self.y = pos
         self.inval()
 
-    def setshape(self, image):
+    def set_shape(self, image):
         self.inval()
-        self.setimage(image)
+        self.set_image(image)
         self.inval()
 
-    def setlayer(self, layer):
+    def set_layer(self, layer):
         self.sprites.remove_from_list(self)
         self.layer = layer
         for i in range(self.sprites.length_of_list()):
diff --git a/window.py b/window.py
index 8c68267..44a005e 100644
--- a/window.py
+++ b/window.py
@@ -137,7 +137,7 @@ def _button_press_cb(win, event, vmw):
 def _button_release_cb(win, event, vmw):
     win.grab_focus()
     x, y = map(int, event.get_coords())
-    spr = vmw.sprites.findsprite((x, y))
+    spr = vmw.sprites.find_sprite((x, y))
     if spr is None:
         return True
     return _process_selection(vmw, spr)
@@ -244,7 +244,7 @@ def _keypress_cb(area, event, vmw):
 # Repaint
 #
 def _expose_cb(win, event, vmw):
-    vmw.sprites.redrawsprites()
+    vmw.sprites.redraw_sprites()
     return True
 
 #