[GRASS-SVN] r62919 - in grass/branches/releasebranch_7_0: . display/d.grid

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-25 01:27:15 -0800 (Tue, 25 Nov 2014)
New Revision: 62919

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/display/d.grid/main.c
Log:
d.grid: use standardized options (#2409)
        (merge r62918 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,62910,62912,62914,62916
   + /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,62912,62914,62916,62918

Modified: grass/branches/releasebranch_7_0/display/d.grid/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.grid/main.c	2014-11-25 09:25:42 UTC (rev 62918)
+++ grass/branches/releasebranch_7_0/display/d.grid/main.c	2014-11-25 09:27:15 UTC (rev 62919)
@@ -92,12 +92,12 @@
     opt1->guisection = _("Color");
 
     opt4 = G_define_standard_option(G_OPT_C_FG);
-    opt4->key = "bordercolor";
+    opt4->key = "border_color";
     opt4->label = _("Border color");
     opt4->guisection = _("Color");
 
     tcolor = G_define_standard_option(G_OPT_C_FG);
-    tcolor->key = "textcolor";
+    tcolor->key = "text_color";
     tcolor->answer = "gray";
     tcolor->label = _("Text color");
     tcolor->guisection = _("Color");