gnue/gnuef/src GFParser.py GFTrigger.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/27 19:20:18

Modified files:
        gnuef/src      : GFParser.py GFTrigger.py 

Log message:
        Fixed problem w/dumpXML preventing forms from being saved in designer

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.39 gnue/gnuef/src/GFParser.py:1.40
--- gnue/gnuef/src/GFParser.py:1.39     Tue Jun 26 21:26:22 2001
+++ gnue/gnuef/src/GFParser.py  Wed Jun 27 19:20:18 2001
@@ -95,6 +95,11 @@
                'Default':  0 },
             'tabbed': {
                'Typecast': char, 
+               'ValueSet': { 
+                  'left': {}, 
+                  'right': {}, 
+                  'bottom': {}, 
+                  'top': {} }, 
                'Default':  "" } },
          'ParentTags':  None },
 
@@ -164,7 +169,7 @@
                'Default':  1}, 
             'rowSpacer': {
                'Typecast': int },
-        'transparentBlock':{
+            'transparentBlock':{
                'Typecast': bool, 
                'Default':  0 },
             'datasource': {
@@ -182,6 +187,10 @@
                'Typecast': char }, 
             'alignment': {
                'Typecast': char, 
+               'ValueSet': { 
+                  'left': {}, 
+                  'right': {}, 
+                  'center': {} }, 
                'Default':  "left"}, 
             'width': {
                'Typecast': int }, 
@@ -205,13 +214,16 @@
             'field': {
                'Typecast': char }, 
             'height': {
-               'Typecast': int }, 
+               'Typecast': int, 
+               'Default': 1 }, 
             'width': {
                'Typecast': int }, 
             'max_length': {
                'Typecast': int }, 
             'visibleCount':{
-               'Typecast': int }, 
+               'Typecast': int, 
+               'Deprecatetd': 1, 
+               'Default': 1 }, 
             'readonly': {
                'Typecast': bool, 
                'Default':  0   }, 
@@ -231,6 +243,10 @@
                'Typecast': char }, 
             'style': {
                'Typecast': char, 
+               'ValueSet': { 
+                  'default': {}, 
+                  'dropdown': {}, 
+                  'checkbox': {} }, 
                'Default': 'default'}, 
             'value': {
                'Typecast': char }, 
@@ -476,4 +492,5 @@
     GParser.xmlHandler.__init__(self) 
 
     self.xmlElements = getXMLelements()
+
 
Index: gnue/gnuef/src/GFTrigger.py
diff -u gnue/gnuef/src/GFTrigger.py:1.35 gnue/gnuef/src/GFTrigger.py:1.36
--- gnue/gnuef/src/GFTrigger.py:1.35    Tue Jun 26 20:17:58 2001
+++ gnue/gnuef/src/GFTrigger.py Wed Jun 27 19:20:18 2001
@@ -199,11 +199,13 @@
       if attribute[0] == "_":
         continue
       val = self.__dict__[attribute]
+      print lookupDict[xmlEntity]
       if lookupDict[xmlEntity].has_key('Attributes') and \
          lookupDict[xmlEntity]['Attributes'].has_key(attribute): 
-        if lookupDict[xmlEntity]['Attributes'][attribute].has_key('Default') 
and \
-           ('%s'%lookupDict[xmlEntity]['Attributes'][attribute]['Default']) != 
('%s'%val): 
-          if lookupDict[xmlEntity][1][attribute][2] == bool \
+        if val != None and \
+           (not 
lookupDict[xmlEntity]['Attributes'][attribute].has_key('Default') or \
+            (lookupDict[xmlEntity]['Attributes'][attribute]['Default']) != 
(val)): 
+          if lookupDict[xmlEntity]['Attributes'][attribute]['Typecast'] == 
bool \
              and val == 1:
             xmlString = xmlString + ' %s=""' % (attribute)
           else: 
@@ -219,11 +221,11 @@
         xmlString = xmlString + ">\n"
        
       if treeDump:
-        if hasContent and escape: 
+        if hasContent and not escape: 
           xmlString = xmlString + "<![CDATA["
         for child in self._children:
           xmlString = xmlString + child.dumpXML(lookupDict, 1,gap+"  
",escape=escape)
-        if hasContent and escape: 
+        if hasContent and not escape: 
           xmlString = xmlString + "]]!>"
 
       if hasContent: