gnue/forms/src GFDisplayHandler.py GFForm.py GF...

[Jason Cater]

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

Modified files:
        forms/src      : GFDisplayHandler.py GFForm.py GFInstance.py 

Log message:
        misc fixes [synching machines]

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFDisplayHandler.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.153&tr2=1.154&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.11 
gnue/forms/src/GFDisplayHandler.py:1.12
*** gnue/forms/src/GFDisplayHandler.py:1.11     Mon Feb 18 17:45:51 2002
--- gnue/forms/src/GFDisplayHandler.py  Tue Feb 19 00:47:49 2002
***************
*** 101,107 ****
  
  
    def endEdit(self, event):
!    ## print "endEdit.. %s" % self.display
  
      # If this event returns __error__, then
      # the input was invalid and the entry is
--- 101,109 ----
  
  
    def endEdit(self, event):
! 
!     if not self.editing:
!       return
  
      # If this event returns __error__, then
      # the input was invalid and the entry is
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.153 gnue/forms/src/GFForm.py:1.154
*** gnue/forms/src/GFForm.py:1.153      Mon Feb 18 17:45:51 2002
--- gnue/forms/src/GFForm.py    Tue Feb 19 00:47:49 2002
***************
*** 261,267 ****
        self._currentPage = self._currentBlock._page
  
        if blockChange:
!         self.refreshBlockDisplay(self._currentBlock)
  
        self.dispatchEvent(GFEvent('updateENTRY', oldEntry))
        self.dispatchEvent(GFEvent('updateENTRY', self._currentEntry))
--- 261,267 ----
        self._currentPage = self._currentBlock._page
  
        if blockChange:
!         self.refreshDisplay(self._currentBlock)
  
        self.dispatchEvent(GFEvent('updateENTRY', oldEntry))
        self.dispatchEvent(GFEvent('updateENTRY', self._currentEntry))
***************
*** 492,498 ****
    def rollback(self, recover=0):
      self.endEditing()
      for block in self._blockList:
!       block.processRollback(recover);
      self._currentBlock.jumpRecord(self._currentBlock._currentRecord)
  
  
--- 492,499 ----
    def rollback(self, recover=0):
      self.endEditing()
      for block in self._blockList:
!       block.processRollback(recover)
!     self.refreshDisplay(self)
      self._currentBlock.jumpRecord(self._currentBlock._currentRecord)
  
  
***************
*** 724,736 ****
    # focus change to the next data entry object
    #
    def nextEntry(self):
- #    print "nextEntry()"
      nextEntry = None
      keepNext = 0
      if not self._currentEntry.verifyValue():
        return "Invalid field value"
  
