[GRASS-SVN] r49349 - in grass/trunk/gui/wxpython: . icons tools

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-24 06:00:17 -0800 (Thu, 24 Nov 2011)
New Revision: 49349

Modified:
   grass/trunk/gui/wxpython/gis_set_error.py
   grass/trunk/gui/wxpython/icons/icon.py
   grass/trunk/gui/wxpython/tools/update_menudata.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI major code reorganization (part 3)


Modified: grass/trunk/gui/wxpython/gis_set_error.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set_error.py	2011-11-24 13:56:11 UTC (rev 49348)
+++ grass/trunk/gui/wxpython/gis_set_error.py	2011-11-24 14:00:17 UTC (rev 49349)
@@ -14,7 +14,7 @@
 import os
 import sys
 
-from gui_modules import globalvar
+from core import globalvar
 import wx
 
 def main():

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2011-11-24 13:56:11 UTC (rev 49348)
+++ grass/trunk/gui/wxpython/icons/icon.py	2011-11-24 14:00:17 UTC (rev 49349)
@@ -22,7 +22,7 @@
 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
 

Modified: grass/trunk/gui/wxpython/tools/update_menudata.py
===================================================================
--- grass/trunk/gui/wxpython/tools/update_menudata.py	2011-11-24 13:56:11 UTC (rev 49348)
+++ grass/trunk/gui/wxpython/tools/update_menudata.py	2011-11-24 14:00:17 UTC (rev 49349)
@@ -30,8 +30,7 @@
 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 @@
     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)
     

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2011-11-24 13:56:11 UTC (rev 49348)
+++ grass/trunk/gui/wxpython/wxgui.py	2011-11-24 14:00:17 UTC (rev 49349)
@@ -312,11 +312,11 @@
         
     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 @@
     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 @@
         
         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"):