gnue/forms/src GFInstance.py uidrivers/qt/UIdri...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/05 22:03:27

Modified files:
        forms/src      : GFInstance.py 
        forms/src/uidrivers/qt: UIdriver.py 

Log message:
        removed self._form from gfinstance completely as it doesn't apply in 
the new model

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/UIdriver.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.91 gnue/forms/src/GFInstance.py:1.92
*** gnue/forms/src/GFInstance.py:1.91   Wed Mar  5 21:06:03 2003
--- gnue/forms/src/GFInstance.py        Wed Mar  5 22:03:27 2003
***************
*** 274,297 ****
    #  sets that form to active status
    #
    def activateForm(self,formName='__main__',parameters={}, modal=0):
!     self._form = self._formsDictionary[formName]
      
      if parameters != {}:
!       self._form._parameters=parameters
  
!     if not self._form._currentEntry:
        raise  _('There are no navigable widgets in this form.  Unable to 
display.')
  
!     self._form.processTrigger('On-Activation')
  
-     print "survey says modal = ",modal
      self._uiinstance.activateForm(formName,modal)
  
!     self.dispatchEvent('gotoENTRY',object=self._form._currentEntry,
!                        _form=self._form)
!     self.dispatchEvent('updateENTRY',self._form._currentEntry)
!     self._form.refreshDisplay(self._form)
!     self.updateStatus()
  
    #
    # buildForm
--- 274,296 ----
    #  sets that form to active status
    #
    def activateForm(self,formName='__main__',parameters={}, modal=0):
!     form = self._formsDictionary[formName]
      
      if parameters != {}:
!       form._parameters=parameters
  
!     if not form._currentEntry:
        raise  _('There are no navigable widgets in this form.  Unable to 
display.')
  
!     form.processTrigger('On-Activation')
  
      self._uiinstance.activateForm(formName,modal)
  
!     self.dispatchEvent('gotoENTRY',object=form._currentEntry,
!                        _form=form)
!     self.dispatchEvent('updateENTRY',form._currentEntry)
!     form.refreshDisplay(form)
!     self.updateStatus(form)
  
    #
    # buildForm
***************
*** 326,375 ****
    #
    # 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()
!     self.updateInsertMode()
!     self.updateRecordCounter()
!     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, _form=self._form)
  
    #
    #
--- 325,374 ----
    #
    # Routines to update parts of the UI's status bar
    #
!   def updateInsertMode(self, form):
!     self.updateStatusBar(insertMode=form._insertMode, form=form)
  
!   def updateRecordCounter(self,form):
!     self.updateStatusBar(currentRecord=form._currentBlock._currentRecord+1,
!                          maxRecord=form._currentBlock._recordCount, form=form)
! 
!   def updatePageCounter(self, form):
!     maxPages = len(form._layout._pageList)
!     count = form._layout._pageList.index(form._currentPage)
!     self.updateStatusBar(currentPage=count+1,maxPage=maxPages, form=form)
  
!   def updateTip(self, form):
      tip = ''
!     if form._currentEntry:
!       if form._currentEntry.getOption('tip'):
!         tip = form._currentEntry.getOption('tip')
!     self.updateStatusBar(tip=tip, form=form)
  
!   def updateRecordStatus(self, form):
!     if form._currentBlock._resultSet.current.isPending():
        status = 'modified'
!     elif form._currentBlock.mode == 'query':
        status = 'query'
!     elif form._currentBlock._resultSet.current.isDeleted():
        status = 'deleted'
      else:
        status = 'saved'
!     self.updateStatusBar(recordStatus=status, form= form)
  
!   def updateStatus(self, form):
!     self.updateTip(form=form)
!     self.updateInsertMode(form=form)
!     self.updateRecordCounter(form=form)
!     self.updateRecordStatus(form=form)
!     self.updatePageCounter(form=form)
  
    def updateStatusBar(self, tip=None, recordStatus=None, insertMode=None,
                        currentRecord=None,maxRecord=None, currentPage=None,
!                       maxPage=None, form=None):
      self.dispatchEvent('uiUPDATESTATUS',tip=tip, recordStatus=recordStatus,
                         insertMode=insertMode, currentRecord=currentRecord,
                         maxRecord=maxRecord, currentPage=currentPage,
!                        maxPage=maxPage, _form=form)
  
    #
    #
***************
*** 386,395 ****
    # entry and it has to update the stat bar.  Used to cut down on
    # repeated code.
    #
!   def _entryUpdated(self):
!     self.dispatchEvent('gotoENTRY',object=self._form._currentEntry, 
_form=self._form)
!     self.updateRecordCounter()
!     self.updateRecordStatus()
  
    #
    # proxyEntryEvent
--- 385,394 ----
    # entry and it has to update the stat bar.  Used to cut down on
    # repeated code.
    #
!   def _entryUpdated(self, form):
!     self.dispatchEvent('gotoENTRY',object=form._currentEntry, _form=form)
!     self.updateRecordCounter(form)
!     self.updateRecordStatus(form)
  
    #
    # proxyEntryEvent
***************
*** 416,422 ****
        # Refresh entry display if appropriate
        if event.refreshDisplay:
          handler.generateRefreshEvent()
!         self.updateRecordStatus()
  
        # If the entry needs an error message displayed,
        # then the proxied event should set this to the
--- 415,421 ----
        # Refresh entry display if appropriate
        if event.refreshDisplay:
          handler.generateRefreshEvent()
!         self.updateRecordStatus(event._form)
  
        # If the entry needs an error message displayed,
        # then the proxied event should set this to the
***************
*** 439,446 ****
        
        return
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateRecordStatus()
!     self.updateTip()
  
    #
    # prevEntry
--- 438,445 ----
        
        return
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateRecordStatus(event._form)
!     self.updateTip(event._form)
  
    #
    # prevEntry
***************
*** 453,460 ****
        return
      event._form.previousEntry()
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateRecordStatus()
!     self.updateTip()
  
    #
    # nextBlock
--- 452,459 ----
        return
      event._form.previousEntry()
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateRecordStatus(event._form)
!     self.updateTip(event._form)
  
    #
    # nextBlock
***************
*** 467,473 ****
        return
      event._form.nextBlock()
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus()
  
    #
    # previousBlock
--- 466,472 ----
        return
      event._form.nextBlock()
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus(event._form)
  
    #
    # previousBlock
***************
*** 480,486 ****
        return
      event._form.previousBlock()
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus()
  
    #
    # gotoPage
--- 479,485 ----
        return
      event._form.previousBlock()
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus(event._form)
  
    #
    # gotoPage
***************
*** 492,498 ****
        return
      event._form.findAndChangeFocus(event._form._layout._pageList[event.data])
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus()
  
    #
    # previousRecord
--- 491,497 ----
        return
      event._form.findAndChangeFocus(event._form._layout._pageList[event.data])
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus(event._form)
  
    #
    # previousRecord
***************
*** 508,514 ****
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated()
  
    #
    # nextRecord
--- 507,513 ----
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated(event._form)
  
    #
    # nextRecord
***************
*** 524,530 ****
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated()
  
    #
    # firstRecord
--- 523,529 ----
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated(event._form)
  
    #
    # firstRecord
***************
*** 540,546 ****
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated()
  
    #
    # lastRecord
--- 539,545 ----
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated(event._form)
  
    #
    # lastRecord
***************
*** 556,562 ****
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated()
  
    #
    # jumpToRecord
--- 555,561 ----
        self.displayMessageBox(message)
        
        return
!     self._entryUpdated(event._form)
  
    #
    # jumpToRecord
***************
*** 579,585 ****
        
        return
  
!     self._entryUpdated()
  
    #
    # jumpRecords
--- 578,584 ----
        
        return
  
!     self._entryUpdated(event._form)
  
    #
    # jumpRecords
***************
*** 600,606 ****
      for jumps in range(abs(int(count))):
        method()
  
!     self._entryUpdated()
  
    #
    # executeExit
--- 599,605 ----
      for jumps in range(abs(int(count))):
        method()
  
!     self._entryUpdated(event._form)
  
    #
    # executeExit
***************
*** 630,636 ****
        self.dispatchEvent('formALERT',_('Block does not allow delete'))
      else:
        event._form.deleteRecord()
!       self.updateRecordStatus()
  
    #
    # newRecord
--- 629,635 ----
        self.dispatchEvent('formALERT',_('Block does not allow delete'))
      else:
        event._form.deleteRecord()
!       self.updateRecordStatus(event._form)
  
    #
    # newRecord
***************
*** 646,652 ****
        self.dispatchEvent('formALERT',_('Block does not allow insert'))
      else:
        event._form.newRecord()
!       self._entryUpdated()
  
    #
    # executeAbout
--- 645,651 ----
        self.dispatchEvent('formALERT',_('Block does not allow insert'))
      else:
        event._form.newRecord()
!       self._entryUpdated(event._form)
  
    #
    # executeAbout
***************
*** 706,712 ****
          
          return
          
!       self._entryUpdated()
    
    # 
    #
--- 705,711 ----
          
          return
          
!       self._entryUpdated(event._form)
    
    # 
    #
***************
*** 716,722 ****
    #
    def toggleInsertMode(self, event):
      event._form.toggleInsertMode()
!     self.updateInsertMode()
  
    #
    # executePrintout
--- 715,721 ----
    #
    def toggleInsertMode(self, event):
      event._form.toggleInsertMode()
!     self.updateInsertMode(event._form)
  
    #
    # executePrintout
***************
*** 738,744 ****
    #
    def executeRollback(self,event):
      event._form.rollback()
!     self._entryUpdated()
  
    #
    # activateDialog
--- 737,743 ----
    #
    def executeRollback(self,event):
      event._form.rollback()
!     self._entryUpdated(event._form)
  
    #
    # activateDialog
***************
*** 772,779 ****
          return
  
        self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!       self.updateRecordStatus()
!       self.updateTip()
  
    #
    # requestQuery
--- 771,778 ----
          return
  
        self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!       self.updateRecordStatus(event._form)
!       self.updateTip(event._form)
  
    #
    # requestQuery
***************
*** 791,797 ****
  
      event._form.refreshDisplay(event._form)
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus()
  
    #
    # cancelQuery
--- 790,796 ----
  
      event._form.refreshDisplay(event._form)
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus(event._form)
  
    #
    # cancelQuery
***************
*** 809,815 ****
  
      event._form.refreshDisplay(event._form)
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus()
  
    #
    # executeQuery
--- 808,814 ----
  
      event._form.refreshDisplay(event._form)
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
!     self.updateStatus(event._form)
  
    #
    # executeQuery
***************
*** 823,829 ****
        
        return
      event._form.refreshDisplay(event._form._currentBlock)
!     self._entryUpdated()
  
    #
    # executeQuery
--- 822,828 ----
        
        return
      event._form.refreshDisplay(event._form._currentBlock)
!     self._entryUpdated(event._form)
  
    #
    # executeQuery
***************
*** 836,842 ****
        self.displayMessageBox(message)
        
      event._form.refreshDisplay(event._form._currentBlock)
!     self._entryUpdated()
  
  
    def preCommit(self, event):
--- 835,841 ----
        self.displayMessageBox(message)
        
      event._form.refreshDisplay(event._form._currentBlock)
!     self._entryUpdated(event._form)
  
  
    def preCommit(self, event):
Index: gnue/forms/src/uidrivers/qt/UIdriver.py
diff -c gnue/forms/src/uidrivers/qt/UIdriver.py:1.3 
gnue/forms/src/uidrivers/qt/UIdriver.py:1.4
*** gnue/forms/src/uidrivers/qt/UIdriver.py:1.3 Tue Mar  4 23:12:02 2003
--- gnue/forms/src/uidrivers/qt/UIdriver.py     Wed Mar  5 22:03:27 2003
***************
*** 217,234 ****
        object.Destroy()
        # wxExit() TODO: Try and work this into navigator or here if it still 
hangs
  
- #####################################################################
- ##
- ## Required Dialog box support
- ##
- #####################################################################
- #
- # UImessageBox
- #
- # A dialog box providing basic message info
- #
- class UIMessageBox(QMessageBox, UIHelper):
-   def __init__(self, interface, message, caption):
-     message = lineWrap(message,60)
-     QMessageDialog.__init__(self, caption) # interface)
-     self.information( message)
--- 217,219 ----