[GRASS-SVN] r35615 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-01-25 11:12:54 -0500 (Sun, 25 Jan 2009)
New Revision: 35615

Modified:
   grass/trunk/gui/wxpython/gui_modules/gselect.py
   grass/trunk/gui/wxpython/gui_modules/preferences.py
Log:
wxGUI: explain how to change icon set
       (merge from devbr6, r35614)


Modified: grass/trunk/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gselect.py	2009-01-25 16:10:59 UTC (rev 35614)
+++ grass/trunk/gui/wxpython/gui_modules/gselect.py	2009-01-25 16:12:54 UTC (rev 35615)
@@ -22,7 +22,6 @@
 
 import os
 import sys
-import platform
 
 import wx
 import wx.combo
@@ -214,10 +213,10 @@
                 mapsets[i] = mapsets[0]
                 mapsets[0] = curr_mapset
         
-	if platform.system() == 'Windows':
-            filesdict = grass.list_grouped(elementdict[element])
-	else:
+        if 'g.mlist' in globalvar.grassCmd['all']:
             filesdict = grass.mlist_grouped(elementdict[element])
+        else:
+            filesdict = grass.list_grouped(elementdict[element])
         
         for dir in mapsets:
             dir_node = self.AddItem('Mapset: '+dir)

Modified: grass/trunk/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/preferences.py	2009-01-25 16:10:59 UTC (rev 35614)
+++ grass/trunk/gui/wxpython/gui_modules/preferences.py	2009-01-25 16:12:54 UTC (rev 35615)
@@ -1433,16 +1433,12 @@
                       pos=(row, 1))
         
         row += 1
-        iconNote = wordwrap(_("Note: Requires GUI restart."),
-                            self.GetSize()[0]-50, wx.ClientDC(self))
-
         gridSizer.Add(item=wx.StaticText(parent=panel, id=wx.ID_ANY,
-                                         label=iconNote),
-                      flag=wx.ALIGN_LEFT |
-                      wx.ALIGN_CENTER_VERTICAL,
+                                         label=_("Note: To change icon theme, "
+                                                 "you must save settings and restart the GUI.")),
+                      flag=wx.ALIGN_CENTER_VERTICAL,
                       pos=(row, 0), span=(1, 2))
-        row += 1
-        
+                      
         sizer.Add(item=gridSizer, proportion=1, flag=wx.ALL | wx.EXPAND, border=5)
         border.Add(item=sizer, proportion=1, flag=wx.ALL | wx.EXPAND, border=3)