[GRASS-SVN] r62909 - in grass/branches/releasebranch_7_0: . vector/v.label vector/v.lrs/v.lrs.label

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-25 01:05:18 -0800 (Tue, 25 Nov 2014)
New Revision: 62909

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/vector/v.label/main.c
   grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.label/main.c
Log:
use G_OPT_C_BG (#2409)
    (merge r62907 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
   + /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

Modified: grass/branches/releasebranch_7_0/vector/v.label/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.label/main.c	2014-11-25 09:01:50 UTC (rev 62908)
+++ grass/branches/releasebranch_7_0/vector/v.label/main.c	2014-11-25 09:05:18 UTC (rev 62909)
@@ -183,8 +183,6 @@
     Hwidth->guisection = _("Effects");
 
     Bcolor = G_define_standard_option(G_OPT_C_BG);
-    Bcolor->key = "background";
-    Bcolor->label = _("Background color");
     Bcolor->answer = "none";
     Bcolor->guisection = _("Colors");
 

Modified: grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.label/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.label/main.c	2014-11-25 09:01:50 UTC (rev 62908)
+++ grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.label/main.c	2014-11-25 09:05:18 UTC (rev 62909)
@@ -224,10 +224,7 @@
     Hwidth->answer = "0";
     Hwidth->options = "0-100";
 
-    Bcolor = G_define_option();
-    Bcolor->key = "background";
-    Bcolor->description = _("Background color");
-    Bcolor->type = TYPE_STRING;
+    Bcolor = G_define_standard_option(G_OPT_C_BG);
     Bcolor->answer = "none";
     Bcolor->options =
 	"none,aqua,black,blue,brown,cyan,gray,green,grey,indigo,magenta,"