[GRASS-SVN] r57702 - grass/trunk/display/d.barscale

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-09-16 06:24:55 -0700 (Mon, 16 Sep 2013)
New Revision: 57702

Modified:
   grass/trunk/display/d.barscale/d.barscale.html
   grass/trunk/display/d.barscale/main.c
Log:
d.barscale: more guisection + i18n
            use standardized key for bgcolor
            manual cosmetics


Modified: grass/trunk/display/d.barscale/d.barscale.html
===================================================================
--- grass/trunk/display/d.barscale/d.barscale.html	2013-09-16 12:54:54 UTC (rev 57701)
+++ grass/trunk/display/d.barscale/d.barscale.html	2013-09-16 13:24:55 UTC (rev 57702)
@@ -1,32 +1,36 @@
 <h2>DESCRIPTION</h2>
  
-<em>d.barscale</em> displays a barscale on the graphics monitor 
-at the given screen coordinates. If no coordinates are given it
-will draw the barscale in the bottom left of the display.
-It can draw the scale or north arrow in a number of styles.
+<em>d.barscale</em> displays a barscale on the graphics monitor at the
+given screen coordinates. If no coordinates are given it will draw the
+barscale in the bottom left of the display. It can draw the scale or
+north arrow in a number of styles (see
+the <a href="http://grasswiki.osgeo.org/wiki/Cartography#Display_monitors">wiki
+page</a> for details).
 
+<p>
+If <b>-n</b> flag is given, <em>d.barscale</em> draws north arrow
+instead of the barscale. Style of north arrow can be controlled
+by <b>north_arrow</b> paramater.
 
 <h2>NOTE</h2>
 
 <em>d.barscale</em> will not work in Lat/Lon locations as the horizontal
-scale distance changes with latitude. Try <em>d.grid</em> instead.
+scale distance changes with latitude. Try <em><a href="d.grid.html">d.grid</a></em> instead.
 
 
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="d.graph.html">d.graph</a><br>
-<a href="d.grid.html">d.grid</a><br>
-<a href="d.legend.html">d.legend</a><br>
-<a href="g.region.html">g.region</a><br>
+<a href="d.graph.html">d.graph</a>,
+<a href="d.grid.html">d.grid</a>,
+<a href="d.legend.html">d.legend</a>,
+<a href="g.region.html">g.region</a>
 </em>
 
-
 <h2>AUTHOR</h2>
 
-unknown, but from USACE/CERL.<br>
+unknown, but from USA/CERL.<br>
 Major rewrite for GRASS 7 by Hamish Bowman
 
-
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/trunk/display/d.barscale/main.c
===================================================================
--- grass/trunk/display/d.barscale/main.c	2013-09-16 12:54:54 UTC (rev 57701)
+++ grass/trunk/display/d.barscale/main.c	2013-09-16 13:24:55 UTC (rev 57702)
@@ -62,11 +62,12 @@
     northarrow = G_define_flag();
     northarrow->key = 'n';
     northarrow->description = _("Draw a north arrow only");
-
+    northarrow->guisection = _("Style");
+    
     no_text = G_define_flag();
     no_text->key = 't';
     no_text->description = _("Draw the scale bar without text");
-    no_text->guisection = "Text";
+    no_text->guisection = _("Text");
 
     barstyle = G_define_option();
     barstyle->key = "style";
@@ -74,6 +75,7 @@
     barstyle->options =
 	"classic,line,solid,hollow,full_checker,part_checker,mixed_checker,tail_checker,up_ticks,down_ticks,both_ticks,arrow_ends";
     barstyle->answer = "classic";
+    barstyle->guisection = _("Style");
 
     coords = G_define_option();
     coords->key = "at";
@@ -87,21 +89,19 @@
     coords->description = _("(0,0) is lower-left of display frame");
 
     fg_color_opt = G_define_standard_option(G_OPT_C_FG);
-    fg_color_opt->key = "color";
     fg_color_opt->label = _("Bar scale, text, and north arrow color");
-    fg_color_opt->guisection = "Colors";
+    fg_color_opt->guisection = _("Colors");
 
     bg_color_opt = G_define_standard_option(G_OPT_C_BG);
-    bg_color_opt->key = "background_color";
     bg_color_opt->label = _("Background color (drawn behind the bar)");
-    bg_color_opt->guisection = "Colors";
+    bg_color_opt->guisection = _("Colors");
 
     text_placement = G_define_option();
     text_placement->key = "text_position";
     text_placement->description = _("Text position");
     text_placement->options = "under,over,left,right";
     text_placement->answer = "right";
-    text_placement->guisection = "Text";
+    text_placement->guisection = _("Text");
 
     fsize = G_define_option();
     fsize->key = "fontsize";
@@ -110,16 +110,15 @@
     fsize->answer = "12";
     fsize->options = "1-360";
     fsize->description = _("Font size");
-    fsize->guisection = "Text";
+    fsize->guisection = _("Text");
 
     n_arrow = G_define_option();
     n_arrow->key = "north_arrow";
-    n_arrow->description = _("Only used when drawing a north arrow with the -n flag");
-    n_arrow->label = _("North arrow style");
+    n_arrow->description = _("North arrow style (used only with the -n flag)");
     n_arrow->options = "1a,1b,2,3,4,5,6,7a,7b,8a,8b,9";
     n_arrow->answer = "1a";
+    n_arrow->guisection = _("Style");
 
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);