[GRASS-SVN] r49365 - in grass/trunk/gui/wxpython: dbm gui_core mapdisp vdigit

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-11-26 09:45:42 -0800 (Sat, 26 Nov 2011)
New Revision: 49365

Modified:
   grass/trunk/gui/wxpython/dbm/vinfo.py
   grass/trunk/gui/wxpython/gui_core/mapwindow.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/vdigit/mapwindow.py
   grass/trunk/gui/wxpython/vdigit/toolbars.py
Log:
wxGUI major code reorganization (vdigit)

Modified: grass/trunk/gui/wxpython/dbm/vinfo.py
===================================================================
--- grass/trunk/gui/wxpython/dbm/vinfo.py	2011-11-26 17:10:01 UTC (rev 49364)
+++ grass/trunk/gui/wxpython/dbm/vinfo.py	2011-11-26 17:45:42 UTC (rev 49365)
@@ -18,7 +18,7 @@
 
 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 @@
     
     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)"""

Modified: grass/trunk/gui/wxpython/gui_core/mapwindow.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/mapwindow.py	2011-11-26 17:10:01 UTC (rev 49364)
+++ grass/trunk/gui/wxpython/gui_core/mapwindow.py	2011-11-26 17:45:42 UTC (rev 49365)
@@ -18,6 +18,8 @@
 
 import wx
 
+from core.settings import UserSettings
+
 class MapWindow(object):
     """!Abstract map display window class
     

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2011-11-26 17:10:01 UTC (rev 49364)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2011-11-26 17:45:42 UTC (rev 49365)
@@ -199,7 +199,7 @@
     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 @@
             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)

Modified: grass/trunk/gui/wxpython/vdigit/mapwindow.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/mapwindow.py	2011-11-26 17:10:01 UTC (rev 49364)
+++ grass/trunk/gui/wxpython/vdigit/mapwindow.py	2011-11-26 17:45:42 UTC (rev 49365)
@@ -18,11 +18,11 @@
 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.

Modified: grass/trunk/gui/wxpython/vdigit/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/toolbars.py	2011-11-26 17:10:01 UTC (rev 49364)
+++ grass/trunk/gui/wxpython/vdigit/toolbars.py	2011-11-26 17:45:42 UTC (rev 49365)
@@ -12,11 +12,13 @@
 
 @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