[GRASS-SVN] r30157 - in grass/trunk/general: . g.gui

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-02-14 15:51:06 -0500 (Thu, 14 Feb 2008)
New Revision: 30157

Modified:
   grass/trunk/general/Makefile
   grass/trunk/general/g.gui/description.html
   grass/trunk/general/g.gui/main.c
Log:
fine tuning; add module to build list

Modified: grass/trunk/general/Makefile
===================================================================
--- grass/trunk/general/Makefile	2008-02-14 20:24:53 UTC (rev 30156)
+++ grass/trunk/general/Makefile	2008-02-14 20:51:06 UTC (rev 30157)
@@ -9,6 +9,7 @@
 	g.findetc \
 	g.findfile \
 	g.gisenv \
+	g.gui \
 	g.mapset \
 	g.mapsets \
 	g.message \

Modified: grass/trunk/general/g.gui/description.html
===================================================================
--- grass/trunk/general/g.gui/description.html	2008-02-14 20:24:53 UTC (rev 30156)
+++ grass/trunk/general/g.gui/description.html	2008-02-14 20:51:06 UTC (rev 30157)
@@ -2,32 +2,33 @@
 
 <p>
 This program allows user to start a selected graphical user interface (GUI)
-from command line prompt.
+from the command line prompt.
 
 <p>
 Currently three different GUIs are supported:
 
 <ul>
-<li><b>tcltk</b> - Current TCL/TK based GUI aka the <em>gis.m</em>
+<li><b>tcltk</b> - Current Tcl/Tk based GUI aka the <em>gis.m</em>
     <a href="gis.m.html">GIS Manager</a></li>
-<li><b>oldtcltk</b> - Old TCL/TK based GUI aka the <em>d.m</em>
+<li><b>oldtcltk</b> - Old Tcl/Tk based GUI aka the <em>d.m</em>
     <a href="d.m.html">Display Manager</a></li>
 <li><b>wxpython</b> - New wxPython based GUI aka
     <a href="wxGUI.html">wxGUI</a></li>
 </ul>
 
-If the <em>g.gisenv</em> <tt>GRASS_GUI</tt> variable is not set or differs
-from the option selected with this module, and the <b>-u</b> flag is not
-set, then the <tt>GRASS_GUI</tt> variable is permanently changed and the
-selected GUI will be used as the default UI from then on.
+If the <b>-u</b> update flag is given or the <em>g.gisenv</em>
+<tt>GRASS_GUI</tt> variable is missing, then the <tt>GRASS_GUI</tt>
+variable is permanently changed and the selected GUI will be used
+as the default UI from then on.
 
+
 <h2>NOTES</h2>
 
 Valid values for GRASS_GUI are <tt>text</tt>, <tt>tcltk</tt>,
 <tt>oldtcltk</tt>, and <tt>wxpython</tt>.
 
 <em>g.gisenv</em> variables are stored in the user's home directory
-in a hidden file called ".grassrc6". They are not shell environment
+in a hidden file called "<TT>.grassrc6</TT>". They are not shell environment
 variables and the "rc" file is not a classic UNIX run command file,
 it just contains persistent GRASS variables and is not executed.
 
@@ -37,15 +38,16 @@
 <em>
 <a href="wxGUI.html">wxPython based new generation GUI</a>,
 <a href="http://grass.gdf-hannover.de/wiki/WxPython-based_GUI_for_GRASS">wxGUI wiki-page</a><br>
-<a href="gis.m.html">TCL/TK based GIS Manager (gis.m)</a>,<br>
-<a href="d.m.html">TCL/TK based Display Manager (d.m)</a>,<br><br>
+<a href="gis.m.html">Tcl/Tk based GIS Manager (gis.m)</a>,<br>
+<a href="d.m.html">Tcl/Tk based Display Manager (d.m)</a>,<br><br>
 <a href="g.gisenv.html">g.gisenv</a>, <a href="variables.html">GRASS variables list</a>
 </em>
 
 
-<h2>AUTHOR</h2>
+<h2>AUTHORS</h2>
 
-Martin Landa, FBK-irst, Trento, Italy
+Martin Landa, FBK-irst, Trento, Italy<BR>
+Hamish Bowman, Otago University, Dunedin, New Zealand (fine tuning)
 
 <p>
 <i>$Date$</i>

Modified: grass/trunk/general/g.gui/main.c
===================================================================
--- grass/trunk/general/g.gui/main.c	2008-02-14 20:24:53 UTC (rev 30156)
+++ grass/trunk/general/g.gui/main.c	2008-02-14 20:51:06 UTC (rev 30157)
@@ -3,6 +3,7 @@
  * MODULE:       g.gui
  *
  * AUTHOR(S):    Martin Landa <landa.martin gmail.com>
+ *		 Hamish Bowman <hamish_b yahoo com> (fine tuning)
  *
  * PURPOSE:      Start GRASS GUI from command line.
  *
@@ -39,8 +40,8 @@
     type->type = TYPE_STRING;
     type->required = YES;
     type->description = _("GUI type");
-    type->descriptions = _("tcltk;TCL/TK based GUI - GIS Manager (gis.m);"
-			   "oldtcltk;Old TCL/TK based GUI - Display Manager (d.m);"
+    type->descriptions = _("tcltk;Tcl/Tk based GUI - GIS Manager (gis.m);"
+			   "oldtcltk;Old Tcl/Tk based GUI - Display Manager (d.m);"
 			   "wxpython;wxPython based next generation GUI (wxgui)");
     type->options = "tcltk,oldtcltk,wxpython";
     gui_type_env = G__getenv("GRASS_GUI");