[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r8065 - trunk/gnue-forms/src
From: |
johannes |
Subject: |
[gnue] r8065 - trunk/gnue-forms/src |
Date: |
Tue, 18 Oct 2005 04:44:36 -0500 (CDT) |
Author: johannes
Date: 2005-10-18 04:44:35 -0500 (Tue, 18 Oct 2005)
New Revision: 8065
Modified:
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
Log:
Don't ignore parameters given on command line, fixed handling of case for
parameters passed to activateDialog ()
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2005-10-17 14:44:48 UTC (rev 8064)
+++ trunk/gnue-forms/src/GFForm.py 2005-10-18 09:44:35 UTC (rev 8065)
@@ -234,16 +234,20 @@
@param parameter: case-insensitive name of parameter
@return: parameter value or None
"""
- param = string.lower(parameter)
try:
- return self._parameters[param]
+ # _parameters is a CaselessDict, so the case of parameter doesn't matter
+ return self._parameters [parameter]
+
except KeyError:
rv = None
+ pn = parameter.lower ()
+
for child in self._children:
- if isinstance(child, GFParameter) and child._name == param:
+ if isinstance (child, GFParameter) and child._name == pn:
rv = child.default
- self._parameters[param] = rv
+ self._parameters [pn] = rv
break
+
return rv
@@ -1382,7 +1386,7 @@
# Launch a standard or custom dialog
# Values can be passed back and forth thru the parameters dictionary
#---------------------------------------------------------------------------
- def triggerActivateDialog(self, dialogName, parameters={}, modal=0):
+ def triggerActivateDialog (self, dialogName, parameters={}, modal=0):
"""
Launches a standard or a custom dialog.
@param dialogName: name of the dialog to be displayed
@@ -1394,8 +1398,8 @@
if dialogName == '_about':
self._instance._uiinstance.showAbout (**parameters)
- else:
- self._instance.activateForm(dialogName, parameters, modal)
+ else:
+ self._instance.activateForm (dialogName, parameters, modal)
#---------------------------------------------------------------------------
@@ -1480,10 +1484,11 @@
@param parameter: the (case-insensitive) name of the parameter to be set
@value: new value for parameter
"""
- param = string.lower(parameter)
- self._parameters[param] = value
+ # _parameters is a CaselessDict, so case of parameter doesn't matter
+ self._parameters [parameter] = value
+
#---------------------------------------------------------------------------
# Runs another trigger.
#---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2005-10-17 14:44:48 UTC (rev 8064)
+++ trunk/gnue-forms/src/GFInstance.py 2005-10-18 09:44:35 UTC (rev 8065)
@@ -46,6 +46,7 @@
from gnue.common import events
from gnue.common.utils.FileUtils import dyn_import
from gnue.common.utils.FileUtils import openResource, openBuffer
+from gnue.common.utils import CaselessDict
from gnue.common.logic.language import AbortRequest
from gnue.common.apps.GClientApp import *
@@ -319,11 +320,11 @@
# stops here until the dialog get's closed. So do *not* enter another
# main loop
assert gDebug (4, "Activating main form as dialog")
- self.activateForm ('__main__', modal = True)
+ self.activateForm ('__main__', self._parameters, modal = True)
else:
assert gDebug (4, "Activating main form")
- self.activateForm ('__main__')
+ self.activateForm ('__main__', self._parameters)
assert gDebug (4, "Startup complete")
assert gDebug (4, "Entering main loop")
@@ -343,8 +344,10 @@
form = self._formsDictionary [formName]
- if len (parameters.keys ()):
- form._parameters = parameters
+ if parameters:
+ form._parameters = CaselessDict.CaselessDict ()
+ for (k, v) in parameters.items ():
+ form._parameters [k] = v
if not form._currentEntry:
raise errors.ApplicationError, \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r8065 - trunk/gnue-forms/src,
johannes <=