commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: James Thompson
Subject: gnue/forms/src GFDisplayHandler.py GFForm.py GF...
Date: Sun, 09 Mar 2003 23:13:51 -0500

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/09 23:13:51

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

Log message:
        adjusted cursor placement after queries and focus changes
        (still not quite right)
        some additional comments and cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.234&tr2=1.235&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.97&tr2=1.98&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFField.py.diff?tr1=1.85&tr2=1.86&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.44 
gnue/forms/src/GFDisplayHandler.py:1.45
*** gnue/forms/src/GFDisplayHandler.py:1.44     Sun Mar  9 14:17:07 2003
--- gnue/forms/src/GFDisplayHandler.py  Sun Mar  9 23:13:51 2003
***************
*** 117,122 ****
--- 117,124 ----
      self._buildDisplay()
  
      self.cursor = len(self.display)
+     # Ensure cursor is properly placed.
+     self.generateRefreshEvent()
  
    #
    # endEdit
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.234 gnue/forms/src/GFForm.py:1.235
*** gnue/forms/src/GFForm.py:1.234      Sun Mar  9 18:02:23 2003
--- gnue/forms/src/GFForm.py    Sun Mar  9 23:13:51 2003
***************
*** 38,44 ****
  from gnue.common.definitions.GRootObj import GRootObj
  from gnue.common.logic.GTrigger import TriggerError
  from gnue.common.definitions.GObjects import GObj
- #from gnue.common.definitions.GParser import GImportItem
  
  from gnue.forms.GFObjects import *
  from gnue.forms import GFParser
--- 38,43 ----
***************
*** 58,68 ****
    # TODO: with a little tweaking we can now stop passing  
GFParser.getXMLelements
      GRootObj.__init__(self, 'form', GFParser.getXMLelements, GFParser)
      GFObj.__init__(self, parent)
      self._type = "GFForm"
-     self._currentObject = [self]
      self.name="__main__"
  
!     self._databaseDictionary = {}
      self._datasourceDictionary = {}
  
      # Dictionary to locate named triggers
--- 57,67 ----
    # TODO: with a little tweaking we can now stop passing  
GFParser.getXMLelements
      GRootObj.__init__(self, 'form', GFParser.getXMLelements, GFParser)
      GFObj.__init__(self, parent)
+     
      self._type = "GFForm"
      self.name="__main__"
  
!     # Datasources referced by this form
      self._datasourceDictionary = {}
  
      # Dictionary to locate named triggers
***************
*** 80,88 ****
      self._instance = instance
      self._app = self._instance #TODO: Imports are broken do to
                                 #TODO: switch from _app to _instance
-     self._triggerns={}
  
-     self._dialogDictionary={}
      # Hackery until proper layout support is added
      self._standardnamespaces = {'Char': 'GNUe:Forms:Char'}
  
--- 79,85 ----
***************
*** 91,152 ****
      self._inits = [self.primaryInit, None, self.secondaryInit]
  
      #
!     # New trigger support
      #
      self._validTriggers = { 'ON-STARTUP':     'On-Startup',
                              'ON-ACTIVATION':  'On-Activation',
                              'ON-EXIT':        'On-Exit',
                              'PRE-COMMIT':     'Pre-Commit',
                              'POST-COMMIT':    'Post-Commit' }
