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

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-02-28 07:59:58 -0500 (Sat, 28 Feb 2009)
New Revision: 36142

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
Log:
wxGUI: Collapse all except current (trac #441)
      (merge from trunk, r36140)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-02-28 12:58:41 UTC (rev 36141)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-02-28 12:59:58 UTC (rev 36142)
@@ -241,15 +241,18 @@
                                        subkey='selection')
                 collapse = True
 
-                if sel == 0: # collapse all expect PERMANENT and current
+                if sel == 0: # collapse all except PERMANENT and current
                     if dir in ('PERMANENT', curr_mapset):
                         collapse = False
-                elif sel == 1: # collapse all expect PERMANENT
+                elif sel == 1: # collapse all except PERMANENT
                     if dir == 'PERMANENT':
                         collapse = False
-                elif sel == 2: # collapse all
+                elif sel == 2: # collapse all except current
+                    if dir == curr_mapset:
+                        collapse = False
+                elif sel == 3: # collapse all
                     pass
-                elif sel == 3: # expand all
+                elif sel == 4: # expand all
                     collapse = False
                 
                 if collapse:

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2009-02-28 12:58:41 UTC (rev 36141)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2009-02-28 12:59:58 UTC (rev 36142)
@@ -499,10 +499,12 @@
                 self.internalSettings[group][key] = {}
 
         # self.internalSettings['general']["mapsetPath"]['value'] = self.GetMapsetPath()
-        self.internalSettings['general']['elementListExpand']['choices'] = (_("Collapse all except PERMANENT and current"),
-                                                                            _("Collapse all except PERMANENT"),
-                                                                            _("Collapse all"),
-                                                                            _("Expand all"))
+        self.internalSettings['general']['elementListExpand']['choices'] = \
+            (_("Collapse all except PERMANENT and current"),
+             _("Collapse all except PERMANENT"),
+             _("Collapse all except current"),
+             _("Collapse all"),
+             _("Expand all"))
         self.internalSettings['atm']['leftDbClick']['choices'] = (_('Edit selected record'),
                                                                   _('Display selected'))
         self.internalSettings['advanced']['settingsFile']['choices'] = ('home',