gnue/forms/src GFEvent.py GFKeyMapper.py uidriv...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Branch:         NumericEvents
Changes by:     Jason Cater <address@hidden>    02/10/24 14:35:48

Modified files:
        forms/src      : GFEvent.py GFKeyMapper.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        fixed GFKeyMapper

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFEvent.py.diff?cvsroot=OldCVS&only_with_tag=NumericEvents&tr1=1.25.2.2&tr2=1.25.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFKeyMapper.py.diff?cvsroot=OldCVS&only_with_tag=NumericEvents&tr1=1.11&tr2=1.11.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&only_with_tag=NumericEvents&tr1=1.198.2.1&tr2=1.198.2.2&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFKeyMapper.py
diff -c gnue/forms/src/GFKeyMapper.py:1.10 gnue/forms/src/GFKeyMapper.py:1.11
*** gnue/forms/src/GFKeyMapper.py:1.10  Tue Sep 17 11:27:45 2002
--- gnue/forms/src/GFKeyMapper.py       Fri Oct 11 19:44:28 2002
***************
*** 30,35 ****
--- 30,36 ----
  
  
  import string, sys
+ from gnue.common import GDebug
  
  
  #
***************
*** 128,135 ****
      usermap.update( {
            (vk.TAB,      0, 0, 0) : 'NEXTENTRY',
            (vk.ENTER,    0, 0, 0) : 'NEXTENTRY',
!           (vk.RETURN,   0, 0, 0) : 'NEXTENTRY' } )
! 
      self.setUserKeyMap(usermap)
  
  
--- 129,135 ----
      usermap.update( {
            (vk.TAB,      0, 0, 0) : 'NEXTENTRY',
            (vk.ENTER,    0, 0, 0) : 'NEXTENTRY',
!           (vk.RETURN,   0, 0, 0) : 'NEXTENTRY'} )
      self.setUserKeyMap(usermap)
  
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.197 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.198
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.197       Wed Oct 23 23:08:23 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Thu Oct 24 00:39:02 2002
***************
*** 31,37 ****
  from wxPython.wx import *
  from wxPython.lib.splashscreen import SplashScreen
  from gnue.forms.GFForm import *
! from gnue.forms.GFEvent import *
  from gnue.forms import GFKeyMapper
  from gnue.forms.uidrivers._base.UIdriver import *
  from gnue.forms.uidrivers._base.UIWidget import *
--- 31,37 ----
  from wxPython.wx import *
  from wxPython.lib.splashscreen import SplashScreen
  from gnue.forms.GFForm import *
! from gnue.common import events
  from gnue.forms import GFKeyMapper
  from gnue.forms.uidrivers._base.UIdriver import *
  from gnue.forms.uidrivers._base.UIWidget import *
***************
*** 390,396 ****
      menu.Append(id, text, help)
      if event:
        EVT_MENU(self._wxapp, id,
!         lambda event, l=self, e=event: l.dispatchEvent(GFEvent(e)))
        self.__eventMenuMapping[event] = id
      return id
  
--- 390,396 ----
      menu.Append(id, text, help)
      if event:
        EVT_MENU(self._wxapp, id,
!         lambda event, l=self, e=event: l.dispatchEvent(events.Event(e)))
        self.__eventMenuMapping[event] = id
      return id
  
***************
*** 565,571 ****
      dlg = wxTextEntryDialog(self.mainWindow, _('Enter record number to jump 
to'),
                                                          _('Which record?'))
      if dlg.ShowModal() == wxID_OK:
!       action = self.dispatchEvent(GFEvent('requestRECORDNUMBER', 
dlg.GetValue()))
      else:
        action = None
  
--- 565,571 ----
      dlg = wxTextEntryDialog(self.mainWindow, _('Enter record number to jump 
to'),
                                                          _('Which record?'))
      if dlg.ShowModal() == wxID_OK:
!       action = self.dispatchEvent(events.Event('requestRECORDNUMBER', 
dlg.GetValue()))
      else:
        action = None
  
***************
*** 582,588 ****
    def closeTrap(self,event):
      object = _eventObjTowxWindow(event)
      if event.CanVeto():
!       self.dispatchEvent(GFEvent('requestEXIT'))
      else:
        object.Destroy()
  
--- 582,588 ----
    def closeTrap(self,event):
      object = _eventObjTowxWindow(event)
      if event.CanVeto():
!       self.dispatchEvent(events.Event('requestEXIT'))
      else:
        object.Destroy()
  
***************
*** 774,780 ****
  
        id = object.GetId()
        gfObject     = _IdToGFObj[id]
!       action = GFEvent('fireTRIGGER',gfObject.trigger)
        self._eventHandler(action)
  
  
--- 774,780 ----
  
        id = object.GetId()
        gfObject     = _IdToGFObj[id]
!       action = events.Event('fireTRIGGER',gfObject.trigger)
        self._eventHandler(action)
  
  
***************
*** 867,873 ****
  
        gfObject     = _IdToGFObj[id]
        eventdata = [gfObject, event.GetString()]
!       action = GFEvent('requestREPLACEVALUE',object=gfObject,
                                index=selection, text=event.GetString())
      self._eventHandler(action)
  
--- 867,873 ----
  
        gfObject     = _IdToGFObj[id]
        eventdata = [gfObject, event.GetString()]
!       action = events.Event('requestREPLACEVALUE',object=gfObject,
                                index=selection, text=event.GetString())
      self._eventHandler(action)
  
***************
*** 880,889 ****
        #for key in self._formToUI.keys():
        #  for count in range(len(self._formToUI[key])):
        #    if self._formToUI[key][count].GetId() == object.GetId():
!       #      self.dispatchEvent(GFEvent('requestFOCUS',key))
        #      eventdata = [key, object.GetValue()]
!       #      self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key._visibleIndex))
!       #      self.dispatchEvent(GFEvent('requestTOGGLECHKBOX',eventdata))
        #      break
  
        #if action:
--- 880,889 ----
        #for key in self._formToUI.keys():
        #  for count in range(len(self._formToUI[key])):
        #    if self._formToUI[key][count].GetId() == object.GetId():
!       #      self.dispatchEvent(events.Event('requestFOCUS',key))
        #      eventdata = [key, object.GetValue()]
!       #      self.dispatchEvent(events.Event('requestJUMPRECORD',count - 
key._visibleIndex))
!       #      self.dispatchEvent(events.Event('requestTOGGLECHKBOX',eventdata))
        #      break
  
        #if action:
