gnue/forms/src GFClient.py GFKeyMapper.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/31 00:47:24

Modified files:
        forms/src      : GFClient.py GFKeyMapper.py 

Log message:
        fixed bug when loading keymaps from gnue.conf

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFClient.py.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFKeyMapper.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.33 gnue/forms/src/GFClient.py:1.34
*** gnue/forms/src/GFClient.py:1.33     Thu Jan 31 00:41:31 2002
--- gnue/forms/src/GFClient.py  Thu Jan 31 00:47:24 2002
***************
*** 125,131 ****
  
      for key in options.keys():
        if string.lower(key)[:4] == 'key_':
!         mapping[key] = options[key]
  
      GFKeyMapper.KeyMapper.loadUserKeyMap(mapping)
  
--- 125,131 ----
  
      for key in options.keys():
        if string.lower(key)[:4] == 'key_':
!         mapping[key[4:]] = options[key]
  
      GFKeyMapper.KeyMapper.loadUserKeyMap(mapping)
  
Index: gnue/forms/src/GFKeyMapper.py
diff -c gnue/forms/src/GFKeyMapper.py:1.3 gnue/forms/src/GFKeyMapper.py:1.4
*** gnue/forms/src/GFKeyMapper.py:1.3   Thu Jan 31 00:41:31 2002
--- gnue/forms/src/GFKeyMapper.py       Thu Jan 31 00:47:24 2002
***************
*** 115,121 ****
            "Invalid keystroke combination '%s' in keymap for '%s'" % \
                (dict[event],event)
  
!       usermap[(base, shifted, ctrl, meta)] = event
  
  
      # Now, load any default keys they forgot to bind
--- 115,121 ----
            "Invalid keystroke combination '%s' in keymap for '%s'" % \
                (dict[event],event)
  
!       usermap[(base, shifted, ctrl, meta)] = string.upper(event)
  
  
      # Now, load any default keys they forgot to bind