Changeset 178:98121552b435 for src

Timestamp:

05/13/12 08:55:07 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Allocating only as many hotkeys as really needed

File:

• src/mlx/gui/gui.py (modified) (3 diffs)

src/mlx/gui/gui.py

@@ -155 +155 @@
 
         self._hotkeySetID = None
+        self._pilotHotkeyIndex = None
+        self._checklistHotkeyIndex = None
 
     @property
@@ -1132 +1134 @@
         """Setup the hotkeys based on the configuration."""
         if self._hotkeySetID is None and self._simulator is not None:
-            self._hotkeySetID = \
-                self._simulator.listenHotkeys([self.config.pilotHotkey,
-                                               self.config.checklistHotkey],
-                                              self._handleHotkeys)
+            self._pilotHotkeyIndex = None
+            self._checklistHotkeyIndex = None
+
+            hotkeys = []
+
+            config = self.config
+            if config.enableSounds and config.pilotControlsSounds:
+                self._pilotHotkeyIndex = len(hotkeys)
+                hotkeys.append(config.pilotHotkey)
+
+            if config.enableChecklists:
+                self._checklistHotkeyIndex = len(hotkeys)
+                hotkeys.append(config.checklistHotkey)
+
+            if hotkeys:
+                self._hotkeySetID = \
+                    self._simulator.listenHotkeys(hotkeys, self._handleHotkeys)
 
     def _clearHotkeys(self):
@@ -1147 +1162 @@
         if id==self._hotkeySetID:
             for index in hotkeys:
-                if index==0:
+                if index==self._pilotHotkeyIndex:
+                    print "gui.GUI._handleHotkeys: pilot hotkey pressed"
                     self._flight.pilotHotkeyPressed()
+                elif index==self._checklistHotkeyIndex:
+                    print "gui.GUI._handleHotkeys: checklist hotkey pressed"
+                    self._flight.checklistHotkeyPressed()
                 else:
-                    self._flight.checklistHotkeyPressed()
+                    print "gui.GUI._handleHotkeys: unhandled hotkey index:", index