gnue/forms samples/intro/intro.gfd src/GFKeyMap...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/10/11 19:44:28

Modified files:
        forms/samples/intro: intro.gfd 
        forms/src      : GFKeyMapper.py 
        forms/src/uidrivers/nstti: UIdriver.py 

Log message:
        work on curses interface

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/intro/intro.gfd.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFKeyMapper.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/nstti/UIdriver.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnue/forms/samples/intro/intro.gfd
diff -c gnue/forms/samples/intro/intro.gfd:1.7 
gnue/forms/samples/intro/intro.gfd:1.8
*** gnue/forms/samples/intro/intro.gfd:1.7      Sun Sep 29 21:11:22 2002
--- gnue/forms/samples/intro/intro.gfd  Fri Oct 11 19:44:28 2002
***************
*** 17,25 ****
  import string
  
  s = SampleBlock.NameEntry.get()[:]
! out = ''
  
! for word in string.splitfields(s,' '):
    if word:
      # check for punctuation
      p = 0
--- 17,26 ----
  import string
  
  s = SampleBlock.NameEntry.get()[:]
! if len(s) &gt; 4:
!  out = ''
  
!  for word in string.splitfields(s,' '):
    if word:
      # check for punctuation
      p = 0
***************
*** 59,64 ****
--- 60,67 ----
  
    out = out + ' ' + word
  
+  else: 
+   out = "Name not long enough."
  SampleBlock.CodeNameEntry.set(string.strip(out))
  </trigger>
    <trigger type="NAMED" name="MyFortune">
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/nstti/UIdriver.py
diff -c gnue/forms/src/uidrivers/nstti/UIdriver.py:1.9 
gnue/forms/src/uidrivers/nstti/UIdriver.py:1.10
*** gnue/forms/src/uidrivers/nstti/UIdriver.py:1.9      Fri Oct 11 01:10:37 2002
--- gnue/forms/src/uidrivers/nstti/UIdriver.py  Fri Oct 11 19:44:28 2002
***************
*** 35,41 ****
  from gnue.forms.uidrivers._base.UIdriver import *
  from gnue.forms.uidrivers._base.UIWidget import *
  
! from UIapp import *
  
  import GFKeyMapper
  
--- 35,41 ----
  from gnue.forms.uidrivers._base.UIdriver import *
  from gnue.forms.uidrivers._base.UIWidget import *
  
! ##from UIapp import *
  
  import GFKeyMapper
  
***************
*** 96,101 ****
--- 96,102 ----
      _EVENTPROCESSOR = self.dispatchEvent
  
      self.forms = {}
+ 
      self.init()
  
  
***************
*** 109,114 ****
--- 110,116 ----
      #
  
      SIO = self._screen = GetSIO()
+     GDebug.printMesg(1,'Initializing curses interface (TERM=%s)' % 
curses.termname())
      mw = self.mainWindow = ScreenContainer(SIO)
      SIO.Cls()
  
***************
*** 219,226 ****
--- 221,240 ----
            newMenu.InsertSeperator()
        newMenu.Finalize()
  
+ 
+     self.statusBar = StatusBar(self.mainWindow, "StatusBar",
+       self._screen.MAXROW, 0,self._screen.MAXCOL, (-1,4,3,9,5))
+ 
+     self.statusBar.SetText(0,'Welcome to GNUe Forms')
+     self.statusBar.SetText(1,'OK')
+     self.statusBar.SetText(2,'INS')
+     self.statusBar.SetText(3,'0/0')
+     self.statusBar.SetText(4,'1/1')
+ 
      self.mainWindow.AddControl(menuBar)
+     self.mainWindow.AddControl(self.statusBar)
      self.mainWindow.Paint()
+ 
      return 1
  
    def activateForm(self, form):
***************
*** 301,306 ****
--- 315,336 ----
      self.mainWindow.panel.RunDialog()
  #    self.mainWindow.Run()
  
+   def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
+     if tip: self.statusBar.SetText(0,str(tip))
+ 
+     if statusValue:
+       self.statusBar.SetText(1,statusValue)
+ 
+     if insertValue:
+       self.statusBar.SetText(2,insertValue)
+ 
+     if currentRecord and  maxRecord:
+       self.statusBar.SetText(3,string.strip("%s/%s" % 
(currentRecord,maxRecord)))
+ 
+     if currentPage and  maxPage:
+       self.statusBar.SetText(4,string.strip("%s/%s" % (currentPage,maxPage)))
+       
+       
    #
    # gotoPage
    #
***************
*** 330,335 ****
--- 360,366 ----
    #
    def formAlert(self, event):
      curses.beep()
+     curses.flash()
  
  
    # Called whenever forms goes into a "wait" state in which user cannot
***************
*** 557,564 ****
      ###newWidget.DeActivate(0)
      event.interface._pageList.append(newWidget)
  
!     newWidget.KeyboardHook = keyboardEvtHandler(_EVENTPROCESSOR)._processEvent
!     keyboardEvtHandler
      return newWidget
  
  #
--- 588,595 ----
      ###newWidget.DeActivate(0)
      event.interface._pageList.append(newWidget)
  
!     newWidget.KeystrokeHook = 
keyboardEvtHandler(_EVENTPROCESSOR)._processEvent
! 
      return newWidget
  
  #
***************
*** 655,661 ****
    vk.PAGEUP    : curses.KEY_NPAGE,     vk.PAGEDOWN : curses.KEY_NPAGE,
    vk.UP        : curses.KEY_UP,        vk.DOWN     : curses.KEY_DOWN,
    vk.LEFT      : curses.KEY_LEFT,      vk.RIGHT    : curses.KEY_RIGHT,
!   vk.TAB       : curses.KEY_CTAB,      vk.ENTER    : curses.KEY_ENTER,
    vk.BACKSPACE : curses.KEY_BACKSPACE }
  
  
--- 686,692 ----
    vk.PAGEUP    : curses.KEY_NPAGE,     vk.PAGEDOWN : curses.KEY_NPAGE,
    vk.UP        : curses.KEY_UP,        vk.DOWN     : curses.KEY_DOWN,
    vk.LEFT      : curses.KEY_LEFT,      vk.RIGHT    : curses.KEY_RIGHT,
!   vk.TAB       : 9,                    vk.ENTER    : 10,
    vk.BACKSPACE : curses.KEY_BACKSPACE }
  
  
***************
*** 727,733 ****
          0, #event.ShiftDown(),
          0, #event.ControlDown(),
          0) #event.AltDown())
!         
      GDebug.printMesg(0,"========= %s" % command)
  
        # TODO : Broken for the moment, this should probably be form driven
--- 758,764 ----
          0, #event.ShiftDown(),
          0, #event.ControlDown(),
          0) #event.AltDown())
! 
      GDebug.printMesg(0,"========= %s" % command)
  
        # TODO : Broken for the moment, this should probably be form driven
***************
*** 739,745 ****
  
      else:
        try:
!         action = GFEvent('requestKEYPRESS', chr(keystroke),
                           text=chr(keystroke),
                           code=keystroke)
        except ValueError:
--- 770,779 ----
  
      else:
        try:
!         GDebug.printMesg(1,'Keystroke=(%s,%s)' % (keystroke, chr(keystroke)))
!         if 32 <= keystroke <= 255 and chr(keystroke) in string.printable:
!           GDebug.printMesg(1,'Keystroke is printable')
!           action = GFEvent('requestKEYPRESS', chr(keystroke),
                           text=chr(keystroke),
                           code=keystroke)
        except ValueError: