gnue/forms/src GFKeyMapper.py UIwxpython.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/19 16:43:24

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

Log message:
        fixed some breakage

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFKeyMapper.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.128&tr2=1.129&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFKeyMapper.py
diff -c gnue/forms/src/GFKeyMapper.py:1.1 gnue/forms/src/GFKeyMapper.py:1.2
*** gnue/forms/src/GFKeyMapper.py:1.1   Sat Jan 19 16:13:41 2002
--- gnue/forms/src/GFKeyMapper.py       Sat Jan 19 16:43:24 2002
***************
*** 45,51 ****
  #
  class BaseKeyMapper:
  
!   def __init__(self, userKeyMap=DefaultMapping):
      self.__functionMap = userKeyMap
      self.__keyTranslations = {}
  
--- 45,51 ----
  #
  class BaseKeyMapper:
  
!   def __init__(self, userKeyMap):
      self.__functionMap = userKeyMap
      self.__keyTranslations = {}
  
***************
*** 126,132 ****
    # then return vk.PAGEUP)
    #
    def getEventKeystroke(self, event):
!     for key in self.__functionMap.keys()
        if self.__functionMap[key] == event:
          return key
      return None
--- 126,132 ----
    # then return vk.PAGEUP)
    #
    def getEventKeystroke(self, event):
!     for key in self.__functionMap.keys():
        if self.__functionMap[key] == event:
          return key
      return None
***************
*** 173,183 ****
                     sh, ctrl, meta)] = self.__functionMap[keys]
  
  
- #
- # ..and the application will only
- #   need one instance, so create one.
- #
- KeyMapper = BaseKeyMapper()
  
  
  #####################################################################
--- 173,178 ----
***************
*** 258,264 ****
        (vk.RIGHT,    0, 0, 0) : 'CURSORRIGHT',
        (vk.END,      0, 0, 0) : 'CURSOREND',
        (vk.HOME,     0, 0, 0) : 'CURSORHOME',
!       (vk.BACK,     0, 0, 0) : 'BACKSPACE',
        (vk.INSERT,   0, 0, 0) : 'MODETOGGLE',
        (vk.DELETE,   0, 0, 0) : 'DELETE',
        (vk.UP,       0, 0, 0) : 'PREVRECORD',
--- 253,259 ----
        (vk.RIGHT,    0, 0, 0) : 'CURSORRIGHT',
        (vk.END,      0, 0, 0) : 'CURSOREND',
        (vk.HOME,     0, 0, 0) : 'CURSORHOME',
!       (vk.BACKSPACE,0, 0, 0) : 'BACKSPACE',
        (vk.INSERT,   0, 0, 0) : 'MODETOGGLE',
        (vk.DELETE,   0, 0, 0) : 'DELETE',
        (vk.UP,       0, 0, 0) : 'PREVRECORD',
***************
*** 273,275 ****
--- 268,275 ----
     }
  
  
+ #
+ # The application will only
+ # need one instance, so create one.
+ #
+ KeyMapper = BaseKeyMapper(DefaultMapping)
Index: gnue/forms/src/UIwxpython.py
diff -c gnue/forms/src/UIwxpython.py:1.128 gnue/forms/src/UIwxpython.py:1.129
*** gnue/forms/src/UIwxpython.py:1.128  Sat Jan 19 16:13:41 2002
--- gnue/forms/src/UIwxpython.py        Sat Jan 19 16:43:24 2002
***************
*** 1166,1183 ****
  from GFKeyMapper import vk
  
  wxKeyTranslations = {
!    WXK_F1     : vk.F1,           WXK_F2     : vk.F2
!    WXK_F3     : vk.F3,           WXK_F4     : vk.F4
!    WXK_F5     : vk.F5,           WXK_F6     : vk.F6
!    WXK_F7     : vk.F7,           WXK_F8     : vk.F8
!    WXK_F9     : vk.F9,           WXK_F10    : vk.F10
!    WXK_F11    : vk.F11,          WXK_F12    : vk.F12
!    WXK_INSERT : vk.INSERT,       WXK_DELETE : vk.DELETE
!    WXK_HOME   : vk.HOME,         WXK_END    : vk.END
!    WXK_PRIOR  : vk.PAGEUP,       WXK_NEXT   : vk.PAGEDOWN
!    WXK_UP     : vk.UP,           WXK_DOWN   : vk.DOWN
!    WXK_LEFT   : vk.LEFT,         WXK_RIGHT  : vk.RIGHT
!    WXK_TAB    : vk.TAB,          WXK_ENTER  : vk.RETURN
     WXK_RETURN : vk.ENTER,        WXK_BACK   : vk.BACKSPACE   }
  
  GFKeyMapper.KeyMapper.setUIKeyMap(wxKeyTranslations)
--- 1166,1183 ----
  from GFKeyMapper import vk
  
  wxKeyTranslations = {
!    WXK_F1     : vk.F1,           WXK_F2     : vk.F2,
!    WXK_F3     : vk.F3,           WXK_F4     : vk.F4,
!    WXK_F5     : vk.F5,           WXK_F6     : vk.F6,
!    WXK_F7     : vk.F7,           WXK_F8     : vk.F8,
!    WXK_F9     : vk.F9,           WXK_F10    : vk.F10,
!    WXK_F11    : vk.F11,          WXK_F12    : vk.F12,
!    WXK_INSERT : vk.INSERT,       WXK_DELETE : vk.DELETE,
!    WXK_HOME   : vk.HOME,         WXK_END    : vk.END,
!    WXK_PRIOR  : vk.PAGEUP,       WXK_NEXT   : vk.PAGEDOWN,
!    WXK_UP     : vk.UP,           WXK_DOWN   : vk.DOWN,
!    WXK_LEFT   : vk.LEFT,         WXK_RIGHT  : vk.RIGHT,
!    WXK_TAB    : vk.TAB,          #WXK_ENTER  : vk.ENTER,
     WXK_RETURN : vk.ENTER,        WXK_BACK   : vk.BACKSPACE   }
  
  GFKeyMapper.KeyMapper.setUIKeyMap(wxKeyTranslations)