[GRASS-SVN] r46700 - in grass/branches/develbranch_6/general: g.mlist manage/cmd

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-06-14 02:17:46 -0700 (Tue, 14 Jun 2011)
New Revision: 46700

Modified:
   grass/branches/develbranch_6/general/g.mlist/main.c
   grass/branches/develbranch_6/general/manage/cmd/list.c
Log:
g.mlist: more guisections, sync desc with g.list
	 (merge r46699 from trunk)


Modified: grass/branches/develbranch_6/general/g.mlist/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.mlist/main.c	2011-06-14 09:11:16 UTC (rev 46699)
+++ grass/branches/develbranch_6/general/g.mlist/main.c	2011-06-14 09:17:46 UTC (rev 46700)
@@ -9,7 +9,7 @@
  * PURPOSE:      Lists available GRASS data base files of the
  *               user-specified data type to standard output
  *
- * COPYRIGHT:    (C) 1999-2008 by the GRASS Development Team
+ * COPYRIGHT:    (C) 1999-2008, 2011 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -65,7 +65,7 @@
     module->keywords = _("general, map management");
     module->description =
 	_("Lists available GRASS data base files "
-	  "of the user-specified data type to standard output.");
+	  "of the user-specified data type optionally using the search pattern.");
 
     read_list(0);
 
@@ -95,6 +95,7 @@
     opt.pattern->required = NO;
     opt.pattern->multiple = NO;
     opt.pattern->description = _("Map name search pattern (default: all)");
+    opt.pattern->guisection = _("Pattern");
 
     opt.exclude = G_define_option();
     opt.exclude->key = "exclude";
@@ -102,6 +103,7 @@
     opt.exclude->required = NO;
     opt.exclude->multiple = NO;
     opt.exclude->description = _("Map name exclusion pattern (default: none)");
+    opt.exclude->guisection = _("Pattern");
 
     opt.separator = G_define_option();
     opt.separator->key = "separator";
@@ -124,27 +126,33 @@
     flag.regex->key = 'r';
     flag.regex->description =
 	_("Use basic regular expressions instead of wildcards");
+    flag.regex->guisection = _("Pattern");
 
     flag.extended = G_define_flag();
     flag.extended->key = 'e';
     flag.extended->description =
 	_("Use extended regular expressions instead of wildcards");
+    flag.extended->guisection = _("Pattern");
 
     flag.type = G_define_flag();
     flag.type->key = 't';
     flag.type->description = _("Print data types");
-
+    flag.type->guisection = _("Print");
+    
     flag.mapset = G_define_flag();
     flag.mapset->key = 'm';
-    flag.mapset->description = _("Print mapset names");
+    flag.mapset->description = _("Print fully-qualified map names (including mapsets)");
+    flag.mapset->guisection = _("Print");
 
     flag.pretty = G_define_flag();
     flag.pretty->key = 'p';
     flag.pretty->description = _("Pretty printing in human readable format");
+    flag.pretty->guisection = _("Print");
 
     flag.full = G_define_flag();
     flag.full->key = 'f';
     flag.full->description = _("Verbose listing (also list map titles)");
+    flag.full->guisection = _("Print");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/branches/develbranch_6/general/manage/cmd/list.c
===================================================================
--- grass/branches/develbranch_6/general/manage/cmd/list.c	2011-06-14 09:11:16 UTC (rev 46699)
+++ grass/branches/develbranch_6/general/manage/cmd/list.c	2011-06-14 09:17:46 UTC (rev 46700)
@@ -41,8 +41,8 @@
     module->keywords = _("general, map management");
     module->description =
 	_("Lists available GRASS data base files "
-	  "of the user-specified data type to standard output.");
-
+	  "of the user-specified data type.");
+    
     element = G_define_option();
     element->key = "type";
     element->key_desc = "datatype";