diff options
Diffstat (limited to 'memorizetoolbar.py')
| -rw-r--r-- | memorizetoolbar.py | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/memorizetoolbar.py b/memorizetoolbar.py index 83e36ee..98ddf0f 100644 --- a/memorizetoolbar.py +++ b/memorizetoolbar.py @@ -23,6 +23,8 @@ from sugar.graphics.toolbutton import ToolButton from sugar.graphics.toolcombobox import ToolComboBox from sugar.graphics.alert import Alert from sugar.graphics.icon import Icon +from sugar.activity.widgets import RadioMenuButton +from sugar.graphics.menuitem import MenuItem import logging from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT @@ -34,15 +36,13 @@ class MemorizeToolbarBuilder(gobject.GObject): __gtype_name__ = 'MemoryToolbarBuilder' - standard_game_names = ['Load demo games', - 'addition', + standard_game_names = ['addition', 'letters', 'sounds' ] - translated_game_names = [_('Load demo games'), - _('addition'), - _('letters'), - _('sounds') + translated_game_names = [_('Addition'), + _('Letters'), + _('Sounds') ] __gsignals__ = { @@ -65,14 +65,16 @@ class MemorizeToolbarBuilder(gobject.GObject): self.toolbar.insert(self._size_combo, -1) self._size_combo.combo.set_active(0) - # Change demo games combobox - self._game_combo = ToolComboBox() - for i, f in enumerate(self.standard_game_names): - f = _(f) - self._game_combo.combo.append_item(i, f) - self._game_combo.combo.set_active(0) - self._game_combo.combo.connect('changed', self._game_changed_cb) - self.toolbar.insert(self._game_combo, -1) + # Change demo games button + self._demo_games = RadioMenuButton(icon_name='memorize-collection') + self._demo_games.props.tooltip = _('Load demo games') + + for i, game in enumerate(self.translated_game_names): + menu_item = MenuItem(game) + menu_item.connect('activate', self.__activate_game_cb, i) + self._demo_games.props.palette.menu.append(menu_item) + menu_item.show() + self.toolbar.insert(self._demo_games, -1) # Reset Button self._restart_button = ToolButton('game-new') @@ -89,7 +91,7 @@ class MemorizeToolbarBuilder(gobject.GObject): def update_controls(self, active): self._size_combo.set_sensitive(active) - self._game_combo.set_sensitive(active) + self._demo_games.set_sensitive(active) self._restart_button.set_sensitive(active and self.activity.game.model.count > 0) @@ -100,9 +102,8 @@ class MemorizeToolbarBuilder(gobject.GObject): game_size = int(self._sizes[self._size_combo.combo.get_active()][0]) self.emit('game_changed', None, game_size, 'size', None, None) - def _game_changed_cb(self, combobox): - if combobox.get_active() == 0: - return + def __activate_game_cb(self, menu, i): + self._game_selected_index = i if self.activity.game.model.is_demo: self._change_game() else: @@ -122,17 +123,12 @@ class MemorizeToolbarBuilder(gobject.GObject): self._change_game() def _change_game(self): - current_game = self._game_combo.combo.get_active() - game_name = self.standard_game_names[current_game] - title = game_name + title = self.translated_game_names[self._game_selected_index] game_size = int(self._sizes[self._size_combo.combo.get_active()][0]) - if game_name in self.translated_game_names: - index = self.translated_game_names.index(game_name) - game_name = self.standard_game_names[index] + game_name = self.standard_game_names[self._game_selected_index] game_file = join(dirname(__file__), 'demos', game_name + '.zip') - self._game_combo.combo.set_active(0) self.emit('game_changed', game_file, game_size, 'demo', title, None) def update_toolbar(self, widget, data, grid): |