gnue common/src/GTrigger.py forms/src/GFTrigger.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/28 00:26:10

Modified files:
        common/src     : GTrigger.py 
        forms/src      : GFTrigger.py 

Log message:
        removed more redundant code from GTrigger/GFTrigger to get designer to 
recognize recent changes to GFTrigger's ValidTriggers list

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GTrigger.py.diff?cvsroot=OldCVS&tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.59&tr2=1.60&r1=text&r2=text

Patches:
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.19 gnue/common/src/GTrigger.py:1.20
*** gnue/common/src/GTrigger.py:1.19    Tue Sep 24 00:35:49 2002
--- gnue/common/src/GTrigger.py Sat Sep 28 00:26:10 2002
***************
*** 365,377 ****
  # Class used to implement triggers
  #
  class GTrigger(GObj):
!   def __init__(self, parent=None, type=None, name=None, src=None, text=None, 
language='python'):
      GObj.__init__(self, parent, 'GTrigger')
  
      self._text=''
      self._triggerns={}
      self._inits   = [None,self.initialize]
  
      self.language=language
      self.src = src
      self.type = type and string.upper(type) or None
--- 365,380 ----
  # Class used to implement triggers
  #
  class GTrigger(GObj):
!   def __init__(self, parent=None, type=None, name=None, src=None, text=None, 
language='python', validtriggers=VALIDTRIGGERS):
      GObj.__init__(self, parent, 'GTrigger')
  
      self._text=''
      self._triggerns={}
      self._inits   = [None,self.initialize]
  
+     # Hack!
+     self.__validtriggers = validtriggers
+ 
      self.language=language
      self.src = src
      self.type = type and string.upper(type) or None
***************
*** 486,492 ****
      if self.type == 'NAMED':
        return self.name
      else:
!       return VALIDTRIGGERS[string.upper(self.type)]
  
    #
    # dumpXML
--- 489,495 ----
      if self.type == 'NAMED':
        return self.name
      else:
!       return self.__validtriggers[string.upper(self.type)]
  
    #
    # dumpXML
Index: gnue/forms/src/GFTrigger.py
diff -c gnue/forms/src/GFTrigger.py:1.59 gnue/forms/src/GFTrigger.py:1.60
*** gnue/forms/src/GFTrigger.py:1.59    Wed Sep 25 16:35:30 2002
--- gnue/forms/src/GFTrigger.py Sat Sep 28 00:26:10 2002
***************
*** 92,112 ****
  #
  class GFTrigger(GTrigger):
  
!   def __init__(self, parent=None, type=None, name=None, src=None, text=None, 
language='python'):
!     GObj.__init__(self, parent)
      self._type = "GFTrigger"
  
!     self._text=''
!     self.language=language
!     self._triggerns={}
!     self.src = src
!     self.type = type
!     self.name = name
!     self._inits   = [None,self.initialize]
!     if text != None:
!       GContent(self, text)
!     if self.type != None:
!       self._buildObject()
        
    def initialize(self): 
      self._root = self.findParentOfType('GFForm')
--- 92,113 ----
  #
  class GFTrigger(GTrigger):
  
!   def __init__(self, *args, **params):
!     params['validtriggers'] = VALIDTRIGGERS
!     GTrigger.__init__(self, *args, **params)
      self._type = "GFTrigger"
  
! ##    self._text=''
! ##    self.language=language
! ##    self._triggerns={}
! ##    self.src = src
! ##    self.type = type
! ##    self.name = name
! ##    self._inits   = [None,self.initialize]
! ##    if text != None:
! ##      GContent(self, text)
! ##    if self.type != None:
! ##      self._buildObject()
        
    def initialize(self): 
      self._root = self.findParentOfType('GFForm')