gnue designer/src/base/Incubator.py designer/sr...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   02/12/22 10:15:31

Modified files:
        designer/src/base: Incubator.py 
        designer/src/reports: Incubator.py 
        designer/src/reports/Standard: Incubator.py 
        reports        : setup.py 
        reports/src    : GRLayout.py 

Log message:
        Let designer's report wizards work again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Incubator.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Incubator.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Standard/Incubator.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/setup.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRLayout.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Incubator.py
diff -c gnue/designer/src/base/Incubator.py:1.15 
gnue/designer/src/base/Incubator.py:1.16
*** gnue/designer/src/base/Incubator.py:1.15    Fri Dec 20 23:52:31 2002
--- gnue/designer/src/base/Incubator.py Sun Dec 22 10:15:31 2002
***************
*** 30,36 ****
  from gnue.common import GDebug, GParserHelpers
  
  class BaseIncubator:
!   elements = []
  
    ##
    ##  Reparent an object
--- 30,36 ----
  from gnue.common import GDebug, GParserHelpers
  
  class BaseIncubator:
!   elements = {}
  
    ##
    ##  Reparent an object
Index: gnue/designer/src/reports/Incubator.py
diff -c gnue/designer/src/reports/Incubator.py:1.6 
gnue/designer/src/reports/Incubator.py:1.7
*** gnue/designer/src/reports/Incubator.py:1.6  Fri Dec 20 23:52:32 2002
--- gnue/designer/src/reports/Incubator.py      Sun Dec 22 10:15:31 2002
***************
*** 37,43 ****
  
    def createObject(self, rootObject, tag, parent, attributes={}, select=1):
      # Handle GRPassThru
!     if tag.find(':'):
        o = self._handlePassThru(rootObject, tag, parent, attributes, select)
        if o:
          self.instance.dispatchEvent('ObjectCreated',object=o, 
originator=__name__)
--- 37,43 ----
  
    def createObject(self, rootObject, tag, parent, attributes={}, select=1):
      # Handle GRPassThru
!     if tag.find(':')+1:
        o = self._handlePassThru(rootObject, tag, parent, attributes, select)
        if o:
          self.instance.dispatchEvent('ObjectCreated',object=o, 
originator=__name__)
***************
*** 45,56 ****
            self.instance.dispatchEvent('ObjectSelected',object=object, 
originator=__name__)
        return o
      else:
!       return BaseIncubator(self, rootObject, tag, parent, attributes, select)
  
  
    def _handlePassThru(self, rootObject, tag, parent,
             attributes={}, select=1):
!     name = tag[tag.find(':')+1:]
      objclass = GRLayout.GRPassThru
      o = objclass(parent)
  
--- 45,62 ----
            self.instance.dispatchEvent('ObjectSelected',object=object, 
originator=__name__)
        return o
      else:
!       return BaseIncubator.createObject(self, rootObject, tag, parent, 
attributes, select)
  
  
    def _handlePassThru(self, rootObject, tag, parent,
             attributes={}, select=1):
!     # handle <out:region name="primary"> when
!     # xmlns:out="GNUe:Reports:Labels"
!     try:
!       name = attributes['name']
!     except KeyError:
!       name = tag[tag.find(':')+1:]
! 
      objclass = GRLayout.GRPassThru
      o = objclass(parent)
  
***************
*** 66,71 ****
      o._xmlnamespace = 
rootObject.findChildOfType('GRLayout')._xmlchildnamespace
  
      o.name = name
!     instance.nameMappings[o.name] = o
      o._buildObject()
      return o
--- 72,77 ----
      o._xmlnamespace = 
rootObject.findChildOfType('GRLayout')._xmlchildnamespace
  
      o.name = name
!     self.instance.nameMappings[o.name] = o
      o._buildObject()
      return o
Index: gnue/designer/src/reports/Standard/Incubator.py
diff -c gnue/designer/src/reports/Standard/Incubator.py:1.1 
gnue/designer/src/reports/Standard/Incubator.py:1.2
*** gnue/designer/src/reports/Standard/Incubator.py:1.1 Sat Dec 21 01:30:28 2002
--- gnue/designer/src/reports/Standard/Incubator.py     Sun Dec 22 10:15:31 2002
***************
*** 29,36 ****
  
  from gnue.common import GDebug, GParserHelpers
  from gnue.reports import GRParser, GRReport, GRLayout
! from gnue.designer.reports.Incubator import BaseIncubator
  
! class Incubator(BaseIncubator):
    pass
    
--- 29,36 ----
  
  from gnue.common import GDebug, GParserHelpers
  from gnue.reports import GRParser, GRReport, GRLayout
! from gnue.designer.reports.Incubator import Incubator as BaseReportIncubator
  
! class Incubator(BaseReportIncubator):
    pass
    
Index: gnue/reports/setup.py
diff -c gnue/reports/setup.py:1.21 gnue/reports/setup.py:1.22
*** gnue/reports/setup.py:1.21  Sat Dec 21 17:41:09 2002
--- gnue/reports/setup.py       Sun Dec 22 10:15:31 2002
***************
*** 234,240 ****
                        ('man/man1', manfiles),
                        ('shared/filters/Labels', 
['src/adpaters/filters/Labels/etc/label-specs.dat']),
                        ('shared/filters/SimpleTabulation', [
!                                       
'src/adpaters/filters/SimpleTabulation/etc/SimpleTabulation/csv.xsl',
                                        
'src/adpaters/filters/SimpleTabulation/etc/html.xsl',
                                        
'src/adpaters/filters/SimpleTabulation/etc/text.xsl']
                         ) ],
--- 234,240 ----
                        ('man/man1', manfiles),
                        ('shared/filters/Labels', 
['src/adpaters/filters/Labels/etc/label-specs.dat']),
                        ('shared/filters/SimpleTabulation', [
!                                       
'src/adpaters/filters/SimpleTabulation/etc/csv.xsl',
                                        
'src/adpaters/filters/SimpleTabulation/etc/html.xsl',
                                        
'src/adpaters/filters/SimpleTabulation/etc/text.xsl']
                         ) ],
Index: gnue/reports/src/GRLayout.py
diff -c gnue/reports/src/GRLayout.py:1.48 gnue/reports/src/GRLayout.py:1.49
*** gnue/reports/src/GRLayout.py:1.48   Fri Dec 20 11:22:04 2002
--- gnue/reports/src/GRLayout.py        Sun Dec 22 10:15:31 2002
***************
*** 61,67 ****
    def __init__(self, parent):
      GObj.__init__(self, parent, type='GRLayout')
      self._inits = (self.initialize,)
!     self.suppressGNUeXML = 0
  
    def initialize(self):
      # Find the xml namespace in use by any child passthru objects
--- 61,67 ----
    def __init__(self, parent):
      GObj.__init__(self, parent, type='GRLayout')
      self._inits = (self.initialize,)
!     self.suppressGNUeTags = 0
  
    def initialize(self):
      # Find the xml namespace in use by any child passthru objects