commit-gnue
[Top][All Lists]
Advanced

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

gnue/forms samples/intro/intro.gfd src/GFForm.p...


From: James Thompson
Subject: gnue/forms samples/intro/intro.gfd src/GFForm.p...
Date: Thu, 28 Nov 2002 01:07:59 -0500

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/11/28 01:07:59

Modified files:
        forms/samples/intro: intro.gfd 
        forms/src      : GFForm.py GFInstance.py 
        forms/src/uidrivers/_base: UIdriver.py 

Log message:
        More cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/intro/intro.gfd.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.212&tr2=1.213&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.80&tr2=1.81&r1=text&r2=text

Patches:
Index: gnue/forms/samples/intro/intro.gfd
diff -c gnue/forms/samples/intro/intro.gfd:1.16 
gnue/forms/samples/intro/intro.gfd:1.17
*** gnue/forms/samples/intro/intro.gfd:1.16     Wed Nov 27 16:29:16 2002
--- gnue/forms/samples/intro/intro.gfd  Thu Nov 28 01:07:59 2002
***************
*** 76,83 ****
              'You have a magnetic personality with GNUe forms.',
              'Use GNUe and you will notice the extraordinary in the ordinary.']
  
- 
- foo()
  if not SampleBlock.YearEntry.isEmpty():
  
    try:
--- 76,81 ----
***************
*** 98,104 ****
        <field name="NameEntry">
          <trigger name="Trigger_1" src="PigLatin" type="PRE-FOCUSOUT"/>
        </field>
!       <field name="YearEntry"/>
        <field name="CodeNameEntry"/>
        <field name="FortuneEntry"/>
      </block>
--- 96,106 ----
        <field name="NameEntry">
          <trigger name="Trigger_1" src="PigLatin" type="PRE-FOCUSOUT"/>
        </field>
!       <field name="YearEntry">
!         <options>
!            <option name="tip" value="Enter the year of your birth"/>
!         </options>
!       </field>
        <field name="CodeNameEntry"/>
        <field name="FortuneEntry"/>
      </block>
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.212 gnue/forms/src/GFForm.py:1.213
*** gnue/forms/src/GFForm.py:1.212      Wed Nov 27 22:35:53 2002
--- gnue/forms/src/GFForm.py    Thu Nov 28 01:07:59 2002
***************
*** 32,48 ****
  import string
  import traceback
  
! from gnue.common import GDebug, GConnections, GTrigger
  from gnue.common import events
- from gnue.common.FileUtils import openResource
- from GFObjects import *
  from gnue.common.GDataObjects import ConnectionError as DBError
  from gnue.common.GRootObj import GRootObj
  from gnue.common.GTrigger import TriggerError
! from gnue.common.GParser import GImportItem
! from GFLibrary import *
! import GFLibrary
! import GFParser
  
  # Defines which objects are "Tab Stops"
  TabStops = ('GFEntry','GFButton')
--- 32,48 ----
  import string
  import traceback
  
! from gnue.common import GDebug # , GConnections, GTrigger
  from gnue.common import events
  from gnue.common.GDataObjects import ConnectionError as DBError
  from gnue.common.GRootObj import GRootObj
  from gnue.common.GTrigger import TriggerError
! from gnue.common.GObjects import GObj
! #from gnue.common.GParser import GImportItem
! 
! from gnue.forms.GFObjects import *
! from gnue.forms import GFParser
! 
  
  # Defines which objects are "Tab Stops"
  TabStops = ('GFEntry','GFButton')
***************
*** 77,83 ****
  
      # set
      self._instance = instance
! 
      self._triggerns={}
  
      self._dialogDictionary={}
--- 77,84 ----
  
      # set
      self._instance = instance
!     self._app = self._instance #TODO: Imports are broken do to
!                                #TODO: switch from _app to _instance
      self._triggerns={}
  
      self._dialogDictionary={}
***************
*** 369,381 ****
        self._currentPage = self._currentEntry._page
  
        if pageChange:
