r6005 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2004-07-20 17:36:53 -0500 (Tue, 20 Jul 2004)
New Revision: 6005

Modified:
   trunk/gnue-forms/src/GFKeyMapper.py
Log:
Added support for arbitary ctrl key bindings via normal ASCII code.


Modified: trunk/gnue-forms/src/GFKeyMapper.py
===================================================================
--- trunk/gnue-forms/src/GFKeyMapper.py 2004-07-20 20:45:10 UTC (rev 6004)
+++ trunk/gnue-forms/src/GFKeyMapper.py 2004-07-20 22:36:53 UTC (rev 6005)
@@ -200,15 +200,12 @@
   def _translateUserKeyMap(self):
     self._translatedUserKeyMap = {}
     for keys in self.__functionMap.keys():
-      try:
-        base, sh, ctrl, meta = keys
-        self._translatedUserKeyMap[(self.__keyTranslations[base],
-                   sh, ctrl, meta)] = self.__functionMap[keys]
-      except KeyError:
-        pass
+      base, sh, ctrl, meta = keys
+      if self.__keyTranslations.has_key(base):
+        base = self.__keyTranslations[base]
+      self._translatedUserKeyMap[(base,sh,ctrl,meta)] = 
self.__functionMap[keys]
 
 
-
 #####################################################################
 #
 #
@@ -288,10 +285,15 @@
 DefaultMapping = {
 
       # (Key, Shifted, Ctrl'd, Meta/Alt'd)
-      (vk.A,        False, True, False) : 'SELECTALL',
-      (vk.C,        False, True, False) : 'COPY',
-      (vk.V,        False, True, False) : 'PASTE',
-      (vk.X,        False, True, False) : 'CUT',
+      (vk.A,        False, True,  False) : 'SELECTALL',
+      (vk.C,        False, True,  False) : 'COPY',
+      (vk.V,        False, True,  False) : 'PASTE',
+      (vk.X,        False, True,  False) : 'CUT',
+      (1,           False, False, False) : 'SELECTALL',  # Ctrl-A
+      (3,           False, False, False) : 'COPY',       # Ctrl-C
+      (17,          False, False, False) : 'EXIT',       # Ctrl-Q
+      (22,          False, False, False) : 'PASTE',      # Ctrl-V
+      (24,          False, False, False) : 'CUT',        # Ctrl-X
       (vk.PAGEUP,   True,  False, False) : 'JUMPROWSUP',
       (vk.PAGEDOWN, True,  False, False) : 'JUMPROWSDOWN',
       (vk.PAGEUP,   False, True,  False) : 'PREVPAGE',