Save modified game automatically

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Reviewed-by: Manuel Quiñones <manuq@laptop.org>

1 files changed, 23 insertions, 23 deletions

diff --git a/createtoolbar.py b/createtoolbar.py
index 03fe785..38decdd 100644
--- a/createtoolbar.py
+++ b/createtoolbar.py
@@ -15,21 +15,19 @@
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import logging
 from gettext import gettext as _
 
 import gtk
 import gobject
-from os.path import join, dirname
 from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT
+import logging
   
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.toolbarbox import ToolbarButton
 from sugar.graphics.toggletoolbutton import ToggleToolButton
 from sugar.graphics.toolcombobox import ToolComboBox
-from sugar.graphics.objectchooser import ObjectChooser
-from sugar.graphics.alert import ConfirmationAlert
-
+from sugar.graphics.alert import Alert
+from sugar.graphics.icon import Icon
 
 class CreateToolbarBuilder(gobject.GObject):
 
@@ -37,7 +35,6 @@ class CreateToolbarBuilder(gobject.GObject):
 
     __gsignals__ = {
         'create_new_game': (SIGNAL_RUN_FIRST, None, []), 
-        'create_save_game': (SIGNAL_RUN_FIRST, None, 3 * [TYPE_PYOBJECT]), 
         'create_equal_pairs': (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), 
     }
     
@@ -46,8 +43,8 @@ class CreateToolbarBuilder(gobject.GObject):
         self.activity = activity
         self.toolbar = self.activity.get_toolbar_box().toolbar
         
-        self._equal_pairs = ToggleToolButton('pair-equals')
-        self._equal_pairs.set_tooltip(_('Equal pairs'))
+        self._equal_pairs = ToggleToolButton('pair-non-equals')
+        self._equal_pairs.set_tooltip(_('Click for equal pairs'))
         self._equal_pairs.connect('toggled', self._emit_equal_pairs)
         self.toolbar.insert(self._equal_pairs, -1)
                 
@@ -72,14 +69,18 @@ class CreateToolbarBuilder(gobject.GObject):
         tool_item.show()
 
     def _clear_game_bt(self, button):
-        alert = ConfirmationAlert()
-        alert.props.title = _('Remove all the tiles from the game?')
+        alert = Alert()
+        alert.props.title = _('Clear all the tiles from the game?')
+        icon = Icon(icon_name='dialog-ok')
+        alert.add_button(1, _('Clear'), icon)
+        icon = Icon(icon_name='dialog-cancel')
+        alert.add_button(0, _('Do not clear'), icon)
         alert.connect('response', self._clear_game_alert_cb)
         self.activity.add_alert(alert)
 
     def _clear_game_alert_cb(self, alert, response_id):
         self.activity.remove_alert(alert)
-        if response_id == gtk.RESPONSE_OK:
+        if response_id == 1:
             self._equal_pairs.set_active(False)
             self._grouped.set_active(False)
             self.emit('create_new_game')
@@ -89,29 +90,28 @@ class CreateToolbarBuilder(gobject.GObject):
         self._grouped.set_sensitive(active)
         self._clear_button.set_sensitive(active)
 
-    """
-    def _save_game_bt(self, button):
-        self.emit('create_save_game', self.game_name_entry.get_text(),
-            self._equal_pairs.get_active(), self._grouped.get_active())
-        self._save_button.set_sensitive(False)
-    """
-
     def _emit_equal_pairs(self, widget):
+        self.emit('create_equal_pairs', self._equal_pairs.get_active())
         if self._equal_pairs.get_active():
-            self._equal_pairs.set_named_icon('pair-non-equals')
-            self._equal_pairs.set_tooltip(_('Click for equal pairs'))
-        else:
             self._equal_pairs.set_named_icon('pair-equals')
             self._equal_pairs.set_tooltip(_('Click for non equal pairs'))
+            self.activity.game.model.data['equal_pairs'] = '1'
+        else:
+            self._equal_pairs.set_named_icon('pair-non-equals')
+            self._equal_pairs.set_tooltip(_('Click for equal pairs'))
+            self.activity.game.model.data['equal_pairs'] = '0'
         
     def _grouped_cb(self, widget):
         if self._grouped.get_active():
             self._grouped.set_named_icon('grouped_game2')
             self._grouped.set_tooltip(_('Click for ungrouped game'))
+            self.activity.game.model.data['divided'] = '1'
         else:
             self._grouped.set_named_icon('grouped_game1')
             self._grouped.set_tooltip(_('Click for grouped game'))
+            self.activity.game.model.data['divided'] = '0'
     
-    def update_create_toolbar(self, widget, game_name, equal_pairs, grouped):        
-        self._equal_pairs.set_active(equal_pairs == 'True')
+    def update_create_toolbar(self, widget, game_name, equal_pairs, grouped):
+        logging.debug('update_create_toolbar game_name %s eq pairs : %s grouped %s', game_name, equal_pairs, grouped)
+        self._equal_pairs.set_active(equal_pairs == '1')
         self._grouped.set_active(grouped == '1')