Changeset 168:71af690e0c26 for src/mlx/gui

Timestamp:

05/12/12 11:52:03 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

The hotkey handling works

Location:

src/mlx/gui

Files:

• gui.py (modified) (5 diffs)
• prefs.py (modified) (2 diffs)

src/mlx/gui/gui.py

@@ -152 +152 @@
         self._lastLoadedPIREP = None
 
+        self._hotkeySetID = None
+
     @property
     def mainWindow(self):
@@ -320 +322 @@
             self._wizard.connected(fsType, descriptor)
         self._reconnecting = False
+        self._listenHotkeys()
 
     def connectionFailed(self):
@@ -402 +405 @@
         """Disconnect from the simulator if connected."""
         self.stopMonitoring()
+        self._clearHotkeys()
 
         if self._connected:
@@ -875 +879 @@
     def _editPreferences(self, menuItem):
         """Callback for editing the preferences."""
+        self._clearHotkeys()
         self._preferences.run(self.config)
         self._setupTimeSync()
+        self._listenHotkeys()
 
     def _setupTimeSync(self):
@@ -1106 +1112 @@
         if callback is not None:
             callback(returned, result)
+
+    def _listenHotkeys(self):
+        """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)
+
+    def _clearHotkeys(self):
+        """Clear the hotkeys."""
+        if self._hotkeySetID is not None:
+            self._hotkeySetID=None
+            self._simulator.clearHotkeys()
+
+    def _handleHotkeys(self, id, hotkeys):
+        """Handle the hotkeys."""
+        if id==self._hotkeySetID:
+            print "gui.GUI._handleHotkeys", hotkeys

src/mlx/gui/prefs.py

@@ -40 +40 @@
         labelAlignment = gtk.Alignment(xalign = 0.0, yalign = 0.5,
                                        xscale = 0.0, yscale = 0.0)
+        labelAlignment.set_padding(padding_top = 0, padding_bottom = 0,
+                                   padding_left = 0, padding_right = 4)
         labelAlignment.add(label)
-        self.pack_start(labelAlignment, False, False, 8)
+        self.pack_start(labelAlignment, False, False, 0)
 
         self._ctrl = gtk.CheckButton("Ctrl")
@@ -54 +56 @@
 
         self._hotkeyModel = gtk.ListStore(str)
-        for keyCode in range(ord("0"), ord("9")) + range(ord("A"), ord("Z")):
+        for keyCode in range(ord("0"), ord("9")+1) + range(ord("A"), ord("Z")+1):
             self._hotkeyModel.append([chr(keyCode)])