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

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-04-20 15:00:07 -0700 (Sun, 20 Apr 2014)
New Revision: 59864

Modified:
   grass/trunk/general/g.gui/g.gui.html
   grass/trunk/general/g.gui/main.c
Log:
g.gui: change option 'gui' to more suitable 'ui'

Modified: grass/trunk/general/g.gui/g.gui.html
===================================================================
--- grass/trunk/general/g.gui/g.gui.html	2014-04-20 21:53:28 UTC (rev 59863)
+++ grass/trunk/general/g.gui/g.gui.html	2014-04-20 22:00:07 UTC (rev 59864)
@@ -5,8 +5,8 @@
 settings.
 
 <p>GRASS 7 comes with 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 from GRASS 6
@@ -17,7 +17,7 @@
 
 If the <b>-u</b> update flag is given or the GRASS
 <tt>GUI</tt> variable is missing, then the <tt>GUI</tt> variable is
-permanently changed and the selected <b>gui</b> will be used as the default
+permanently changed and the selected <b>ui</b> will be used as the default
 UI from then on.
 
 <p>
@@ -33,7 +33,7 @@
 
 Set the command line text-based UI to be the default UI:
 <div class="code"><pre>
-g.gui -u gui=text
+g.gui -u ui=text
 </pre></div>
 
 <h2>SEE ALSO</h2>

Modified: grass/trunk/general/g.gui/main.c
===================================================================
--- grass/trunk/general/g.gui/main.c	2014-04-20 21:53:28 UTC (rev 59863)
+++ grass/trunk/general/g.gui/main.c	2014-04-20 22:00:07 UTC (rev 59864)
@@ -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
@@ -35,14 +35,15 @@
 
     module = G_define_module();
     G_add_keyword(_("general"));
+    G_add_keyword(_("user interface"));
     G_add_keyword(_("gui"));
     module->description =
 	_("Launches a GRASS graphical user interface (GUI) session.");
 
     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,
@@ -61,13 +62,13 @@
 
     update = G_define_flag();
     update->key = 'u';
-    update->description = _("Update default GUI setting");
+    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))