[gnue] r8478 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2006-05-22 07:08:39 -0500 (Mon, 22 May 2006)
New Revision: 8478

Modified:
   trunk/gnue-forms/src/GFParser.py
Log:
Enabled new usercode elements in forms.


Modified: trunk/gnue-forms/src/GFParser.py
===================================================================
--- trunk/gnue-forms/src/GFParser.py    2006-05-22 12:05:24 UTC (rev 8477)
+++ trunk/gnue-forms/src/GFParser.py    2006-05-22 12:08:39 UTC (rev 8478)
@@ -32,7 +32,7 @@
 from gnue.common.datasources import GDataSource
 from gnue.common.definitions import GParser
 from gnue.common.formatting import GTypecast
-from gnue.common.logic import GTrigger
+from gnue.common.logic import usercode, GTrigger
 from gnue.common import GMenu
 
 import copy, types
@@ -996,6 +996,13 @@
 
     xmlElements.update( datasourceElems )
 
+    # Add usercode elements
+    xmlElements.update(usercode.get_xml_elements(
+        updates = {
+            'action': {'ParentTags': ('form')},
+            'menu': {'ParentTags': ('form')},
+            'toolbar': {'ParentTags': ('form')}}))
+    
     #
     # Add trigger elements
     #
@@ -1005,16 +1012,6 @@
                    'ParentTags': ('form')},
                 }))
 
-    #
-    # Add menu elements
-    #
-    xmlElements.update(
-        GMenu.getXMLelements(
-                updates={'menu': {
-                   ##'BaseClass': GFObjects.GFMenu,
-                   'ParentTags': ('form',) },
-                 }))
-
     xmlElements = GParser.buildImportableTags ('form', xmlElements)
   return xmlElements