[GRASS-SVN] r30161 - in grass/trunk: general/g.gui gui/wxpython lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-02-14 16:30:57 -0500 (Thu, 14 Feb 2008)
New Revision: 30161

Modified:
   grass/trunk/general/g.gui/main.c
   grass/trunk/gui/wxpython/Makefile
   grass/trunk/gui/wxpython/wxgui
   grass/trunk/lib/init/init.sh
Log:
wxgui script moved to /home/martin/src/grass_trunk/dist.i686-pc-linux-gnu/etc/wxpython/scripts directory. Use g.gui module to (re)start GUI session.

Modified: grass/trunk/general/g.gui/main.c
===================================================================
--- grass/trunk/general/g.gui/main.c	2008-02-14 21:24:42 UTC (rev 30160)
+++ grass/trunk/general/g.gui/main.c	2008-02-14 21:30:57 UTC (rev 30161)
@@ -27,6 +27,7 @@
     struct Flag *oneoff;
     struct GModule *module;
     char *gui_type_env;
+    char progname[GPATH_MAX];
 
     G_gisinit(argv[0]);
 
@@ -42,7 +43,7 @@
     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);"
-			   "wxpython;wxPython based next generation GUI (wxgui)");
+			   "wxpython;wxPython based next generation GUI");
     type->options = "tcltk,oldtcltk,wxpython";
     gui_type_env = G__getenv("GRASS_GUI");
     if (gui_type_env && strcmp(gui_type_env, "text")) {
@@ -89,12 +90,12 @@
 	}
     }
     else if (strcmp(type->answer, "wxpython") == 0) {
-	/* sprintf (progname, "%s/etc/wxpython/wxgui", G_gisbase()); */
+	sprintf (progname, "%s/etc/wxpython/scripts/wxgui", G_gisbase());
 	if (rc_file->answer) {
-	    G_spawn("wxgui", "workspace=%s", rc_file->answer, NULL);
+	    G_spawn(progname, "wxgui", rc_file->answer, NULL);
 	}
 	else {
-	    G_system("wxgui");
+	    G_spawn(progname, "wxgui", NULL);
 	}
     }
 

Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile	2008-02-14 21:24:42 UTC (rev 30160)
+++ grass/trunk/gui/wxpython/Makefile	2008-02-14 21:30:57 UTC (rev 30161)
@@ -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 wxgui $(GISBASE)/scripts/
+	$(INSTALL) -m 755 wxgui $(ETCDIR)/scripts/
 
 clean: cleansubdirs

Modified: grass/trunk/gui/wxpython/wxgui
===================================================================
--- grass/trunk/gui/wxpython/wxgui	2008-02-14 21:24:42 UTC (rev 30160)
+++ grass/trunk/gui/wxpython/wxgui	2008-02-14 21:30:57 UTC (rev 30161)
@@ -7,7 +7,7 @@
 #%option
 #% key: workspace
 #% type: string
-#% description: Name of Layer Manager settings file (.grc)
+#% description: Name of workspace file (.grc)
 #% required : no
 #%End
 

Modified: grass/trunk/lib/init/init.sh
===================================================================
--- grass/trunk/lib/init/init.sh	2008-02-14 21:24:42 UTC (rev 30160)
+++ grass/trunk/lib/init/init.sh	2008-02-14 21:30:57 UTC (rev 30161)
@@ -771,7 +771,7 @@
 	fi
 	;;
     wxpython)
-        "$GISBASE/scripts/wxgui" &
+        "$GISBASE/etc/wxpython/scripts/wxgui"
 	;;
 
     # Ignore others
@@ -812,16 +812,16 @@
 
 case "$GRASS_GUI" in
     tcltk | gis.m)
-        echo "If required, restart the graphical user interface with: gis.m"
+        echo "If required, restart the graphical user interface with: g.gui type=tcltk"
         ;;
     oldtcltk | d.m)
-        echo "If required, restart the graphical user interface with: d.m"
+        echo "If required, restart the graphical user interface with: g.gui type=oldtcltk"
         ;;
     wxpython)
-        echo "If required, restart the graphical user interface with: wxgui"
+        echo "If required, restart the graphical user interface with: g.gui type=wxpython"
         ;;
     *)
-        echo "Start the graphical user interface with: gis.m"
+        echo "Start the graphical user interface with: g.gui type=tcltk"
         ;;
 esac