wxGUI major code reorganization (part 3)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49349 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gis_set_error.py

@@ -14,7 +14,7 @@ This program is free software under the GNU General Public License
 import os
 import sys
 
-from gui_modules import globalvar
+from core import globalvar
 import wx
 
 def main():

gui/wxpython/icons/icon.py

@@ -22,7 +22,7 @@ for details.
 import os
 import sys
 
-sys.path.append(os.path.join(os.getenv("GISBASE"), "etc", "gui", "wxpython", "gui_modules"))
+sys.path.append(os.path.join(os.getenv("GISBASE"), "etc", "gui", "wxpython"))
 
 import wx
 

gui/wxpython/tools/update_menudata.py

@@ -30,8 +30,7 @@ except ImportError:
 from grass.script import core as grass
 from grass.script import task as gtask
 
-sys.path.append('gui_modules')
-import menudata
+from core.menudata import ManagerData
 
 def parseModules():
     """!Parse modules' interface"""
@@ -149,7 +148,7 @@ def main(argv = None):
     modules = dict()
     modules = parseModules()
     grass.info("Step 3: reading menu data...")
-    data = menudata.ManagerData()
+    data = ManagerData()
     grass.info("Step 4: updating menu data...")
     updateData(data, modules)
     

gui/wxpython/wxgui.py

@@ -312,11 +312,11 @@ class GMFrame(wx.Frame):
         
     def OnLocationWizard(self, event):
         """!Launch location wizard"""
-        from gui_modules import location_wizard
+        from location_wizard.wizard import LocationWizard
         
         gisdbase = grass.gisenv()['GISDBASE']
-        gWizard = location_wizard.LocationWizard(parent = self,
-                                                 grassdatabase = gisdbase)
+        gWizard = LocationWizard(parent = self,
+                                 grassdatabase = gisdbase)
         
         if gWizard.location !=  None:
             dlg = wx.MessageDialog(parent = self,
@@ -346,8 +346,8 @@ class GMFrame(wx.Frame):
     def OnGCPManager(self, event):
         """!Launch georectifier module
         """
-        from gui_modules import gcpmanager
-        gcpmanager.GCPWizard(self)
+        from gcp.manager import GCPWizard
+        GCPWizard(self)
 
     def OnGModeler(self, event):
         """!Launch Graphical Modeler"""
@@ -364,22 +364,6 @@ class GMFrame(wx.Frame):
         
         win.Show()
 
-    def OnRStream(self, event):
-        """!GSoC's r.stream.* interface for testing
-        """
-        try:
-            from gui_modules import rstream
-        except:
-            GError(parent = self.parent,
-                   message = _("RStream Utility is not available. You can install it by %s") % \
-                       'g.extension -s extension=wx.stream')
-            return
-        
-        win = rstream.RStreamFrame(parent = self)
-        win.CentreOnScreen()
-        
-        win.Show()
-        
     def OnDone(self, cmd, returncode):
         """Command execution finised"""
         if hasattr(self, "model"):