gnue/common/src GTrigger.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/07/04 14:41:36

Modified files:
        common/src     : GTrigger.py 

Log message:
        temporarily fixed issue with saving forms with triggers under designer

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GTrigger.py.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.16 gnue/common/src/GTrigger.py:1.17
*** gnue/common/src/GTrigger.py:1.16    Thu May 30 23:54:19 2002
--- gnue/common/src/GTrigger.py Thu Jul  4 14:41:36 2002
***************
*** 126,132 ****
              setFunc = None
            
triggerObject._triggerProperties.addProperty(item,gobjObject._triggerProperties[item]['get'],
 setFunc)
  
!       # Process the children of this Gobj 
        if len(gobjObject._children):
          for child in gobjObject._children:
            object = self.constructTriggerObject(child, triggerObject)
--- 126,132 ----
              setFunc = None
            
triggerObject._triggerProperties.addProperty(item,gobjObject._triggerProperties[item]['get'],
 setFunc)
  
!       # Process the children of this Gobj
        if len(gobjObject._children):
          for child in gobjObject._children:
            object = self.constructTriggerObject(child, triggerObject)
***************
*** 344,356 ****
                    'POST-FOCUSOUT':  'Post-FocusOut',
                    'PRE-FOCUSIN':    'Pre-FocusIn',
                    'POST-FOCUSIN':   'Post-FocusIn',
-                   'PRE-COMMIT':     'Pre-Commit',
-                   'POST-COMMIT':    'Post-Commit',
                    'POST-QUERY':     'Post-Query',
                    'ON-SWITCH':      'On-Switch',
                    'PRE-CHANGE':     'Pre-Change',
                    'POST-CHANGE':    'Post-Change',
!                   'ON-NEWRECORD':   'On-NewRecord' }
  
  
  
--- 344,360 ----
                    'POST-FOCUSOUT':  'Post-FocusOut',
                    'PRE-FOCUSIN':    'Pre-FocusIn',
                    'POST-FOCUSIN':   'Post-FocusIn',
                    'POST-QUERY':     'Post-Query',
                    'ON-SWITCH':      'On-Switch',
                    'PRE-CHANGE':     'Pre-Change',
                    'POST-CHANGE':    'Post-Change',
!                   'ON-NEWRECORD':   'On-NewRecord',
!                   'PRE-COMMIT':     'Pre-Commit',
!                   'PRE-INSERT':     'Pre-Insert',
!                   'PRE-UPDATE':     'Pre-Update',
!                   'PRE-DELETE':     'Pre-Delete',
!                   'PRE-MODIFY':     'Pre-Modify',
!                   'POST-COMMIT':    'Post-Commit'}
  
  
  
***************
*** 481,489 ****
    # for use by designer
    #
    def getDescription(self):
!     if self.type == 'NAMED': 
        return self.name
!     else: 
        return VALIDTRIGGERS[string.upper(self.type)]
  
    #
--- 485,493 ----
    # for use by designer
    #
    def getDescription(self):
!     if self.type == 'NAMED':
        return self.name
!     else:
        return VALIDTRIGGERS[string.upper(self.type)]
  
    #
***************
*** 493,514 ****
    # used in saving
    #
    def dumpXML(self, lookupDict, treeDump=None, gap=None,xmlnamespaces={}):
!     escape = not int(gConfig('StoreTriggersAsCDATA'))
      xmlEntity = "trigger"
      xmlString = "%s<%s" % (gap[:-2],xmlEntity)
  
!     indent = len(xmlString) 
      pos = indent
      for attribute in self.__dict__.keys():
!       
        # variables beginning with _ are never saved out to file
        # they are internal to the program
        if attribute[0] == "_":
          continue
!       
        val = self.__dict__[attribute]
        if lookupDict[xmlEntity].has_key('Attributes') and \
!          lookupDict[xmlEntity]['Attributes'].has_key(attribute): 
          if val != None and \
             (not 
lookupDict[xmlEntity]['Attributes'][attribute].has_key('Default') or \
              (lookupDict[xmlEntity]['Attributes'][attribute]['Default']) != 
(val)): 
--- 497,521 ----
    # used in saving
    #
    def dumpXML(self, lookupDict, treeDump=None, gap=None,xmlnamespaces={}):
!     try:
!       escape = not int(gConfig('StoreTriggersAsCDATA'))
!     except:
!       escape = 1
      xmlEntity = "trigger"
      xmlString = "%s<%s" % (gap[:-2],xmlEntity)
  
!     indent = len(xmlString)
      pos = indent
      for attribute in self.__dict__.keys():
! 
        # variables beginning with _ are never saved out to file
        # they are internal to the program
        if attribute[0] == "_":
          continue
! 
        val = self.__dict__[attribute]
        if lookupDict[xmlEntity].has_key('Attributes') and \
!          lookupDict[xmlEntity]['Attributes'].has_key(attribute):
          if val != None and \
             (not 
lookupDict[xmlEntity]['Attributes'][attribute].has_key('Default') or \
              (lookupDict[xmlEntity]['Attributes'][attribute]['Default']) != 
(val)):