[GRASS-SVN] r59874 - grass/branches/releasebranch_7_0/general/g.gui
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Apr 21 04:58:29 PDT 2014
Author: martinl
Date: 2014-04-21 04:58:28 -0700 (Mon, 21 Apr 2014)
New Revision: 59874
Modified:
grass/branches/releasebranch_7_0/general/g.gui/g.gui.html
grass/branches/releasebranch_7_0/general/g.gui/main.c
Log:
g.gui: rename options: gui -> ui, -u -> -d
manual tuning
(merge r59863+r59864+r59873 from trunk)
Modified: grass/branches/releasebranch_7_0/general/g.gui/g.gui.html
===================================================================
--- grass/branches/releasebranch_7_0/general/g.gui/g.gui.html 2014-04-21 11:55:01 UTC (rev 59873)
+++ grass/branches/releasebranch_7_0/general/g.gui/g.gui.html 2014-04-21 11:58:28 UTC (rev 59874)
@@ -6,20 +6,15 @@
<p>
GRASS GIS 7 comes with both a wxPython-based GUI
-aka <em><a href="wxGUI.html">wxGUI</a></em> (<b>gui=wxpython</b>) and
-command line text-based UI (<b>gui=text</b>).
+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>gui</b> will be used as the default UI from then on.
+the selected <b>ui</b> will be used as the default UI from then on.
<p>
All GRASS internal variables (see <em><a href="g.gisenv.html">g.gisenv</a></em>)
@@ -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 gui=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 gui=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/branches/releasebranch_7_0/general/g.gui/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.gui/main.c 2014-04-21 11:55:01 UTC (rev 59873)
+++ grass/branches/releasebranch_7_0/general/g.gui/main.c 2014-04-21 11:58:28 UTC (rev 59874)
@@ -8,7 +8,7 @@
*
* PURPOSE: Start GRASS GUI from command line.
*
- * COPYRIGHT: (C) 2008, 2010-2011 by the GRASS Development Team
+ * COPYRIGHT: (C) 2008-2014 by the GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
@@ -36,13 +36,15 @@
module = G_define_module();
G_add_keyword(_("general"));
G_add_keyword(_("gui"));
- module->description =
+ G_add_keyword(_("user interface"));
+ module->label =
_("Launches a GRASS graphical user interface (GUI) session.");
+ module->description = _("And updates default user interface settings.");
type = G_define_option();
- type->key = "gui";
+ type->key = "ui";
type->type = TYPE_STRING;
- type->label = _("GUI type");
+ type->label = _("User interface");
type->description = _("Default value: GRASS_GUI if defined otherwise wxpython");
desc = NULL;
G_asprintf(&desc,
@@ -60,14 +62,14 @@
rc_file->description = _("Name of workspace file to load on start-up (valid only for wxGUI)");
update = G_define_flag();
- update->key = 'u';
- update->description = _("Update default GUI setting");
+ update->key = 'd';
+ update->description = _("Update default user interface settings");
update->guisection = _("Default");
nolaunch = G_define_flag();
nolaunch->key = 'n';
nolaunch->description =
- _("Do not launch GUI after updating the default GUI setting");
+ _("Do not launch GUI after updating the default user interface settings");
nolaunch->guisection = _("Default");
if (G_parser(argc, argv))
More information about the grass-commit
mailing list