[gnue] r8146 - in trunk/gnue-forms/src/uidrivers: _base/widgets curses win32/widgets

[johannes]

Author: johannes
Date: 2006-01-30 02:12:25 -0600 (Mon, 30 Jan 2006)
New Revision: 8146

Modified:
   trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
Log:
Fix use of input/GFKeyMapper.KeyMapper.getEvent () as it return a tuple 
now (instead of a command name)


Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-01-27 
10:44:22 UTC (rev 8145)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-01-30 
08:12:25 UTC (rev 8146)
@@ -120,16 +120,18 @@
   # Handle a keyboard request for a character key
   def _keypress (self, character):
     if character in [chr (9), chr (10)]: # tab and enter shouldn't be ctrl keys
-      self._request (KeyMapper.getEvent (ord (character), False, False, False))
+      (evt, arg) = KeyMapper.getEvent (ord (character), False, False, False)
+      self._request (evt, triggerName = arg)
     elif character < ' ':                # control key
-      self._request (KeyMapper.getEvent (ord (character) + 96,
-                                         False, True, False))
+      (evt, arg) = KeyMapper.getEvent (ord (character) + 96, False, True, 
False)
+      self._request (evt, triggerName = arg)
     else:
       self._request ('KEYPRESS', text = character)
 
   # Handle a keyboard request for a function key
   def _fkeypress (self, key, shift, ctrl, meta):
-    self._request (KeyMapper.getEvent (key, shift, ctrl, meta))
+    (evt, args) = KeyMapper.getEvent (key, shift, ctrl, meta)
+    self._request (evt, triggerName = args)
 
 
   #

Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2006-01-27 10:44:22 UTC 
(rev 8145)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2006-01-30 08:12:25 UTC 
(rev 8146)
@@ -111,7 +111,8 @@
         (key, shift, ctrl, meta) = self.__shiftkeys [fkey]
       else:
         (key, shift, ctrl, meta) = (fkey, False, False, False)
-      name = KeyMapper.getEvent (key, shift, ctrl, meta)
+
+      (name, args) = KeyMapper.getEvent (key, shift, ctrl, meta)
       if name:
         event = [name, False]
         self.__events_fkey [fkey] = event
@@ -203,7 +204,7 @@
             (shift, ctrl, meta) = (False, False, False)
 
           self._uiFocusWidget._fkeypress (key, shift, ctrl, meta)
-      except:
+      except Exception, e:
         self.showException ()
 
   # ---------------------------------------------------------------------------
@@ -314,7 +315,7 @@
     # Give us a chance to debug exceptions until we have a 'good' exception
     # dialog
     assert gDebug (2, "MESSAGE: %s" % message)
-    assert gDebug (2, "Detail : %s" % detail)
+    assert gDebug (2, "Detail : %s" % repr (detail))
     self.showMessage (message, kind = 'Error')
 
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-01-27 
10:44:22 UTC (rev 8145)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-01-30 
08:12:25 UTC (rev 8146)
@@ -265,7 +265,7 @@
         #
         # Get the event to process from the KeyMapper
         #
-        command = GFKeyMapper.KeyMapper.getEvent(
+        (command, args) = GFKeyMapper.KeyMapper.getEvent(
           keycode,
           ShiftDown,
           ControlDown,