[GRASS-SVN] r62947 - in grass/branches/releasebranch_7_0: . display/d.vect

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-25 07:10:23 -0800 (Tue, 25 Nov 2014)
New Revision: 62947

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/display/d.vect/main.c
Log:
d.vect: use standardized options (#2409)
        (merge r62945 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62945

Modified: grass/branches/releasebranch_7_0/display/d.vect/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect/main.c	2014-11-25 15:08:18 UTC (rev 62946)
+++ grass/branches/releasebranch_7_0/display/d.vect/main.c	2014-11-25 15:10:23 UTC (rev 62947)
@@ -112,25 +112,15 @@
 
 
     /* 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 @@
 
     /* 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 @@
     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");