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, 23 insertions, 40 deletions

diff --git a/edittoolbar.py b/edittoolbar.py
index 2c3a57d..ad356ef 100644
--- a/edittoolbar.py
+++ b/edittoolbar.py
@@ -30,8 +30,7 @@ class EditToolbar(gtk.Toolbar):
     __gtype_name__ = 'EditToolbar'
 
     __gsignals__ = {
-        'add-black': (SIGNAL_RUN_FIRST, TYPE_NONE, []),
-        'add-white': (SIGNAL_RUN_FIRST, TYPE_NONE, []),
+        'edit': (SIGNAL_RUN_FIRST, TYPE_NONE, []),
         'add-x': (SIGNAL_RUN_FIRST, TYPE_NONE, []),
         'add-circle': (SIGNAL_RUN_FIRST, TYPE_NONE, []),
         'add-triangle': (SIGNAL_RUN_FIRST, TYPE_NONE, []),
@@ -43,26 +42,14 @@ class EditToolbar(gtk.Toolbar):
     def __init__(self, activity):
         gtk.Toolbar.__init__(self)
         self.activity = activity
-        
-        # Add Black Toggle Button
-        add_black_icon = join(dirname(__file__), 'images', 'black.gif')
-        add_black_image = gtk.Image()
-        add_black_image.set_from_file(add_black_icon)
-        self._add_black_button = ToolButton()
-        self._add_black_button.set_icon_widget(add_black_image)
-        self._add_black_button.connect('clicked', self._add_black_cb)
-        self.insert(self._add_black_button, -1)
-        self._add_black_button.show()
-
-        # Add White Toggle Button
-        add_white_icon = join(dirname(__file__), 'images', 'white.gif')
-        add_white_image = gtk.Image()
-        add_white_image.set_from_file(add_white_icon)
-        self._add_white_button = ToolButton()
-        self._add_white_button.set_icon_widget(add_white_image)
-        self._add_white_button.connect('clicked', self._add_white_cb)
-        self.insert(self._add_white_button, -1)
-        self._add_white_button.show()
+        self._is_editing = 0
+
+        # Edit Button
+        self._edit_button = ToolButton()
+        self._edit_button.set_label(_('Edit'))
+        self._edit_button.connect('clicked', self._edit_cb)
+        self.insert(self._edit_button, -1)
+        self._edit_button.show()
 
         # Separator
         separator = gtk.SeparatorToolItem()
@@ -135,26 +122,22 @@ class EditToolbar(gtk.Toolbar):
         widget.show()
         self.insert(tool_item, -1)
         tool_item.show()
-        
-    def _add_black_cb(self, widget):
-        self._add_black_button.set_sensitive(False)
-        self.emit('add-black')
-
-    def activate_add_black(self):
-        self._add_black_button.set_sensitive(True)
-    
-    def grey_out_add_black(self):
-        self._add_black_button.set_sensitive(False)
-
-    def _add_white_cb(self, widget):
-        self._add_white_button.set_sensitive(False)
-        self.emit('add-white')
 
-    def activate_add_white(self):
-        self._add_white_button.set_sensitive(True)
+    def _edit_cb(self, widget):
+        if self._is_editing == 0:
+            self._is_editing = 1
+            self._edit_button.set_label(_('Finished'))
+        else:
+            self._is_editing = 0
+            self._edit_button.set_label(_('Edit'))
+        self._edit_button.set_sensitive(True)
+        self.emit('edit')
+
+    def activate_edit(self):
+        self._edit_button.set_sensitive(True)
     
-    def grey_out_add_white(self):
-        self._add_white_button.set_sensitive(False)
+    def grey_out_edit(self):
+        self._edit_button.set_sensitive(False)
 
     def _add_x_cb(self, widget):
         self._add_x_button.set_sensitive(False)