gnue/forms/src GFDisplayHandler.py GFInstance.p...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/10 00:42:55

Modified files:
        forms/src      : GFDisplayHandler.py GFInstance.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        attempt at fixing formAlerts

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.246&tr2=1.247&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.45 
gnue/forms/src/GFDisplayHandler.py:1.46
*** gnue/forms/src/GFDisplayHandler.py:1.45     Sun Mar  9 23:13:51 2003
--- gnue/forms/src/GFDisplayHandler.py  Mon Mar 10 00:42:55 2003
***************
*** 162,168 ****
  
        else:
          self.dispatchEvent(events.Event('formALERT',
!           _("Invalid input: '%s'" % self.work)))
  
  
    def addText(self, event):
--- 162,168 ----
  
        else:
          self.dispatchEvent(events.Event('formALERT',
!           _("Invalid input: '%s'" % self.work),_form=event._form))
  
  
    def addText(self, event):
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.98 gnue/forms/src/GFInstance.py:1.99
*** gnue/forms/src/GFInstance.py:1.98   Sun Mar  9 23:13:51 2003
--- gnue/forms/src/GFInstance.py        Mon Mar 10 00:42:55 2003
***************
*** 630,638 ****
    #
    def deleteRecord(self, event):
      if event._form.readonly:
!       self.dispatchEvent('formALERT',_('Form is readonly'))
      elif event._form._currentBlock.restrictDelete:
!       self.dispatchEvent('formALERT',_('Block does not allow delete'))
      else:
        event._form.deleteRecord()
        self.updateRecordStatus(event._form)
--- 630,638 ----
    #
    def deleteRecord(self, event):
      if event._form.readonly:
!       self.dispatchEvent('formALERT',_('Form is readonly'),_form=event._form)
      elif event._form._currentBlock.restrictDelete:
!       self.dispatchEvent('formALERT',_('Block does not allow 
delete'),_form=event._form)
      else:
        event._form.deleteRecord()
        self.updateRecordStatus(event._form)
***************
*** 646,654 ****
      if not event._form.endEditing():
        return
      if event._form.readonly:
!       self.dispatchEvent('formALERT',_('Form is readonly'))
      elif event._form._currentBlock.restrictInsert:
!       self.dispatchEvent('formALERT',_('Block does not allow insert'))
      else:
        event._form.newRecord()
        self._entryUpdated(event._form)
--- 646,654 ----
      if not event._form.endEditing():
        return
      if event._form.readonly:
!       self.dispatchEvent('formALERT',_('Form is readonly'),_form=event._form)
      elif event._form._currentBlock.restrictInsert:
!       self.dispatchEvent('formALERT',_('Block does not allow 
insert'),_form=event._form)
      else:
        event._form.newRecord()
        self._entryUpdated(event._form)
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.246 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.247
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.246       Thu Mar  6 18:01:18 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Mar 10 00:42:55 2003
***************
*** 159,165 ****
    #
    def formAlert(self, event):
      wxBell()
!     self.statusBar.SetStatusText(event.data,0)
  
    #
    # Called whenever forms goes into a "wait" state in which user cannot
--- 159,166 ----
    #
    def formAlert(self, event):
      wxBell()
!     ui = self._gfObjToUIWidget[event._form]
!     ui.statusBar.SetStatusText(event.data,0)
  
    #
    # Called whenever forms goes into a "wait" state in which user cannot