Fri Jan 18 04:06:50 PST 2013

Author: martinl
Date: 2013-01-18 04:06:49 -0800 (Fri, 18 Jan 2013)
New Revision: 54699

Modified:
   grass/trunk/display/d.font/main.c
   grass/trunk/display/d.graph/main.c
   grass/trunk/display/d.legend/main.c
   grass/trunk/display/d.rast.arrow/main.c
   grass/trunk/display/d.text/main.c
   grass/trunk/display/d.vect/main.c
   grass/trunk/general/g.pnmcat/main.c
   grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c
   grass/trunk/raster/r.in.bin/main.c
   grass/trunk/raster/r.in.mat/main.c
   grass/trunk/raster/r.in.png/main.c
   grass/trunk/raster/r.li/r.li.cwed/cwed.c
   grass/trunk/raster/r.li/r.li.dominance/dominance.c
   grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
   grass/trunk/raster/r.li/r.li.mpa/mpa.c
   grass/trunk/raster/r.li/r.li.mps/mps.c
   grass/trunk/raster/r.li/r.li.padcv/padcv.c
   grass/trunk/raster/r.li/r.li.padrange/padrange.c
   grass/trunk/raster/r.li/r.li.padsd/padsd.c
   grass/trunk/raster/r.li/r.li.patchdensity/main.c
   grass/trunk/raster/r.li/r.li.patchnum/main.c
   grass/trunk/raster/r.li/r.li.pielou/pielou.c
   grass/trunk/raster/r.li/r.li.renyi/renyi.c
   grass/trunk/raster/r.li/r.li.richness/richness.c
   grass/trunk/raster/r.li/r.li.shannon/shannon.c
   grass/trunk/raster/r.li/r.li.shape/main.c
   grass/trunk/raster/r.li/r.li.simpson/simpson.c
   grass/trunk/raster/r.out.arc/main.c
   grass/trunk/raster/r.out.ascii/main.c
   grass/trunk/raster/r.out.mat/main.c
   grass/trunk/raster/r.out.tiff/main.c
   grass/trunk/raster/r.out.vrml/main.c
   grass/trunk/raster/r.out.vtk/parameters.c
   grass/trunk/raster/r.profile/main.c
   grass/trunk/raster3d/r3.in.ascii/main.c
   grass/trunk/raster3d/r3.in.bin/main.c
   grass/trunk/raster3d/r3.mkdspf/main.c
   grass/trunk/raster3d/r3.out.ascii/main.c
   grass/trunk/raster3d/r3.out.v5d/main.c
   grass/trunk/scripts/db.in.ogr/db.in.ogr.py
   grass/trunk/scripts/db.out.ogr/db.out.ogr.py
   grass/trunk/scripts/r.in.wms/r.in.wms.py
   grass/trunk/scripts/r.unpack/r.unpack.py
   grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
   grass/trunk/scripts/v.pack/v.pack.py
   grass/trunk/scripts/v.unpack/v.unpack.py
   grass/trunk/vector/v.db.connect/main.c
   grass/trunk/vector/v.edit/args.c
   grass/trunk/vector/v.net/args.c
   grass/trunk/vector/v.out.vtk/main.c
   grass/trunk/visualization/wximgview/main.cpp
   grass/trunk/visualization/ximgview/main.c
Log:
use standardized options (files)


Modified: grass/trunk/display/d.font/main.c
===================================================================

--- grass/trunk/display/d.font/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/display/d.font/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -56,13 +56,12 @@
     opt1->answer = "romans";
     opt1->description = _("Choose new current font");
 
-    opt2 = G_define_option();
+    opt2 = G_define_standard_option(G_OPT_F_INPUT);
     opt2->key = "path";
-    opt2->type = TYPE_STRING;
     opt2->required = NO;
     opt2->description =
 	_("Path to Freetype-compatible font including file name");
-    opt2->gisprompt = "old_file,file,font";
+    opt2->gisprompt = "old,font,file";
 
     opt3 = G_define_option();
     opt3->key = "charset";

