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

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/01/30 21:29:22

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

Log message:
        block and form level initQuery in triggers

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.221&tr2=1.222&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.73&tr2=1.74&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.221 gnue/forms/src/GFForm.py:1.222
*** gnue/forms/src/GFForm.py:1.221      Wed Jan  1 19:45:48 2003
--- gnue/forms/src/GFForm.py    Thu Jan 30 21:29:22 2003
***************
*** 143,148 ****
--- 143,150 ----
                                
'activateDialog':{'function':self.triggerActivateDialog,
                                            'global': 1,
                                            } ,
+                               'initQuery':{'function':self.initQuery,
+                                           },
                                }
  
      self._features = {
***************
*** 424,430 ****
          return 0
      return 1
  
!   def prepQuery(self):
      message = None
      if self._currentBlock.mode != 'query':
        for block in self._logic._blockList:
--- 426,432 ----
          return 0
      return 1
  
!   def initQuery(self):
      message = None
      if self._currentBlock.mode != 'query':
        for block in self._logic._blockList:
***************
*** 438,444 ****
          if hasattr(entry,'queryDefault'):
            GDebug.printMesg(1, "%s will be set to %s" % (entry.name, 
entry.queryDefault))
            entry.setValue(entry.queryDefault)
!     self._currentBlock.initQuery()
      return message
  
    def executeQuery(self):
--- 440,453 ----
          if hasattr(entry,'queryDefault'):
            GDebug.printMesg(1, "%s will be set to %s" % (entry.name, 
entry.queryDefault))
            entry.setValue(entry.queryDefault)
! 
!     # If Enter-Query is hit once, enter query mode
!     # If Enter-Query is hit twice, bring back conditions from last query.
!     # If Enter-Query is hit thrice, cancel the query and go into normal mode.
! 
!     for block in self._logic._blockList:
!       block.initQuery()
!     
      return message
  
    def executeQuery(self):
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.80 gnue/forms/src/GFInstance.py:1.81
*** gnue/forms/src/GFInstance.py:1.80   Wed Jan  1 19:45:48 2003
--- gnue/forms/src/GFInstance.py        Thu Jan 30 21:29:22 2003
***************
*** 674,680 ****
      if not event._form.endEditing():
        return
      
!     message = event._form.prepQuery()
  
      if message:
        messageBox = GFMsgBox(self,message)
--- 674,680 ----
      if not event._form.endEditing():
        return
      
!     message = event._form.initQuery()
  
      if message:
        messageBox = GFMsgBox(self,message)
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.73 
gnue/forms/src/GFObjects/GFBlock.py:1.74
*** gnue/forms/src/GFObjects/GFBlock.py:1.73    Wed Jan  1 19:45:48 2003
--- gnue/forms/src/GFObjects/GFBlock.py Thu Jan 30 21:29:22 2003
***************
*** 120,125 ****
--- 120,127 ----
                                            'description':'Navigates the block 
to the previous record in sequence.'},
                              'rollback':{'function':self.processRollback,
                                          'description':'Clears all records 
regardless of state from the block'},
+                             'initQuery':{'function':self.initQuery,
+                                         'description':'Prepares the block for 
query input.'},
                              }
  
      self._triggerProperties={'parent':  {'get':self.getParent}}
***************
*** 423,444 ****
      # If Enter-Query is hit thrice, cancel the query and go into normal mode.
  
      if self.mode != 'query':
!       for block in self._logic._blockList:
!         block.mode = 'query'
!         block._query2 = int(gConfig("RememberLastQuery"))
!         block._queryValues = {}
!         block._queryValues.update(self._queryDefaults)
!         block.switchRecord(0)
      elif self._query2:
!       for block in self._logic._blockList:
!         block._query2 = 0
!         block._queryValues = {}
!         block._queryValues.update(block._lastQueryValues)
!         block.switchRecord(0)
      else:
!       for block in self._logic._blockList:
!         block.mode = 'normal'
!         block.switchRecord(0)
  
  
    def processQuery(self):
--- 425,443 ----
      # If Enter-Query is hit thrice, cancel the query and go into normal mode.
  
      if self.mode != 'query':
!         self.mode = 'query'
!         self._query2 = int(gConfig("RememberLastQuery"))
!         self._queryValues = {}
!         self._queryValues.update(self._queryDefaults)
!         self.switchRecord(0)
      elif self._query2:
!         self._query2 = 0
!         self._queryValues = {}
!         self._queryValues.update(self._lastQueryValues)
!         self.switchRecord(0)
      else:
!         self.mode = 'normal'
!         self.switchRecord(0)
  
  
    def processQuery(self):