|
@@ -112,25 +112,15 @@ int main(int argc, char **argv)
|
|
|
|
|
|
|
|
|
/* Colors */
|
|
|
- color_opt = G_define_option();
|
|
|
- color_opt->key = "color";
|
|
|
- color_opt->type = TYPE_STRING;
|
|
|
- color_opt->answer = DEFAULT_FG_COLOR;
|
|
|
+ color_opt = G_define_standard_option(G_OPT_C_FG);
|
|
|
color_opt->label = _("Feature color");
|
|
|
color_opt->guisection = _("Colors");
|
|
|
- color_opt->gisprompt = "old,color_none,color";
|
|
|
- color_opt->description =
|
|
|
- _("Either a standard GRASS color, R:G:B triplet, or \"none\"");
|
|
|
-
|
|
|
- fcolor_opt = G_define_option();
|
|
|
- fcolor_opt->key = "fcolor";
|
|
|
- fcolor_opt->type = TYPE_STRING;
|
|
|
+
|
|
|
+ fcolor_opt = G_define_standard_option(G_OPT_C_BG);
|
|
|
+ fcolor_opt->key = "fill_color";
|
|
|
fcolor_opt->answer = "200:200:200";
|
|
|
fcolor_opt->label = _("Area fill color");
|
|
|
fcolor_opt->guisection = _("Colors");
|
|
|
- fcolor_opt->gisprompt = "old,color_none,color";
|
|
|
- fcolor_opt->description =
|
|
|
- _("Either a standard GRASS color, R:G:B triplet, or \"none\"");
|
|
|
|
|
|
rgbcol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
|
|
|
rgbcol_opt->key = "rgb_column";
|
|
@@ -201,10 +191,10 @@ int main(int argc, char **argv)
|
|
|
|
|
|
/* Labels */
|
|
|
lfield_opt = G_define_standard_option(G_OPT_V_FIELD);
|
|
|
- lfield_opt->key = "llayer";
|
|
|
+ lfield_opt->key = "label_layer";
|
|
|
lfield_opt->required = NO;
|
|
|
lfield_opt->guisection = _("Labels");
|
|
|
- lfield_opt->description =
|
|
|
+ lfield_opt->label =
|
|
|
_("Layer number for labels (default: the given layer number)");
|
|
|
|
|
|
attrcol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
|
|
@@ -213,37 +203,27 @@ int main(int argc, char **argv)
|
|
|
attrcol_opt->guisection = _("Labels");
|
|
|
attrcol_opt->description = _("Name of column to be displayed as a label");
|
|
|
|
|
|
- lcolor_opt = G_define_option();
|
|
|
- lcolor_opt->key = "lcolor";
|
|
|
- lcolor_opt->type = TYPE_STRING;
|
|
|
+ lcolor_opt = G_define_standard_option(G_OPT_C_FG);
|
|
|
+ lcolor_opt->key = "label_color";
|
|
|
lcolor_opt->answer = "red";
|
|
|
lcolor_opt->label = _("Label color");
|
|
|
lcolor_opt->guisection = _("Labels");
|
|
|
- lcolor_opt->gisprompt = "old_color,color,color";
|
|
|
- lcolor_opt->description = _("Either a standard color name or R:G:B triplet");
|
|
|
|
|
|
- bgcolor_opt = G_define_option();
|
|
|
- bgcolor_opt->key = "bgcolor";
|
|
|
- bgcolor_opt->type = TYPE_STRING;
|
|
|
+ bgcolor_opt = G_define_standard_option(G_OPT_C_BG);
|
|
|
+ bgcolor_opt->key = "label_bgcolor";
|
|
|
bgcolor_opt->answer = "none";
|
|
|
bgcolor_opt->guisection = _("Labels");
|
|
|
bgcolor_opt->label = _("Label background color");
|
|
|
- bgcolor_opt->gisprompt = "old,color_none,color";
|
|
|
- bgcolor_opt->description =
|
|
|
- _("Either a standard GRASS color, R:G:B triplet, or \"none\"");
|
|
|
|
|
|
- bcolor_opt = G_define_option();
|
|
|
- bcolor_opt->key = "bcolor";
|
|
|
+ bcolor_opt = G_define_standard_option(G_OPT_C_BG);
|
|
|
+ bcolor_opt->key = "label_bcolor";
|
|
|
bcolor_opt->type = TYPE_STRING;
|
|
|
bcolor_opt->answer = "none";
|
|
|
bcolor_opt->guisection = _("Labels");
|
|
|
bcolor_opt->label = _("Label border color");
|
|
|
- bcolor_opt->gisprompt = "old,color_none,color";
|
|
|
- bcolor_opt->description =
|
|
|
- _("Either a standard GRASS color, R:G:B triplet, or \"none\"");
|
|
|
|
|
|
lsize_opt = G_define_option();
|
|
|
- lsize_opt->key = "lsize";
|
|
|
+ lsize_opt->key = "label_size";
|
|
|
lsize_opt->type = TYPE_INTEGER;
|
|
|
lsize_opt->answer = "8";
|
|
|
lsize_opt->guisection = _("Labels");
|