wxGUI major code reorganization (vdigit)

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

gui/wxpython/dbm/vinfo.py

@@ -18,7 +18,7 @@ import types
 
 import wx
 
-from gui_core.gselect import VectorDBInfo
+from gui_core.gselect import VectorDBInfo as VectorDBInfoBase
 from core.gcmd        import RunCommand
 from core.settings    import UserSettings
 
@@ -66,11 +66,11 @@ def createDbInfoDesc(panel, mapDBInfo, layer):
     
     return infoFlexSizer
         
-class VectorDBInfo(VectorDBInfo):
+class VectorDBInfo(VectorDBInfoBase):
     """!Class providing information about attribute tables
     linked to the vector map"""
     def __init__(self, map):
-        VectorDBInfo.__init__(self, map)
+        VectorDBInfoBase.__init__(self, map)
         
     def GetColumns(self, table):
         """!Return list of columns names (based on their index)"""

gui/wxpython/gui_core/mapwindow.py

@@ -18,6 +18,8 @@ for details.
 
 import wx
 
+from core.settings import UserSettings
+
 class MapWindow(object):
     """!Abstract map display window class
     

gui/wxpython/mapdisp/frame.py

@@ -199,7 +199,7 @@ class MapFrame(MapFrameBase):
     def _addToolbarVDigit(self):
         """!Add vector digitizer toolbar
         """
-        from vdigit import haveVDigit
+        from vdigit.main import haveVDigit
         
         if not haveVDigit:
             from vdigit import errorMsg
@@ -227,7 +227,7 @@ class MapFrame(MapFrameBase):
             log = None
         
         if not self.MapWindowVDigit:
-            from mapdisp_vdigit import VDigitWindow
+            from vdigit.mapwindow import VDigitWindow
             self.MapWindowVDigit = VDigitWindow(self, id = wx.ID_ANY,
                                                 Map = self.Map, tree = self.tree,
                                                 lmgr = self._layerManager)

gui/wxpython/vdigit/mapwindow.py

@@ -18,11 +18,11 @@ import wx
 from dbm.dialogs    import DisplayAttributesDialog
 from core.gcmd      import RunCommand, GMessage, GError
 from core.debug     import Debug
-from mapdisp.window import BufferedWindow
+from mapdisp.mapwindow import BufferedWindow
 from core.settings  import UserSettings
 from core.utils     import ListOfCatsToRange
 from core.globalvar import QUERYLAYER
-from vdigit.dialogs import VDigitCategoryDialog, DigitZBulkDialog, VDigitDuplicatesDialog
+from vdigit.dialogs import VDigitCategoryDialog, VDigitZBulkDialog, VDigitDuplicatesDialog
 
 class VDigitWindow(BufferedWindow):
     """!A Buffered window extended for vector digitizer.

gui/wxpython/vdigit/toolbars.py

@@ -12,11 +12,13 @@ This program is free software under the GNU General Public License
 
 @author Martin Landa <landa.martin gmail.com>
 """
+import wx
 
 from grass.script import core as grass
 
 from gui_core.toolbars  import BaseToolbar
 from gui_core.dialogs   import CreateNewVector
+from icons.icon         import Icons
 from vdigit.preferences import VDigitSettingsDialog
 from vdigit.main        import VDigit
 from core.debug         import Debug