Modified: grass/trunk/display/d.graph/main.c
===================================================================
--- grass/trunk/display/d.graph/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/display/d.graph/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -61,14 +61,11 @@
 	_("Program for generating and displaying simple graphics on the "
 	  "display monitor.");
 
-    opt1 = G_define_option();
-    opt1->key = "input";
-    opt1->type = TYPE_STRING;
+    opt1 = G_define_standard_option(G_OPT_F_INPUT);
     opt1->required = NO;
     opt1->description = _("Name of file containing graphics commands, "
 			  "if not given reads from standard input");
-    opt1->gisprompt = "old_file,file,input";
-
+    
     opt2 = G_define_option();
     opt2->key = "color";
     opt2->type = TYPE_STRING;

Modified: grass/trunk/display/d.legend/main.c
===================================================================
--- grass/trunk/display/d.legend/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/display/d.legend/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -167,12 +167,11 @@
     opt_fontscale->description = _("Font scaling factor for floating point legends");
     opt_fontscale->guisection = _("Font settings");
 
-    opt_path = G_define_option();
+    opt_path = G_define_standard_option(G_OPT_F_INPUT);
     opt_path->key = "path";
-    opt_path->type = TYPE_STRING;
     opt_path->required = NO;
     opt_path->description = _("Path to font file");
-    opt_path->gisprompt = "old_file,file,font";
+    opt_path->gisprompt = "old_file,font,file";
     opt_path->guisection = _("Font settings");
 
     opt_charset = G_define_option();

Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/display/d.rast.arrow/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -121,10 +121,9 @@
     
     opt4 = G_define_option();
     opt4->key = "grid_color";
-    opt4->type = TYPE_STRING;
     opt4->required = NO;
     opt4->answer = "gray";
-    opt4->gisprompt = "old_color,color,color_none";
+    opt4->gisprompt = "old,color_none,color";
     opt4->description = _("Color for drawing grid or \"none\"");
     opt4->guisection = _("Colors");
 
@@ -133,7 +132,7 @@
     opt5->type = TYPE_STRING;
     opt5->required = NO;
     opt5->answer = DEFAULT_FG_COLOR;
-    opt5->gisprompt = "old_color,color,color_none";
+    opt5->gisprompt = "old,color_none,color";
     opt5->description = _("Color for drawing X's (null values)");
     opt5->guisection = _("Colors");
 
@@ -142,7 +141,7 @@
     opt6->type = TYPE_STRING;
     opt6->required = NO;
     opt6->answer = "red";
-    opt6->gisprompt = "old_color,color,color_none";
+    opt6->gisprompt = "old,color_none,color";
     opt6->description = _("Color for showing unknown information");
     opt6->guisection = _("Colors");
 

Modified: grass/trunk/display/d.text/main.c
===================================================================
--- grass/trunk/display/d.text/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/display/d.text/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -218,12 +218,11 @@
     opt.font->required = NO;
     opt.font->description = _("Font name");
 
-    opt.path = G_define_option();
+    opt.path = G_define_standard_option(G_OPT_F_INPUT);
     opt.path->key = "path";
-    opt.path->type = TYPE_STRING;
     opt.path->required = NO;
     opt.path->description = _("Path to font file");
-    opt.path->gisprompt = "old_file,file,font";
+    opt.path->gisprompt = "old,font,file";
 
     opt.charset = G_define_option();
     opt.charset->key = "charset";

Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/display/d.vect/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -118,7 +118,7 @@
     color_opt->answer = DEFAULT_FG_COLOR;
     color_opt->label = _("Feature color");
     color_opt->guisection = _("Colors");
-    color_opt->gisprompt = "old_color,color,color_none";
+    color_opt->gisprompt = "old,color_none,color";
     color_opt->description =
 	_("Either a standard GRASS color, R:G:B triplet, or \"none\"");
 
@@ -128,7 +128,7 @@
     fcolor_opt->answer = "200:200:200";
     fcolor_opt->label = _("Area fill color");
     fcolor_opt->guisection = _("Colors");