! 
!     self._triggerGlobal = 1
      self._triggerFunctions = {'setFocus':{'function':self.triggerSetFocus,
                                            'global': 1,
                                            },
!                               
'getAuthenticatedUser':{'function':self.getAuthenticatedUser,
!                                           'global': 1,
!                                           },
                                
'getCurrentEntry':{'function':self.triggerGetCurrentEntry,
!                                           'global': 1,
!                                           },
                                
'getCurrentBlock':{'function':self.triggerGetCurrentBlock,
!                                           'global': 1,
!                                           },
                                
'getCurrentPage':{'function':self.triggerGetCurrentPage,
!                                           'global': 1,
!                                           },
                                
'setStatusText':{'function':self.triggerSetStatusText,
!                                           'global': 1,
!                                           },
                                'getParameter':{'function':self.getParameter,
!                                           'global': 1,
!                                           },
!                               'setParameter':{'function':self.setParameter,
!                                           'global': 1,
!                                           },
!                               'showMessage':{'function':self.showMessageBox,
!                                           'global': 1,
!                                           },
                                'commit':{'function':self.commit,
!                                           'global': 1,
!                                           },
!                               'close':{'function':self.close,
!                                           'global': 1,
!                                           },
                                'getFeature':{'function':self.triggerGetFeature,
!                                           'global': 1,
!                                           },
                                'setFeature':{'function':self.triggerSetFeature,
!                                           'global': 1,
!                                           },
                                'runForm':{'function':self.triggerRunForm,
!                                           'global': 1,
!                                           } ,
                                
'activateDialog':{'function':self.triggerActivateDialog,
!                                           'global': 1,
!                                           } ,
                                'initQuery':{'function':self.initQuery,
!                                           },
                                }
  
      self._features = {
--- 88,152 ----
      self._inits = [self.primaryInit, None, self.secondaryInit]
  
      #
!     # Trigger support
      #
+     self._triggerns={}
+     self._triggerGlobal = 1 # Put this object into the global namespace by 
it's name
+              
+ 
      self._validTriggers = { 'ON-STARTUP':     'On-Startup',
                              'ON-ACTIVATION':  'On-Activation',
                              'ON-EXIT':        'On-Exit',
                              'PRE-COMMIT':     'Pre-Commit',
                              'POST-COMMIT':    'Post-Commit' }
!     
      self._triggerFunctions = {'setFocus':{'function':self.triggerSetFocus,
                                            'global': 1,
                                            },
!                               
'getAuthenticatedUser':{'function':self.triggerGetAuthenticatedUser,
!                                                       'global': 1,
!                                                       },
                                
'getCurrentEntry':{'function':self.triggerGetCurrentEntry,
!                                                  'global': 1,
!                                                  },
                                
'getCurrentBlock':{'function':self.triggerGetCurrentBlock,
!                                                  'global': 1,
!                                                  },
                                
'getCurrentPage':{'function':self.triggerGetCurrentPage,
!                                                 'global': 1,
!                                                 },
                                
'setStatusText':{'function':self.triggerSetStatusText,
!                                                'global': 1,
!                                                },
                                'getParameter':{'function':self.getParameter,
!                                               'global': 1,
!                                               },
!                               
'setParameter':{'function':self.triggerSetParameter,
!                                               'global': 1,
!                                               },
!                               
'showMessage':{'function':self.triggerShowMessageBox,
!                                              'global': 1,
!                                              },
                                'commit':{'function':self.commit,
!                                         'global': 1,
!                                         },
!                               'close':{'function':self.triggerClose,
!                                        'global': 1,
!                                        },
                                'getFeature':{'function':self.triggerGetFeature,
!                                             'global': 1,
!                                             },
                                'setFeature':{'function':self.triggerSetFeature,
!                                             'global': 1,
!                                             },
                                'runForm':{'function':self.triggerRunForm,
!                                          'global': 1,
!                                          } ,
                                
'activateDialog':{'function':self.triggerActivateDialog,
!                                                 'global': 1,
!                                                 } ,
                                'initQuery':{'function':self.initQuery,
!                                            },
                                }
  
      self._features = {
***************
*** 155,181 ****
        'GUI:STATUSBAR:SUPPRESS': 0, 
      }
  
- 
- ##   #
- ##   # Modify the base phaseInit to only process
- ##   #
- ##   def phaseInit(self, iterations=5, dialogInit=0):
- ##     if self.style != 'dialog' or dialogInit:
- ##       for phase in range(iterations):
- ##         self._phaseInit(phase, dialogInit=dialogInit)
-                   
- ##   def _phaseInit(self,phase,dialogInit=0):
- ##     if self.style != 'dialog' or dialogInit:
- ##       if (len(self._inits) > phase) and self._inits[phase]:
- ##         GDebug.printMesg(6,"%s: Init Phase %s" % (self._type, phase+1))
- ##         self._inits[phase]()
- 
- ##       for child in self._children:
- ##         if isinstance(child, GObj):
- ##           child._phaseInit(phase)
-           
- 
- 
    #
    # primaryInit
    #
--- 155,160 ----
***************
*** 197,203 ****
  
  
      ## TODO: This ain't right!  Fix after 0.5.0
!     self._triggerns['runForm'] = self.triggerRunForm
      ## TODO
  
  
--- 176,182 ----
  
  
      ## TODO: This ain't right!  Fix after 0.5.0
!     #self._triggerns['runForm'] = self.triggerRunForm
      ## TODO
  
  
***************
*** 234,249 ****
    #
    # Set a user parameter.
    #
!   def setParameter(self, parameter, value):
      param = string.lower(parameter)
      self._parameters[param]=value
  
  
    #
-   # show a MessageBox from a trigger
    #
!   def showMessageBox(self,msgtxt):
!     self._instance.displayMessageBox(msgtxt)
  
    #
    # Find focus
--- 213,239 ----
    #
    # Set a user parameter.
    #
!   def triggerSetParameter(self, parameter, value):
      param = string.lower(parameter)
      self._parameters[param]=value
  
  
    #
    #
!   # Focus functions
!   #
!   #
! 
!   #
!   # findAndChangeFocus
!   #
!   # Runs findFocus and then runs
!   # changeFocus with that value.
!   #
!   def findAndChangeFocus(self, object):
!     entry = self.findFocus(object)
!     if entry:
!       self.changeFocus(entry)
  
    #
    # Find focus
***************
*** 251,256 ****
--- 241,248 ----
    # Find the next focusable item given
    # an item of type Page, Block, or Entry
    #
+   # Only called by findAndChangeFocus
+   #
    def findFocus(self, object):
    
      if object._type == 'GFField':
***************
*** 280,297 ****
      return entry
  
    #
-   # findAndChangeFocus
-   #
-   # Runs findFocus and then runs
-   # changeFocus with that value.
-   #
-   def findAndChangeFocus(self, object):
-     entry = self.findFocus(object)
-     if entry:
-       self.changeFocus(entry)
- 
- 
-   #
    # changeFocus
    #
    # changes to the requested entry object requested by
--- 272,277 ----
***************
*** 304,311 ****
      try:
        if self._currentEntry:
          event = events.Event('endEDITMODE',_form=self)
          
!         self._instance.dispatchEvent(event)
          if event.__error__:
            return 1
  
--- 284,292 ----
      try:
        if self._currentEntry:
          event = events.Event('endEDITMODE',_form=self)
+         self.dispatchEvent(event)
          
!         #self._instance.dispatchEvent(event)
          if event.__error__:
            return 1
  
***************
*** 378,391 ****
        message = _("Trigger Exception :\n") + t.msg
      return message
  
    #
-   # end of routines made for walking
    #
- 
- 
-   def updateUIEntry(self,field):
-     for entry in field._entryList:
-       self._instance.dispatchEvent('updateENTRY',entry, _form=self);
  
    #
    # Incoming Event handlers
--- 359,370 ----
        message = _("Trigger Exception :\n") + t.msg
      return message
  
+ 
+   #
+   #
+   # Events
    #
    #
  
    #
    # Incoming Event handlers
***************
*** 423,430 ****
      # 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.
!     
!     self._instance.dispatchEvent('beginENTERQUERY', _form=self);
  
      for block in self._logic._blockList:
        block.initQuery()
--- 402,410 ----
      # 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.
! 
!     self.dispatchEvent('beginENTERQUERY', _form=self)
!     #self._instance.dispatchEvent('beginENTERQUERY', _form=self)
  
      for block in self._logic._blockList:
        block.initQuery()
***************
*** 432,440 ****
      
      return message
  
      
!   def cancelQuery(self):    
!     self._instance.dispatchEvent('endENTERQUERY', _form=self);
      message = None
      for block in self._logic._blockList:
        block.cancelQuery()
--- 412,426 ----
      
      return message
  
+   def updateUIEntry(self,field):
+     for entry in field._entryList:
+       self.dispatchEvent('updateENTRY',entry, _form=self)
+       #self._instance.dispatchEvent('updateENTRY',entry, _form=self)
+ 
      
!   def cancelQuery(self):
!     self.dispatchEvent('endENTERQUERY', _form=self)
!     #self._instance.dispatchEvent('endENTERQUERY', _form=self)
      message = None
      for block in self._logic._blockList:
        block.cancelQuery()
***************
*** 445,451 ****
      if self._currentBlock.mode != 'query': 
        self.initQuery()
        
!     self._instance.dispatchEvent('endENTERQUERY', _form=self);
      message = None
      for block in self._logic._blockList:
        block.copyQuery()
--- 431,438 ----
      if self._currentBlock.mode != 'query': 
        self.initQuery()
        
!     self.dispatchEvent('endENTERQUERY', _form=self);
!     #self._instance.dispatchEvent('endENTERQUERY', _form=self);
      message = None
      for block in self._logic._blockList:
        block.copyQuery()
***************
*** 454,461 ****
      
  
    def executeQuery(self):
!     self._instance.dispatchEvent('endENTERQUERY', _form=self);
!     self._instance.dispatchEvent('beginWAIT',None, _form=self);
  
      message = None
      try:
--- 441,450 ----
      
  
    def executeQuery(self):
!     self.dispatchEvent('endENTERQUERY', _form=self);
!     self.dispatchEvent('beginWAIT',None, _form=self);
!     #self._instance.dispatchEvent('endENTERQUERY', _form=self);
!     #self._instance.dispatchEvent('beginWAIT',None, _form=self);
  
      message = None
      try:
***************
*** 465,474 ****
        self.rollback(1)
        message = _("Database query error:\n%s\n%s ") % (sys.exc_info()[0], 
sys.exc_info()[1])
  
!     self._instance.dispatchEvent('endWAIT', _form=self)
  
    def commit(self):
!     self._instance.dispatchEvent('beginWAIT', _form=self)
  
      message = None
  
--- 454,470 ----
        self.rollback(1)
        message = _("Database query error:\n%s\n%s ") % (sys.exc_info()[0], 
sys.exc_info()[1])
  
! 
! 
!     self.dispatchEvent('endWAIT', _form=self)
!     #self._instance.dispatchEvent('endWAIT', _form=self)
!     self.refreshDisplay(self._currentBlock)
! 
! 
  
    def commit(self):
!     self.dispatchEvent('beginWAIT', _form=self)
!     #self._instance.dispatchEvent('beginWAIT', _form=self)
  
      message = None
  
***************
*** 479,485 ****
            self.processTrigger('Pre-Commit')
          except TriggerError:
            GDebug.printMesg(1, "Trigger form Pre-Commit threw a TriggerError!")
!           self._instance.dispatchEvent('endWAIT',None, _form=self)
            return _("Form trigger returned error")
  
          for block in self._logic._blockList:
--- 475,482 ----
            self.processTrigger('Pre-Commit')
          except TriggerError:
            GDebug.printMesg(1, "Trigger form Pre-Commit threw a TriggerError!")
!           self.dispatchEvent('endWAIT',None, _form=self)
!           #self._instance.dispatchEvent('endWAIT',None, _form=self)
            return _("Form trigger returned error")
  
          for block in self._logic._blockList:
***************
*** 492,498 ****
              block.processCommit()
            except TriggerError:
              GDebug.printMesg(1, "Trigger block Pre-Commit threw a 
TriggerError!")
!             self._instance.dispatchEvent('endWAIT',None, _form=self)
              return _("Block trigger returned error")
            block.processTrigger('Post-Commit')
  
--- 489,496 ----
              block.processCommit()
            except TriggerError:
              GDebug.printMesg(1, "Trigger block Pre-Commit threw a 
TriggerError!")
!             self.dispatchEvent('endWAIT',None, _form=self)
!             #self._instance.dispatchEvent('endWAIT',None, _form=self)
              return _("Block trigger returned error")
            block.processTrigger('Post-Commit')
  
***************
*** 504,510 ****
  
        else:
          message = _('Form is readonly')
!         self._instance.dispatchEvent('endWAIT',None, _form=self)
          return message
  
        self.processTrigger('Post-Commit')
--- 502,510 ----
  
        else:
          message = _('Form is readonly')
!         #self._instance.dispatchEvent('endWAIT',None, _form=self)
!         self.dispatchEvent('endWAIT',None, _form=self)
!         
          return message
  
        self.processTrigger('Post-Commit')
***************
*** 518,524 ****
        traceback.print_exc(file=sys.stdout)
        print '-'*60
  
!     self._instance.dispatchEvent('endWAIT',None, _form=self)
  
      return message
  
--- 518,525 ----
        traceback.print_exc(file=sys.stdout)
        print '-'*60
  
!     #self._instance.dispatchEvent('endWAIT',None, _form=self)
!     self.dispatchEvent('endWAIT',None, _form=self)
  
      return message
  
***************
*** 541,546 ****
--- 542,553 ----
  # Updated methods for the new gnue-forms code
  #
  
+   def updateUIEntry(self,field):
+     for entry in field._entryList:
+       #self._instance.dispatchEvent('updateENTRY',entry, _form=self);
+       self.dispatchEvent('updateENTRY',entry, _form=self);
+       
+ 
  
    #
    # nextEntry
***************
*** 674,680 ****
  ##      dispatchEvent('canNEXTRECORD')
        
        # TODO: There should probably be some tests here....
!       dispatchEvent('canCOMMIT')
        dispatchEvent('canROLLBACK')
        dispatchEvent('canJUMPPROMPT')
        dispatchEvent('canNEWRECORD')
--- 681,691 ----
  ##      dispatchEvent('canNEXTRECORD')
        
        # TODO: There should probably be some tests here....
!       if not self.isSaved():
!         dispatchEvent('canCOMMIT')
!       else:
!         dispatchEvent('cannotCOMMIT')
!         
        dispatchEvent('canROLLBACK')
        dispatchEvent('canJUMPPROMPT')
        dispatchEvent('canNEWRECORD')
***************
*** 757,810 ****
  
  
    def prevRecord(self):
!     if self._currentBlock.mode == 'query':
!       GDebug.printMesg(5,'Cannot go to previous record: in query mode!')
!       return
      self._currentBlock.prevRecord()
  
    def firstRecord(self):
!     if self._currentBlock.mode == 'query':
!       GDebug.printMesg(5,'Cannot go to first record: in query mode!')
!       return
      self._currentBlock.firstRecord()
  
    def lastRecord(self):
!     if self._currentBlock.mode == 'query':
!       GDebug.printMesg(5,'Cannot go to last record: in query mode!')
!       return
      self._currentBlock.lastRecord()
  
    def nextRecord(self):
!     if self._currentBlock.mode == 'query':
!       GDebug.printMesg(5,'Cannot go to next record: in query mode!')
!       return
      self._currentBlock.nextRecord()
  
    def jumpRecord(self,count):
!     if self._currentBlock.mode == 'query':
!       GDebug.printMesg(5,'Cannot jump to record: in query mode!')
!       return
      self._currentBlock.jumpRecord(count)
  
    def toggleInsertMode(self):
      self._insertMode = not self._insertMode
  
    def triggerSetFocus(self,object):
      self.changeFocus(object._object,1)
      self.dispatchEvent('gotoENTRY',object=self._currentEntry,_form=self)
  
    def triggerGetCurrentEntry(self):
      return self._currentEntry
  
    def triggerGetCurrentBlock(self):
      return self._currentBlock
  
    def triggerGetCurrentPage(self):
      return self._currentPage
  
    def triggerSetStatusText(self,tip=''):
      self.dispatchEvent('uiUPDATESTATUS',tip=tip, _form=self)
  
    def triggerRunForm(self, fileName):
      from GFInstance import GFInstance
      instance = GFInstance(self._instance.manager,
--- 768,878 ----
  
  
    def prevRecord(self):
! #    if self._currentBlock.mode == 'query':
! #      GDebug.printMesg(5,'Cannot go to previous record: in query mode!')
! #      return
      self._currentBlock.prevRecord()
  
    def firstRecord(self):
! #    if self._currentBlock.mode == 'query':
! #      GDebug.printMesg(5,'Cannot go to first record: in query mode!')
! #      return
      self._currentBlock.firstRecord()
  
    def lastRecord(self):
! #    if self._currentBlock.mode == 'query':
! #      GDebug.printMesg(5,'Cannot go to last record: in query mode!')
! #      return
      self._currentBlock.lastRecord()
  
    def nextRecord(self):
! #    if self._currentBlock.mode == 'query':
! #      GDebug.printMesg(5,'Cannot go to next record: in query mode!')
! #      return
      self._currentBlock.nextRecord()
  
    def jumpRecord(self,count):
! #    if self._currentBlock.mode == 'query':
! #      GDebug.printMesg(5,'Cannot jump to record: in query mode!')
! #      return
      self._currentBlock.jumpRecord(count)
  
    def toggleInsertMode(self):
      self._insertMode = not self._insertMode
  
+   #
+   #
+   # Trigger functions
+   #
+   # The following functions are only used to implement
+   # functions exposed in the trigger namespace.
+   #
+   #
+ 
+   #
+   # triggerShowMessageBox
+   #
+   # display a standard message box
+   #
+   def triggerShowMessageBox(self,msgtxt):
+     self._instance.displayMessageBox(msgtxt)
+ 
+   #
+   # triggerSetFocus
+   #
+   # allow the trigger to switch input focus
+   # to a specfic entry widget
+   #
    def triggerSetFocus(self,object):
      self.changeFocus(object._object,1)
      self.dispatchEvent('gotoENTRY',object=self._currentEntry,_form=self)
  
+   #
+   # allow the trigger to get a handle to
+   # an actual GFEntry object
+   #
+   # TODO: WHY?  This seems like a good way to write 
+   # TODO: triggers that break due to internal forms changes
+   #
    def triggerGetCurrentEntry(self):
      return self._currentEntry
  
+ 
+   #
+   # allow the trigger to get a handle to
+   # an actual GFBlock object
+   #
+   # TODO: WHY?  This seems like a good way to write 
+   # TODO: triggers that break due to internal forms changes
+   #
    def triggerGetCurrentBlock(self):
      return self._currentBlock
  
+   #
+   # allow the trigger to get a handle to
+   # an actual GFPage object
+   #
+   # TODO: WHY?  This seems like a good way to write 
+   # TODO: triggers that break due to internal forms changes
+   #
    def triggerGetCurrentPage(self):
      return self._currentPage
  
+   #
+   # triggerSetStatusText
+   #
+   # Allows the trigger to display a custom message
+   # on the forms status bar
+   #
    def triggerSetStatusText(self,tip=''):
      self.dispatchEvent('uiUPDATESTATUS',tip=tip, _form=self)
  
+   #
+   # triggerRunForm
+   #
+   # Allows the trigger to launch a new instance
+   # of gnue-forms running a different form.
+   #
    def triggerRunForm(self, fileName):
      from GFInstance import GFInstance
      instance = GFInstance(self._instance.manager,
***************
*** 813,841 ****
      instance.addFormFromFile(fileName)
      instance.activate()
  
    def triggerActivateDialog(self,dialogName, parameters={}, modal=0):
      self._instance.activateForm(dialogName,parameters, modal)
  
!   # Close this form.
!   def close(self):
      event = events.Event('requestEXIT', _form=self)
!     self._instance.dispatchEvent(event)
      if event.__error__:
        return 1
  
    def triggerSetFeature(self, feature, value):
      if not self._features.has_key(feature):
        raise KeyError, "Trigger attempted to set unknown feature %s" % feature
      else:
        self._features[feature] = value
  
    def triggerGetFeature(self, feature):
      try:
        return self._features[feature]
      except KeyError:
        raise KeyError, "Trigger attempted to get unknown feature %s" % feature
  
!   def getAuthenticatedUser(self, connection=None):
      return self._instance.connections.getAuthenticatedUser(connection)
  
      
--- 881,938 ----
      instance.addFormFromFile(fileName)
      instance.activate()
  
+   #
+   # triggerActivateDialog
+   #
+   # Allows the trigger to launch a standard or custom
+   # dialog.  Values can be passed back and forth thru
+   # the parameters dictionary
+   #
    def triggerActivateDialog(self,dialogName, parameters={}, modal=0):
      self._instance.activateForm(dialogName,parameters, modal)
  
!   #
!   # triggerClose
!   #
!   # Allows the trigger to close this copy of gnue-forms
!   #
!   def triggerClose(self):
      event = events.Event('requestEXIT', _form=self)
!     #self._instance.dispatchEvent(event)
!     self.dispatchEvent(event)
      if event.__error__:
        return 1
  
+   #
+   # triggerSetFeature
+   #
+   # Allows the trigger to set feature values
+   # Features are things like toolbars, menubars, and statusbar
+   #
    def triggerSetFeature(self, feature, value):
      if not self._features.has_key(feature):
        raise KeyError, "Trigger attempted to set unknown feature %s" % feature
      else:
        self._features[feature] = value
  
+   #
+   # triggerGetFeature
+   #
+   # Allows the trigger to get feature values
+   # Features are things like toolbars, menubars, and statusbar
+   #
    def triggerGetFeature(self, feature):
      try:
        return self._features[feature]
      except KeyError:
        raise KeyError, "Trigger attempted to get unknown feature %s" % feature
  
!   #
!   # triggerGetAuthenticatedUser
!   #
!   # TODO: Description
!   #
!   def triggerGetAuthenticatedUser(self, connection=None):
      return self._instance.connections.getAuthenticatedUser(connection)
  
      
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.97 gnue/forms/src/GFInstance.py:1.98
*** gnue/forms/src/GFInstance.py:1.97   Sun Mar  9 17:47:22 2003
--- gnue/forms/src/GFInstance.py        Sun Mar  9 23:13:51 2003
***************
*** 179,185 ****
         #  GDebug.printMesg(2,"dialogs.%s doesn't appear to be a valid dialog" 
% (dialogName))
         #  GDebug.printMesg(5,' --> %s' % (mesg))
                                                                                
                                                   
!   
    
    def addFormFromBuffer(self,buffer):
      try:
--- 179,190 ----
         #  GDebug.printMesg(2,"dialogs.%s doesn't appear to be a valid dialog" 
% (dialogName))
         #  GDebug.printMesg(5,' --> %s' % (mesg))
                                                                                
                                                   
! 
!   #
!   # addFormFromBuffer
!   #
!   # Loads a form from a string buffer
!   #
    
    def addFormFromBuffer(self,buffer):
      try:
***************
*** 290,299 ****
      self.dispatchEvent('gotoENTRY',object=form._currentEntry,
                         _form=form)
      self.dispatchEvent('updateENTRY',form._currentEntry)
-     form.refreshDisplay(form)
      
      self.updateStatus(form)
- 
          
    #
    # buildForm
--- 295,303 ----
      self.dispatchEvent('gotoENTRY',object=form._currentEntry,
                         _form=form)
      self.dispatchEvent('updateENTRY',form._currentEntry)
      
+     form.refreshDisplay(form)
      self.updateStatus(form)
          
    #
    # buildForm
***************
*** 321,327 ****
      except GDataObjects.Error, mesg:
        self.handleStartupError(mesg)
                                              
- 
    #
    #
    # UI FUNCTIONS 
--- 325,330 ----
***************
*** 438,444 ****
      message = event._form.nextEntry()
      if message:
        self.displayMessageBox( message)
-       
        return
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
      self.updateRecordStatus(event._form)
--- 441,446 ----
Index: gnue/forms/src/GFObjects/GFField.py
diff -c gnue/forms/src/GFObjects/GFField.py:1.85 
gnue/forms/src/GFObjects/GFField.py:1.86
*** gnue/forms/src/GFObjects/GFField.py:1.85    Sun Mar  9 17:47:23 2003
--- gnue/forms/src/GFObjects/GFField.py Sun Mar  9 23:13:51 2003
***************
*** 191,217 ****
        block._queryDefaults[self] = self.queryDefault
  
  
- ##    # Create an appropriate display handler
- ##    if self.style == 'checkbox':
- ##      self._displayHandler = GFDisplayHandler.CheckboxDisplayHandler(self,
- ##               self._block._form._app.eventController)
- ##    elif self.style == 'dropdown':
- ##      self._displayHandler = GFDisplayHandler.DropdownDisplayHandler(self,
- ##               self._block._form._app.eventController)
- ##    elif self.typecast == 'text':
- ##      self._displayHandler = GFDisplayHandler.TextDisplayHandler(self,
- ##               self._block._form._app.eventController,
- ##               self._displaymask, self._inputmask)
- ##    elif self.typecast == 'number':
- ##      self._displayHandler = GFDisplayHandler.NumberDisplayHandler(self,
- ##               self._block._form._app.eventController,
- ##               self._displaymask, self._inputmask)
- ##    elif self.typecast == 'date':
- ##      self._displayHandler = GFDisplayHandler.DateDisplayHandler(self,
- ##               self._block._form._app.eventController,
- ##               self._displaymask, self._inputmask)
- 
- 
    def isQueryable(self):
      return self._queryable
  
--- 191,196 ----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]