Mercurial > rinkhals
changeset 482:cab751de93cc
selected button switches when you toggle select/move
| author | Adrianna Pińska <adrianna.pinska@gmail.com> |
|---|---|
| date | Wed, 25 Nov 2009 20:44:28 +0000 |
| parents | fac63919a972 |
| children | 25e8c57189c3 |
| files | gamelib/gameboard.py gamelib/toolbar.py |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/gamelib/gameboard.py Wed Nov 25 19:56:18 2009 +0000 +++ b/gamelib/gameboard.py Wed Nov 25 20:44:28 2009 +0000 @@ -264,12 +264,16 @@ if not self.day: return if e.button == 3: # Right button - #self.set_selected_tool(None, None) - #self.toolbar.clear_tool() if self.selected_tool == constants.TOOL_PLACE_ANIMALS: self.set_selected_tool(constants.TOOL_SELECT_CHICKENS, cursors.cursors["select"]) + self.toolbar._select_tool.group.value = self.toolbar._select_tool.value + self.toolbar._move_tool.pcls = "" + self.toolbar._select_tool.pcls = "down" elif self.selected_tool == constants.TOOL_SELECT_CHICKENS: self.set_selected_tool(constants.TOOL_PLACE_ANIMALS, cursors.cursors["chicken"]) + self.toolbar._move_tool.group.value = self.toolbar._move_tool.value + self.toolbar._select_tool.pcls = "" + self.toolbar._move_tool.pcls = "down" return elif e.button != 1: # Left button return
--- a/gamelib/toolbar.py Wed Nov 25 19:56:18 2009 +0000 +++ b/gamelib/toolbar.py Wed Nov 25 20:44:28 2009 +0000 @@ -234,7 +234,7 @@ def add_tool_button(self, text, tool, price=None, cursor=None): if price is not None: text = "%s (%s)" % (text, price) - self.add_tool(text, lambda: self.gameboard.set_selected_tool(tool, + return self.add_tool(text, lambda: self.gameboard.set_selected_tool(tool, cursor)) def add_tool(self, text, func): @@ -270,14 +270,14 @@ self.make_toolbar() def make_toolbar(self): - self.add_tool_button("Select chicken", constants.TOOL_SELECT_CHICKENS, + self._select_tool = self.add_tool_button("Select chicken", constants.TOOL_SELECT_CHICKENS, None, cursors.cursors['select']) self.add_spacer(5) self.add_tool('Equip chickens', self.add_equipment_toolbar) - self.add_tool_button("Move chickens", constants.TOOL_PLACE_ANIMALS, + self._move_tool = self.add_tool_button("Move chickens", constants.TOOL_PLACE_ANIMALS, None, cursors.cursors['select']) self.add_tool('Sell stuff', self.add_sell_toolbar)