r6559 - trunk/gnue-reports/src/client

[johannes]

Author: johannes
Date: 2004-10-25 04:50:45 -0500 (Mon, 25 Oct 2004)
New Revision: 6559

Modified:
   trunk/gnue-reports/src/client/GRRunUI.py
Log:
Other way to fetch filters, and only OK submitts params


Modified: trunk/gnue-reports/src/client/GRRunUI.py
===================================================================
--- trunk/gnue-reports/src/client/GRRunUI.py    2004-10-25 09:23:45 UTC (rev 
6558)
+++ trunk/gnue-reports/src/client/GRRunUI.py    2004-10-25 09:50:45 UTC (rev 
6559)
@@ -92,7 +92,7 @@
       self.userParameters ['filter']          = self.filter
       self.userParameters ['destination']     = self.destination
       self.userParameters ['destinationtype'] = self.destinationType
-      self.userParameters ['canceled']        = False
+      self.userParameters ['ok']              = False
 
       # Create the form's code on the fly and put it into an instance
       formBuffer = self.__buildForm ()
@@ -104,7 +104,7 @@
 
       # Now iterate through the parameters dictionary and fetch our 'private'
       # values, also remove them from userParameters
-      if self.userParameters ['canceled']:
+      if not self.userParameters ['ok']:
         raise errors.UserError, u_("Report canceled")
 
       self.filter          = self.userParameters ['filter']
@@ -114,7 +114,7 @@
       del self.userParameters ['filter']
       del self.userParameters ['destination']
       del self.userParameters ['destinationtype']
-      del self.userParameters ['canceled']
+      del self.userParameters ['ok']
 
 
   # ---------------------------------------------------------------------------
@@ -355,9 +355,13 @@
     """
 
     filters = [('raw', u_("Raw XML"))]
-    for item in self.reportInfo.getFilters ():
-      filters.append ((item [1]['formatter'], item [1]['description']))
+    if self.reportInfo.getNamespace ():
+      for (key, item) in self.reportInfo.getFilters ():
+        name  = key.split (':') [-1]
+        descr = item.get ('description', u_("%s output filter") % name)
 
+        filters.append ((name, descr))
+
     rows = []
     for (key, descr) in filters:
       rows.extend (self.__getStaticSetRow (key, descr))
@@ -443,8 +447,6 @@
 
       onActivate.append ("blkInput.%s.set (getParameter ('%s'))" \
                           % (item ['name'], item ['name']))
-      onActivate.append ('print "%s:", getParameter ("%s")' \
-          % (item ['name'], item ['name']))
 
       onExit.append ("setParameter ('%s', blkInput.%s.get ())" \
                      % (item ['name'], item ['name']))
@@ -452,6 +454,12 @@
     
     result = []
 
+    onStartup = ["form.setFeature ('GUI:MENUBAR:SUPPRESS', 1)",
+                 "form.setFeature ('GUI:TOOLBAR:SUPPRESS', 1)",
+                 "form.setFeature ('GUI:STATUSBAR:SUPPRESS', 1)"]
+
+    result.extend (self._getXMLTag ('trigger', {'type': 'ON-STARTUP',
+                                                'contents': onStartup}, "  "))
     if len (onActivate):
       result.extend (self._getXMLTag ('trigger', {'type': 'ON-ACTIVATION',
                                                 'contents': onActivate}, "  "))
@@ -461,11 +469,11 @@
 
     # Button-Triggers
     result.extend (self._getXMLTag ('trigger', {'type': 'NAMED',
-      'name': 'trgOk', 'contents': ["close ()"]}, "  "))
+      'name': 'trgOk',
+      'contents': ["setParameter ('ok', True)", "close ()"]}, "  "))
 
     result.extend (self._getXMLTag ('trigger', {'type': 'NAMED',
-      'name': 'trgCancel',
-      'contents': ["setParameter ('canceled', True)", "close ()"]}, "  "))
+      'name': 'trgCancel', 'contents': ["close ()"]}, "  "))
 
     return result