Mercurial > rinkhals

changeset 245:634491bf37e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change toolbar to gui.Toolbar -- gives nicer highlighting.
author Simon Cross <hodgestar@gmail.com>
date Sat, 05 Sep 2009 12:15:46 +0000
parents 7024d48c41c2
children 592bfad67488
files gamelib/engine.py gamelib/gameboard.py
diffstat 2 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/engine.py	Sat Sep 05 12:11:58 2009 +0000
+++ b/gamelib/engine.py	Sat Sep 05 12:15:46 2009 +0000
@@ -118,6 +118,7 @@
 
     def event(self, e):
         if events_equal(e, START_NIGHT):
+            self.game.gameboard.reset_states()
             return NightState(self.game)
         elif e.type is KEYDOWN and e.key == K_ESCAPE:
             self.game.gameboard.reset_states()
--- a/gamelib/gameboard.py	Sat Sep 05 12:11:58 2009 +0000
+++ b/gamelib/gameboard.py	Sat Sep 05 12:15:46 2009 +0000
@@ -58,6 +58,8 @@
 class ToolBar(gui.Table):
     def __init__(self, gameboard, **params):
         gui.Table.__init__(self, **params)
+        self.group = gui.Group(name='toolbar', value=None)
+        self._next_tool_value = 0
         self.gameboard = gameboard
         self.cash_counter = mklabel(align=1)
         self.chicken_counter = mklabel(align=1)
@@ -100,7 +102,7 @@
                     cursors.cursors.get(equipment_cls.NAME, None))
         self.add_spacer(30)
 
-        self.add_button("Finished Day", self.day_done)
+        self.add_tool("Finished Day", self.day_done)
 
     def day_done(self):
         import engine
@@ -121,14 +123,20 @@
         self.td(mklabel(text), colspan=2)
 
     def add_tool_button(self, text, tool, cursor=None):
-        self.add_button(text, lambda: self.gameboard.set_selected_tool(tool,
+        self.add_tool(text, lambda: self.gameboard.set_selected_tool(tool,
             cursor))
 
-    def add_button(self, text, func):
-        button = gui.Button(text, width=self.rect.w, style={"padding_left": 0})
-        button.connect(gui.CLICK, func)
+    def add_tool(self, text, func):
+        label = gui.basic.Label(text)
+        value = self._next_tool_value
+        self._next_tool_value += 1
+        tool = gui.Tool(self.group, label, value, width=self.rect.w, style={"padding_left": 0})
+        tool.connect(gui.CLICK, func)
         self.tr()
-        self.td(button, align=-1, colspan=2)
+        self.td(tool, align=-1, colspan=2)
+
+    def clear_tool(self):
+        self.group.value = None
 
     def add_counter(self, icon, label):
         self.tr()
@@ -285,9 +293,8 @@
 
     def reset_states(self):
         """Clear current states (highlights, etc.)"""
-        if self.animal_to_place:
-            self.select_animal_to_place(None)
-        self.set_cursor()
+        self.set_selected_tool(None, None)
+        self.toolbar.clear_tool()
 
     def update_sprite_cursor(self, e):
         tile_pos = self.tv.screen_to_tile(e.pos)