-    fcolor_opt->gisprompt = "old_color,color,color_none";
+    fcolor_opt->gisprompt = "old,color_none,color";
     fcolor_opt->description =
 	_("Either a standard GRASS color, R:G:B triplet, or \"none\"");
 
@@ -229,7 +229,7 @@
     bgcolor_opt->answer = "none";
     bgcolor_opt->guisection = _("Labels");
     bgcolor_opt->label = _("Label background color");
-    bgcolor_opt->gisprompt = "old_color,color,color_none";
+    bgcolor_opt->gisprompt = "old,color_none,color";
     bgcolor_opt->description =
 	_("Either a standard GRASS color, R:G:B triplet, or \"none\"");
 
@@ -239,7 +239,7 @@
     bcolor_opt->answer = "none";
     bcolor_opt->guisection = _("Labels");
     bcolor_opt->label = _("Label border color");
-    bcolor_opt->gisprompt = "old_color,color,color_none";
+    bcolor_opt->gisprompt = "old,color_none,color";
     bcolor_opt->description =
 	_("Either a standard GRASS color, R:G:B triplet, or \"none\"");
 

Modified: grass/trunk/general/g.pnmcat/main.c
===================================================================
--- grass/trunk/general/g.pnmcat/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/general/g.pnmcat/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -127,13 +127,9 @@
     opt.base->required = YES;
     opt.base->description = _("Base name of input files");
 
-    opt.out = G_define_option();
-    opt.out->key = "output";
-    opt.out->type = TYPE_STRING;
+    opt.out = G_define_standard_option(G_OPT_F_OUTPUT);
     opt.out->required = YES;
-    opt.out->description = _("Name of output file");
-    opt.out->gisprompt = "new_file,file,output";
-
+    
     opt.rows = G_define_option();
     opt.rows->key = "rows";
     opt.rows->type = TYPE_INTEGER;

Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -66,7 +66,7 @@
     camera_opt = G_define_standard_option(G_OPT_F_INPUT);
     camera_opt->key = "camera";
     camera_opt->required = YES;
-    camera_opt->gisprompt = "old_file,camera,camera";
+    camera_opt->gisprompt = "old,camera,file";
     camera_opt->label =
 	_("Name of camera reference file");
 

Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.in.bin/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -262,12 +262,10 @@
     flag.gmt_hd->description = _("Get region info from GMT style header");
     flag.gmt_hd->guisection = _("Bounds");
 
-    parm.input = G_define_option();
-    parm.input->key = "input";
-    parm.input->type = TYPE_STRING;
+    parm.input = G_define_standard_option(G_OPT_F_INPUT);
     parm.input->required = YES;
     parm.input->description = _("Binary raster file to be imported");
-    parm.input->gisprompt = "old_file,file,input";
+    parm.input->gisprompt = "old,bin,file";
 
     parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
 

Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.in.mat/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -95,19 +95,13 @@
 
 
     /* Define the different options */
-    inputfile = G_define_option();
-    inputfile->key = "input";
-    inputfile->type = TYPE_STRING;
+    inputfile = G_define_standard_option(G_OPT_F_INPUT);
     inputfile->required = YES;
-    inputfile->gisprompt = "old_file,file,input";
-    inputfile->description = _("Name of an existing MAT-File(v4)");
+    inputfile->description = _("Name of input MAT-File(v4)");
 
-    outputfile = G_define_option();
-    outputfile->key = "output";
-    outputfile->type = TYPE_STRING;
+    outputfile = G_define_standard_option(G_OPT_R_OUTPUT);
     outputfile->required = NO;
-    outputfile->gisprompt = "new,cell,raster";
-    outputfile->description = _("Name for the output raster map (override)");
+    outputfile->description = _("Name for output raster map (override)");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/raster/r.in.png/main.c
===================================================================
--- grass/trunk/raster/r.in.png/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.in.png/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -522,7 +522,7 @@
     module->description = _("Imports non-georeferenced PNG format image.");
 
     inopt = G_define_standard_option(G_OPT_F_INPUT);