!         self.dispatchEvent(events.Event('gotoPAGE',self._currentPage));
  
        if blockChange:
          self.refreshDisplay(self._currentBlock)
  
!       self.dispatchEvent(events.Event('updateENTRY', oldEntry))
!       self.dispatchEvent(events.Event('updateENTRY', self._currentEntry))
  
        if fireFocusTriggers:
          if pageChange:
--- 370,382 ----
        self._currentPage = self._currentEntry._page
  
        if pageChange:
!         self.dispatchEvent('gotoPAGE',self._currentPage);
  
        if blockChange:
          self.refreshDisplay(self._currentBlock)
  
!       self.dispatchEvent('updateENTRY', oldEntry)
!       self.dispatchEvent('updateENTRY', self._currentEntry)
  
        if fireFocusTriggers:
          if pageChange:
***************
*** 406,412 ****
  
    def updateUIEntry(self,field):
      for entry in field._entryList:
!       self._instance.dispatchEvent(events.Event('updateENTRY',entry));
  
    #
    # Incoming Event handlers
--- 407,413 ----
  
    def updateUIEntry(self,field):
      for entry in field._entryList:
!       self._instance.dispatchEvent('updateENTRY',entry);
  
    #
    # Incoming Event handlers
***************
*** 444,450 ****
      return message
  
    def executeQuery(self):
!     self._instance.dispatchEvent(events.Event('beginWAIT',None));
  
      message = None
      try:
--- 445,451 ----
      return message
  
    def executeQuery(self):
!     self._instance.dispatchEvent('beginWAIT',None);
  
      message = None
      try:
***************
*** 454,463 ****
        self.rollback(1)
        message = _("Database query error:\n%s\n%s ") % (sys.exc_info()[0], 
sys.exc_info()[1])
  
!     self._instance.dispatchEvent(events.Event('endWAIT',None));
  
    def commit(self):
!     self._instance.dispatchEvent(events.Event('beginWAIT',None));
  
      message = None
  
--- 455,464 ----
        self.rollback(1)
        message = _("Database query error:\n%s\n%s ") % (sys.exc_info()[0], 
sys.exc_info()[1])
  
!     self._instance.dispatchEvent('endWAIT',None)
  
    def commit(self):
!     self._instance.dispatchEvent('beginWAIT',None)
  
      message = None
  
***************
*** 468,474 ****
            self.processTrigger('Pre-Commit')
          except TriggerError:
            GDebug.printMesg(1, "Trigger form Pre-Commit threw a TriggerError!")
!           self._instance.dispatchEvent(events.Event('endWAIT',None));
            return _("Form trigger returned error")
  
          for block in self._logic._blockList:
--- 469,475 ----
            self.processTrigger('Pre-Commit')
          except TriggerError:
            GDebug.printMesg(1, "Trigger form Pre-Commit threw a TriggerError!")
!           self._instance.dispatchEvent('endWAIT',None)
            return _("Form trigger returned error")
  
          for block in self._logic._blockList:
