[GRASS-SVN] r62911 - in grass/branches/releasebranch_7_0: . display/d.colortable

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-25 01:09:38 -0800 (Tue, 25 Nov 2014)
New Revision: 62911

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



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,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
   + /grass/trunk:60817,61096,61141,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

Modified: grass/branches/releasebranch_7_0/display/d.colortable/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colortable/main.c	2014-11-25 09:08:29 UTC (rev 62910)
+++ grass/branches/releasebranch_7_0/display/d.colortable/main.c	2014-11-25 09:09:38 UTC (rev 62911)
@@ -66,12 +66,9 @@
     opt1->description =
 	_("Name of raster map whose color table is to be displayed");
 
-    opt2 = G_define_option();
-    opt2->key = "color";
-    opt2->type = TYPE_STRING;
+    opt2 = G_define_standard_option(G_OPT_C_FG);
     opt2->answer = DEFAULT_BG_COLOR;
-    opt2->gisprompt = "old_color,color,color";
-    opt2->description =
+    opt2->label =
 	_("Color of lines separating the colors of the color table");
 
     opt3 = G_define_option();
@@ -81,7 +78,7 @@
     opt3->description = _("Number of lines to appear in the color table");
 
     opt4 = G_define_option();
-    opt4->key = "cols";
+    opt4->key = "columns";
     opt4->type = TYPE_INTEGER;
     opt4->options = "1-1000";
     opt4->description = _("Number of columns to appear in the color table");