gnue/gnuef/src GFParser.py GFObjects/GFObj.py G...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/07/03 17:54:41

Modified files:
        gnuef/src      : GFParser.py 
        gnuef/src/GFObjects: GFObj.py GFOption.py 

Log message:
        Made changes so options will be easier to edit in Designer

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFObj.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFOption.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFObjects/GFObj.py
diff -u gnue/gnuef/src/GFObjects/GFObj.py:1.1 
gnue/gnuef/src/GFObjects/GFObj.py:1.2
--- gnue/gnuef/src/GFObjects/GFObj.py:1.1       Fri Jun 29 15:55:58 2001
+++ gnue/gnuef/src/GFObjects/GFObj.py   Tue Jul  3 17:54:41 2001
@@ -68,7 +68,7 @@
         for o in child._children: 
           if o._type == "GFOption": 
             if o.name == name:
-              option = o.getChildrenAsContent()
+              option = o.value
     return option
            
 
Index: gnue/gnuef/src/GFObjects/GFOption.py
diff -u gnue/gnuef/src/GFObjects/GFOption.py:1.1 
gnue/gnuef/src/GFObjects/GFOption.py:1.2
--- gnue/gnuef/src/GFObjects/GFOption.py:1.1    Fri Jun 29 15:55:58 2001
+++ gnue/gnuef/src/GFObjects/GFOption.py        Tue Jul  3 17:54:41 2001
@@ -51,13 +51,13 @@
     GObj.__init__(self, parent)
     self._type = "GFOption"
     self.name = name
-    self._value = ""
-    if value != None:
-      from gnue.common.GParser import GContent
-      self._value = value
-      GContent(self, value)
+    self.value = value
 
-
+  def buildObject(self): 
+    if self.value == None: 
+      self.value = self.getChildrenAsContent()
+      self._children = [] 
+      
 
 
 
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.43 gnue/gnuef/src/GFParser.py:1.44
--- gnue/gnuef/src/GFParser.py:1.43     Mon Jul  2 17:35:35 2001
+++ gnue/gnuef/src/GFParser.py  Tue Jul  3 17:54:41 2001
@@ -366,7 +366,9 @@
          'Attributes': { 
             'name': {
                'Required': 1, 
-               'Typecast': char } },
+               'Typecast': char },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'ParentTags':  ('options',) },
 
@@ -375,7 +377,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'title' } },
+               'Default':  'title' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  ('options',) },
@@ -385,7 +389,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'name' } },
+               'Default':  'name' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  ('options',) },
@@ -395,7 +401,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'height' } },
+               'Default':  'height' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  None },
@@ -405,7 +413,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'width' } },
+               'Default':  'width' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  ('options',) },
@@ -415,7 +425,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'author' } },
+               'Default':  'author' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  ('options',) },
@@ -425,7 +437,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'description' } },
+               'Default':  'description' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  ('options',) },
@@ -435,7 +449,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'version' } },
+               'Default':  'version' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  ('options',) },
@@ -445,7 +461,9 @@
          'Attributes': { 
             'name': {
                'Typecast': char, 
-               'Default':  'tip' } },
+               'Default':  'tip' },
+            'value': {
+               'Typecast': char } }, 
          'MixedContent':   1, 
          'SingleInstance': 1, 
          'ParentTags':  ('options',) },