[GRASS-SVN] r43931 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-10-15 07:50:58 -0700 (Fri, 15 Oct 2010)
New Revision: 43931

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
Log:
fix wxGUI: propagate option key_desc (#1192)
(merge r43929 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2010-10-15 14:49:29 UTC (rev 43930)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2010-10-15 14:50:58 UTC (rev 43931)
@@ -1145,8 +1145,12 @@
             else:
                 title_sizer = wx.BoxSizer(wx.HORIZONTAL)
                 title_txt = wx.StaticText(parent=which_panel)
+                if p['key_desc']:
+                    ltype = ','.join(p['key_desc'])
+                else:
+                    ltype = p['type']
                 rtitle_txt = wx.StaticText(parent=which_panel,
-                                           label = '(' + p['name'] + ', ' + p['type'] + ')')
+                                           label = '(' + p['name'] + '=' + ltype + ')')
                 title_sizer.Add(item=title_txt, proportion=1,
                                 flag=wx.LEFT | wx.TOP | wx.EXPAND, border=5)
                 title_sizer.Add(item=rtitle_txt, proportion=0,