gnue/forms/src GFForm.py GFInstance.py GFObject...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/04/01 23:08:57

Modified files:
        forms/src      : GFForm.py GFInstance.py 
        forms/src/GFObjects: GFBlock.py GFField.py 

Log message:
        block level pre|post-commit triggers working
        fixed focus issues on multiblock forms

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.238&tr2=1.239&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFField.py.diff?tr1=1.88&tr2=1.89&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.238 gnue/forms/src/GFForm.py:1.239
*** gnue/forms/src/GFForm.py:1.238      Mon Mar 24 21:05:08 2003
--- gnue/forms/src/GFForm.py    Tue Apr  1 23:08:57 2003
***************
*** 247,253 ****
        object = object._entryList[0]
  
      entry = None
- 
      if isinstance(object, GFObj):
        if (object._type in TabStops and
            (object._navigable) and ((not object.readonly) or
--- 247,252 ----
***************
*** 260,266 ****
            for child in object._entryList:
              entry = self.findFocus(child)
              if entry:
!               break
          for child in object._children:
            entry = self.findFocus(child)
            if entry:
--- 259,270 ----
            for child in object._entryList:
              entry = self.findFocus(child)
              if entry:
!               return entry
!         #
!         # We're in trouble.  Scan all children for a
!         # focusable widget.  Will dump GFField objects
!         # stored in blocks into itself.
!         #
          for child in object._children:
            entry = self.findFocus(child)
            if entry:
***************
*** 723,730 ****
        nextBlock = 
self._logic._blockList[self._logic._blockList.index(self._currentBlock)+1]
      except IndexError:
        nextBlock = self._logic._blockList[0]
- 
      self.findAndChangeFocus(nextBlock)
  
  
    #
--- 727,734 ----
        nextBlock = 
self._logic._blockList[self._logic._blockList.index(self._currentBlock)+1]
      except IndexError:
        nextBlock = self._logic._blockList[0]
      self.findAndChangeFocus(nextBlock)
+     
  
  
    #
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.104 gnue/forms/src/GFInstance.py:1.105
*** gnue/forms/src/GFInstance.py:1.104  Mon Mar 31 21:38:11 2003
--- gnue/forms/src/GFInstance.py        Tue Apr  1 23:08:57 2003
***************
*** 921,929 ****
      except AttributeError:
        return
  
!     block.processTrigger('POST-QUERY')
!     for child in block._fieldList:
!       child.processTrigger('POST-QUERY')
  
    #
    # fireTrigger
--- 921,933 ----
      except AttributeError:
        return
  
!     #
!     # TODO: Running this here causes the trigger
!     # TODO: to fire prior to all blocks being filled
!     #
!     #block.processTrigger('POST-QUERY')
!     #for child in block._fieldList:
!     #  child.processTrigger('POST-QUERY')
  
    #
    # fireTrigger
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.80 
gnue/forms/src/GFObjects/GFBlock.py:1.81
*** gnue/forms/src/GFObjects/GFBlock.py:1.80    Mon Mar 31 22:23:20 2003
--- gnue/forms/src/GFObjects/GFBlock.py Tue Apr  1 23:08:57 2003
***************
*** 91,97 ****
                    'PRE-FOCUSOUT':   'Pre-FocusOut',
                    'POST-FOCUSOUT':  'Post-FocusOut',
                    'PRE-FOCUSIN':    'Pre-FocusIn',
!                   'POST-FOCUSIN':   'Post-FocusIn' }
  
  
      self._triggerGlobal = 1
--- 91,100 ----
                    'PRE-FOCUSOUT':   'Pre-FocusOut',
                    'POST-FOCUSOUT':  'Post-FocusOut',
                    'PRE-FOCUSIN':    'Pre-FocusIn',
!                   'POST-FOCUSIN':   'Post-FocusIn',
!                   'PRE-CHANGE':     'Pre-Change',
!                   'POST-CHANGE':    'Post-Change',
!                   }
  
  
      self._triggerGlobal = 1
***************
*** 496,502 ****
  
        conditions = _generateConditional(block)
        SQL = self._dataSourceLink.getQueryString(conditions,1,SQL)
- 
  
      for block in self._logic._blockList:
       if maxList[-1] == block._dataSourceLink._dataObject:
--- 499,504 ----
Index: gnue/forms/src/GFObjects/GFField.py
diff -c gnue/forms/src/GFObjects/GFField.py:1.88 
gnue/forms/src/GFObjects/GFField.py:1.89
*** gnue/forms/src/GFObjects/GFField.py:1.88    Mon Mar 24 21:05:08 2003
--- gnue/forms/src/GFObjects/GFField.py Tue Apr  1 23:08:57 2003
***************
*** 254,261 ****
--- 254,263 ----
        value = self._block._preCommitWorkingRecord.setField(self.field,value)
  
      else:
+       self._block.processTrigger('Pre-Change')
        self.processTrigger('Pre-Change')
        self._block._resultSet.current.setField(self.field,value)
+       self._block.processTrigger('Post-Change')
        self.processTrigger('Post-Change')
  
  ###      if self._block._resultSet.current.isPending():