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

[reinhard]

Author: reinhard
Date: 2006-02-20 15:37:41 -0600 (Mon, 20 Feb 2006)
New Revision: 8168

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/GFParser.py
Log:
Every form has its own parameter set. Main form gets parameters from command
line, and dialogs get parameters from runDialog call.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-02-20 19:12:41 UTC (rev 8167)
+++ trunk/gnue-forms/src/GFForm.py      2006-02-20 21:37:41 UTC (rev 8168)
@@ -1400,15 +1400,11 @@
     @param modal: whether the dialog should be modal or not
     @return: None
     """
-    userParameters = CaselessDict.CaselessDict ()
-    for (k, v) in  parameters.items ():
-      userParameters [k] = v
-
     # Keep this to allow calling of about-box from trigger namespace
     if dialogName == '_about':
       self._instance._uiinstance.showAbout (**parameters)
     else:
-      self._instance.activateForm (dialogName, userParameters, modal)
+      self._instance.activateForm (dialogName, parameters, modal)
 
 
   #---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-02-20 19:12:41 UTC (rev 8167)
+++ trunk/gnue-forms/src/GFInstance.py  2006-02-20 21:37:41 UTC (rev 8168)
@@ -353,6 +353,8 @@
       raise errors.ApplicationError, \
          u_("There are no navigable widgets in this form. Unable to display.")
 
+    form._parameters = parameters
+
     assert gDebug (4, "Processing activation trigger")
     form.processTrigger ('On-Activation')
 
@@ -367,7 +369,6 @@
     assert gDebug (4, "Activating form")    
     self._uiinstance.activateForm (formName, modal)
 
-    #print "Form ", parameters
     assert gLeave (4)
 
 

Modified: trunk/gnue-forms/src/GFParser.py
===================================================================
--- trunk/gnue-forms/src/GFParser.py    2006-02-20 19:12:41 UTC (rev 8167)
+++ trunk/gnue-forms/src/GFParser.py    2006-02-20 21:37:41 UTC (rev 8168)
@@ -64,7 +64,6 @@
   """
   return GParser.loadXMLObject (buffer, xmlFormsHandler, 'GFForm', 'form',
            initialize, attributes={"_instance": instance,
-                               "_parameters": instance._parameters,
                                "_connections": instance.connections },
            url = url)