[GRASS-SVN] r32437 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-31 17:40:50 -0400 (Thu, 31 Jul 2008)
New Revision: 32437

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: flag->label fix, trac #241 (merge from trunk r32436)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2008-07-31 21:39:46 UTC (rev 32436)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2008-07-31 21:40:50 UTC (rev 32437)
@@ -290,7 +290,8 @@
             self.task.name = attrs.get('name', None)
 
         if name == 'parameter':
-            self.inParameter = True;
+            self.inParameter = True
+            self.label = '' # tmp variable
             self.param_label = ''
             self.param_description = ''
             self.param_default = ''
@@ -309,7 +310,9 @@
             self.param_multiple = attrs.get('multiple', None)
 
         if name == 'flag':
-            self.inFlag = True;
+            self.inFlag = True
+            self.label = '' # tmp variable
+            self.flag_label = ''
             self.flag_description = ''
             self.flag_default = ''
             self.flag_guisection = ''
@@ -421,12 +424,15 @@
             self.inFlag = False;
             self.task.flags.append({
                 "name" : self.flag_name,
+                "label" : self.flag_label,
                 "description" : self.flag_description,
                 "guisection" : self.flag_guisection } )
 
         if name == 'label':
             if self.inParameter:
                 self.param_label = normalize_whitespace(self.label)
+            elif self.inFlag:
+                self.flag_label = normalize_whitespace(self.label)
             else:
                 self.task.label = normalize_whitespace(self.label)