!     for object in self._currentEntry._parent._children:
        # Put the first field as the next to rollover
        if (object.getObjectType() in TabStops and
            (not object.hidden) and ((not object.readonly) or
--- 725,736 ----
    # focus change to the next data entry object
    #
    def nextEntry(self):
      nextEntry = None
      keepNext = 0
      if not self._currentEntry.verifyValue():
        return "Invalid field value"
  
!     for object in self._currentEntry._block._children:
        # Put the first field as the next to rollover
        if (object.getObjectType() in TabStops and
            (not object.hidden) and ((not object.readonly) or
***************
*** 746,769 ****
          if keepNext == 1:
            nextEntry = object
            break
-     message = None
-     try:
-       self._currentEntry.processTrigger('Pre-FocusOut')
-       nextEntry.processTrigger('Pre-FocusIn')
-       prevEntry = self._currentEntry
-       if self._currentBlock.transparentBlock and nextEntry == firstEntry:
-         # Jump to the next block if block is tagged as transparent
-         self.nextBlock()
-       else:
-         self._currentEntry = nextEntry
  
!       prevEntry.processTrigger('Post-FocusOut')
!       self._app.dispatchEvent(GFEvent('updateENTRY', prevEntry))
!       self._app.dispatchEvent(GFEvent('updateENTRY', self._currentEntry))
!       nextEntry.processTrigger('Post-FocusIn')
!     except TriggerError, t:
!       message = self.TriggerErrorFunc(t)
!     return message
  
  
    #
--- 746,757 ----
          if keepNext == 1:
            nextEntry = object
            break
  
!     if nextEntry == firstEntry and self._currentBlock.transparentBlock:
!       # Jump to the next block if block is tagged as transparent
!       self.nextBlock()
!     else:
!       self.changeFocus(nextEntry)
  
  
    #
***************
*** 778,784 ****
      lastEntry = self._currentEntry
      if not self._currentEntry.verifyValue(): return
  
!     for object in self._currentEntry._parent._children:
        if object.getObjectType() in TabStops and \
           not object.hidden and (not object.readonly or \
           (self._currentBlock.mode=='query' and object._queryable)):
--- 766,772 ----
      lastEntry = self._currentEntry
      if not self._currentEntry.verifyValue(): return
  
!     for object in self._currentEntry._block._children:
        if object.getObjectType() in TabStops and \
           not object.hidden and (not object.readonly or \
           (self._currentBlock.mode=='query' and object._queryable)):
***************
*** 786,792 ****
          lastEntry = object
  
      keepNext = 0
!     for object in self._currentEntry._parent._children:
        # Put the first field as the next to rollover
        if object.getObjectType() in TabStops and not object.hidden and not 
object.readonly:
          if object == self._currentEntry:
--- 774,780 ----
          lastEntry = object
  
      keepNext = 0
!     for object in self._currentEntry._block._children:
        # Put the first field as the next to rollover
        if object.getObjectType() in TabStops and not object.hidden and not 
object.readonly:
          if object == self._currentEntry:
***************
*** 794,828 ****
  
          nextEntry = object
  
!     try:
!       self._currentEntry.processTrigger('Pre-FocusOut')
!       nextEntry.processTrigger('Pre-FocusIn')
!       if self._currentBlock.transparentBlock and nextEntry == lastEntry: # 
Jump to the prev block if block is tagged as transparent
!         self.previousBlock()
!         # Move to the new last record of the new current block
!         for object in self._currentEntry._parent._children:
!           if object.getObjectType() in TabStops and \
!              not object.hidden and (not object.readonly or 
self._currentBlock.mode=='query'):
!             nextEntry = object
! 
! 
!       self._currentEntry.processTrigger('Post-FocusOut')
!       self._currentEntry = nextEntry
!       self._app.dispatchEvent(GFEvent('updateENTRY', lastEntry))
!       self._app.dispatchEvent(GFEvent('updateENTRY', self._currentEntry))
!       self._currentEntry.processTrigger('Post-FocusIn')
!     except TriggerError, t:
!       print "Got to the exception handler!"
!       self.TriggerErrorFunc(t)
  
    #
!   # refreshBlockDisplay
    #
!   def refreshBlockDisplay(self, block):
!     block.walk(self.__refreshBlockDisplay)
! 
  
!   def __refreshBlockDisplay(self, object):
      if object._type == 'GFEntry':
        self.dispatchEvent(GFEvent('updateENTRY',object))
  
--- 782,808 ----
  
          nextEntry = object
  
!     if self._currentBlock.transparentBlock and nextEntry == lastEntry: # Jump 
to the prev block if block is tagged as transparent
!       prevBlock = self.findPreviousBlock()
!       # Move to the new last record of the new current block
!       for object in prevBlock._children:
!         if object.getObjectType() in TabStops and \
!            not object.hidden and (not object.readonly or 
self._currentBlock.mode=='query'):
!           nextEntry = object
! 
!     self.findAndChangeFocus(nextEntry)
! 
  
    #
!   # refreshDisplay
    #
!   # Refreshes all the UI fields to match
!   # the virtual form's fields
!   #
!   def refreshDisplay(self, block):
!     block.walk(self.__refreshDisplay)
  
!   def __refreshDisplay(self, object):
      if object._type == 'GFEntry':
        self.dispatchEvent(GFEvent('updateENTRY',object))
  
***************
*** 841,850 ****
      except IndexError:
        nextBlock = self._blockList[0]
  
-     print "switching to block %s" % nextBlock.name
- 
      self.findAndChangeFocus(nextBlock)
  
    #
    # previousBlock
    #
--- 821,841 ----
      except IndexError:
        nextBlock = self._blockList[0]
  
      self.findAndChangeFocus(nextBlock)
  
+ 
+   #
+   # findPreviousBlock
+   #
+   # Convenience routine to find the previous block
+   #
+   def findPreviousBlock(self):
+     try:
+       return self._blockList[self._blockList.index(self._currentBlock)-1]
+     except IndexError:
+       return self._blockList[-1]
+ 
+ 
    #
    # previousBlock
    #
***************
*** 852,869 ****
    # focus change to the next data entry block
    #
    def previousBlock(self):
  
-     try:
-       nextBlock = self._blockList[self._blockList.index(self._currentBlock)-1]
-     except IndexError:
-       nextBlock = self._blockList[-1]
- 
-     self.findAndChangeFocus(nextBlock)
  
    def endEditing(self):
      event = GFEvent('endEditMode',None)
      self.dispatchEvent(event)
      return not event.__error__
  
    def gotoPage(self, index):
      for object in self._blockList:
--- 843,862 ----
    # focus change to the next data entry block
    #
    def previousBlock(self):
+     self.findAndChangeFocus(self.findPreviousBlock())
  
  
+   #
+   # endEditing
+   #
+   # Signal to the current Entry to stop editing
+   # mode and save it's value to the virtual form
+   #
    def endEditing(self):
      event = GFEvent('endEditMode',None)
      self.dispatchEvent(event)
      return not event.__error__
+ 
  
    def gotoPage(self, index):
      for object in self._blockList:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.35 gnue/forms/src/GFInstance.py:1.36
*** gnue/forms/src/GFInstance.py:1.35   Mon Feb 18 17:48:50 2002
--- gnue/forms/src/GFInstance.py        Tue Feb 19 00:47:49 2002
***************
*** 406,412 ****
    #
    def executeRollback(self,event):
      self._form.rollback()
-     self._form.refreshBlockDisplay(self._form)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
--- 406,411 ----
***************
*** 555,561 ****
        messageBox.show()
        return
  
!     self._form.refreshBlockDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
--- 554,560 ----
        messageBox.show()
        return
  
!     self._form.refreshDisplay(self._form)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
***************
*** 567,573 ****
        messageBox = GFMsgBox(self,message)
        messageBox.show()
        return
!     self._form.refreshBlockDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
--- 566,572 ----
        messageBox = GFMsgBox(self,message)
        messageBox.show()
        return
!     self._form.refreshDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
***************
*** 579,585 ****
      if message:
        messageBox = GFMsgBox(self,message)
        messageBox.show()
!     self._form.refreshBlockDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()
--- 578,584 ----
      if message:
        messageBox = GFMsgBox(self,message)
        messageBox.show()
!     self._form.refreshDisplay(self._form._currentBlock)
      
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateRecordCounter()