[GRASS-SVN] r56909 - in grass/branches/develbranch_6: gui/wxpython/scripts scripts/v.krige tools

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-06-24 16:09:13 -0700 (Mon, 24 Jun 2013)
New Revision: 56909

Modified:
   grass/branches/develbranch_6/gui/wxpython/scripts/p.db.py
   grass/branches/develbranch_6/gui/wxpython/scripts/p.mon.py
   grass/branches/develbranch_6/scripts/v.krige/v.krige.py
   grass/branches/develbranch_6/tools/module_synopsis.sh
Log:
update to new wxGUI dir structure

Modified: grass/branches/develbranch_6/gui/wxpython/scripts/p.db.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/scripts/p.db.py	2013-06-24 15:55:02 UTC (rev 56908)
+++ grass/branches/develbranch_6/gui/wxpython/scripts/p.db.py	2013-06-24 23:09:13 UTC (rev 56909)
@@ -37,7 +37,7 @@
 def main():
     table = options["table"]
 
-    os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/gui_modules/dbm.py" % os.environ["GISBASE"], table)
+    os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/dbmgr/manager.py" % os.environ["GISBASE"], table)
 
 if __name__ == "__main__":
     options, flags = grass.parser()

Modified: grass/branches/develbranch_6/gui/wxpython/scripts/p.mon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/scripts/p.mon.py	2013-06-24 15:55:02 UTC (rev 56908)
+++ grass/branches/develbranch_6/gui/wxpython/scripts/p.mon.py	2013-06-24 23:09:13 UTC (rev 56909)
@@ -96,7 +96,7 @@
     os.system("g.gisenv set=GRASS_PYCMDFILE=%s" % command_file)
 
     if start != "":
-        os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/gui_modules/mapdisp.py" % os.environ["GISBASE"], start, command_file)
+        os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/gui_core/mapdisp.py" % os.environ["GISBASE"], start, command_file)
         return
 
 #    if stop != "" or select != "" or unlock != "":

Modified: grass/branches/develbranch_6/scripts/v.krige/v.krige.py
===================================================================
--- grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2013-06-24 15:55:02 UTC (rev 56908)
+++ grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2013-06-24 23:09:13 UTC (rev 56909)
@@ -108,7 +108,7 @@
     print "You must be in GRASS GIS to run this program."
     sys.exit(1)
 
-GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "gui_modules")
+GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "modules")
 sys.path.append(GUIModulesPath)
 
 GUIPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "scripts")

Modified: grass/branches/develbranch_6/tools/module_synopsis.sh
===================================================================
--- grass/branches/develbranch_6/tools/module_synopsis.sh	2013-06-24 15:55:02 UTC (rev 56908)
+++ grass/branches/develbranch_6/tools/module_synopsis.sh	2013-06-24 23:09:13 UTC (rev 56909)
@@ -59,7 +59,7 @@
 
 
 ### generate menu hierarchy
-MDPY="$GISBASE/etc/wxpython/gui_modules/menudata.py"
+MDPY="$GISBASE/etc/wxpython/core/menudata.py"
 # python menudata.py commands
 # python menudata.py tree
 # python menudata.py strings