Mercurial > rinkhals

changeset 529:93eab01a1e57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated (but no prettier) control dialog.
author Jeremy Thurgood <firxen@gmail.com>
date Fri, 27 Nov 2009 20:44:39 +0000
parents 04975aa3ec70
children c1f14fa35d30
files gamelib/toolbar.py
diffstat 1 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/toolbar.py	Fri Nov 27 19:56:08 2009 +0000
+++ b/gamelib/toolbar.py	Fri Nov 27 20:44:39 2009 +0000
@@ -159,15 +159,16 @@
     def show_controls(self):
         """Popup dialog of controls"""
 
-        COMBOS = {
-                'Select Multiple chickens' : 'Shift & Left Click',
-                'Move selected chickens' : 'Ctrl & Left Click',
-                'Toggle between select and move' : 'Right Click',
-                'Unselect current tool and all chickens' : 'Middle Click',
-                'Save selection' : 'Ctrl & 0 .. 9',
-                'Recall saved selection' : '0 .. 9',
-                'Exit game' : 'Esc',
-                }
+        COMBOS = [
+            ('Select Multiple chickens', 'Shift & Left Click'),
+            ('Move selected chickens', 'Ctrl & Left Click'),
+            ('Toggle between select and move', 'Right Click'),
+            ('Unselect current tool and chickens', 'Middle Click'),
+            ('Save selection', 'Ctrl & 0 .. 9'),
+            ('        or', 'Alt & 0 .. 9'),
+            ('Recall saved selection', '0 .. 9'),
+            ('Exit game', 'Esc'),
+            ]
 
         tbl = gui.Table()
         tbl.tr()
@@ -176,7 +177,7 @@
         for header in ['Action', 'Combination']:
             doc.add(misc.make_box(header))
         doc.br(space[1])
-        for command, combo in COMBOS.iteritems():
+        for command, combo in COMBOS:
             doc.add(misc.make_box(command))
             doc.add(misc.make_box(combo))
             doc.br(space[1])