[GRASS-SVN] r73266 - in grass/branches/releasebranch_7_6: doc gui/wxpython gui/wxpython/docs lib/init mswindows mswindows/osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Sep 4 22:59:43 PDT 2018
Author: neteler
Date: 2018-09-04 22:59:43 -0700 (Tue, 04 Sep 2018)
New Revision: 73266
Modified:
grass/branches/releasebranch_7_6/doc/grass_database.html
grass/branches/releasebranch_7_6/gui/wxpython/README
grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html
grass/branches/releasebranch_7_6/lib/init/README
grass/branches/releasebranch_7_6/lib/init/grass.py
grass/branches/releasebranch_7_6/lib/init/grass7.html
grass/branches/releasebranch_7_6/mswindows/GRASS-Installer.nsi.tmpl
grass/branches/releasebranch_7_6/mswindows/osgeo4w/postinstall.bat
Log:
Update all occurrences of -text, -gtext, -gui to --text, --gtext, --gui (trac #1665)
Modified: grass/branches/releasebranch_7_6/doc/grass_database.html
===================================================================
--- grass/branches/releasebranch_7_6/doc/grass_database.html 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/doc/grass_database.html 2018-09-05 05:59:43 UTC (rev 73266)
@@ -222,7 +222,7 @@
in a given Mapset with only command line interface:
<div class="code"><pre>
-grass76 -text ~/grassdata/mylocation/mymapset
+grass76 --text ~/grassdata/mylocation/mymapset
</pre></div>
And the following will create the given Location with projection given
Modified: grass/branches/releasebranch_7_6/gui/wxpython/README
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/README 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/gui/wxpython/README 2018-09-05 05:59:43 UTC (rev 73266)
@@ -16,9 +16,9 @@
2 - STARTUP WITH GRASS INITIALIZATION
If you want to launch wxPython GUI automatically, start GRASS with
-`-gui` parameter
+`--gui` parameter
-$ grass76 -gui
+$ grass76 --gui
3 - STARTUP FROM GRASS TERMINAL
Modified: grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html 2018-09-05 05:59:43 UTC (rev 73266)
@@ -684,10 +684,10 @@
<p>
The user can also start GRASS from the shell command line with the wxGUI
-specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
+specifying the <tt>--gui</tt> switch:
<div class="code"><pre>
-grass76 -gui
+grass76 --gui
</pre></div>
Modified: grass/branches/releasebranch_7_6/lib/init/README
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/README 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/lib/init/README 2018-09-05 05:59:43 UTC (rev 73266)
@@ -1,11 +1,12 @@
o GRASS text mode startup
- "grass76" starts up d.m by default (if not first time user).
- "grass76 -text" will start up in text mode.
- "grass76 -wxpython" or "grass76 -gui" will start up in wxpython mode.
+ "grass76" starts up g.gui by default (if not first time user).
+ "grass76 --text" will start up in text mode.
+ "grass76 --gtext" will start up with graphical welcome screen but continue then in text mode.
+ "grass76 --gui" will start up in th graphical user interface (wxpython mode).
- You can use alias "grass76" to "grass76 -text" to use text mode by default.
- Or set env var GRASS_GUI=text.
+ You can set an alias "grass76" to e.g. "grass76 --text" to use text mode by default.
+ Or set the environmental variable GRASS_GUI=text.
o GRASS non-interactive startup examples
@@ -77,5 +78,5 @@
# GISDBASE/loc2-1/map1-1 location
- Any suggestionss to <grass-dev at lists.osgeo.org>
+ Send any suggestions to <grass-dev at lists.osgeo.org> at https://lists.osgeo.org/pipermail/grass-dev/
Modified: grass/branches/releasebranch_7_6/lib/init/grass.py
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/grass.py 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/lib/init/grass.py 2018-09-05 05:59:43 UTC (rev 73266)
@@ -339,7 +339,7 @@
version_flag=_("show version information and exit"),
create=_("create given database, location or mapset if it doesn't exist"),
exit_after=_("exit after creation of location or mapset. Only with -c flag"),
- force_removal=_("force removal of .gislock if exists (use with care!). Only with -text flag"),
+ force_removal=_("force removal of .gislock if exists (use with care!). Only with --text flag"),
text=_("use text based interface (skip welcome screen)"),
text_detail=_("and set as default"),
gtext=_("use text based interface (show welcome screen)"),
@@ -1089,7 +1089,7 @@
" report this error to the GRASS developers.\n"
"On systems with package manager, make sure you have the right"
" GUI package, probably named grass-gui, installed.\n"
- "To run GRASS GIS in text mode use the -text flag.\n"
+ "To run GRASS GIS in text mode use the --text flag.\n"
"Use '--help' for further options\n"
" {cmd_name} --help\n"
"See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html").format(
@@ -1862,13 +1862,13 @@
elif i in ["help", "-h", "-help", "--help", "--h"]:
help_message(default_gui=default_gui)
sys.exit()
- # Check if the -text flag was given
+ # Check if the --text flag was given
elif i in ["-text", "--text"]:
params.grass_gui = 'text'
- # Check if the -gtext flag was given
+ # Check if the --gtext flag was given
elif i in ["-gtext", "--gtext"]:
params.grass_gui = 'gtext'
- # Check if the -gui flag was given
+ # Check if the --gui flag was given
elif i in ["-gui", "--gui"]:
params.grass_gui = default_gui
# Check if the -wxpython flag was given
@@ -2019,8 +2019,8 @@
if grass_gui == 'text' and not params.mapset:
fatal(_("Unable to start GRASS GIS. You have the choice to:\n"
" - Launch the graphical user interface with"
- " the '-gui' switch\n"
- " {cmd_name} -gui\n"
+ " the '--gui' switch\n"
+ " {cmd_name} --gui\n"
" - Launch with path to "
"the location/mapset as an argument\n"
" {cmd_name} /path/to/location/mapset`\n"
@@ -2061,7 +2061,7 @@
if not set_mapset_interactive(grass_gui):
# No GUI available, update gisrc file
fatal(_("<{0}> requested, but not available. Run GRASS in text "
- "mode (-text) or install missing package (usually "
+ "mode (--text) or install missing package (usually "
"'grass-gui').").format(grass_gui))
else:
# Try non-interactive start up
Modified: grass/branches/releasebranch_7_6/lib/init/grass7.html
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/grass7.html 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/lib/init/grass7.html 2018-09-05 05:59:43 UTC (rev 73266)
@@ -4,7 +4,7 @@
<b>grass76</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
[<b>-c</b> | <b>-c geofile</b> | <b>-c EPSG:code[:datum_trans]</b>]
- [<b>-text</b> | <b>-gtext</b> | <b>-gui</b>]
+ [<b>--text</b> | <b>--gtext</b> | <b>--gui</b>]
[[[<b><GISDBASE>/</b>]<b><LOCATION_NAME>/</b>]
<b><MAPSET></b>]
@@ -34,15 +34,15 @@
<dd> Exit after creation of location or mapset. Only with <b>-c</b> flag
<dt><b>-f</b>
-<dd> Forces removal of .gislock if exists (use with care!). Only with -text flag
+<dd> Forces removal of .gislock if exists (use with care!). Only with --text flag
-<dt><b>-text</b>
+<dt><b>--text</b>
<dd> Indicates that Text-based User Interface should be used (skip welcome screen)
-<dt><b>-gtext</b>
+<dt><b>--gtext</b>
<dd> Indicates that Text-based User Interface should be used (show welcome screen)
-<dt><b>-gui</b>
+<dt><b>--gui</b>
<dd> Indicates that Graphical User Interface
(<em><a href="wxGUI.html">wxGUI</a></em>) should be used
@@ -97,7 +97,7 @@
<em>grass76</em> (without any options) will start GRASS with the
previous settings for the user interface and mapset selected.
-<p>If you specify a graphical user interface (<b>-gui</b>)
+<p>If you specify a graphical user interface (<b>--gui</b>)
the <em>grass76</em> program will try to verify that the system you
specified exists and that you can access it successfully. If any of
these checks fail then <em>grass76</em> will automatically switch back
@@ -246,16 +246,16 @@
<dd> Start GRASS using the default user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass76 -gui</b>
+<dt><b>grass76 --gui</b>
<dd> Start GRASS using the graphical user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass76 -text</b>
+<dt><b>grass76 --text</b>
<dd> Start GRASS using the text-based user interface. Appropriate
location and mapset must be set by environmental variables (see
examples below) otherwise taken from the last GRASS session.</dd>
-<dt><b>grass76 -gtext</b>
+<dt><b>grass76 --gtext</b>
<dd> Start GRASS using the text-based user interface. The user will be
prompted to choose the appropriate location and mapset.
@@ -263,7 +263,7 @@
<dd> Start GRASS using the default user interface and automatically
launch into the given mapset, bypassing the mapset selection menu.
-<dt><b>grass76 -gui -</b>
+<dt><b>grass76 --gui -</b>
<dd> Start GRASS using the graphical user interface and try to
obtain the location and mapset from environment variables.
Modified: grass/branches/releasebranch_7_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_6/mswindows/GRASS-Installer.nsi.tmpl 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/mswindows/GRASS-Installer.nsi.tmpl 2018-09-05 05:59:43 UTC (rev 73266)
@@ -657,7 +657,7 @@
;Create the Desktop Shortcut
SetShellVarContext current
- CreateShortCut "$DESKTOP\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
+ CreateShortCut "$DESKTOP\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "--gui"\
"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
;Create the Windows Start Menu Shortcuts
@@ -665,7 +665,7 @@
CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
- CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
+ CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "--gui"\
"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Uninstall ${GRASS_BASE}.lnk" "$INSTALL_DIR\Uninstall-GRASS.exe" ""\
Modified: grass/branches/releasebranch_7_6/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/releasebranch_7_6/mswindows/osgeo4w/postinstall.bat 2018-09-05 05:59:31 UTC (rev 73265)
+++ grass/branches/releasebranch_7_6/mswindows/osgeo4w/postinstall.bat 2018-09-05 05:59:43 UTC (rev 73266)
@@ -3,8 +3,8 @@
textreplace -std -t "%BATCH%"
textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION at .lnk" "%BATCH%" "-gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%"
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%"
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION at .lnk" "%BATCH%" "--gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%"
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "--gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%"
rem run g.mkfontcap outside a GRASS session during
rem an OSGeo4W installation for updating paths to fonts
More information about the grass-commit
mailing list