-    inopt->gisprompt = "old,file,bin_input";
+    inopt->gisprompt = "old,bin,file";
     
     outopt = G_define_standard_option(G_OPT_R_OUTPUT);
 

Modified: grass/trunk/raster/r.li/r.li.cwed/cwed.c
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/cwed.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.cwed/cwed.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -51,20 +51,16 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->type = TYPE_STRING;
     conf->required = YES;
-    conf->gisprompt = "old_file,file,input";
 
-    path = G_define_option();
+    path = G_define_standard_option(G_OPT_F_INPUT);
     path->key = "path";
     path->description =
-	"Input file that contains the weight to calculate the index";
-    path->type = TYPE_STRING;
+        _("Name of file that contains the weight to calculate the index");
     path->required = YES;
-    path->gisprompt = "old_file,file,input";
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);
 

Modified: grass/trunk/raster/r.li/r.li.dominance/dominance.c
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/dominance.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.dominance/dominance.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -46,11 +46,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -44,12 +44,10 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->type = TYPE_STRING;
     conf->required = YES;
-    conf->gisprompt = "old_file,file,input";
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);
 

Modified: grass/trunk/raster/r.li/r.li.mpa/mpa.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/mpa.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.mpa/mpa.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -43,12 +43,10 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->type = TYPE_STRING;
     conf->required = YES;
-    conf->gisprompt = "old_file,file,input";
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);
 

Modified: grass/trunk/raster/r.li/r.li.mps/mps.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/mps.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.mps/mps.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -44,12 +44,10 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->type = TYPE_STRING;
     conf->required = YES;
-    conf->gisprompt = "old_file,file,input";
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);
 

Modified: grass/trunk/raster/r.li/r.li.padcv/padcv.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/padcv.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.padcv/padcv.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -43,11 +43,9 @@
     /* define options */
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.padrange/padrange.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/padrange.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.padrange/padrange.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -43,11 +43,9 @@
     /* define options */
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.padsd/padsd.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/padsd.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.padsd/padsd.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -41,11 +41,9 @@
     /* define options */
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.patchdensity/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.patchdensity/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -40,11 +40,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.patchnum/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.patchnum/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -41,11 +41,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.pielou/pielou.c
===================================================================
--- grass/trunk/raster/r.li/r.li.pielou/pielou.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.pielou/pielou.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -63,11 +63,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.renyi/renyi.c
===================================================================
--- grass/trunk/raster/r.li/r.li.renyi/renyi.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.renyi/renyi.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -50,11 +50,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     alpha = G_define_option();

Modified: grass/trunk/raster/r.li/r.li.richness/richness.c
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/richness.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.richness/richness.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -44,11 +44,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->type = TYPE_STRING;
-    conf->gisprompt = "old_file,file,input";
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.shannon/shannon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/shannon.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.shannon/shannon.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -43,11 +43,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.shape/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.shape/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -39,11 +39,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->gisprompt = "old_file,file,input";
-    conf->type = TYPE_STRING;
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.li/r.li.simpson/simpson.c
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/simpson.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.li/r.li.simpson/simpson.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -44,11 +44,9 @@
 
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
-    conf = G_define_option();
+    conf = G_define_standard_option(G_OPT_F_INPUT);
     conf->key = "config";
     conf->description = _("Configuration file");
-    conf->type = TYPE_STRING;
-    conf->gisprompt = "old_file,file,input";
     conf->required = YES;
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);

Modified: grass/trunk/raster/r.out.arc/main.c
===================================================================
--- grass/trunk/raster/r.out.arc/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.out.arc/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -66,9 +66,8 @@
     parm.map = G_define_standard_option(G_OPT_R_INPUT);
 
     parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.output->gisprompt = "new_file,file,output";
     parm.output->description =
-	_("Name of an output ARC-GRID map (use out=- for stdout)");
+	_("Name for output ARC-GRID file (use out=- for stdout)");
 
     parm.dp = G_define_option();
     parm.dp->key = "dp";

Modified: grass/trunk/raster/r.out.ascii/main.c
===================================================================
--- grass/trunk/raster/r.out.ascii/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.out.ascii/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -70,11 +70,8 @@
     parm.map->gisprompt = "old,cell,raster";
     parm.map->description = _("Name of an existing raster map");
 