***************
*** 481,487 ****
              block.processCommit()
            except TriggerError:
              GDebug.printMesg(1, "Trigger block Pre-Commit threw a 
TriggerError!")
!             self._instance.dispatchEvent(events.Event('endWAIT',None));
              return _("Block trigger returned error")
            block.processTrigger('Post-Commit')
  
--- 482,488 ----
              block.processCommit()
            except TriggerError:
              GDebug.printMesg(1, "Trigger block Pre-Commit threw a 
TriggerError!")
!             self._instance.dispatchEvent('endWAIT',None)
              return _("Block trigger returned error")
            block.processTrigger('Post-Commit')
  
***************
*** 490,496 ****
  
        else:
          message = _('Form is readonly')
!         self._instance.dispatchEvent(events.Event('endWAIT',None));
          return message
  
        self.processTrigger('Post-Commit')
--- 491,497 ----
  
        else:
          message = _('Form is readonly')
!         self._instance.dispatchEvent('endWAIT',None)
          return message
  
        self.processTrigger('Post-Commit')
***************
*** 504,510 ****
        traceback.print_exc(file=sys.stdout)
        print '-'*60
  
!     self._instance.dispatchEvent(events.Event('endWAIT',None));
  
      return message
  
--- 505,511 ----
        traceback.print_exc(file=sys.stdout)
        print '-'*60
  
!     self._instance.dispatchEvent('endWAIT',None)
  
      return message
  
***************
*** 515,521 ****
       author = self.getOption('author') or "Unknown"
       description = self.getOption('description') or "Unknown"
  
!      
self.dispatchEvent(events.Event('uiABOUT',[version,name,formversion,author,description]))
  
    def rollback(self, recover=0):
      self.endEditing()
--- 516,522 ----
       author = self.getOption('author') or "Unknown"
       description = self.getOption('description') or "Unknown"
  
!      
self.dispatchEvent('uiABOUT',[version,name,formversion,author,description])
  
    def rollback(self, recover=0):
      self.endEditing()
***************
*** 636,642 ****
  
    def __refreshDisplay(self, object):
      if object._type == 'GFEntry':
!       self.dispatchEvent(events.Event('updateENTRY',object))
  
  
  
--- 637,643 ----
  
    def __refreshDisplay(self, object):
      if object._type == 'GFEntry':
!       self.dispatchEvent('updateENTRY',object)
  
  
  
***************
*** 725,731 ****
  
    def triggerSetFocus(self,object):
      self.changeFocus(object._object,1)
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._currentEntry}))
  
    def triggerGetCurrentEntry(self):
      return self._currentEntry
--- 726,732 ----
  
    def triggerSetFocus(self,object):
      self.changeFocus(object._object,1)
!     self.dispatchEvent('gotoENTRY',{'object':self._currentEntry})
  
    def triggerGetCurrentEntry(self):
      return self._currentEntry
***************
*** 737,743 ****
      return self._currentPage
  
    def triggerSetStatusText(self,tip=''):
!     
self.dispatchEvent(events.Event('uiUPDATESTATUS',[tip,None,None,None,None,None,None]))
  
    def triggerRunForm(self,fileName):
      self._instance.addFormFromFile(fileName)
--- 738,744 ----
      return self._currentPage
  
    def triggerSetStatusText(self,tip=''):
!     self.dispatchEvent('uiUPDATESTATUS',tip=tip)
  
    def triggerRunForm(self,fileName):
      self._instance.addFormFromFile(fileName)
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.70 gnue/forms/src/GFInstance.py:1.71
*** gnue/forms/src/GFInstance.py:1.70   Wed Nov 27 22:35:53 2002
--- gnue/forms/src/GFInstance.py        Thu Nov 28 01:07:59 2002
***************
*** 22,33 ****
  # GFInstance.py
  #
  # DESCRIPTION:
! # Client startup file that parses args, builds form from file
! # and passes control to a UI.
  #
  # NOTES:
  #  Once all the events are moved back in here
- #    debug
  #    make the next/prec methods more generic in the GFForm
  #    change self._form in here to a list
  
--- 22,33 ----
  # GFInstance.py
  #
  # DESCRIPTION:
! # GFInstance manages forms instances in a 1:N relationship.
! # It sits between the UI and the form and passes events
! # between the two in a semi-intelligent manner.
  #
  # NOTES:
  #  Once all the events are moved back in here
  #    make the next/prec methods more generic in the GFForm
  #    change self._form in here to a list
  
***************
*** 39,44 ****
--- 39,45 ----
  from gnue.forms import GFKeyMapper
  from gnue.common import GDebug, GDataObjects
  from gnue.common import events
+ from gnue.common.FileUtils import openResource
  
  from gnue.common.GClientApp import *
  
***************
*** 117,138 ****
                             'requestPASTE'        : self.proxyEntryEvent,
                       } )
  
!     self.connections = connections
!     self.manager = manager
! #    self._serial = serial
!     self._uimodule = ui
!     self._disableSplash = disableSplash
!     self._parameters = parameters
  
