Occupied pieces with editing marks have been added. Toolbar buttons changed to make the editor be more connected to the game than independent. Board widget modified to add the new pixel buffers, gogame modified to ignore editing pieces, and activity modified to make the basics of the editor work.HEADmaster

1 files changed, 33 insertions, 3 deletions

diff --git a/boardwidget.py b/boardwidget.py
index 5c08532..7a1ba46 100644
--- a/boardwidget.py
+++ b/boardwidget.py
@@ -93,7 +93,14 @@ class GoBoardWidget(gtk.Widget):
         self.TriangleWhitePixbuf = gtk.gdk.pixbuf_new_from_file("./images/TriangleWhite.gif")
         self.SquareBlackPixbuf = gtk.gdk.pixbuf_new_from_file("./images/SquareBlack.gif")
         self.SquareWhitePixbuf = gtk.gdk.pixbuf_new_from_file("./images/SquareWhite.gif")
-        
+        self.XBlackOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/XBlackOccupied.gif")
+        self.XWhiteOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/XWhiteOccupied.gif")
+        self.CircleBlackOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/CircleBlackOccupied.gif")
+        self.CircleWhiteOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/CircleWhiteOccupied.gif")
+        self.TriangleBlackOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/TriangleBlackOccupied.gif")
+        self.TriangleWhiteOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/TriangleWhiteOccupied.gif")
+        self.SquareBlackOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/SquareBlackOccupied.gif")
+        self.SquareWhiteOccupiedPixbuf = gtk.gdk.pixbuf_new_from_file("./images/SquareWhiteOccupied.gif")
 
         self.gc = self.style.fg_gc[gtk.STATE_NORMAL]
         
@@ -183,7 +190,14 @@ class GoBoardWidget(gtk.Widget):
         self.ScaledTriangleWhitePixbuf = self.TriangleWhitePixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
         self.ScaledSquareBlackPixbuf = self.SquareBlackPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
         self.ScaledSquareWhitePixbuf = self.SquareWhitePixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
-
+        self.ScaledXBlackOccupiedPixbuf = self.XBlackOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
+        self.ScaledXWhiteOccupiedPixbuf = self.XWhiteOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
+        self.ScaledCircleBlackOccupiedPixbuf = self.CircleBlackOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
+        self.ScaledCircleWhiteOccupiedPixbuf = self.CircleWhiteOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
+        self.ScaledTriangleBlackOccupiedPixbuf = self.TriangleBlackOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
+        self.ScaledTriangleWhiteOccupiedPixbuf = self.TriangleWhiteOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
+        self.ScaledSquareBlackOccupiedPixbuf = self.SquareBlackOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
+        self.ScaledSquareWhiteOccupiedPixbuf = self.SquareWhiteOccupiedPixbuf.scale_simple( int(self.unit), int(self.unit), gtk.gdk.INTERP_BILINEAR )
 
         #Draw the board
         self.window.draw_drawable(self.gc, self.BoardPixmap, 0, 0, 0, 0, self.allocation.width, self.allocation.height)
@@ -264,8 +278,24 @@ class GoBoardWidget(gtk.Widget):
             ct.set_source_pixbuf(self.ScaledCircleWhitePixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
         elif color == 'S':
             ct.set_source_pixbuf(self.ScaledSquareBlackPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
-        else:
+        elif color == 'R':
             ct.set_source_pixbuf(self.ScaledSquareWhitePixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        elif color == 'E':
+            ct.set_source_pixbuf(self.ScaledXBlackOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        elif color == 'F':
+            ct.set_source_pixbuf(self.ScaledXWhiteOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        elif color == 'G':
+            ct.set_source_pixbuf(self.ScaledTriangleBlackOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        elif color == 'H':
+            ct.set_source_pixbuf(self.ScaledTriangleWhiteOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        elif color == 'I':
+            ct.set_source_pixbuf(self.ScaledCircleBlackOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        elif color == 'J':
+            ct.set_source_pixbuf(self.ScaledCircleWhiteOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        elif color == 'K':
+            ct.set_source_pixbuf(self.ScaledSquareBlackOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
+        else:
+            ct.set_source_pixbuf(self.ScaledSquareWhiteOccupiedPixbuf, self.unit*x - self.unit/2, self.unit*y - self.unit/2 )
         
         ctx.paint()