[GRASS-SVN] r30078 - in grass/trunk/gui/wxpython: . docs gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Feb 11 06:35:35 EST 2008
Author: martinl
Date: 2008-02-11 06:35:34 -0500 (Mon, 11 Feb 2008)
New Revision: 30078
Added:
grass/trunk/gui/wxpython/wxgui
Removed:
grass/trunk/gui/wxpython/wxgrass
Modified:
grass/trunk/gui/wxpython/Makefile
grass/trunk/gui/wxpython/README
grass/trunk/gui/wxpython/docs/wxGUI.html
grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: wxgrass script renamed to wxgui
Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile 2008-02-11 11:21:23 UTC (rev 30077)
+++ grass/trunk/gui/wxpython/Makefile 2008-02-11 11:35:34 UTC (rev 30078)
@@ -19,6 +19,6 @@
$(INSTALL_DATA) gis_set.py wxgui.py README $(ETCDIR)/
# $(INSTALL_DATA) vdigit/_grass6_wxvdigit.so $(ETCDIR)/vdigit/
# $(INSTALL_DATA) vdigit/grass6_wxvdigit.py $(ETCDIR)/vdigit/
- $(INSTALL) -m 755 wxgrass $(GISBASE)/scripts/
+ $(INSTALL) -m 755 wxgui $(GISBASE)/scripts/
clean: cleansubdirs
Modified: grass/trunk/gui/wxpython/README
===================================================================
--- grass/trunk/gui/wxpython/README 2008-02-11 11:21:23 UTC (rev 30077)
+++ grass/trunk/gui/wxpython/README 2008-02-11 11:35:34 UTC (rev 30078)
@@ -42,13 +42,9 @@
$ cd gui/wxpython
-1) Copy everything from gui directory into a new directory $GISBASE/etc/wx.
- Or easier, create symlink (in running GRASS session):
- ln -s `pwd` $GISBASE/etc/wx
+and run
-2) Copy the script "wxgrass" into $GISBASE/scripts.
- Or easier, create symlink (in running GRASS session):
- ln -s `pwd`/wxgrass $GISBASE/scripts
+$ make
2 - STARTUP WITH GRASS INITIALIZATION
@@ -69,13 +65,13 @@
Simply type
-$ wxgrass
+$ wxgui
from the GRASS terminal.
You can also specify workspace file to load on startup.
-$ wxgrass myworkspace.grc
+$ wxgui myworkspace.grc
4 - CLI Display scripts
Modified: grass/trunk/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.html 2008-02-11 11:21:23 UTC (rev 30077)
+++ grass/trunk/gui/wxpython/docs/wxGUI.html 2008-02-11 11:35:34 UTC (rev 30078)
@@ -15,9 +15,12 @@
The GUI can be quit by selecting the 'File->Exit' menu item. The GUI
can be restarted from the GRASS command line prompt by
-typing <em>wxgrass</em>.
+typing
-<p>
+<div class="code"><pre>
+ wxgui
+</pre></div>
+
The GUI is composed by <em>two</em> main components:
<ul>
Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py 2008-02-11 11:21:23 UTC (rev 30077)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py 2008-02-11 11:35:34 UTC (rev 30078)
@@ -67,7 +67,7 @@
import os
from os import system
import gettext
-gettext.install("wxgrass")
+gettext.install("wxgui")
gisbase = os.getenv("GISBASE")
import globalvar
Deleted: grass/trunk/gui/wxpython/wxgrass
===================================================================
--- grass/trunk/gui/wxpython/wxgrass 2008-02-11 11:21:23 UTC (rev 30077)
+++ grass/trunk/gui/wxpython/wxgrass 2008-02-11 11:35:34 UTC (rev 30078)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ -z "$GISBASE" ] ; then
- echo "You must be in GRASS GIS to run this program." 1>&2
- exit 1
-fi
-
-if [ ! -z "$1" ] ; then
- # load workspace file
- python "$GISBASE/etc/wxpython/wxgui.py" "--workspace" "$1" &
-else
- python "$GISBASE/etc/wxpython/wxgui.py" &
-fi
-
-exit 0
Copied: grass/trunk/gui/wxpython/wxgui (from rev 30075, grass/trunk/gui/wxpython/wxgrass)
===================================================================
--- grass/trunk/gui/wxpython/wxgui (rev 0)
+++ grass/trunk/gui/wxpython/wxgui 2008-02-11 11:35:34 UTC (rev 30078)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ -z "$GISBASE" ] ; then
+ echo "You must be in GRASS GIS to run this program." 1>&2
+ exit 1
+fi
+
+if [ ! -z "$1" ] ; then
+ # load workspace file
+ python "$GISBASE/etc/wxpython/wxgui.py" "--workspace" "$1" &
+else
+ python "$GISBASE/etc/wxpython/wxgui.py" &
+fi
+
+exit 0
More information about the grass-commit
mailing list