!     self.loadKeyMappings()
! 
! 
!   #
!   # loadKeyMappings
!   # 
!   # Called once during __init__ to load the users keymappings
!   #
!   def loadKeyMappings(self):
      options = gConfigDict()
      mapping = {}
  
--- 118,134 ----
                             'requestPASTE'        : self.proxyEntryEvent,
                       } )
  
!     self.connections = connections       # Link to the GBaseApp's GConnections
!     self.manager = manager               # Link to the GBaseApp Instance that
!                                          #   created this GFInstance
!     self._uimodule = ui                  # The UI created in the GBaseApp
!     self._disableSplash = disableSplash  # Disable splashscreen
!     self._parameters = parameters        # The parameters passed to the
!                                          # GBaseApp instance
  
!     #
!     # Load user customized key mappings
!     #
      options = gConfigDict()
      mapping = {}
  
***************
*** 142,147 ****
--- 138,144 ----
          
      GFKeyMapper.KeyMapper.loadUserKeyMap(mapping)
  
+ 
    #
    # addFormFromFile
    #
***************
*** 155,160 ****
--- 152,158 ----
        fileHandle=openResource(fileName)
        self._form = loadFile (fileHandle, self)
        fileHandle.close()
+       print self.manager
      except IOError, mesg:
        self.manager.handleStartupError(_("Unable to open file\n\n     
%s")%mesg)
  
***************
*** 184,201 ****
      ui.activateForm(self._form)
  
      currentEntry = self._form._currentEntry
      if not currentEntry:
        raise  _('There are no navigable widgets in this form.  Unable to 
display.')
  
!     self.dispatchEvent(events.Event('gotoENTRY',{'object':currentEntry}))
!     self.dispatchEvent(events.Event('updateENTRY',currentEntry))
      self._form.refreshDisplay(self._form)
      self.updateStatus()
      self._ui = ui
  
      # pass control to UI
      ui.mainLoop()
-             
      
    #
    # Associate a form object with this instance
--- 182,199 ----
      ui.activateForm(self._form)
  
      currentEntry = self._form._currentEntry
+ 
      if not currentEntry:
        raise  _('There are no navigable widgets in this form.  Unable to 
display.')
  
!     self.dispatchEvent('gotoENTRY',{'object':currentEntry})
!     self.dispatchEvent('updateENTRY',currentEntry)
      self._form.refreshDisplay(self._form)
      self.updateStatus()
      self._ui = ui
  
      # pass control to UI
      ui.mainLoop()
      
    #
    # Associate a form object with this instance
***************
*** 204,215 ****
      self._form = form
  
    #
-   # Return this instance's serial number
-   #
-   def getSerialNumber(self):
-     return self._serial
- 
-   #
    # _entryUpdated
    #
    # Common code snipped called when something has changed with an
--- 202,207 ----
***************
*** 217,223 ****
    # repeated code.
    #
    def _entryUpdated(self):
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordCounter()
      self.updateRecordStatus()
  
--- 209,215 ----
    # repeated code.
    #
    def _entryUpdated(self):
!     self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
      self.updateRecordCounter()
      self.updateRecordStatus()
  
***************
*** 225,261 ****
    # Routines to update parts of the UI's status bar
    #
    def updateInsertMode(self):
!     
self.dispatchEvent(events.Event('uiUPDATESTATUS',[None,None,self._form._insertMode,None,None,None,None]))
  
    def updateRecordCounter(self):
!     
self.dispatchEvent(events.Event('uiUPDATESTATUS',[None,None,None,self._form._currentBlock._currentRecord+1,self._form._currentBlock._recordCount,None,None]))
  
    def updatePageCounter(self):
      maxPages = len(self._form._layout._pageList)
      count = self._form._layout._pageList.index(self._form._currentPage)
!     
self.dispatchEvent(events.Event('uiUPDATESTATUS',[None,None,None,None,None,count+1,maxPages]))
  
    def updateTip(self):
      tip = ''
      if self._form._currentEntry:
        if self._form._currentEntry.getOption('tip'):
          tip = self._form._currentEntry.getOption('tip')
!       else:
!         tip = ''
! 
!     
self.dispatchEvent(events.Event('uiUPDATESTATUS',[tip,None,None,None,None,None,None]))
  
    def updateRecordStatus(self):
!     if self._form._currentBlock.mode == 'query':
        status = 'query'
      elif self._form._currentBlock._resultSet.current.isDeleted():
        status = 'deleted'
-     elif self._form._currentBlock._resultSet.current.isPending():
-       status = 'modified'
      else:
        status = 'saved'
! 
!     
self.dispatchEvent(events.Event('uiUPDATESTATUS',[None,status,None,None,None,None,None]))
  
    def updateStatus(self):
      self.updateTip()
--- 217,250 ----
    # Routines to update parts of the UI's status bar
    #
    def updateInsertMode(self):
!     self.updateStatusBar(insertMode=self._form._insertMode)
  
    def updateRecordCounter(self):
!     
self.updateStatusBar(currentRecord=self._form._currentBlock._currentRecord+1,
!                          maxRecord=self._form._currentBlock._recordCount)
  
    def updatePageCounter(self):
      maxPages = len(self._form._layout._pageList)
      count = self._form._layout._pageList.index(self._form._currentPage)
!     self.updateStatusBar(currentPage=count+1,maxPage=maxPages)
  
    def updateTip(self):
      tip = ''
      if self._form._currentEntry:
        if self._form._currentEntry.getOption('tip'):
          tip = self._form._currentEntry.getOption('tip')
!     self.updateStatusBar(tip=tip)
  
    def updateRecordStatus(self):
!     if self._form._currentBlock._resultSet.current.isPending():
!       status = 'modified'
!     elif self._form._currentBlock.mode == 'query':
        status = 'query'
      elif self._form._currentBlock._resultSet.current.isDeleted():
        status = 'deleted'
      else:
        status = 'saved'
!     self.updateStatusBar(recordStatus=status)
  
    def updateStatus(self):
      self.updateTip()
***************
*** 264,276 ****
      self.updateRecordStatus()
      self.updatePageCounter()
  
  
    #
    #
!   # EVENT FUNCTIONS
    #
    #
- 
    #
    # proxyEntryEvent
    #
--- 253,273 ----
      self.updateRecordStatus()
      self.updatePageCounter()
  
+   def updateStatusBar(self, tip=None, recordStatus=None, insertMode=None,
+                       currentRecord=None,maxRecord=None, currentPage=None,
+                       maxPage=None):
+     self.dispatchEvent('uiUPDATESTATUS',tip=tip, recordStatus=recordStatus,
+                        insertMode=insertMode, currentRecord=currentRecord,
+                        maxRecord=maxRecord, currentPage=currentPage,
+                        maxPage=maxPage)
  
    #
    #
!   # EVENT FUNCTIONS 
    #
+   # From here down should be nothing but eventListeners listed
+   # in the __init__ above.
    #
    #
    # proxyEntryEvent
    #
***************
*** 281,287 ****
    #
    def proxyEntryEvent(self, event):
  
!     if self._form._currentEntry != None and \
         self._form._currentEntry._type != 'GFButton':
  
        handler = self._form._currentEntry._displayHandler
--- 278,284 ----
    #
    def proxyEntryEvent(self, event):
  
!     if self._form._currentEntry and \
         self._form._currentEntry._type != 'GFButton':
  
        handler = self._form._currentEntry._displayHandler
***************
*** 306,312 ****
          messageBox = GFMsgBox(self, event.__errortext__)
          messageBox.show()
  
- 
    #
    # nextEntry
    #
--- 303,308 ----
***************
*** 321,327 ****
        messageBox = GFMsgBox(self, message)
        messageBox.show()
        return
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateTip()
  
--- 317,323 ----
        messageBox = GFMsgBox(self, message)
        messageBox.show()
        return
!     self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
      self.updateRecordStatus()
      self.updateTip()
  
***************
*** 335,341 ****
      if not self._form.endEditing():
        return
      self._form.previousEntry()
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateRecordStatus()
      self.updateTip()
  
--- 331,337 ----
      if not self._form.endEditing():
        return
      self._form.previousEntry()
!     self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
      self.updateRecordStatus()
      self.updateTip()
  
***************
*** 349,356 ****
      if not self._form.endEditing():
        return
      self._form.nextBlock()
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
! 
      self.updateStatus()
  
    #
--- 345,351 ----
      if not self._form.endEditing():
        return
      self._form.nextBlock()
!     self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
      self.updateStatus()
  
    #
***************
*** 363,369 ****
      if not self._form.endEditing():
        return
      self._form.previousBlock()
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
    #
--- 358,364 ----
      if not self._form.endEditing():
        return
      self._form.previousBlock()
!     self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
      self.updateStatus()
  
    #
***************
*** 375,381 ****
      if not self._form.endEditing():
        return
      self._form.findAndChangeFocus(self._form._layout._pageList[event.data])
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
    #
--- 370,376 ----
      if not self._form.endEditing():
        return
      self._form.findAndChangeFocus(self._form._layout._pageList[event.data])
!     self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
      self.updateStatus()
  
    #
***************
*** 499,505 ****
        message.show()
      else:
        self._form.processTrigger('On-Exit')
!       self.dispatchEvent(events.Event('exitApplication',_('Current data is 
saved')))
  
      return
  
--- 494,500 ----
        message.show()
      else:
        self._form.processTrigger('On-Exit')
!       self.dispatchEvent('exitApplication',_('Current data is saved'))
  
      return
  
***************
*** 510,518 ****
    #
    def deleteRecord(self, event):
      if self._form.readonly:
!       self.dispatchEvent(events.Event('formALERT',_('Form is readonly')))
      elif self._form._currentBlock.restrictDelete:
!       self.dispatchEvent(events.Event('formALERT',_('Block does not allow 
delete')));
      else:
        self._form.deleteRecord()
        self.updateRecordStatus()
--- 505,513 ----
    #
    def deleteRecord(self, event):
      if self._form.readonly:
!       self.dispatchEvent('formALERT',_('Form is readonly'))
      elif self._form._currentBlock.restrictDelete:
!       self.dispatchEvent('formALERT',_('Block does not allow delete'))
      else:
        self._form.deleteRecord()
        self.updateRecordStatus()
***************
*** 526,534 ****
      if not self._form.endEditing():
        return
      if self._form.readonly:
!       self.dispatchEvent(events.Event('formALERT',_('Form is readonly')))
      elif self._form._currentBlock.restrictInsert:
!       self.dispatchEvent(events.Event('formALERT',_('Block does not allow 
insert')));
      else:
        self._form.newRecord()
        self._entryUpdated()
--- 521,529 ----
      if not self._form.endEditing():
        return
      if self._form.readonly:
!       self.dispatchEvent('formALERT',_('Form is readonly'))
      elif self._form._currentBlock.restrictInsert:
!       self.dispatchEvent('formALERT',_('Block does not allow insert'))
      else:
        self._form.newRecord()
        self._entryUpdated()
***************
*** 539,551 ****
    # Displays the about dialog
    #
    def executeAbout(self,event):
-     global VERSION
-     version = VERSION;
      name = self._form.title or "Unknown"
      formversion = self._form.getOption('version') or "Unknown"
      author = self._form.getOption('author') or "Unknown"
      description = self._form.getOption('description') or "Unknown"
!     
self.dispatchEvent(events.Event('uiABOUT',[version,name,formversion,author,description]))
  
    #
    # toggleInsertMode(self):
--- 534,544 ----
    # Displays the about dialog
    #
    def executeAbout(self,event):
      name = self._form.title or "Unknown"
      formversion = self._form.getOption('version') or "Unknown"
      author = self._form.getOption('author') or "Unknown"
      description = self._form.getOption('description') or "Unknown"
!     
self.dispatchEvent('uiABOUT',[VERSION,name,formversion,author,description])
  
    #
    # toggleInsertMode(self):
***************
*** 601,610 ****
          messageBox.show()
          return
  
!       
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
        self.updateRecordStatus()
        self.updateTip()
  
    def requestQuery(self, event):
      if not self._form.endEditing():
        return
--- 594,606 ----
          messageBox.show()
          return
  
!       self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
        self.updateRecordStatus()
        self.updateTip()
  
+   #
+   # requestQuery
+   #
    def requestQuery(self, event):
      if not self._form.endEditing():
        return
***************
*** 617,625 ****
        return
  
      self._form.refreshDisplay(self._form)
!     
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._form._currentEntry}))
      self.updateStatus()
  
    def executeCommit(self, event):
      if not self._form.endEditing():
        return
--- 613,624 ----
        return
  
      self._form.refreshDisplay(self._form)
!     self.dispatchEvent('gotoENTRY',{'object':self._form._currentEntry})
      self.updateStatus()
  
+   #
+   # requestQuery
+   #
    def executeCommit(self, event):
      if not self._form.endEditing():
        return
***************
*** 631,636 ****
--- 630,638 ----
      self._form.refreshDisplay(self._form._currentBlock)
      self._entryUpdated()
  
+   #
+   # executeQuery
+   # 
    def executeQuery(self, event):
      if not self._form.endEditing():
        return
***************
*** 642,667 ****
      self._entryUpdated()
  
  
-   def _handlePreCommit(self, event, trigger):
-     try:
-       block = event.record._parent._block
-     except AttributeError:
-       return
- 
-     saveMode = block.mode
-     block._preCommitWorkingRecord = event.record
-     block.mode = 'precommit'
-     block.processTrigger(trigger)
-     for child in block._children:
-       if child._type == 'GFField':
-         child.processTrigger(trigger)
-     block.mode = saveMode
- 
- 
    def preCommit(self, event):
      self._handlePreCommit(event, 'PRE-COMMIT')
  
- 
    def preInsert(self, event):
      self._handlePreCommit(event, 'PRE-INSERT')
  
--- 644,652 ----
***************
*** 676,681 ****
--- 661,681 ----
  
    def onRecordTouched(self, event):
      self._handlePreCommit(event, 'PRE-MODIFY')
+ 
+   def _handlePreCommit(self, event, trigger):
+     try:
+       block = event.record._parent._block
+     except AttributeError:
+       return
+ 
+     saveMode = block.mode
+     block._preCommitWorkingRecord = event.record
+     block.mode = 'precommit'
+     block.processTrigger(trigger)
+     for child in block._children:
+       if child._type == 'GFField':
+         child.processTrigger(trigger)
+     block.mode = saveMode
  
    #
    # fireTrigger
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.80 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.81
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.80     Mon Nov 25 09:22:36 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Thu Nov 28 01:07:59 2002
***************
*** 243,258 ****
    # Calls the UIs function to update status
    def updateStatusBar(self,event):
  
!     tip, recordStatus, insertMode, currentRecord, maxRecord, currentPage, 
maxPage =event.data
  
      status = None
!     if recordStatus != None:
!       status = statusValues[recordStatus]
  
      insertValue = None
!     if insertMode != None:
!       insertValue = insertMode and 'INS' or  'OVR'
!     self._setStatusBar(tip, status, insertValue, currentRecord, maxRecord, 
currentPage, maxPage)
  
    #
    # exitApplication
--- 243,258 ----
    # Calls the UIs function to update status
    def updateStatusBar(self,event):
  
!     #tip, recordStatus, insertMode, currentRecord, maxRecord, currentPage, 
maxPage =event.data
  
      status = None
!     if event.recordStatus != None:
!       status = statusValues[event.recordStatus]
  
      insertValue = None
!     if event.insertMode != None:
!       insertValue = event.insertMode and 'INS' or  'OVR'
!     self._setStatusBar(event.tip, status, insertValue, event.currentRecord, 
event.maxRecord, event.currentPage, event.maxPage)
  
    #
    # exitApplication




reply via email to

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