diff options
| -rw-r--r-- | activity.py | 2 | ||||
| -rw-r--r-- | createtoolbar.py | 10 | ||||
| -rw-r--r-- | memorizetoolbar.py | 8 |
3 files changed, 3 insertions, 17 deletions
diff --git a/activity.py b/activity.py index 8e07fa9..5eed76d 100644 --- a/activity.py +++ b/activity.py @@ -121,8 +121,6 @@ class MemorizeActivity(Activity): self.table.connect('key-press-event', self.table.key_press_event) self.table.connect('card-flipped', self.game.card_flipped) - self.table.connect('card-flipped', - self._memorizeToolbarBuilder.card_flipped) self.table.connect('card-overflipped', self.game.card_overflipped) self.table.connect('card-highlighted', self.game.card_highlighted) diff --git a/createtoolbar.py b/createtoolbar.py index 521d6a4..49feaf7 100644 --- a/createtoolbar.py +++ b/createtoolbar.py @@ -44,13 +44,12 @@ class CreateToolbarBuilder(gobject.GObject): self._equal_pairs = ToggleToolButton('pair-non-equals') self._equal_pairs.set_tooltip(_('Match different tiles')) - self.id_equal_cb = self._equal_pairs.connect('toggled', - self._emit_equal_pairs) + self._equal_pairs.connect('toggled', self._emit_equal_pairs) self.toolbar.insert(self._equal_pairs, -1) self._grouped = ToggleToolButton('grouped_game1') self._grouped.set_tooltip(_('Mixed tiles game')) - self.id_grouped_cb = self._grouped.connect('toggled', self._grouped_cb) + self._grouped.connect('toggled', self._grouped_cb) self.toolbar.insert(self._grouped, -1) self._clear_button = ToolButton('edit-clear') @@ -123,10 +122,5 @@ class CreateToolbarBuilder(gobject.GObject): self.activity.game.model.mark_modified() def update_create_toolbar(self, widget, game_name, equal_pairs, grouped): - self._equal_pairs.handler_block(self.id_equal_cb) self._equal_pairs.set_active(equal_pairs == '1') - self._equal_pairs.handler_unblock(self.id_equal_cb) - - self._grouped.handler_block(self.id_grouped_cb) self._grouped.set_active(grouped == '1') - self._grouped.handler_unblock(self.id_grouped_cb) diff --git a/memorizetoolbar.py b/memorizetoolbar.py index 2e8f118..c7e4366 100644 --- a/memorizetoolbar.py +++ b/memorizetoolbar.py @@ -80,23 +80,17 @@ class MemorizeToolbarBuilder(gobject.GObject): self._restart_button = ToolButton('game-new') self._restart_button.connect('clicked', self._game_reset_cb) self._restart_button.set_tooltip(_('Restart Game')) - self._restart_button.set_sensitive(False) self.toolbar.insert(self._restart_button, -1) self._restart_button.show() def _game_reset_cb(self, widget): - self._restart_button.set_sensitive(False) self.activity.game.model.count = 0 self.emit('game_changed', None, None, 'reset', None, None) def update_controls(self, active): self._size_combo.set_sensitive(active) self._demo_games.set_sensitive(active) - self._restart_button.set_sensitive(active and - self.activity.game.model.count > 0) - - def card_flipped(self, widget, identifier, signal=False): - self._restart_button.set_sensitive(self.activity.game.model.count > 0) + self._restart_button.set_sensitive(active) def _game_size_cb(self, widget): game_size = int(self._sizes[self._size_combo.combo.get_active()][0]) |