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

[jamest]

Author: jamest
Date: 2005-10-27 15:40:32 -0500 (Thu, 27 Oct 2005)
New Revision: 8084

Modified:
   trunk/gnue-forms/src/GFClient.py
   trunk/gnue-forms/src/GFInstance.py
Log:
fix parameter dict setup when no parameters are given on command line


Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py    2005-10-27 16:10:11 UTC (rev 8083)
+++ trunk/gnue-forms/src/GFClient.py    2005-10-27 20:40:32 UTC (rev 8084)
@@ -32,6 +32,7 @@
 from gnue.common.apps import GConfig
 from gnue.common.apps.GClientApp import GClientApp, StartupError
 from gnue.common.utils.FileUtils import dyn_import
+from gnue.common.utils import CaselessDict
 
 from gnue.forms import VERSION
 from gnue.forms.GFInstance import GFInstance
@@ -154,8 +155,11 @@
     #
     assert gDebug (4, "Parsing command line parameters")
 
-    userParameters = self.getCommandLineParameters (self.ARGUMENTS [1:])
+    userParameters = CaselessDict.CaselessDict ()    
+    for (k, v) in  (self.getCommandLineParameters (self.ARGUMENTS 
[1:])).items():
+      userParameters [k] = v
 
+    
 
     # Create the instance that will control the loaded form(s)
     assert gDebug (4, "Creating GFInstance object")

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2005-10-27 16:10:11 UTC (rev 8083)
+++ trunk/gnue-forms/src/GFInstance.py  2005-10-27 20:40:32 UTC (rev 8084)
@@ -73,7 +73,7 @@
   # ---------------------------------------------------------------------------
 
   def __init__ (self, manager, connections, ui, disableSplash = False,
-      parameters = {}, parentContainer = None, moduleName = None):
+      parameters = None, parentContainer = None, moduleName = None):
     # moduleName is here only for Designer to be able to pass it in
     #when debugging a form.
     
@@ -137,8 +137,13 @@
                                          #   created this GFInstance
     self._uimodule = ui                  # The UI created in the GBaseApp
     self._disableSplash = disableSplash  # Disable splashscreen
-    self._parameters = parameters        # The parameters passed to the
-                                         # GBaseApp instance
+    
+    # The parameters passed to the GBaseApp instance
+    if parameters is None:           
+       self._parameters = CaselessDict.CaselessDict ()
+    else:                                              
+      self._parameters = parameters        
+                                           
     self._formsDictionary = {}           # A dictionary containing all the
                                          # forms loaded from a file
 
@@ -338,17 +343,18 @@
   # Activate a given form
   # ---------------------------------------------------------------------------
 
-  def activateForm (self, formName = '__main__', parameters = {}, modal = 0):
+  def activateForm (self, formName = '__main__', parameters = None, modal = 0):
 
     assert gEnter (4)
 
     form = self._formsDictionary [formName]
 
-    if parameters:
-      form._parameters = CaselessDict.CaselessDict ()
-      for (k, v) in parameters.items ():
-        form._parameters [k] = v
+#     if parameters:
+#       form._parameters = CaselessDict.CaselessDict ()
+#       for (k, v) in parameters.items ():
+#         form._parameters [k] = v
 
+        
     if not form._currentEntry:
       raise errors.ApplicationError, \
          u_("There are no navigable widgets in this form. Unable to display.")