wxGUI: various mirror fixes

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

gui/wxpython/gis_set.py

@@ -31,13 +31,16 @@ import codecs
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
 from core import globalvar
 import wx
 import wx.lib.mixins.listctrl as listmix
 import wx.lib.scrolledpanel as scrolled
 
 from gui_core.ghelp import HelpFrame
-from core.gcmd      import GMessage, GError
+from core.gcmd      import GMessage, GError, DecodeString, RunCommand
+from core.utils     import GetListOfLocations, GetListOfMapsets
 
 sys.stderr = codecs.getwriter('utf8')(sys.stderr)
 
@@ -873,15 +876,11 @@ class StartUp(wx.App):
         return 1
 
 if __name__ ==  "__main__":
-
     if os.getenv("GISBASE") is None:
-        print >> sys.stderr, "Failed to start GUI, GRASS GIS is not running."
-    else:
-        import gettext
-        gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-
-        from core.gcmd  import RunCommand, DecodeString
-        from core.utils import GetListOfMapsets, GetListOfLocations
-
-        GRASSStartUp = StartUp(0)
-        GRASSStartUp.MainLoop()
+        sys.exit("Failed to start GUI, GRASS GIS is not running.")
+        
+    import gettext
+    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
+    
+    GRASSStartUp = StartUp(0)
+    GRASSStartUp.MainLoop()

gui/wxpython/gui_core/dialogs.py

@@ -19,7 +19,6 @@ List of classes:
  - dialogs::DxfImportDialog
  - dialogs::LayersList (used by MultiImport) 
  - dialogs::SetOpacityDialog
- - dialogs::StaticWrapText
  - dialogs::ImageSizeDialog
  - dialogs::SqlQueryFrame
 

gui/wxpython/gui_core/forms.py

@@ -5,8 +5,11 @@
 description.
 
 Classes:
+ - forms::UpdateThread
+ - forms::UpdateQThread
  - forms::TaskFrame
  - forms::CmdPanel
+ - forms::GUI
  - forms::GrassGUIApp
 
 This program is just a coarse approach to automatically build a GUI

gui/wxpython/gui_core/ghelp.py

@@ -42,23 +42,6 @@ from lmgr.menudata    import ManagerData
 from core.gcmd        import GError, DecodeString
 from gui_core.widgets import GNotebook, StaticWrapText, ItemTree
 
