[GRASS-SVN] r37348 - in grass/trunk/gui/wxpython: . gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu May 21 18:08:15 EDT 2009
Author: martinl
Date: 2009-05-21 18:08:15 -0400 (Thu, 21 May 2009)
New Revision: 37348
Modified:
grass/trunk/gui/wxpython/gui_modules/colorrules.py
grass/trunk/gui/wxpython/gui_modules/gcmd.py
grass/trunk/gui/wxpython/gui_modules/gdialogs.py
grass/trunk/gui/wxpython/gui_modules/georect.py
grass/trunk/gui/wxpython/gui_modules/gselect.py
grass/trunk/gui/wxpython/gui_modules/location_wizard.py
grass/trunk/gui/wxpython/gui_modules/mapdisp.py
grass/trunk/gui/wxpython/gui_modules/menuform.py
grass/trunk/gui/wxpython/gui_modules/preferences.py
grass/trunk/gui/wxpython/gui_modules/profile.py
grass/trunk/gui/wxpython/gui_modules/render.py
grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py
grass/trunk/gui/wxpython/gui_modules/toolbars.py
grass/trunk/gui/wxpython/gui_modules/utils.py
grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
grass/trunk/gui/wxpython/wxgui.py
Log:
fix wxGUI, see r37347
Modified: grass/trunk/gui/wxpython/gui_modules/colorrules.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/colorrules.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/colorrules.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -24,7 +24,7 @@
import wx.lib.colourselect as csel
import wx.lib.scrolledpanel as scrolled
-import grass
+from grass.script import core as grass
import dbm
import gcmd
Modified: grass/trunk/gui/wxpython/gui_modules/gcmd.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gcmd.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/gcmd.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -56,7 +56,7 @@
import globalvar
grassPath = os.path.join(globalvar.ETCDIR, "python")
sys.path.append(grassPath)
-import grass
+from grass.script import core as grass
import utils
from debug import Debug as Debug
Modified: grass/trunk/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gdialogs.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/gdialogs.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -31,7 +31,7 @@
import wx.lib.filebrowsebutton as filebrowse
import wx.lib.mixins.listctrl as listmix
-import grass
+from grass.script import core as grass
import gcmd
import globalvar
Modified: grass/trunk/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/georect.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/georect.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -35,7 +35,7 @@
import wx.lib.colourselect as csel
import wx.wizard as wiz
-import grass
+from grass.script import core as grass
import globalvar
import mapdisp
Modified: grass/trunk/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gselect.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/gselect.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -26,7 +26,7 @@
import wx
import wx.combo
-import grass
+from grass.script import core as grass
import globalvar
import gcmd
Modified: grass/trunk/gui/wxpython/gui_modules/location_wizard.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/location_wizard.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/location_wizard.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -46,7 +46,7 @@
import gcmd
import globalvar
import utils
-import grass
+from grass.script import core as grass
try:
import subprocess
except:
Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -63,7 +63,7 @@
import globalvar
import utils
import gdialogs
-import grass
+from grass.script import core as grass
from debug import Debug
from icon import Icons
from preferences import globalSettings as UserSettings
Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -93,7 +93,7 @@
imagepath = os.path.join(wxbase, "images")
sys.path.append(imagepath)
-import grass
+from grass.script import core as grass
import gselect
import gcmd
Modified: grass/trunk/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/preferences.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/preferences.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -35,7 +35,7 @@
import wx.lib.mixins.listctrl as listmix
from wx.lib.wordwrap import wordwrap
-import grass
+from grass.script import core as grass
import gcmd
import utils
import globalvar
Modified: grass/trunk/gui/wxpython/gui_modules/profile.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/profile.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/profile.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -56,7 +56,7 @@
from debug import Debug as Debug
from icon import Icons as Icons
from preferences import globalSettings as UserSettings
-import grass
+from grass.script import core as grass
class ProfileFrame(wx.Frame):
"""
Modified: grass/trunk/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/render.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/render.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -37,7 +37,7 @@
import wx
from wx.lib.newevent import NewEvent
-import grass
+from grass.script import core as grass
import globalvar
import utils
Modified: grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -24,7 +24,7 @@
import os,sys
import time
-import grass
+from grass.script import core as grass
import gcmd
import globalvar
Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -25,7 +25,7 @@
import os, sys
import platform
-import grass
+from grass.script import core as grass
import globalvar
import gcmd
Modified: grass/trunk/gui/wxpython/gui_modules/utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/utils.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/utils.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -21,7 +21,7 @@
import globalvar
grassPath = os.path.join(globalvar.ETCDIR, "python")
sys.path.append(grassPath)
-import grass
+from grass.script import core as grass
import gcmd
try:
Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -30,7 +30,7 @@
import wx.lib.newevent
import wx.lib.buttons as buttons
-import grass
+from grass.script import core as grass
import gdialogs
import globalvar
Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py 2009-05-21 22:04:15 UTC (rev 37347)
+++ grass/trunk/gui/wxpython/wxgui.py 2009-05-21 22:08:15 UTC (rev 37348)
@@ -66,7 +66,7 @@
grassPath = os.path.join(globalvar.ETCDIR, "python")
sys.path.append(grassPath)
-import grass
+from grass.script import core as grass
import gui_modules.utils as utils
import gui_modules.preferences as preferences
More information about the grass-commit
mailing list