-    parm.output = G_define_option();
-    parm.output->key = "output";
-    parm.output->type = TYPE_STRING;
+    parm.output = G_define_standard_option(G_OPT_F_OUTPUT);
     parm.output->required = NO;
-    parm.output->gisprompt = "new_file,file,output";
     parm.output->description =
 	_("Name for output ASCII grid map (use out=- for stdout)");
 

Modified: grass/trunk/raster/r.out.mat/main.c
===================================================================
--- grass/trunk/raster/r.out.mat/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.out.mat/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -67,12 +67,10 @@
 
     inputfile = G_define_standard_option(G_OPT_R_INPUT);
 
-    outputfile = G_define_option();
-    outputfile->key = "output";
-    outputfile->type = TYPE_STRING;
+    outputfile = G_define_standard_option(G_OPT_F_OUTPUT);
     outputfile->required = YES;
-    outputfile->gisprompt = "new_file,file,output";
-    outputfile->description = _("Name for the output binary MAT-File");
+    outputfile->gisprompt = "new,bin,file";
+    outputfile->description = _("Name for output binary MAT file");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/raster/r.out.tiff/main.c
===================================================================
--- grass/trunk/raster/r.out.tiff/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.out.tiff/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -95,12 +95,10 @@
 
     inopt = G_define_standard_option(G_OPT_R_INPUT);
 
-    outopt = G_define_option();
-    outopt->key = "output";
-    outopt->type = TYPE_STRING;
+    outopt = G_define_standard_option(G_OPT_F_OUTPUT);
     outopt->required = YES;
-    outopt->gisprompt = "new_file,tiff,tiff";
-    outopt->description = _("Name for new TIFF file");
+    outopt->gisprompt = "new,bin,file";
+    outopt->description = _("Name for output TIFF file");
 
     compopt = G_define_option();
     compopt->key = "compression";

Modified: grass/trunk/raster/r.out.vrml/main.c
===================================================================
--- grass/trunk/raster/r.out.vrml/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.out.vrml/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -71,12 +71,9 @@
     exag_opt->answer = "1.0";
     exag_opt->description = _("Vertical exaggeration");
 
-    out = G_define_option();
-    out->key = "output";
-    out->type = TYPE_STRING;
+    out = G_define_standard_option(G_OPT_F_OUTPUT);
     out->required = YES;
-    out->gisprompt = "new_file,file,output";
-    out->description = _("Name for new VRML file");
+    out->description = _("Name for output VRML file");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/raster/r.out.vtk/parameters.c
===================================================================
--- grass/trunk/raster/r.out.vtk/parameters.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.out.vtk/parameters.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -33,21 +33,13 @@
     param.input->description =
         _("Raster map(s) to be converted to VTK-ASCII data format");
 
-    param.output = G_define_option();
-    param.output->key = "output";
-    param.output->type = TYPE_STRING;
-    param.output->gisprompt = "new_file,file,output";
+    param.output = G_define_standard_option(G_OPT_F_OUTPUT);
     param.output->required = NO;
     param.output->description = _("Name for VTK-ASCII output file");
 
-    param.elevationmap = G_define_option();
-    param.elevationmap->key = "elevation";
-    param.elevationmap->type = TYPE_STRING;
+    param.elevationmap = G_define_standard_option(G_OPT_R_ELEV);
     param.elevationmap->required = NO;
-    param.elevationmap->gisprompt = "old,cell,raster";
-    param.elevationmap->multiple = NO;
-    param.elevationmap->description = _("Elevation raster map");
-
+    
     param.null_val = G_define_option();
     param.null_val->key = "null";
     param.null_val->type = TYPE_DOUBLE;

Modified: grass/trunk/raster/r.profile/main.c
===================================================================
--- grass/trunk/raster/r.profile/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster/r.profile/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -54,12 +54,9 @@
 
     parm.opt1 = G_define_standard_option(G_OPT_R_INPUT);
 