***************
*** 932,938 ****
        action = None
  
        if self.__ui.__notebookLoopTrap == 0:
!         action = GFEvent('requestPAGE',event.GetSelection())
          self.__ui.__notebookLoopTrap = 1
        else:
          self.__ui.__notebookLoopTrap = 0
--- 932,938 ----
        action = None
  
        if self.__ui.__notebookLoopTrap == 0:
!         action = events.Event('requestPAGE',event.GetSelection())
          self.__ui.__notebookLoopTrap = 1
        else:
          self.__ui.__notebookLoopTrap = 0
***************
*** 1039,1049 ****
      gfObject     = _IdToGFObj[id]
      screenWidget = _IdToWxObj[id]
      count        = _IdToUIObj[id].widgets.index(screenWidget)
!     self._eventProcessor(GFEvent('requestFOCUS',gfObject))
!     self._eventProcessor(GFEvent('requestJUMPRECORD',count - 
gfObject._visibleIndex))
!     self._eventProcessor(GFEvent('requestCURSORMOVE',position=cursorPosition))
  #    if gfObject._type == 'GFButton':
! #      self._eventProcessor(GFEvent('fireTRIGGER',gfObject.trigger))
  
      event.Skip()
  
--- 1039,1049 ----
      gfObject     = _IdToGFObj[id]
      screenWidget = _IdToWxObj[id]
      count        = _IdToUIObj[id].widgets.index(screenWidget)
!     self._eventProcessor(events.Event('requestFOCUS',gfObject))
!     self._eventProcessor(events.Event('requestJUMPRECORD',count - 
gfObject._visibleIndex))
!     
self._eventProcessor(events.Event('requestCURSORMOVE',position=cursorPosition))
  #    if gfObject._type == 'GFButton':
! #      self._eventProcessor(events.Event('fireTRIGGER',gfObject.trigger))
  
      event.Skip()
  
***************
*** 1096,1115 ****
        action = _PROMPTFORRECORD()
  
      elif command == 'NEWLINE':
!       action = GFEvent('requestKEYPRESS', '\n',
                       text='\n',
                       code=10)
  
      elif command:
!       action = GFEvent('request%s' % command)
  
      elif object._type == 'GFButton':
!       action = GFEvent('fireTRIGGER',object.trigger)
  
      elif object.style == 'checkbox' and object._type == 'GFEntry':
        # <space> <=> <click>
        if keycode == 32:
!           action = GFEvent('requestTOGGLECHKBOX')
        else:
            # maybe some background error message here
            pass
--- 1096,1115 ----
        action = _PROMPTFORRECORD()
  
      elif command == 'NEWLINE':
!       action = events.Event('requestKEYPRESS', '\n',
                       text='\n',
                       code=10)
  
      elif command:
!       action = events.Event('request%s' % command)
  
      elif object._type == 'GFButton':
!       action = events.Event('fireTRIGGER',object.trigger)
  
      elif object.style == 'checkbox' and object._type == 'GFEntry':
        # <space> <=> <click>
        if keycode == 32:
!           action = events.Event('requestTOGGLECHKBOX')
        else:
            # maybe some background error message here
            pass
***************
*** 1118,1124 ****
          char = chr(keycode)
          if char in string.printable or char == "\n" or \
             128 <= keycode <= 255:
!           action = GFEvent('requestKEYPRESS', char,
                           text=char,
                           code=keycode)
        except ValueError:
--- 1118,1124 ----
          char = chr(keycode)
          if char in string.printable or char == "\n" or \
             128 <= keycode <= 255:
!           action = events.Event('requestKEYPRESS', char,
                           text=char,
                           code=keycode)
        except ValueError: