[GRASS-SVN] r40915 - grass/branches/develbranch_6/raster/r.region

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-02-10 14:35:27 -0500 (Wed, 10 Feb 2010)
New Revision: 40915

Modified:
   grass/branches/develbranch_6/raster/r.region/main.c
Log:
Use standard options, add ->gisprompt settings (backport)

Modified: grass/branches/develbranch_6/raster/r.region/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.region/main.c	2010-02-10 19:24:20 UTC (rev 40914)
+++ grass/branches/develbranch_6/raster/r.region/main.c	2010-02-10 19:35:27 UTC (rev 40915)
@@ -87,21 +87,18 @@
     parm.region->multiple = NO;
     parm.region->type = TYPE_STRING;
     parm.region->description = _("Set region from named region");
+    parm.region->gisprompt = "old,windows,region";
 
-    parm.raster = G_define_option();
+    parm.raster = G_define_standard_option(G_OPT_R_MAP);
     parm.raster->key = "raster";
-    parm.raster->key_desc = "name";
     parm.raster->required = NO;
     parm.raster->multiple = NO;
-    parm.raster->type = TYPE_STRING;
     parm.raster->description = _("Set region to match this raster map");
 
-    parm.vect = G_define_option();
+    parm.vect = G_define_standard_option(G_OPT_V_MAP);
     parm.vect->key = "vector";
-    parm.vect->key_desc = "name";
     parm.vect->required = NO;
     parm.vect->multiple = NO;
-    parm.vect->type = TYPE_STRING;
     parm.vect->description = _("Set region to match this vector map");
 
     parm.view = G_define_option();
@@ -111,6 +108,7 @@
     parm.view->multiple = NO;
     parm.view->type = TYPE_STRING;
     parm.view->description = _("Set region to match this 3dview file");
+    parm.view->gisprompt = "old,3d.view,3d view";
 
     parm.north = G_define_option();
     parm.north->key = "n";
@@ -152,12 +150,10 @@
 	llinfo(_("Value for the western edge"), G_lon_format_string(),
 	       window.proj);
 
-    parm.align = G_define_option();
+    parm.align = G_define_standard_option(G_OPT_R_MAP);
     parm.align->key = "align";
-    parm.align->key_desc = "name";
     parm.align->required = NO;
     parm.align->multiple = NO;
-    parm.align->type = TYPE_STRING;
     parm.align->description = _("Raster map to align to");
 
     if (G_parser(argc, argv))