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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-11-16 01:15:30 -0800 (Tue, 16 Nov 2010)
New Revision: 44345

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/utils.py
Log:
wxGUI: show all mapsets in MapsetSelect
(merge r44344 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2010-11-16 09:13:46 UTC (rev 44344)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2010-11-16 09:15:30 UTC (rev 44345)
@@ -780,7 +780,7 @@
             self.location = location
         
         if setItems:
-            self.SetItems(utils.GetListOfMapsets(self.gisdbase, self.location, selectable = True)) # selectable
+            self.SetItems(utils.GetListOfMapsets(self.gisdbase, self.location, selectable = False)) # selectable
 
     def UpdateItems(self, location, dbase = None):
         """!Update list of mapsets for given location
@@ -792,7 +792,7 @@
             self.gisdbase = dbase
         self.location = location
         if location:
-            self.SetItems(utils.GetListOfMapsets(self.gisdbase, self.location, selectable = True))
+            self.SetItems(utils.GetListOfMapsets(self.gisdbase, self.location, selectable = False))
         else:
             self.SetItems([])
         

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/utils.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/utils.py	2010-11-16 09:13:46 UTC (rev 44344)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/utils.py	2010-11-16 09:15:30 UTC (rev 44345)
@@ -627,11 +627,9 @@
     else:
         for mapset in glob.glob(os.path.join(dbase, location, "*")):
             if os.path.isdir(mapset) and \
-                    os.path.isfile(os.path.join(dbase, location, mapset, "WIND")) and \
-                    os.path.basename(mapset) != 'PERMANENT':
+                    os.path.isfile(os.path.join(dbase, location, mapset, "WIND")):
                 listOfMapsets.append(EncodeString(os.path.basename(mapset)))
-        listOfMapsets.insert(0, 'PERMANENT')
-
+    
     ListSortLower(listOfMapsets)    
     return listOfMapsets