-    parm.output = G_define_option();
-    parm.output->key = "output";
-    parm.output->type = TYPE_STRING;
+    parm.output = G_define_standard_option(G_OPT_F_OUTPUT);
     parm.output->required = NO;
     parm.output->answer = "-";
-    parm.output->gisprompt = "new_file,file,output";
     parm.output->description =
 	_("Name of file for output (use output=- for stdout)");
 

Modified: grass/trunk/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster3d/r3.in.ascii/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -78,13 +78,9 @@
 
 static void setParams()
 {
-    param.input = G_define_option();
-    param.input->key = "input";
-    param.input->type = TYPE_STRING;
+    param.input = G_define_standard_option(G_OPT_F_INPUT);
     param.input->required = YES;
-    param.input->key_desc = "name";
-    param.input->gisprompt = "old_file,file,input";
-    param.input->description = _("ASCII raster map to be imported");
+    param.input->description = _("Name of input file to be imported");
 
     param.output = G_define_standard_option(G_OPT_R3_OUTPUT);
 

Modified: grass/trunk/raster3d/r3.in.bin/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.bin/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster3d/r3.in.bin/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -250,7 +250,7 @@
 
 	parm.input = G_define_standard_option(G_OPT_F_INPUT);
 	parm.input->description = _("Name of binary 3D raster file to be imported");
-	parm.input->gisprompt = "old,file,bin_input";
+	parm.input->gisprompt = "old,bin,file";
 
 	parm.output = G_define_standard_option(G_OPT_R3_OUTPUT);
 

Modified: grass/trunk/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster3d/r3.mkdspf/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -89,12 +89,10 @@
     /* should still find the DIRECTORY */
     name->description = _("Name of an existing 3d raster map");
 
-    out = G_define_option();
+    out = G_define_standard_option(G_OPT_F_OUTPUT);
     out->key = "dspf";
-    out->type = TYPE_STRING;
     out->required = YES;
-    out->gisprompt = "new_file,file,output";
-    out->description = _("Name of output display file");
+    out->description = _("Name for output display file");
 
     levels = G_define_option();
     levels->key = "levels";

Modified: grass/trunk/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster3d/r3.out.ascii/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -80,10 +80,7 @@
     param.input->multiple = NO;
     param.input->description = _("3D raster map to be converted to ASCII");
 
-    param.output = G_define_option();
-    param.output->key = "output";
-    param.output->type = TYPE_STRING;
-    param.output->gisprompt = "new_file,file,output";
+    param.output = G_define_standard_option(G_OPT_F_OUTPUT);
     param.output->required = NO;
     param.output->description = _("Name for ASCII output file");
 

Modified: grass/trunk/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/raster3d/r3.out.v5d/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -71,10 +71,7 @@
     param.input->description =
 	_("3D raster map to be converted to Vis5D (V5D) file");
 
-    param.output = G_define_option();
-    param.output->key = "output";
-    param.output->type = TYPE_STRING;
-    param.output->gisprompt = "new_file,file,output";
+    param.output = G_define_standard_option(G_OPT_F_OUTPUT);
     param.output->required = YES;
     param.output->description = _("Name for V5D output file");
 

Modified: grass/trunk/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2013-01-18 12:06:49 UTC (rev 54699)
@@ -20,11 +20,9 @@
 #%  keywords: attribute table
 #%End
 
-#%option
+#%option G_OPT_F_INPUT
 #% key: dsn
-#% type: string
-#% key_desc : name
-#% gisprompt: old_file,file,input
+#% gisprompt: old,bin,file
 #% description: Table file to be imported or DB connection string
 #% required : yes
 #%end

Modified: grass/trunk/scripts/db.out.ogr/db.out.ogr.py
===================================================================
--- grass/trunk/scripts/db.out.ogr/db.out.ogr.py	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/scripts/db.out.ogr/db.out.ogr.py	2013-01-18 12:06:49 UTC (rev 54699)
@@ -25,11 +25,9 @@
 #% required: yes
 #%end
 
-#%option
+#%option G_OPT_F_INPUT
 #% key: dsn
-#% type: string
-#% key_desc: name
-#% gisprompt: new_file,file,input
+#% gisprompt: old,bin,file
 #% description: Table file to be exported or DB connection string
 #% required : yes
 #%end

Modified: grass/trunk/scripts/r.in.wms/r.in.wms.py
===================================================================
--- grass/trunk/scripts/r.in.wms/r.in.wms.py	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/scripts/r.in.wms/r.in.wms.py	2013-01-18 12:06:49 UTC (rev 54699)
@@ -157,14 +157,13 @@
 #%option G_OPT_F_INPUT
 #% key: capfile
 #% required: no
-#% gisprompt: old,file,bin_input
+#% gisprompt: old,bin,file
 #% description: Capabilities file to load
 #%end
 
 #%option G_OPT_F_OUTPUT
 #% key: capfile_output
 #% required: no
-#% gisprompt: old,file,bin_input
 #% description: File where capabilities will be saved (only with 'c' flag).
 #%end
 

Modified: grass/trunk/scripts/r.unpack/r.unpack.py
===================================================================
--- grass/trunk/scripts/r.unpack/r.unpack.py	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/scripts/r.unpack/r.unpack.py	2013-01-18 12:06:49 UTC (rev 54699)
@@ -21,7 +21,7 @@
 #%end
 #%option G_OPT_F_INPUT
 #% description: Name of input pack file
-#% gisprompt: old,file,bin_input
+#% gisprompt: old,bin,file
 #% key_desc: name.pack
 #%end
 #%option G_OPT_R_OUTPUT

Modified: grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
===================================================================
--- grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py	2013-01-18 12:06:49 UTC (rev 54699)
@@ -36,14 +36,9 @@
 #% key: i
 #% description: Ignore broken lines
 #%End
-#%Option
-#% key: input
-#% type: string
+#%Option G_OPT_F_INPUT
 #% required: yes
-#% multiple: no
-#% key_desc: name
 #% description: ASCII file containing input data
-#% gisprompt: old_file,file,input
 #%End
 #%Option
 #% key: output

Modified: grass/trunk/scripts/v.pack/v.pack.py
===================================================================
--- grass/trunk/scripts/v.pack/v.pack.py	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/scripts/v.pack/v.pack.py	2013-01-18 12:06:49 UTC (rev 54699)
@@ -26,12 +26,8 @@
 #% key_desc: name
 #% required : yes
 #%end
-#%option
-#% key: output
-#% type: string
-#% gisprompt: new_file,file,output
+#%option G_OPT_F_OUTPUT
 #% description: Name for output file (default is <input>.pack)
-#% key_desc: path
 #% required : no
 #%end
 #%flag

Modified: grass/trunk/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/trunk/scripts/v.unpack/v.unpack.py	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/scripts/v.unpack/v.unpack.py	2013-01-18 12:06:49 UTC (rev 54699)
@@ -18,12 +18,9 @@
 #% description: Unpacks a vector map packed with r.pack.
 #% keywords: vector, import, copying
 #%end
-#%option
-#% key: input
-#% type: string
-#% gisprompt: old,file,input
+#%option G_OPT_F_INPUT
+#% gisprompt: old,bin,file
 #% description: Name of input pack file
-#% key_desc: path
 #% required : yes
 #%end
 #%option

Modified: grass/trunk/vector/v.db.connect/main.c
===================================================================
--- grass/trunk/vector/v.db.connect/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/vector/v.db.connect/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -75,7 +75,7 @@
     
     field_opt = G_define_standard_option(G_OPT_V_FIELD);
     field_opt->description = _("Format: layer number[/layer name]");
-    field_opt->gisprompt = "new_layer,layer,layer";
+    field_opt->gisprompt = "new,layer,layer";
 
     sep_opt = G_define_standard_option(G_OPT_F_SEP);
     sep_opt->description = _("Field separator for shell script style output");

Modified: grass/trunk/vector/v.edit/args.c
===================================================================
--- grass/trunk/vector/v.edit/args.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/vector/v.edit/args.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -20,7 +20,7 @@
     params->map->label = _("Name of vector map to edit");
 
     params->fld = G_define_standard_option(G_OPT_V_FIELD);
-    params->fld->gisprompt = "new_layer,layer,layer";
+    params->fld->gisprompt = "old,layer,layer";
     params->fld->guisection = _("Selection");
 
     params->type = G_define_standard_option(G_OPT_V_TYPE);

Modified: grass/trunk/vector/v.net/args.c
===================================================================
--- grass/trunk/vector/v.net/args.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/vector/v.net/args.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -51,14 +51,14 @@
 
     opt->afield_opt = G_define_standard_option(G_OPT_V_FIELD);
     opt->afield_opt->key = "alayer";
-    opt->afield_opt->gisprompt = "new_layer,layer,layer";
+    opt->afield_opt->gisprompt = "new,layer,layer";
     opt->afield_opt->label = _("Arc layer");
     opt->afield_opt->guisection = _("Arcs");
 
     opt->nfield_opt = G_define_standard_option(G_OPT_V_FIELD);
     opt->nfield_opt->key = "nlayer";
     opt->nfield_opt->answer = "2";
-    opt->nfield_opt->gisprompt = "new_layer,layer,layer";
+    opt->nfield_opt->gisprompt = "new,layer,layer";
     opt->nfield_opt->label = _("Node layer");
     opt->nfield_opt->guisection = _("Nodes");
 

Modified: grass/trunk/vector/v.out.vtk/main.c
===================================================================
--- grass/trunk/vector/v.out.vtk/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/vector/v.out.vtk/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -51,13 +51,9 @@
 
     input = G_define_standard_option(G_OPT_V_INPUT);
 
-    output = G_define_option();
-    output->key = "output";
-    output->type = TYPE_STRING;
+    output = G_define_standard_option(G_OPT_F_OUTPUT);
     output->required = NO;
-    output->multiple = NO;
-    output->gisprompt = "new_file,file,output";
-    output->description = _("Path to resulting VTK file");
+    output->description = _("Name for output VTK file");
 
     type_opt = G_define_standard_option(G_OPT_V_TYPE);
     type_opt->answer = "point,kernel,centroid,line,boundary,area,face";

Modified: grass/trunk/visualization/wximgview/main.cpp
===================================================================
--- grass/trunk/visualization/wximgview/main.cpp	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/visualization/wximgview/main.cpp	2013-01-18 12:06:49 UTC (rev 54699)
@@ -256,13 +256,10 @@
     G_add_keyword(_("visualization"));
     module->description = _("View BMP images from the PNG driver.");
 
-    opt.image = G_define_option();
+    opt.image = G_define_standard_option(G_OPT_F_OUTPUT);
     opt.image->key = "image";
-    opt.image->type = TYPE_STRING;
     opt.image->required = YES;
-    opt.image->multiple = NO;
-    opt.image->gisprompt = "old_file,file,input";
-    opt.image->description = _("Image file");
+    opt.image->description = _("Name for output image file");
 
     opt.percent = G_define_option();
     opt.percent->key = "percent";

Modified: grass/trunk/visualization/ximgview/main.c
===================================================================
--- grass/trunk/visualization/ximgview/main.c	2013-01-18 11:39:21 UTC (rev 54698)
+++ grass/trunk/visualization/ximgview/main.c	2013-01-18 12:06:49 UTC (rev 54699)
@@ -294,13 +294,10 @@
     G_add_keyword(_("visualization"));
     module->description = _("View BMP images from the PNG driver.");
 
-    opt.image = G_define_option();
+    opt.image = G_define_standard_option(G_OPT_F_OUTPUT);
     opt.image->key = "image";
-    opt.image->type = TYPE_STRING;
     opt.image->required = YES;
-    opt.image->multiple = NO;
-    opt.image->gisprompt = "old_file,file,input";
-    opt.image->description = _("Image file");
+    opt.image->description = _("Name for output image file");
 
     opt.percent = G_define_option();
     opt.percent->key = "percent";

