diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-03-29 16:44:57 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-03-29 16:44:57 (GMT) |
commit | 20deb71b4c3403380596adbbf37769822cac76d4 (patch) | |
tree | d4ddab0410e4088fa61eb94e55af1e8989062f4a | |
parent | de8c9525988fcea6885080e254ea3a27a612f89a (diff) | |
parent | 5c28743aa1fd34e4989770248e8daf45f11c28d6 (diff) |
Merge branch 'master' of git.sugarlabs.org:paths/mainline
-rw-r--r-- | PathsActivity.py | 8 | ||||
-rw-r--r-- | game.py | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/PathsActivity.py b/PathsActivity.py index 77a5b49..ccc6b8a 100644 --- a/PathsActivity.py +++ b/PathsActivity.py @@ -186,10 +186,10 @@ class PathsActivity(activity.Activity): self.player = _image_factory( svg_str_to_pixbuf(generate_xo(scale=0.8, - colors=['#404040', '#000000'])), + colors=['#303030', '#303030'])), self.toolbar, tooltip=self.nick) - self.dialog_button = _button_factory('dialog-ok', + self.dialog_button = _button_factory('go-next', _('Turn complete'), self._dialog_cb, self.toolbar) @@ -469,7 +469,9 @@ state=%d' % (id, initiator, type, service, params, state)) if self.initiating: # First, remove the piece from whatever hand it was played. for i in range(COL): - if self._game.hands[self._game.whos_turn].hand[i].number == \ + if self._game.hands[self._game.whos_turn].hand[i] is not None \ + and \ + self._game.hands[self._game.whos_turn].hand[i].number == \ tile_number: self._game.hands[self._game.whos_turn].hand[i] = None break @@ -189,7 +189,7 @@ class Game(): self._redeal() if self._running_sugar: self._activity.set_player_on_toolbar(self._activity.nick) - self._activity.dialog_button.set_icon('dialog-ok') + self._activity.dialog_button.set_icon('go-next') self._activity.dialog_button.set_tooltip( _('Click after taking your turn.')) self._set_label(_('It is your turn.')) @@ -202,7 +202,8 @@ class Game(): self.hands[ROBOT_HAND].deal(self.deck) if self.hands[self._my_hand].cards_in_hand() == 0: if self._running_sugar: - self._activity.dialog_button.set_icon('dialog-cancel') + self._activity.dialog_button.set_icon( + 'media-playback-stop-insensitive') self._activity.dialog_button.set_tooltip(_('Game over')) self._set_label(_('Game over')) @@ -257,15 +258,14 @@ class Game(): gobject.timeout_add(1000, self._robot_turn) elif not self.we_are_sharing(): self.its_my_turn() - else: + elif self._initiating(): self.whos_turn += 1 if self.whos_turn == len(self.buddies): self.whos_turn = 0 else: - print "it's %s's turn" % (self.buddies[self.whos_turn]) self.its_their_turn(self.buddies[self.whos_turn]) self._activity.send_event('t|%s' % ( - self.buddies[self.whos_turn])) + self.buddies[self.whos_turn])) def _robot_turn(self): self._robot_play() @@ -278,7 +278,7 @@ class Game(): if self._running_sugar: if not self.playing_with_robot: self._activity.set_player_on_toolbar(nick) - self._activity.dialog_button.set_icon('dialog-cancel') + self._activity.dialog_button.set_icon('media-playback-stop') self._activity.dialog_button.set_tooltip(_('Wait your turn.')) self._set_label(_('Waiting for') + ' ' + nick) self._waiting_for_my_turn = True # I am still waiting. @@ -477,7 +477,7 @@ class Game(): pos=self.grid.grid_to_xy(order[i])) return # Nowhere to play. - self._set_label(_('Nowhere to play. Game over')) + self._set_label(_('Nowhere to play.')) def _robot_play(self): ''' The robot tries random cards in random locations. ''' |