[GRASS-SVN] r59873 - grass/trunk/general/g.gui

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-04-21 04:55:01 -0700 (Mon, 21 Apr 2014)
New Revision: 59873

Modified:
   grass/trunk/general/g.gui/g.gui.html
   grass/trunk/general/g.gui/main.c
Log:
g.gui: rename -u flag to -d
       manual tuning


Modified: grass/trunk/general/g.gui/g.gui.html
===================================================================
--- grass/trunk/general/g.gui/g.gui.html	2014-04-21 09:48:18 UTC (rev 59872)
+++ grass/trunk/general/g.gui/g.gui.html	2014-04-21 11:55:01 UTC (rev 59873)
@@ -9,14 +9,9 @@
 aka <em><a href="wxGUI.html">wxGUI</a></em> (<b>ui=wxpython</b>) and
 command line text-based UI (<b>ui=text</b>).
 
-<p>
-The old <em>gis.m</em> and <em>d.m</em> Tcl/Tk-based GUIs known from 
-GRASS GIS 6 have been dropped in GRASS GIS 7.
-
-
 <h2>NOTES</h2>
 
-If the <b>-u</b> update flag is given or the <tt>GRASS_GUI</tt> 
+If the <b>-d</b> update flag is given or the <tt>GRASS_GUI</tt> 
 environmental <a href="variables.html">variable</a> is unset, then 
 the GRASS internal variable <tt>GUI</tt> is permanently changed and 
 the selected <b>ui</b> will be used as the default UI from then on.
@@ -27,33 +22,47 @@
 <tt>$HOME/.grass7/rc</tt> on Unix-based operating systems
 and <tt>%APPDATA%\GRASS7\rc</tt> on MS Windows. Note that these GRASS
 internal variables are not the shell environment variables and the
-"rc" file is not a classic UNIX run command file, it just
+<tt>rc</tt> file is not a classic UNIX run command file, it just
 contains persistent GRASS variables.
 
-<h2>EXAMPLE</h2>
+<p>
+The
+old <em><a href="http://grass.osgeo.org/grass64/manuals/gis.m.html">gis.m</a></em>
+and <em><a href="http://grass.osgeo.org/grass64/manuals/d.m.html">d.m</a></em>
+Tcl/Tk-based GUIs known from GRASS GIS 6 have been dropped in GRASS
+GIS 7.
 
+<h2>EXAMPLES</h2>
+
 Set default user interface setting to command line, text-based UI:
 <div class="code"><pre>
-g.gui -u ui=text
+g.gui -d ui=text
 </pre></div>
 
 <p>
-Set default user interface setting to the graphical user interface (GUI):
+Set default user interface setting to the graphical user interface
+(GUI) and <i>launch</i> the GUI:
 <div class="code"><pre>
-g.gui -u ui=wxpython
+g.gui -d ui=wxpython
 </pre></div>
+
+<p>
+Set default user interface setting to the graphical user interface
+(GUI) but <i>do not launch</i> the GUI:
+<div class="code"><pre>
+g.gui -dn ui=wxpython
+</pre></div>
+
 <h2>SEE ALSO</h2>
 
 <em>
 <a href="wxGUI.html">wxGUI</a>,
-<a href="http://grasswiki.osgeo.org/wiki/WxPython-based_GUI_for_GRASS">wxGUI wiki-page</a>
+<a href="g.gisenv.html">g.gisenv</a>,
+<a href="variables.html">GRASS variables</a>
 </em>
 
 <p>
-<em>
-<a href="g.gisenv.html">g.gisenv</a>,
-<a href="variables.html">GRASS variables list</a>
-</em>
+<a href="http://grasswiki.osgeo.org/wiki/WxPython-based_GUI_for_GRASS">wxGUI wiki page</a>
 
 <h2>AUTHORS</h2>
 

Modified: grass/trunk/general/g.gui/main.c
===================================================================
--- grass/trunk/general/g.gui/main.c	2014-04-21 09:48:18 UTC (rev 59872)
+++ grass/trunk/general/g.gui/main.c	2014-04-21 11:55:01 UTC (rev 59873)
@@ -35,10 +35,11 @@
 
     module = G_define_module();
     G_add_keyword(_("general"));
+    G_add_keyword(_("gui"));
     G_add_keyword(_("user interface"));
-    G_add_keyword(_("gui"));
-    module->description =
+    module->label =
 	_("Launches a GRASS graphical user interface (GUI) session.");
+    module->description = _("And updates default user interface settings.");
 
     type = G_define_option();
     type->key = "ui";
@@ -61,7 +62,7 @@
     rc_file->description = _("Name of workspace file to load on start-up (valid only for wxGUI)");
 
     update = G_define_flag();
-    update->key = 'u';
+    update->key = 'd';
     update->description = _("Update default user interface settings");
     update->guisection = _("Default");