gnue-forms/src GFClient.py GFForm.py

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/11/07 13:27:56

Modified files:
        src            : GFClient.py GFForm.py 

Log message:
        GFCLient: use new language interface error names
        GFForm: add recursion check, translate GFField into GFEntry

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFClient.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFForm.py.diff?tr1=1.249&tr2=1.250&r1=text&r2=text

Patches:
Index: gnue-forms/src/GFClient.py
diff -c gnue-forms/src/GFClient.py:1.75 gnue-forms/src/GFClient.py:1.76
*** gnue-forms/src/GFClient.py:1.75     Tue Sep 30 06:32:55 2003
--- gnue-forms/src/GFClient.py  Fri Nov  7 13:27:55 2003
***************
*** 36,42 ****
  from gnue.common.apps import GConfig
  from gnue.common.datasources import GDataObjects, GConnections
  from gnue.common.utils.FileUtils import dyn_import
! from gnue.common.logic.GTrigger import TriggerRuntimeError
  
  from gnue.forms import VERSION
  from gnue.forms.GFInstance import *
--- 36,42 ----
  from gnue.common.apps import GConfig
  from gnue.common.datasources import GDataObjects, GConnections
  from gnue.common.utils.FileUtils import dyn_import
! from gnue.common.logic.language.Base import LangIfCompileError
  
  from gnue.forms import VERSION
  from gnue.forms.GFInstance import *
***************
*** 161,167 ****
      instance.addDialogs()
      try:
        instance.activate()
!     except TriggerRuntimeError, msg:
        self.handleStartupError(msg)
  
  if __name__ == '__main__':
--- 161,167 ----
      instance.addDialogs()
      try:
        instance.activate()
!     except LangIfCompileError, msg:
        self.handleStartupError(msg)
  
  if __name__ == '__main__':
Index: gnue-forms/src/GFForm.py
diff -c gnue-forms/src/GFForm.py:1.249 gnue-forms/src/GFForm.py:1.250
*** gnue-forms/src/GFForm.py:1.249      Mon Oct 20 15:31:26 2003
--- gnue-forms/src/GFForm.py    Fri Nov  7 13:27:56 2003
***************
*** 157,162 ****
--- 157,164 ----
        'GUI:STATUSBAR:SUPPRESS': 0, 
      }
  
+     self._in_trigger_lock = 0
+ 
    #
    # primaryInit
    #
***************
*** 845,853 ****
    # 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
--- 847,874 ----
    # to a specfic entry widget
    #
    def triggerSetFocus(self,object):
!     # add global focus locking
!     if self._in_trigger_lock:
!       print "Already called by a trigger"
!       return
! 
!     self._in_trigger_lock = 1
!     
!     focus = object._object
!     if focus._type=='GFField':
!       try:
!         focus = focus._entryList[0]
!       except KeyError:
!         raise "setFocus failed: GFField is not bound to an GFEntry object."
! 
!     if focus._type != 'GFEntry':
!       raise "setFocus failed: Can just switch to GFEntry objects. " +\
!             "You passed a '%s' object." % focus._type
!     self.changeFocus(focus,1)
      self.dispatchEvent('gotoENTRY',object=self._currentEntry,_form=self)
  
+     self._in_trigger_lock = 0
+     
    #
    # allow the trigger to get a handle to
    # an actual GFEntry object