-class HelpFrame(wx.Frame):
-    """!GRASS Quickstart help window"""
-    def __init__(self, parent, id, title, size, file):
-        wx.Frame.__init__(self, parent = parent, id = id, title = title, size = size)
-        
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        
-        # text
-        content = HelpPanel(parent = self)
-        content.LoadPage(file)
-        
-        sizer.Add(item = content, proportion = 1, flag = wx.EXPAND)
-        
-        self.SetAutoLayout(True)
-        self.SetSizer(sizer)
-        self.Layout()
-
 class SearchModuleWindow(wx.Panel):
     """!Search module window (used in MenuTreeWindow)"""
     def __init__(self, parent, id = wx.ID_ANY, cmdPrompt = None,
@@ -710,6 +693,23 @@ class AboutWindow(wx.Frame):
         """!Close window"""
         self.Close()
 
+class HelpFrame(wx.Frame):
+    """!GRASS Quickstart help window"""
+    def __init__(self, parent, id, title, size, file):
+        wx.Frame.__init__(self, parent = parent, id = id, title = title, size = size)
+        
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        
+        # text
+        content = HelpPanel(parent = self)
+        content.LoadPage(file)
+        
+        sizer.Add(item = content, proportion = 1, flag = wx.EXPAND)
+        
+        self.SetAutoLayout(True)
+        self.SetSizer(sizer)
+        self.Layout()
+
 class HelpWindow(HtmlWindow):
     """!This panel holds the text from GRASS docs.
     

gui/wxpython/gui_core/goutput.py

@@ -6,9 +6,9 @@
 Classes:
  - goutput::CmdThread
  - goutput::GMConsole
- - goutput::GMStc
  - goutput::GMStdout
  - goutput::GMStderr
+ - goutput::GMStc
 
 (C) 2007-2011 by the GRASS Development Team
 

gui/wxpython/gui_core/gselect.py

@@ -11,6 +11,7 @@ Classes:
  - gselect::LayerSelect
  - gselect::DriverSelect
  - gselect::DatabaseSelect
+ - gselect::TableSelect
  - gselect::ColumnSelect
  - gselect::DbaseSelect
  - gselect::LocationSelect

gui/wxpython/gui_core/preferences.py

@@ -13,6 +13,7 @@ Classes:
  - preferences::PreferencesDialog
  - preferences::DefaultFontDialog
  - preferences::MapsetAccess
+ - preferences::CheckListMapset
 
 (C) 2007-2011 by the GRASS Development Team
 

gui/wxpython/gui_core/widgets.py

@@ -41,8 +41,8 @@ try:
 except ImportError:
     import wx.lib.customtreectrl as CT
 
-from core import globalvar
-from core.debug         import Debug
+from core        import globalvar
+from core.debug  import Debug
 
 class GNotebook(FN.FlatNotebook):
     """!Generic notebook widget

gui/wxpython/lmgr/pyshell.py

@@ -6,8 +6,8 @@
 Classes:
  - pyshell::PyShellWindow
 
-@todo run pyshell and evaluate code in a separate instance of python
-& design the widget communicate back and forth with it
+@todo Run pyshell and evaluate code in a separate instance of python &
+design the widget communicate back and forth with it
 
 (C) 2011 by the GRASS Development Team
 

gui/wxpython/location_wizard/wizard.py

@@ -14,6 +14,7 @@ Classes:
  - wizard::DatumPage
  - wizard::EllipsePage
  - wizard::GeoreferencedFilePage
+ - wizard::WKTPage
  - wizard::EPSGPage
  - wizard::CustomPage
  - wizard::SummaryPage

gui/wxpython/mapdisp/frame.py

@@ -34,7 +34,7 @@ sys.path.append(os.path.join(globalvar.ETCWXDIR, "icons"))
 sys.path.append(os.path.join(globalvar.ETCDIR,   "python"))
 
 from core               import globalvar
-from core.render        import EVT_UPDATE_PRGBAR, Map
+from core.render        import EVT_UPDATE_PRGBAR
 from vdigit.toolbars    import VDigitToolbar
 from mapdisp.toolbars   import MapToolbar
 from mapdisp.gprint     import PrintOptions

gui/wxpython/modules/mcalc_builder.py

@@ -1,5 +1,5 @@
 """!
-@package modules mcalc_builder
+@package modules::mcalc_builder
 
 @brief Map calculator, GUI wrapper for r.mapcalc
 

gui/wxpython/nviz/animation.py

@@ -6,7 +6,7 @@
 Classes:
  - animation::Animation
 
-(C) 2008-2011 by the GRASS Development Team
+(C) 2011 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.

gui/wxpython/nviz/mapwindow.py

@@ -36,7 +36,6 @@ import grass.script as grass
 from core.gcmd          import GMessage, GException, GError
 from core.debug         import Debug
 from gui_core.mapwindow import MapWindow
-from gui_core.goutput   import wxCmdOutput
 from core.settings      import UserSettings
 from nviz.workspace     import NvizSettings
 from nviz.animation     import Animation

gui/wxpython/nviz/workspace.py

@@ -19,7 +19,7 @@ import copy
 from core.settings import UserSettings
 
 try:
-    import nviz.wxnviz as wxnviz
+    from nviz      import wxnviz
 except ImportError:
     wxnviz = None
 

gui/wxpython/psmap/frame.py

@@ -41,7 +41,7 @@ import grass.script as grass
 from gui_core.menu    import Menu
 from gui_core.goutput import CmdThread, EVT_CMD_DONE
 from psmap.toolbars   import PsMapToolbar
-from icon             import Icons, MetaIcon, iconSet
+from icon             import Icons
 from core.gcmd        import RunCommand, GError, GMessage
 from gui_core.forms   import GUI
 from psmap.menudata   import PsMapData

gui/wxpython/wxgui.py

@@ -75,6 +75,7 @@ from lmgr.toolbars         import LMWorkspaceToolbar, LMDataToolbar, LMToolsTool
 from lmgr.toolbars         import LMMiscToolbar, LMVectorToolbar, LMNvizToolbar
 from lmgr.pyshell          import PyShellWindow
 from gui_core.forms        import GUI
+from gcp.manager           import GCPWizard
 
 class GMFrame(wx.Frame):
     """!Layer Manager frame with notebook widget for controlling GRASS
@@ -347,7 +348,6 @@ class GMFrame(wx.Frame):
     def OnGCPManager(self, event):
         """!Launch georectifier module
         """
-        from gcp.manager import GCPWizard
         GCPWizard(self)
 
     def OnGModeler(self, event):