[GRASS-SVN] r46820 - grass-addons/grass7/gui/wxpython/wx.wms

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Jun 28 04:58:31 EDT 2011


Author: sudeepsingh
Date: 2011-06-28 01:58:31 -0700 (Tue, 28 Jun 2011)
New Revision: 46820

Added:
   grass-addons/grass7/gui/wxpython/wx.wms/toolbars.py
   grass-addons/grass7/gui/wxpython/wx.wms/wxgui.py
Log:
Modifeid version of toolbars.py and wxgui.py for wms support

Added: grass-addons/grass7/gui/wxpython/wx.wms/toolbars.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.wms/toolbars.py	                        (rev 0)
+++ grass-addons/grass7/gui/wxpython/wx.wms/toolbars.py	2011-06-28 08:58:31 UTC (rev 46820)
@@ -0,0 +1,1641 @@
+"""!
+ at package toolbar
+
+ at brief wxGUI toolbar widgets
+
+Classes:
+ - AbstractToolbar
+ - MapToolbar
+ - GCPMapToolbar
+ - GCPDisplayToolbar
+ - VDigitToolbar
+ - ProfileToolbar
+ - NvizToolbar
+ - ModelToolbar
+ - HistogramToolbar
+ - LMWorkspaceToolbar
+ - LMDataToolbar
+ - LMToolsToolbar
+ - LMMiscToolbar
+ - PsMapToolbar
+
+(C) 2007-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.
+
+ at author Michael Barton
+ at author Jachym Cepicky
+ at author Martin Landa <landa.martin gmail.com>
+ at author Anna Kratochvilova <anna.kratochvilova fsv.cvut.cz>
+"""
+
+import os
+import sys
+import platform
+
+from grass.script import core as grass
+
+import wx
+
+import globalvar
+import gcmd
+import gdialogs
+from vdigit import VDigitSettingsDialog, haveVDigit, VDigit
+from debug import Debug
+from preferences import globalSettings as UserSettings
+from nviz import haveNviz
+from nviz_preferences import NvizPreferencesDialog
+
+sys.path.append(os.path.join(globalvar.ETCWXDIR, "icons"))
+from icon import Icons
+
+class AbstractToolbar(wx.ToolBar):
+    """!Abstract toolbar class"""
+    def __init__(self, parent):
+        self.parent = parent
+        wx.ToolBar.__init__(self, parent = self.parent, id = wx.ID_ANY)
+        
+        self.action = dict()
+        
+        self.Bind(wx.EVT_TOOL, self.OnTool)
+        
+        self.SetToolBitmapSize(globalvar.toolbarSize)
+        
+    def InitToolbar(self, toolData):
+        """!Initialize toolbar, add tools to the toolbar
+        """
+        for tool in toolData:
+            self.CreateTool(*tool)
+        
+        self._data = toolData
+        
+    def _toolbarData(self):
+        """!Toolbar data (virtual)"""
+        return None
+    
+    def CreateTool(self, label, bitmap, kind,
+                   shortHelp, longHelp, handler):
+        """!Add tool to the toolbar
+        
+        @return id of tool
+        """
+        bmpDisabled = wx.NullBitmap
+        tool = -1
+        if label:
+            tool = vars(self)[label] = wx.NewId()
+            Debug.msg(3, "CreateTool(): tool=%d, label=%s bitmap=%s" % \
+                          (tool, label, bitmap))
+            toolWin = self.AddLabelTool(tool, label, bitmap,
+                                        bmpDisabled, kind,
+                                        shortHelp, longHelp)
+            self.Bind(wx.EVT_TOOL, handler, toolWin)
+        else: # separator
+            self.AddSeparator()
+        
+        return tool
+    
+    def EnableLongHelp(self, enable = True):
+        """!Enable/disable long help
+        
+        @param enable True for enable otherwise disable
+        """
+        for tool in self._data:
+            if tool[0] == '': # separator
+                continue
+            
+            if enable:
+                self.SetToolLongHelp(vars(self)[tool[0]], tool[4])
+            else:
+                self.SetToolLongHelp(vars(self)[tool[0]], "")
+        
+    def OnTool(self, event):
+        """!Tool selected
+        """
+        if self.parent.GetName() == "GCPFrame":
+            return
+        
+        if hasattr(self.parent, 'toolbars'):
+            if self.parent.toolbars['vdigit']:
+                # update vdigit toolbar (unselect currently selected tool)
+                id = self.parent.toolbars['vdigit'].GetAction(type = 'id')
+                self.parent.toolbars['vdigit'].ToggleTool(id, False)
+        
+        if event:
+            # deselect previously selected tool
+            id = self.action.get('id', -1)
+            if id != event.GetId():
+                self.ToggleTool(self.action['id'], False)
+            else:
+                self.ToggleTool(self.action['id'], True)
+            
+            self.action['id'] = event.GetId()
+            
+            event.Skip()
+        else:
+            # initialize toolbar
+            self.ToggleTool(self.action['id'], True)
+        
+    def GetAction(self, type = 'desc'):
+        """!Get current action info"""
+        return self.action.get(type, '')
+    
+    def SelectDefault(self, event):
+        """!Select default tool"""
+        self.ToggleTool(self.defaultAction['id'], True)
+        self.defaultAction['bind'](event)
+        self.action = { 'id' : self.defaultAction['id'],
+                        'desc' : self.defaultAction.get('desc', '') }
+        
+    def FixSize(self, width):
+	"""!Fix toolbar width on Windows
+        
+	@todo Determine why combobox causes problems here
+	"""
+        if platform.system() == 'Windows':
+            size = self.GetBestSize()
+            self.SetSize((size[0] + width, size[1]))
+
+    def Enable(self, tool, enable = True):
+        """!Enable defined tool
+        
+        @param tool name
+        @param enable True to enable otherwise disable tool
+        """
+        try:
+            id = getattr(self, tool)
+        except AttributeError:
+            return
+        
+        self.EnableTool(id, enable)
+        
+    def _getToolbarData(self, data):
+        """!Define tool
+        """
+        retData = list()
+        for args in data:
+            retData.append(self._defineTool(*args))
+        
+        return retData
+
+    def _defineTool(self, name = None, icon = None, handler = None, item = wx.ITEM_NORMAL):
+        """!Define tool
+        """
+        if name:
+            return (name, icon.GetBitmap(),
+                    item, icon.GetLabel(), icon.GetDesc(),
+                    handler)
+        return ("", "", "", "", "", "") # separator
+    
+class MapToolbar(AbstractToolbar):
+    """!Map Display toolbar
+    """
+    def __init__(self, parent, mapcontent):
+        """!Map Display constructor
+
+        @param parent reference to MapFrame
+        @param mapcontent reference to render.Map (registred by MapFrame)
+        """
+        self.mapcontent = mapcontent # render.Map
+        AbstractToolbar.__init__(self, parent = parent) # MapFrame
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # optional tools
+        choices = [ _('2D view'), ]
+        self.toolId = { '2d' : 0 }
+        if self.parent.GetLayerManager():
+            log = self.parent.GetLayerManager().GetLogWindow()
+        
+        if haveNviz:
+            if not self.parent.GetLayerManager().existNviz:
+                choices.append(_('3D view'))
+                self.toolId['3d'] = 1
+            else:
+                self.toolId['3d'] = -1
+        else:
+            from nviz import errorMsg
+            log.WriteCmdLog(_('3D view mode not available'))
+            log.WriteWarning(_('Reason: %s') % str(errorMsg))
+            log.WriteLog(_('Note that the wxGUI\'s 3D view mode is currently disabled '
+                           'on MS Windows (hopefully this will be fixed soon). '
+                           'Please keep an eye out for updated versions of GRASS. '
+                           'In the meantime you can use "NVIZ" from the File menu.'), wrap = 60)
+            
+            self.toolId['3d'] = -1
+
+        if haveVDigit:
+            choices.append(_('Digitize'))
+            if self.toolId['3d'] > -1:
+                self.toolId['vdigit'] = 2
+            else:
+                self.toolId['vdigit'] = 1
+        else:
+            from vdigit import errorMsg
+            log.WriteCmdLog(_('Vector digitizer not available'))
+            log.WriteWarning(_('Reason: %s') % errorMsg)
+            log.WriteLog(_('Note that the wxGUI\'s vector digitizer is currently disabled '
+                           '(hopefully this will be fixed soon). '
+                           'Please keep an eye out for updated versions of GRASS. '
+                           'In the meantime you can use "v.digit" from the Develop Vector menu.'), wrap = 60)
+            
+            self.toolId['vdigit'] = -1
+        
+        self.combo = wx.ComboBox(parent = self, id = wx.ID_ANY,
+                                 choices = choices,
+                                 style = wx.CB_READONLY, size = (90, -1))
+        self.combo.SetSelection(0)
+        
+        self.comboid = self.AddControl(self.combo)
+        self.parent.Bind(wx.EVT_COMBOBOX, self.OnSelectTool, self.comboid)
+        
+        # realize the toolbar
+        self.Realize()
+        
+        # workaround for Mac bug. May be fixed by 2.8.8, but not before then.
+        self.combo.Hide()
+        self.combo.Show()
+        
+        self.action = { 'id' : self.pointer }
+        self.defaultAction = { 'id' : self.pointer,
+                               'bind' : self.parent.OnPointer }
+        
+        self.OnTool(None)
+        
+        self.EnableTool(self.zoomback, False)
+        
+        self.FixSize(width = 90)
+        
+    def _toolbarData(self):
+        """!Toolbar data"""
+        icons = Icons['displayWindow']
+        return self._getToolbarData((('displaymap', icons['display'],
+                                      self.parent.OnDraw),
+                                      ('displaymap', icons['display'],
+                                      self.parent.OnDraw),
+                                     ('rendermap', icons['render'],
+                                      self.parent.OnRender),
+                                     ('erase', icons['erase'],
+                                      self.parent.OnErase),
+                                     (None, ),
+                                     ('pointer', icons['pointer'],
+                                      self.parent.OnPointer,
+                                      wx.ITEM_CHECK),
+                                     ('query', icons['query'],
+                                      self.parent.OnQuery,
+                                      wx.ITEM_CHECK),
+                                     ('pan', icons['pan'],
+                                      self.parent.OnPan,
+                                      wx.ITEM_CHECK),
+                                     ('zoomin', icons['zoomIn'],
+                                      self.parent.OnZoomIn,
+                                      wx.ITEM_CHECK),
+                                     ('zoomout', icons['zoomOut'],
+                                      self.parent.OnZoomOut,
+                                      wx.ITEM_CHECK),
+                                     ('zoomextent', icons['zoomExtent'],
+                                      self.parent.OnZoomToMap),
+                                     ('zoomback', icons['zoomBack'],
+                                      self.parent.OnZoomBack),
+                                     ('zoommenu', icons['zoomMenu'],
+                                      self.parent.OnZoomMenu),
+                                     (None, ),
+                                     ('analyze', icons['analyze'],
+                                      self.parent.OnAnalyze),
+                                     (None, ),
+                                     ('dec', icons['overlay'],
+                                      self.parent.OnDecoration),
+                                     (None, ),
+                                     ('savefile', icons['saveFile'],
+                                      self.parent.SaveToFile),
+                                     ('printmap', icons['print'],
+                                      self.parent.PrintMenu),
+                                     (None, ))
+                                    )
+    
+    def OnSelectTool(self, event):
+        """!Select / enable tool available in tools list
+        """
+        tool =  event.GetSelection()
+        
+        if tool == self.toolId['2d']:
+            self.ExitToolbars()
+            self.Enable2D(True)
+        
+        elif tool == self.toolId['3d'] and \
+                not self.parent.toolbars['nviz']:
+            self.ExitToolbars()
+            self.parent.AddToolbar("nviz")
+            
+        elif tool == self.toolId['vdigit'] and \
+                not self.parent.toolbars['vdigit']:
+            self.ExitToolbars()
+            self.parent.AddToolbar("vdigit")
+            self.parent.MapWindow.SetFocus()
+        
+    def ExitToolbars(self):
+        if self.parent.toolbars['vdigit']:
+            self.parent.toolbars['vdigit'].OnExit()
+        if self.parent.toolbars['nviz']:       
+            self.parent.toolbars['nviz'].OnExit()
+        
+    def Enable2D(self, enabled):
+        """!Enable/Disable 2D display mode specific tools"""
+        for tool in (self.pointer,
+                     self.pan,
+                     self.zoomin,
+                     self.zoomout,
+                     self.zoomback,
+                     self.zoommenu,
+                     self.analyze,
+                     self.dec,
+                     self.printmap):
+            self.EnableTool(tool, enabled)
+        
+class GCPManToolbar(AbstractToolbar):
+    """!Toolbar for managing ground control points
+
+    @param parent reference to GCP widget
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+
+    def _toolbarData(self):
+        icons = Icons['georectify']
+        return self._getToolbarData((('gcpSave', icons["gcpSave"],
+                                      self.parent.SaveGCPs),
+                                     ('gcpReload', icons["gcpReload"],
+                                      self.parent.ReloadGCPs),
+                                     (None, ),
+                                     ('gcpAdd', icons["gcpAdd"],
+                                      self.parent.AddGCP),
+                                     ('gcpDelete', icons["gcpDelete"],
+                                      self.parent.DeleteGCP),
+                                     ('gcpClear', icons["gcpClear"],
+                                      self.parent.ClearGCP),
+                                     (None, ),
+                                     ('rms', icons["gcpRms"],
+                                      self.parent.OnRMS),
+                                     ('georect', icons["georectify"],
+                                      self.parent.OnGeorect))
+                                    )
+    
+class GCPDisplayToolbar(AbstractToolbar):
+    """!GCP Display toolbar
+    """
+    def __init__(self, parent):
+        """!GCP Display toolbar constructor
+        """
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # add tool to toggle active map window
+        self.togglemapid = wx.NewId()
+        self.togglemap = wx.Choice(parent = self, id = self.togglemapid,
+						    choices = [_('source'), _('target')],
+						    style = wx.CB_READONLY)
+
+        self.InsertControl(10, self.togglemap)
+
+        self.SetToolShortHelp(self.togglemapid, '%s %s %s' % (_('Set map canvas for '),
+                                                              Icons['displayWindow']["zoomBack"].GetLabel(),
+                                                              _(' / Zoom to map')))
+
+        # realize the toolbar
+        self.Realize()
+        
+        self.action = { 'id' : self.gcpset }
+        self.defaultAction = { 'id' : self.gcpset,
+                               'bind' : self.parent.OnPointer }
+        
+        self.OnTool(None)
+        
+        self.EnableTool(self.zoomback, False)
+        
+    def _toolbarData(self):
+        """!Toolbar data"""
+        icons = Icons['displayWindow']
+        return self._getToolbarData((("displaymap", icons["display"],
+                                      self.parent.OnDraw),
+                                     ("rendermap", icons["render"],
+                                      self.parent.OnRender),
+                                     ("erase", icons["erase"],
+                                      self.parent.OnErase),
+                                     (None, ),
+                                     ("gcpset", Icons["georectify"]["gcpSet"],
+                                      self.parent.OnPointer),
+                                     ("pan", icons["pan"],
+                                      self.parent.OnPan),
+                                     ("zoomin", icons["zoomIn"],
+                                      self.parent.OnZoomIn),
+                                     ("zoomout", icons["zoomOut"],
+                                      self.parent.OnZoomOut),
+                                     ("zoommenu", icons["zoomMenu"],
+                                      self.parent.OnZoomMenuGCP),
+                                     (None, ),
+                                     ("zoomback", icons["zoomBack"],
+                                      self.parent.OnZoomBack),
+                                     ("zoomtomap", icons["zoomExtent"],
+                                      self.parent.OnZoomToMap),
+                                     (None, ),
+                                     ('settings', Icons["georectify"]["settings"],
+                                      self.parent.OnSettings),
+                                     ('help', Icons["misc"]["help"],
+                                      self.parent.OnHelp),
+                                     (None, ),
+                                     ('quit', Icons["georectify"]["quit"],
+                                      self.parent.OnQuit))
+                                    )
+    
+class VDigitToolbar(AbstractToolbar):
+    """!Toolbar for digitization
+    """
+    def __init__(self, parent, mapcontent, layerTree = None, log = None):
+        self.mapcontent    = mapcontent # Map class instance
+        self.layerTree     = layerTree  # reference to layer tree associated to map display
+        self.log           = log        # log area
+        AbstractToolbar.__init__(self, parent)
+        self.digit         = None
+        
+        # currently selected map layer for editing (reference to MapLayer instance)
+        self.mapLayer = None
+        # list of vector layers from Layer Manager (only in the current mapset)
+        self.layers   = [] 
+        
+        self.comboid    = None
+        
+        # only one dialog can be open
+        self.settingsDialog   = None
+        
+        # create toolbars (two rows optionally)
+        self.InitToolbar(self._toolbarData())
+        self.Bind(wx.EVT_TOOL, self.OnTool)
+        
+        # default action (digitize new point, line, etc.)
+        self.action = { 'desc' : 'addLine',
+                        'type' : 'point',
+                        'id'   : self.addPoint }
+        
+        # list of available vector maps
+        self.UpdateListOfLayers(updateTool = True)
+        
+        # realize toolbar
+        self.Realize()
+        # workaround for Mac bug. May be fixed by 2.8.8, but not before then.
+        self.combo.Hide()
+        self.combo.Show()
+        
+        # disable undo/redo
+        self.EnableTool(self.undo, False)
+        
+        # toogle to pointer by default
+        self.OnTool(None)
+        
+        self.FixSize(width = 105)
+        
+    def _toolbarData(self):
+        """!Toolbar data
+        """
+        data = []
+        icons = Icons['vdigit']
+        return self._getToolbarData(((None, ),
+                                     ("addPoint", icons["addPoint"],
+                                      self.OnAddPoint),
+                                     ("addLine", icons["addLine"],
+                                      self.OnAddLine,
+                                      wx.ITEM_CHECK),
+                                     ("addBoundary", icons["addBoundary"],
+                                      self.OnAddBoundary,
+                                      wx.ITEM_CHECK),
+                                     ("addCentroid", icons["addCentroid"],
+                                      self.OnAddCentroid,
+                                      wx.ITEM_CHECK),
+                                     ("addArea", icons["addArea"],
+                                      self.OnAddArea,
+                                      wx.ITEM_CHECK),
+                                     ("moveVertex", icons["moveVertex"],
+                                      self.OnMoveVertex,
+                                      wx.ITEM_CHECK),
+                                     ("addVertex", icons["addVertex"],
+                                      self.OnAddVertex,
+                                      wx.ITEM_CHECK),
+                                     ("removeVertex", icons["removeVertex"],
+                                      self.OnRemoveVertex,
+                                      wx.ITEM_CHECK),
+                                     ("splitLine", icons["splitLine"],
+                                      self.OnSplitLine,
+                                      wx.ITEM_CHECK),
+                                     ("editLine", icons["editLine"],
+                                      self.OnEditLine,
+                                      wx.ITEM_CHECK),
+                                     ("moveLine", icons["moveLine"],
+                                      self.OnMoveLine,
+                                      wx.ITEM_CHECK),
+                                     ("deleteLine", icons["deleteLine"],
+                                      self.OnDeleteLine,
+                                      wx.ITEM_CHECK),
+                                     ("displayCats", icons["displayCats"],
+                                      self.OnDisplayCats,
+                                      wx.ITEM_CHECK),
+                                     ("copyCats", icons["copyCats"],
+                                      self.OnCopyCA,
+                                      wx.ITEM_CHECK),
+                                     ("displayAttr", icons["displayAttr"],
+                                      self.OnDisplayAttr,
+                                      wx.ITEM_CHECK),
+                                     ("additionalTools", icons["additionalTools"],
+                                      self.OnAdditionalToolMenu,
+                                      wx.ITEM_CHECK),                                      
+                                     (None, ),
+                                     ("undo", icons["undo"],
+                                      self.OnUndo),
+                                     ("settings", icons["settings"],
+                                      self.OnSettings),
+                                     ("quit", icons["quit"],
+                                      self.OnExit))
+                                    )
+    
+    def OnTool(self, event):
+        """!Tool selected -> disable selected tool in map toolbar"""
+        id = self.parent.toolbars['map'].GetAction(type = 'id')
+        self.parent.toolbars['map'].ToggleTool(id, False)
+        
+        # set cursor
+        cursor = self.parent.cursors["cross"]
+        self.parent.MapWindow.SetCursor(cursor)
+        
+        # pointer
+        self.parent.OnPointer(None)
+        
+        if event:
+            # deselect previously selected tool
+            id = self.action.get('id', -1)
+            if id != event.GetId():
+                self.ToggleTool(self.action['id'], False)
+            else:
+                self.ToggleTool(self.action['id'], True)
+            
+            self.action['id'] = event.GetId()
+            
+            event.Skip()
+        
+        self.ToggleTool(self.action['id'], True)
+        
+        # clear tmp canvas
+        if self.action['id'] != id:
+            self.parent.MapWindow.ClearLines(pdc = self.parent.MapWindow.pdcTmp)
+            if self.digit and \
+                    len(self.parent.MapWindow.digit.GetDisplay().GetSelected()) > 0:
+                # cancel action
+                self.parent.MapWindow.OnMiddleDown(None)
+        
+        # set focus
+        self.parent.MapWindow.SetFocus()
+        
+    def OnAddPoint(self, event):
+        """!Add point to the vector map Laier"""
+        Debug.msg (2, "VDigitToolbar.OnAddPoint()")
+        self.action = { 'desc' : "addLine",
+                        'type' : "point",
+                        'id'   : self.addPoint }
+        self.parent.MapWindow.mouse['box'] = 'point'
+        
+    def OnAddLine(self, event):
+        """!Add line to the vector map layer"""
+        Debug.msg (2, "VDigitToolbar.OnAddLine()")
+        self.action = { 'desc' : "addLine",
+                        'type' : "line",
+                        'id'   : self.addLine }
+        self.parent.MapWindow.mouse['box'] = 'line'
+        ### self.parent.MapWindow.polycoords = [] # reset temp line
+                
+    def OnAddBoundary(self, event):
+        """!Add boundary to the vector map layer"""
+        Debug.msg (2, "VDigitToolbar.OnAddBoundary()")
+        if self.action['desc'] != 'addLine' or \
+                self.action['type'] != 'boundary':
+            self.parent.MapWindow.polycoords = [] # reset temp line
+        self.action = { 'desc' : "addLine",
+                        'type' : "boundary",
+                        'id'   : self.addBoundary }
+        self.parent.MapWindow.mouse['box'] = 'line'
+        
+    def OnAddCentroid(self, event):
+        """!Add centroid to the vector map layer"""
+        Debug.msg (2, "VDigitToolbar.OnAddCentroid()")
+        self.action = { 'desc' : "addLine",
+                        'type' : "centroid",
+                        'id'   : self.addCentroid }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnAddArea(self, event):
+        """!Add area to the vector map layer"""
+        Debug.msg (2, "VDigitToolbar.OnAddCentroid()")
+        self.action = { 'desc' : "addLine",
+                        'type' : "area",
+                        'id'   : self.addArea }
+        self.parent.MapWindow.mouse['box'] = 'line'
+
+    def OnExit (self, event=None):
+        """!Quit digitization tool"""
+        # stop editing of the currently selected map layer
+        if self.mapLayer:
+            self.StopEditing()
+        
+        # close dialogs if still open
+        if self.settingsDialog:
+            self.settingsDialog.OnCancel(None)
+            
+        # set default mouse settings
+        self.parent.MapWindow.mouse['use'] = "pointer"
+        self.parent.MapWindow.mouse['box'] = "point"
+        self.parent.MapWindow.polycoords = []
+        
+        # disable the toolbar
+        self.parent.RemoveToolbar("vdigit")
+        
+    def OnMoveVertex(self, event):
+        """!Move line vertex"""
+        Debug.msg(2, "Digittoolbar.OnMoveVertex():")
+        self.action = { 'desc' : "moveVertex",
+                        'id'   : self.moveVertex }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnAddVertex(self, event):
+        """!Add line vertex"""
+        Debug.msg(2, "Digittoolbar.OnAddVertex():")
+        self.action = { 'desc' : "addVertex",
+                        'id'   : self.addVertex }
+        self.parent.MapWindow.mouse['box'] = 'point'
+        
+    def OnRemoveVertex(self, event):
+        """!Remove line vertex"""
+        Debug.msg(2, "Digittoolbar.OnRemoveVertex():")
+        self.action = { 'desc' : "removeVertex",
+                        'id'   : self.removeVertex }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnSplitLine(self, event):
+        """!Split line"""
+        Debug.msg(2, "Digittoolbar.OnSplitLine():")
+        self.action = { 'desc' : "splitLine",
+                        'id'   : self.splitLine }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnEditLine(self, event):
+        """!Edit line"""
+        Debug.msg(2, "Digittoolbar.OnEditLine():")
+        self.action = { 'desc' : "editLine",
+                        'id'   : self.editLine }
+        self.parent.MapWindow.mouse['box'] = 'line'
+
+    def OnMoveLine(self, event):
+        """!Move line"""
+        Debug.msg(2, "Digittoolbar.OnMoveLine():")
+        self.action = { 'desc' : "moveLine",
+                        'id'   : self.moveLine }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnDeleteLine(self, event):
+        """!Delete line"""
+        Debug.msg(2, "Digittoolbar.OnDeleteLine():")
+        self.action = { 'desc' : "deleteLine",
+                        'id'   : self.deleteLine }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnDisplayCats(self, event):
+        """!Display/update categories"""
+        Debug.msg(2, "Digittoolbar.OnDisplayCats():")
+        self.action = { 'desc' : "displayCats",
+                        'id'   : self.displayCats }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnDisplayAttr(self, event):
+        """!Display/update attributes"""
+        Debug.msg(2, "Digittoolbar.OnDisplayAttr():")
+        self.action = { 'desc' : "displayAttrs",
+                        'id'   : self.displayAttr }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnCopyCA(self, event):
+        """!Copy categories/attributes menu"""
+        point = wx.GetMousePosition()
+        toolMenu = wx.Menu()
+        # Add items to the menu
+        cats = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                           text = _('Copy categories'),
+                           kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(cats)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopyCats, cats)
+        if self.action['desc'] == "copyCats":
+            cats.Check(True)
+        
+        attrb = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                            text = _('Duplicate attributes'),
+                            kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(attrb)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopyAttrb, attrb)
+        if self.action['desc'] == "copyAttrs":
+            attrb.Check(True)
+        
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.parent.MapWindow.PopupMenu(toolMenu)
+        toolMenu.Destroy()
+        
+        if self.action['desc'] == "addPoint":
+            self.ToggleTool(self.copyCats, False)
+        
+    def OnCopyCats(self, event):
+        """!Copy categories"""
+        if self.action['desc'] == 'copyCats': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.copyCats, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnCopyCats():")
+        self.action = { 'desc' : "copyCats",
+                        'id'   : self.copyCats }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnCopyAttrb(self, event):
+        if self.action['desc'] == 'copyAttrs': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.copyCats, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnCopyAttrb():")
+        self.action = { 'desc' : "copyAttrs",
+                        'id'   : self.copyCats }
+        self.parent.MapWindow.mouse['box'] = 'point'
+        
+    def OnUndo(self, event):
+        """!Undo previous changes"""
+        self.digit.Undo()
+        
+        event.Skip()
+
+    def EnableUndo(self, enable=True):
+        """!Enable 'Undo' in toolbar
+        
+        @param enable False for disable
+        """
+        if enable:
+            if self.GetToolEnabled(self.undo) is False:
+                self.EnableTool(self.undo, True)
+        else:
+            if self.GetToolEnabled(self.undo) is True:
+                self.EnableTool(self.undo, False)
+        
+    def OnSettings(self, event):
+        """!Show settings dialog"""
+        if self.digit is None:
+            try:
+                self.digit = self.parent.MapWindow.digit = VDigit(mapwindow = self.parent.MapWindow)
+            except SystemExit:
+                self.digit = self.parent.MapWindow.digit = None
+        
+        if not self.settingsDialog:
+            self.settingsDialog = VDigitSettingsDialog(parent = self.parent, title = _("Digitization settings"),
+                                                       style = wx.DEFAULT_DIALOG_STYLE)
+            self.settingsDialog.Show()
+
+    def OnAdditionalToolMenu(self, event):
+        """!Menu for additional tools"""
+        point = wx.GetMousePosition()
+        toolMenu = wx.Menu()
+        # Add items to the menu
+        copy = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                           text = _('Copy features from (background) vector map'),
+                           kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(copy)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopy, copy)
+        if self.action['desc'] == "copyLine":
+            copy.Check(True)
+        
+        flip = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                           text = _('Flip selected lines/boundaries'),
+                           kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(flip)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnFlip, flip)
+        if self.action['desc'] == "flipLine":
+            flip.Check(True)
+        
+        merge = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                            text = _('Merge selected lines/boundaries'),
+                            kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(merge)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnMerge, merge)
+        if self.action['desc'] == "mergeLine":
+            merge.Check(True)
+        
+        breakL = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                             text = _('Break selected lines/boundaries at intersection'),
+                             kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(breakL)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnBreak, breakL)
+        if self.action['desc'] == "breakLine":
+            breakL.Check(True)
+        
+        snap = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                           text = _('Snap selected lines/boundaries (only to nodes)'),
+                           kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(snap)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnSnap, snap)
+        if self.action['desc'] == "snapLine":
+            snap.Check(True)
+        
+        connect = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                              text = _('Connect selected lines/boundaries'),
+                              kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(connect)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnConnect, connect)
+        if self.action['desc'] == "connectLine":
+            connect.Check(True)
+        
+        query = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                            text = _('Query features'),
+                            kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(query)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnQuery, query)
+        if self.action['desc'] == "queryLine":
+            query.Check(True)
+        
+        zbulk = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                            text = _('Z bulk-labeling of 3D lines'),
+                            kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(zbulk)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnZBulk, zbulk)
+        if self.action['desc'] == "zbulkLine":
+            zbulk.Check(True)
+        
+        typeconv = wx.MenuItem(parentMenu = toolMenu, id = wx.ID_ANY,
+                               text = _('Feature type conversion'),
+                               kind = wx.ITEM_CHECK)
+        toolMenu.AppendItem(typeconv)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnTypeConversion, typeconv)
+        if self.action['desc'] == "typeConv":
+            typeconv.Check(True)
+        
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.parent.MapWindow.PopupMenu(toolMenu)
+        toolMenu.Destroy()
+        
+        if self.action['desc'] == 'addPoint':
+            self.ToggleTool(self.additionalTools, False)
+        
+    def OnCopy(self, event):
+        """!Copy selected features from (background) vector map"""
+        if self.action['desc'] == 'copyLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnCopy():")
+        self.action = { 'desc' : "copyLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnFlip(self, event):
+        """!Flip selected lines/boundaries"""
+        if self.action['desc'] == 'flipLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnFlip():")
+        self.action = { 'desc' : "flipLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnMerge(self, event):
+        """!Merge selected lines/boundaries"""
+        if self.action['desc'] == 'mergeLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnMerge():")
+        self.action = { 'desc' : "mergeLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnBreak(self, event):
+        """!Break selected lines/boundaries"""
+        if self.action['desc'] == 'breakLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnBreak():")
+        self.action = { 'desc' : "breakLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnSnap(self, event):
+        """!Snap selected features"""
+        if self.action['desc'] == 'snapLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnSnap():")
+        self.action = { 'desc' : "snapLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnConnect(self, event):
+        """!Connect selected lines/boundaries"""
+        if self.action['desc'] == 'connectLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnConnect():")
+        self.action = { 'desc' : "connectLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnQuery(self, event):
+        """!Query selected lines/boundaries"""
+        if self.action['desc'] == 'queryLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnQuery(): %s" % \
+                      UserSettings.Get(group = 'vdigit', key = 'query', subkey = 'selection'))
+        self.action = { 'desc' : "queryLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnZBulk(self, event):
+        """!Z bulk-labeling selected lines/boundaries"""
+        if not self.digit.IsVector3D():
+            gcmd.GError(parent = self.parent,
+                        message = _("Vector map is not 3D. Operation canceled."))
+            return
+        
+        if self.action['desc'] == 'zbulkLine': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnZBulk():")
+        self.action = { 'desc' : "zbulkLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'line'
+
+    def OnTypeConversion(self, event):
+        """!Feature type conversion
+
+        Supported conversions:
+         - point <-> centroid
+         - line <-> boundary
+        """
+        if self.action['desc'] == 'typeConv': # select previous action
+            self.ToggleTool(self.addPoint, True)
+            self.ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnTypeConversion():")
+        self.action = { 'desc' : "typeConv",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnSelectMap (self, event):
+        """!Select vector map layer for editing
+
+        If there is a vector map layer already edited, this action is
+        firstly terminated. The map layer is closed. After this the
+        selected map layer activated for editing.
+        """
+        if event.GetSelection() == 0: # create new vector map layer
+            if self.mapLayer:
+                openVectorMap = self.mapLayer.GetName(fullyQualified = False)['name']
+            else:
+                openVectorMap = None
+            mapName = gdialogs.CreateNewVector(self.parent,
+                                               exceptMap = openVectorMap, log = self.log,
+                                               cmd = (('v.edit',
+                                                       { 'tool' : 'create' },
+                                                       'map')),
+                                               disableAdd = True)[0]
+            if mapName:
+                # add layer to map layer tree
+                if self.layerTree:
+                    self.layerTree.AddLayer(ltype = 'vector',
+                                            lname = mapName,
+                                            lchecked = True,
+                                            lopacity = 1.0,
+                                            lcmd = ['d.vect', 'map=%s' % mapName])
+                    
+                    vectLayers = self.UpdateListOfLayers(updateTool = True)
+                    selection = vectLayers.index(mapName)
+                else:
+                    pass # TODO (no Layer Manager)
+            else:
+                self.combo.SetValue(_('Select vector map'))
+                return 
+        else:
+            selection = event.GetSelection() - 1 # first option is 'New vector map'
+        
+        # skip currently selected map
+        if self.layers[selection] == self.mapLayer:
+            return False
+        
+        if self.mapLayer:
+            # deactive map layer for editing
+            self.StopEditing()
+        
+        # select the given map layer for editing
+        self.StartEditing(self.layers[selection])
+        
+        event.Skip()
+
+        return True
+    
+    def StartEditing (self, mapLayer):
+        """!Start editing selected vector map layer.
+
+        @param mapLayer MapLayer to be edited
+        """
+        # deactive layer
+        self.mapcontent.ChangeLayerActive(mapLayer, False)
+        
+        # clean map canvas
+        self.parent.MapWindow.EraseMap()
+        
+        # unset background map if needed
+        if mapLayer:
+            if UserSettings.Get(group = 'vdigit', key = 'bgmap',
+                                subkey = 'value', internal = True) == mapLayer.GetName():
+                UserSettings.Set(group = 'vdigit', key = 'bgmap',
+                                 subkey = 'value', value = '', internal = True)
+            
+            self.parent.statusbar.SetStatusText(_("Please wait, "
+                                                  "opening vector map <%s> for editing...") % mapLayer.GetName(),
+                                                0)
+        
+        self.parent.MapWindow.pdcVector = wx.PseudoDC()
+        self.digit = self.parent.MapWindow.digit = VDigit(mapwindow = self.parent.MapWindow)
+        
+        self.mapLayer = mapLayer
+        
+        # open vector map
+        if self.digit.OpenMap(mapLayer.GetName()) is None:
+            self.mapLayer = None
+            self.StopEditing()
+            return False
+        
+        # update toolbar
+        self.combo.SetValue(mapLayer.GetName())
+        self.parent.toolbars['map'].combo.SetValue (_('Digitize'))
+        lmgr = self.parent.GetLayerManager()
+        if lmgr:
+            lmgr.toolbars['tools'].Enable('vdigit', enable = False)
+        
+        Debug.msg (4, "VDigitToolbar.StartEditing(): layer=%s" % mapLayer.GetName())
+        
+        # change cursor
+        if self.parent.MapWindow.mouse['use'] == 'pointer':
+            self.parent.MapWindow.SetCursor(self.parent.cursors["cross"])
+        
+        if not self.parent.MapWindow.resize:
+            self.parent.MapWindow.UpdateMap(render = True)
+        
+        opacity = mapLayer.GetOpacity(float = True)
+        if opacity < 1.0:
+            alpha = int(opacity * 255)
+            self.digit.UpdateSettings(alpha)
+        
+        return True
+
+    def StopEditing(self):
+        """!Stop editing of selected vector map layer.
+
+        @return True on success
+        @return False on failure
+        """
+        self.combo.SetValue (_('Select vector map'))
+        
+        # save changes
+        if self.mapLayer:
+            Debug.msg (4, "VDigitToolbar.StopEditing(): layer=%s" % self.mapLayer.GetName())
+            if UserSettings.Get(group = 'vdigit', key = 'saveOnExit', subkey = 'enabled') is False:
+                if self.digit.GetUndoLevel() > -1:
+                    dlg = wx.MessageDialog(parent = self.parent,
+                                           message = _("Do you want to save changes "
+                                                     "in vector map <%s>?") % self.mapLayer.GetName(),
+                                           caption = _("Save changes?"),
+                                           style = wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+                    if dlg.ShowModal() == wx.ID_NO:
+                        # revert changes
+                        self.digit.Undo(0)
+                    dlg.Destroy()
+            
+            self.parent.statusbar.SetStatusText(_("Please wait, "
+                                                  "closing and rebuilding topology of "
+                                                  "vector map <%s>...") % self.mapLayer.GetName(),
+                                                0)
+            lmgr = self.parent.GetLayerManager()
+            if lmgr:
+                lmgr.toolbars['tools'].Enable('vdigit', enable = True)
+                lmgr.notebook.SetSelectionByName('output')
+            self.digit.CloseMap()
+            if lmgr:
+                lmgr.GetLogWindow().GetProgressBar().SetValue(0)
+                lmgr.GetLogWindow().WriteCmdLog(_("Editing of vector map <%s> successfully finished") % \
+                                                    self.mapLayer.GetName())
+            # re-active layer 
+            item = self.parent.tree.FindItemByData('maplayer', self.mapLayer)
+            if item and self.parent.tree.IsItemChecked(item):
+                self.mapcontent.ChangeLayerActive(self.mapLayer, True)
+        
+        # change cursor
+        self.parent.MapWindow.SetCursor(self.parent.cursors["default"])
+        self.parent.MapWindow.pdcVector = None
+        
+        # close dialogs
+        for dialog in ('attributes', 'category'):
+            if self.parent.dialogs[dialog]:
+                self.parent.dialogs[dialog].Close()
+                self.parent.dialogs[dialog] = None
+        
+        del self.digit
+        del self.parent.MapWindow.digit
+        
+        self.mapLayer = None
+        
+        self.parent.MapWindow.redrawAll = True
+        
+        return True
+    
+    def UpdateListOfLayers (self, updateTool = False):
+        """!
+        Update list of available vector map layers.
+        This list consists only editable layers (in the current mapset)
+
+        Optionally also update toolbar
+        """
+        Debug.msg (4, "VDigitToolbar.UpdateListOfLayers(): updateTool=%d" % \
+                   updateTool)
+        
+        layerNameSelected = None
+         # name of currently selected layer
+        if self.mapLayer:
+            layerNameSelected = self.mapLayer.GetName()
+        
+        # select vector map layer in the current mapset
+        layerNameList = []
+        self.layers = self.mapcontent.GetListOfLayers(l_type = "vector",
+                                                      l_mapset = grass.gisenv()['MAPSET'])
+        for layer in self.layers:
+            if not layer.name in layerNameList: # do not duplicate layer
+                layerNameList.append (layer.GetName())
+        
+        if updateTool: # update toolbar
+            if not self.mapLayer:
+                value = _('Select vector map')
+            else:
+                value = layerNameSelected
+
+            if not self.comboid:
+                self.combo = wx.ComboBox(self, id = wx.ID_ANY, value = value,
+                                         choices = [_('New vector map'), ] + layerNameList, size = (115, -1),
+                                         style = wx.CB_READONLY)
+                self.comboid = self.InsertControl(0, self.combo)
+                self.parent.Bind(wx.EVT_COMBOBOX, self.OnSelectMap, self.comboid)
+            else:
+                self.combo.SetItems([_('New vector map'), ] + layerNameList)
+            
+            self.Realize()
+        
+        return layerNameList
+
+    def GetLayer(self):
+        """!Get selected layer for editing -- MapLayer instance"""
+        return self.mapLayer
+    
+class ProfileToolbar(AbstractToolbar):
+    """!Toolbar for profiling raster map
+    """ 
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+        
+    def _toolbarData(self):
+        """!Toolbar data"""
+        icons = Icons['profile']
+        return self._getToolbarData((('addraster', Icons['layerManager']["addRast"],
+                                      self.parent.OnSelectRaster),
+                                     ('transect', icons["transect"],
+                                      self.parent.OnDrawTransect),
+                                     (None, ),
+                                     ('draw', icons["draw"],
+                                      self.parent.OnCreateProfile),
+                                     ('erase', Icons['displayWindow']["erase"],
+                                      self.parent.OnErase),
+                                     ('drag', Icons['displayWindow']['pan'],
+                                      self.parent.OnDrag),
+                                     ('zoom', Icons['displayWindow']['zoomIn'],
+                                      self.parent.OnZoom),
+                                     ('unzoom', Icons['displayWindow']['zoomBack'],
+                                      self.parent.OnRedraw),
+                                     (None, ),
+                                     ('datasave', icons["save"],
+                                      self.parent.SaveProfileToFile),
+                                     ('image', Icons['displayWindow']["saveFile"],
+                                      self.parent.SaveToFile),
+                                     ('print', Icons['displayWindow']["print"],
+                                      self.parent.PrintMenu),
+                                     (None, ),
+                                     ('settings', icons["options"],
+                                      self.parent.ProfileOptionsMenu),
+                                     ('quit', icons["quit"],
+                                      self.parent.OnQuit),
+                                     ))
+    
+class NvizToolbar(AbstractToolbar):
+    """!Nviz toolbar
+    """
+    def __init__(self, parent, mapcontent):
+        self.mapcontent = mapcontent
+        self.lmgr = parent.GetLayerManager()
+        
+        AbstractToolbar.__init__(self, parent)
+        
+        # only one dialog can be open
+        self.settingsDialog   = None
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+        
+    def _toolbarData(self):
+        """!Toolbar data"""
+        icons = Icons['nviz']
+        return self._getToolbarData((("view", icons["view"],
+                                      self.OnShowPage),
+                                     (None, ),
+                                     ("surface", icons["surface"],
+                                      self.OnShowPage),
+                                     ("vector", icons["vector"],
+                                      self.OnShowPage),
+                                     ("volume", icons["volume"],
+                                      self.OnShowPage),
+                                     (None, ),
+                                     ("light", icons["light"],
+                                      self.OnShowPage),
+                                     ("fringe", icons["fringe"],
+                                      self.OnShowPage),
+                                     (None, ),
+                                     ("settings", icons["settings"],
+                                      self.OnSettings),
+                                     ("help", Icons['misc']["help"],
+                                      self.OnHelp),
+                                     (None, ),
+                                     ('quit', icons["quit"],
+                                      self.OnExit))
+                                    )
+    
+    def OnShowPage(self, event):
+        """!Go to the selected page"""
+        if not self.lmgr or not hasattr(self.lmgr, "nviz"):
+            event.Skip()
+            return
+        
+        self.lmgr.notebook.SetSelectionByName('nviz')
+        eId = event.GetId()
+        if eId == self.view:
+            self.lmgr.nviz.SetPage('view')
+        elif eId == self.surface:
+            self.lmgr.nviz.SetPage('surface')
+        elif eId == self.surface:
+            self.lmgr.nviz.SetPage('surface')
+        elif eId == self.vector:
+            self.lmgr.nviz.SetPage('vector')
+        elif eId == self.volume:
+            self.lmgr.nviz.SetPage('volume')
+        elif eId == self.light:
+            self.lmgr.nviz.SetPage('light')
+        elif eId == self.fringe:
+            self.lmgr.nviz.SetPage('fringe')
+        
+        self.lmgr.Raise()
+
+    def OnHelp(self, event):
+        """!Show 3D view mode help"""
+        if not self.lmgr:
+            gcmd.RunCommand('g.manual',
+                            entry = 'wxGUI.Nviz')
+        else:
+            log = self.lmgr.GetLogWindow()
+            log.RunCmd(['g.manual',
+                        'entry=wxGUI.Nviz'])
+        
+    def OnSettings(self, event):
+        """!Show nviz notebook page"""
+        if not self.settingsDialog:
+            self.settingsDialog = NvizPreferencesDialog(parent = self.parent)
+        self.settingsDialog.Show()
+            
+    def OnExit (self, event = None):
+        """!Quit nviz tool (swith to 2D mode)"""
+        # set default mouse settings
+        self.parent.MapWindow.mouse['use'] = "pointer"
+        self.parent.MapWindow.mouse['box'] = "point"
+        self.parent.MapWindow.polycoords = []
+        
+        # return to map layer page (gets rid of ugly exit bug)
+        self.lmgr.notebook.SetSelectionByName('layers')
+
+        # disable the toolbar
+        self.parent.RemoveToolbar("nviz")
+        
+class ModelToolbar(AbstractToolbar):
+    """!Graphical modeler toolbar (see gmodeler.py)
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+        
+    def _toolbarData(self):
+        """!Toolbar data"""
+        icons = Icons['modeler']
+        return self._getToolbarData((('new', icons['new'],
+                                      self.parent.OnModelNew),
+                                     ('open', icons['open'],
+                                      self.parent.OnModelOpen),
+                                     ('save', icons['save'],
+                                      self.parent.OnModelSave),
+                                     ('image', icons['toImage'],
+                                      self.parent.OnExportImage),
+                                     ('python', icons['toPython'],
+                                      self.parent.OnExportPython),
+                                     (None, ),
+                                     ('action', icons['actionAdd'],
+                                      self.parent.OnAddAction),
+                                     ('data', icons['dataAdd'],
+                                      self.parent.OnAddData),
+                                     ('relation', icons['relation'],
+                                      self.parent.OnDefineRelation),
+                                     (None, ),
+                                     ('redraw', icons['redraw'],
+                                      self.parent.OnCanvasRefresh),
+                                     ('validate', icons['validate'],
+                                      self.parent.OnValidateModel),
+                                     ('run', icons['run'],
+                                      self.parent.OnRunModel),
+                                     (None, ),
+                                     ("variables", icons['variables'],
+                                      self.parent.OnVariables),
+                                     ("settings", icons['settings'],
+                                      self.parent.OnPreferences),
+                                     ("help", Icons['misc']['help'],
+                                      self.parent.OnHelp),
+                                     (None, ),
+                                     ('quit', icons['quit'],
+                                      self.parent.OnCloseWindow))
+                                    )
+    
+class HistogramToolbar(AbstractToolbar):
+    """!Histogram toolbar (see histogram.py)
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+        
+    def _toolbarData(self):
+        """!Toolbar data"""
+        icons = Icons['displayWindow']
+        return self._getToolbarData((('histogram', icons["histogram"],
+                                      self.parent.OnOptions),
+                                     ('rendermao', icons["display"],
+                                      self.parent.OnRender),
+                                     ('erase', icons["erase"],
+                                      self.parent.OnErase),
+                                     ('font', Icons['misc']["font"],
+                                      self.parent.SetHistFont),
+                                     (None, ),
+                                     ('save', icons["saveFile"],
+                                      self.parent.SaveToFile),
+                                     ('hprint', icons["print"],
+                                      self.parent.PrintMenu),
+                                     (None, ),
+                                     ('quit', Icons['misc']["quit"],
+                                      self.parent.OnQuit))
+                                    )
+
+class LMWorkspaceToolbar(AbstractToolbar):
+    """!Layer Manager `workspace` toolbar
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+
+    def _toolbarData(self):
+        """!Toolbar data
+        """
+        icons = Icons['layerManager']
+        return self._getToolbarData((('newdisplay', icons["newdisplay"],
+                                      self.parent.OnNewDisplay),
+                                      ('newdisplay', icons["newdisplay"],
+                                      self.parent.OnNewDisplay1),
+                                     (None, ),
+                                     ('workspaceNew', icons["workspaceNew"],
+                                      self.parent.OnWorkspaceNew),
+                                     ('workspaceOpen', icons["workspaceOpen"],
+                                      self.parent.OnWorkspaceOpen),
+                                     ('workspaceSave', icons["workspaceSave"],
+                                      self.parent.OnWorkspaceSave),
+                                     ))
+
+class LMDataToolbar(AbstractToolbar):
+    """!Layer Manager `data` toolbar
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+
+    def _toolbarData(self):
+        """!Toolbar data
+        """
+        icons = Icons['layerManager']
+        return self._getToolbarData((('addMulti', icons["addMulti"],
+                                      self.parent.OnAddMaps),
+                                     ('addrast', icons["addRast"],
+                                      self.parent.OnAddRaster),
+                                     ('rastmisc', icons["rastMisc"],
+                                      self.parent.OnAddRasterMisc),
+                                     ('addvect', icons["addVect"],
+                                      self.parent.OnAddVector),
+                                     ('vectmisc', icons["vectMisc"],
+                                      self.parent.OnAddVectorMisc),
+                                     ('addgrp',  icons["addGroup"],
+                                      self.parent.OnAddGroup),
+                                     ('addovl',  icons["addOverlay"],
+                                      self.parent.OnAddOverlay),
+                                     ('delcmd',  icons["delCmd"],
+                                      self.parent.OnDeleteLayer),
+                                     (None, ),
+                                     ('importMap', icons["import"],
+                                      self.parent.OnImportMenu),
+                                     (None, ),
+                                     ('vdigit', icons["vdigit"],
+                                      self.parent.OnVDigit),
+                                     ('attribute', icons["attrTable"],
+                                      self.parent.OnShowAttributeTable),
+                                     ))
+
+class LMToolsToolbar(AbstractToolbar):
+    """!Layer Manager `tools` toolbar
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+
+    def _toolbarData(self):
+        """!Toolbar data
+        """
+        icons = Icons['layerManager']
+        return self._getToolbarData((('mapCalc', icons["mapcalc"],
+                                      self.parent.OnMapCalculator),
+                                     ('georect', Icons["georectify"]["georectify"],
+                                      self.parent.OnGCPManager),
+                                     ('modeler', icons["modeler"],
+                                      self.parent.OnGModeler),
+                                     ('mapOutput', icons['mapOutput'],
+                                      self.parent.OnPsMap)
+                                     ))
+
+class LMMiscToolbar(AbstractToolbar):
+    """!Layer Manager `misc` toolbar
+    """
+    def __init__(self, parent):
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        # realize the toolbar
+        self.Realize()
+
+    def _toolbarData(self):
+        """!Toolbar data
+        """
+        icons = Icons['layerManager']
+        return self._getToolbarData((('settings', icons["settings"],
+                                      self.parent.OnPreferences),
+                                     ('help', Icons["misc"]["help"],
+                                      self.parent.OnHelp),
+                                     ))
+    
+class PsMapToolbar(AbstractToolbar):
+    def __init__(self, parent):
+        """!Toolbar Hardcopy Map Output Utility (psmap.py)
+        
+        @param parent parent window
+        """
+        AbstractToolbar.__init__(self, parent)
+        
+        self.InitToolbar(self._toolbarData())
+        
+        self.Realize()
+        
+        self.action = { 'id' : self.pointer }
+        self.defaultAction = { 'id' : self.pointer,
+                               'bind' : self.parent.OnPointer }
+        self.OnTool(None)
+        
+        from psmap import haveImage
+        if not haveImage:
+            self.EnableTool(self.preview, False)
+        
+    def _toolbarData(self):
+        """!Toolbar data
+        """
+        icons = Icons['psMap']
+        return self._getToolbarData((('loadFile', icons['scriptLoad'],
+                                      self.parent.OnLoadFile),                                    
+                                     ('instructionFile', icons['scriptSave'],
+                                      self.parent.OnInstructionFile),
+                                     (None, ),
+                                     ('pagesetup', icons['pageSetup'],
+                                      self.parent.OnPageSetup),
+                                     (None, ),
+                                     ("pointer", Icons["displayWindow"]["pointer"],
+                                      self.parent.OnPointer, wx.ITEM_CHECK),
+                                     ('pan', Icons["displayWindow"]['pan'],
+                                      self.parent.OnPan, wx.ITEM_CHECK),
+                                     ("zoomin", Icons["displayWindow"]["zoomIn"],
+                                      self.parent.OnZoomIn, wx.ITEM_CHECK),
+                                     ("zoomout", Icons["displayWindow"]["zoomOut"],
+                                      self.parent.OnZoomOut, wx.ITEM_CHECK),
+                                     ('zoomAll', icons['fullExtent'],
+                                      self.parent.OnZoomAll),
+                                     (None, ),
+                                     ('addMap', icons['addMap'],
+                                      self.parent.OnAddMap, wx.ITEM_CHECK),
+                                     ('addRaster', icons['addRast'],
+                                      self.parent.OnAddRaster),
+                                     ('addVector', icons['addVect'],
+                                      self.parent.OnAddVect),
+                                     ("dec", Icons["displayWindow"]["overlay"],
+                                      self.parent.OnDecoration),
+                                     ("delete", icons["deleteObj"],
+                                      self.parent.OnDelete),
+                                     (None, ),
+                                     ("preview", icons["preview"],
+                                      self.parent.OnPreview),
+                                     ('generatePS', icons['psExport'],
+                                      self.parent.OnPSFile),
+                                     ('generatePDF', icons['pdfExport'],
+                                      self.parent.OnPDFFile),
+                                     (None, ),
+                                     ("help", Icons['misc']['help'],
+                                      self.parent.OnHelp),
+                                     ('quit', icons['quit'],
+                                      self.parent.OnCloseWindow))
+                                    )

Added: grass-addons/grass7/gui/wxpython/wx.wms/wxgui.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.wms/wxgui.py	                        (rev 0)
+++ grass-addons/grass7/gui/wxpython/wx.wms/wxgui.py	2011-06-28 08:58:31 UTC (rev 46820)
@@ -0,0 +1,1693 @@
+Index: gui/wxpython/wxgui.py
+===================================================================
+--- gui/wxpython/wxgui.py	(revision 46749)
++++ gui/wxpython/wxgui.py	(working copy)
+@@ -1,1666 +0,0 @@
+-"""!
+- at package wxgui.py
+-
+- at brief Main Python app for GRASS wxPython GUI. Main menu, layer management
+-toolbar, notebook control for display management and access to
+-command console.
+-
+-Classes:
+- - GMFrame
+- - GMApp
+-
+-(C) 2006-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.
+-
+- at author Michael Barton (Arizona State University)
+- at author Jachym Cepicky (Mendel University of Agriculture)
+- at author Martin Landa <landa.martin gmail.com>
+- at author Vaclav Petras <wenzeslaus gmail.com> (menu customization)
+-"""
+-
+-import sys
+-import os
+-import time
+-import string
+-import getopt
+-import platform
+-import signal
+-import tempfile
+-
+-### XML
+-try:
+-    import xml.etree.ElementTree as etree
+-except ImportError:
+-    import elementtree.ElementTree as etree # Python <= 2.4
+-
+-### i18N
+-import gettext
+-gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
+-
+-from gui_modules import globalvar
+-import wx
+-import wx.aui
+-import wx.combo
+-import wx.html
+-import wx.stc
+-try:
+-    import wx.lib.agw.customtreectrl as CT
+-    import wx.lib.agw.flatnotebook   as FN
+-except ImportError:
+-    import wx.lib.customtreectrl as CT
+-    import wx.lib.flatnotebook   as FN
+-
+-try:
+-    import wx.lib.agw.advancedsplash as SC
+-except ImportError:
+-    SC = None
+-
+-sys.path.append(os.path.join(globalvar.ETCDIR, "python"))
+-from grass.script import core as grass
+-
+-from gui_modules import utils
+-from gui_modules import preferences
+-from gui_modules import layertree
+-from gui_modules import mapdisp
+-from gui_modules import menudata
+-from gui_modules import menuform
+-from gui_modules import histogram
+-from gui_modules import profile
+-from gui_modules import mcalc_builder as mapcalculator
+-from gui_modules import gcmd
+-from gui_modules import dbm
+-from gui_modules import workspace
+-from gui_modules import goutput
+-from gui_modules import gdialogs
+-from gui_modules import colorrules
+-from gui_modules import ogc_services
+-from gui_modules import prompt
+-from gui_modules import menu
+-from gui_modules import gmodeler
+-from gui_modules import vclean
+-from gui_modules import nviz_tools
+-from gui_modules.debug    import Debug
+-from gui_modules.ghelp    import MenuTreeWindow, AboutWindow, InstallExtensionWindow
+-from gui_modules.toolbars import LMWorkspaceToolbar, LMDataToolbar, LMToolsToolbar, LMMiscToolbar
+-from gui_modules.gpyshell import PyShellWindow
+-from icons.icon           import Icons
+-
+-UserSettings = preferences.globalSettings
+-
+-class GMFrame(wx.Frame):
+-    """!Layer Manager frame with notebook widget for controlling GRASS
+-    GIS. Includes command console page for typing GRASS (and other)
+-    commands, tree widget page for managing map layers.
+-    """
+-    def __init__(self, parent, id = wx.ID_ANY, title = _("GRASS GIS Layer Manager"),
+-                 workspace = None,
+-                 size = globalvar.GM_WINDOW_SIZE, style = wx.DEFAULT_FRAME_STYLE, **kwargs):
+-        self.parent    = parent
+-        self.baseTitle = title
+-        self.iconsize  = (16, 16)
+-        
+-        wx.Frame.__init__(self, parent = parent, id = id, size = size,
+-                          style = style, **kwargs)
+-                          
+-        self.SetTitle(self.baseTitle)
+-        self.SetName("LayerManager")
+-
+-        self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
+-
+-        self._auimgr = wx.aui.AuiManager(self)
+-
+-        # initialize variables
+-        self.disp_idx      = 0            # index value for map displays and layer trees
+-        self.curr_page     = None         # currently selected page for layer tree notebook
+-        self.curr_pagenum  = None         # currently selected page number for layer tree notebook
+-        self.workspaceFile = workspace    # workspace file
+-        self.workspaceChanged = False     # track changes in workspace
+-        self.georectifying = None         # reference to GCP class or None
+-        self.gcpmanagement = None         # reference to GCP class or None
+-        self.existNviz = False
+-        # list of open dialogs
+-        self.dialogs        = dict()
+-        self.dialogs['preferences'] = None
+-        self.dialogs['atm'] = list()
+-        
+-        # creating widgets
+-        self._createMenuBar()
+-        self.statusbar = self.CreateStatusBar(number = 1)
+-        self.notebook  = self._createNoteBook()
+-        self.toolbars  = { 'workspace' : LMWorkspaceToolbar(parent = self),
+-                           'data'      : LMDataToolbar(parent = self),
+-                           'tools'     : LMToolsToolbar(parent = self),
+-                           'misc'      : LMMiscToolbar(parent = self) }
+-        self._toolbarsData = { 'workspace' : ("toolbarWorkspace",     # name
+-                                              _("Workspace Toolbar"), # caption
+-                                              1),                     # row
+-                               'data'      : ("toolbarData",
+-                                              _("Data Toolbar"),
+-                                              1),
+-                               'misc'      : ("toolbarMisc",
+-                                              _("Misc Toolbar"),
+-                                              2),
+-                               'tools'     : ("toolbarTools",
+-                                              _("Tools Toolbar"),
+-                                              2),
+-                               }
+-        if sys.platform == 'win32':
+-            self._toolbarsList = ('workspace', 'data',
+-                                  'tools', 'misc')
+-        else:
+-            self._toolbarsList = ('data', 'workspace',
+-                                  'misc', 'tools')
+-        for toolbar in self._toolbarsList:
+-            name, caption, row = self._toolbarsData[toolbar]
+-            self._auimgr.AddPane(self.toolbars[toolbar],
+-                                 wx.aui.AuiPaneInfo().
+-                                 Name(name).Caption(caption).
+-                                 ToolbarPane().Top().Row(row).
+-                                 LeftDockable(False).RightDockable(False).
+-                                 BottomDockable(False).TopDockable(True).
+-                                 CloseButton(False).Layer(2).
+-                                 BestSize((self.toolbars[toolbar].GetBestSize())))
+-            
+-        # bindings
+-        self.Bind(wx.EVT_CLOSE,    self.OnCloseWindow)
+-        self.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+-
+-        # minimal frame size
+-        self.SetMinSize((500, 400))
+-
+-        # AUI stuff
+-        self._auimgr.AddPane(self.notebook, wx.aui.AuiPaneInfo().
+-                             Left().CentrePane().BestSize((-1,-1)).Dockable(False).
+-                             CloseButton(False).DestroyOnClose(True).Row(1).Layer(0))
+-
+-        self._auimgr.Update()
+-
+-        wx.CallAfter(self.notebook.SetSelectionByName, 'layers')
+-        
+-        # use default window layout ?
+-        if UserSettings.Get(group = 'general', key = 'defWindowPos', subkey = 'enabled'):
+-            dim = UserSettings.Get(group = 'general', key = 'defWindowPos', subkey = 'dim')
+-            try:
+-               x, y = map(int, dim.split(',')[0:2])
+-               w, h = map(int, dim.split(',')[2:4])
+-               self.SetPosition((x, y))
+-               self.SetSize((w, h))
+-            except:
+-                pass
+-        else:
+-            self.Centre()
+-        
+-        self.Layout()
+-        self.Show()
+-        
+-        # load workspace file if requested
+-        if self.workspaceFile:
+-            # load given workspace file
+-            if self.LoadWorkspaceFile(self.workspaceFile):
+-                self.SetTitle(self.baseTitle + " - " +  os.path.basename(self.workspaceFile))
+-            else:
+-                self.workspaceFile = None
+-        else:
+-            # start default initial display
+-            self.NewDisplay(show = False)
+-
+-        # show map display widnow
+-        # -> OnSize() -> UpdateMap()
+-        if self.curr_page and not self.curr_page.maptree.mapdisplay.IsShown():
+-            self.curr_page.maptree.mapdisplay.Show()
+-        
+-        # redirect stderr to log area    
+-        self.goutput.Redirect()
+-        # fix goutput's pane size
+-        self.goutput.SetSashPosition(int(self.GetSize()[1] * .45))
+-
+-        self.workspaceChanged = False
+-        
+-        # start with layer manager on top
+-        if self.curr_page:
+-            self.curr_page.maptree.mapdisplay.Raise()
+-        wx.CallAfter(self.Raise)
+-        
+-    def _createMenuBar(self):
+-        """!Creates menu bar"""
+-        self.menubar = menu.Menu(parent = self, data = menudata.ManagerData())
+-        self.SetMenuBar(self.menubar)
+-        self.menucmd = self.menubar.GetCmd()
+-        
+-    def _setCopyingOfSelectedText(self):
+-        copy = UserSettings.Get(group = 'manager', key = 'copySelectedTextToClipboard', subkey = 'enabled')
+-        self.goutput.SetCopyingOfSelectedText(copy)
+-        
+-    def _createNoteBook(self):
+-        """!Creates notebook widgets"""
+-        self.notebook = menuform.GNotebook(parent = self, style = globalvar.FNPageDStyle)
+-        # create displays notebook widget and add it to main notebook page
+-        cbStyle = globalvar.FNPageStyle
+-        if globalvar.hasAgw:
+-            self.gm_cb = FN.FlatNotebook(self, id = wx.ID_ANY, agwStyle = cbStyle)
+-        else:
+-            self.gm_cb = FN.FlatNotebook(self, id = wx.ID_ANY, style = cbStyle)
+-        self.gm_cb.SetTabAreaColour(globalvar.FNPageColor)
+-        self.notebook.AddPage(page = self.gm_cb, text = _("Map layers"), name = 'layers')
+-        
+-        # create 'command output' text area
+-        self.goutput = goutput.GMConsole(self)
+-        self.notebook.AddPage(page = self.goutput, text = _("Command console"), name = 'output')
+-        self._setCopyingOfSelectedText()
+-        
+-        # create 'search module' notebook page
+-        if not UserSettings.Get(group = 'manager', key = 'hideTabs', subkey = 'search'):
+-            self.search = MenuTreeWindow(parent = self)
+-            self.notebook.AddPage(page = self.search, text = _("Search module"), name = 'search')
+-        else:
+-            self.search = None
+-        
+-        # create 'python shell' notebook page
+-        if not UserSettings.Get(group = 'manager', key = 'hideTabs', subkey = 'pyshell'):
+-            self.pyshell = PyShellWindow(parent = self)
+-            self.notebook.AddPage(page = self.pyshell, text = _("Python shell"), name = 'pyshell')
+-        else:
+-            self.pyshell = None
+-        
+-        # bindings
+-        self.gm_cb.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CHANGED,    self.OnCBPageChanged)
+-        self.notebook.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
+-        self.gm_cb.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CLOSING,    self.OnCBPageClosed)
+-        
+-        return self.notebook
+-            
+-    def AddNviz(self):
+-        """!Add nviz notebook page"""
+-        Debug.msg(5, "GMFrame.AddNviz(): begin")
+-        self.nviz = nviz_tools.NvizToolWindow(parent = self,
+-                                              display = self.curr_page.maptree.GetMapDisplay())
+-        idx = self.notebook.GetPageIndexByName('layers')
+-        self.notebook.InsertPage(indx = idx + 1, page = self.nviz, text = _("3D view"), name = 'nviz')
+-        self.notebook.SetSelectionByName('nviz')
+-        self.existNviz = True
+-        Debug.msg(5, "GMFrame.AddNviz(): end")
+-        
+-    def RemoveNviz(self):
+-        """!Remove nviz notebook page"""
+-        # print self.notebook.GetPage(1)
+-        self.notebook.RemovePage(self.notebook.GetPageIndexByName('nviz'))
+-        del self.nviz
+-        self.notebook.SetSelectionByName('layers')
+-        
+-    def WorkspaceChanged(self):
+-        """!Update window title"""
+-        if not self.workspaceChanged:
+-            self.workspaceChanged = True
+-        
+-        if self.workspaceFile:
+-            self.SetTitle(self.baseTitle + " - " +  os.path.basename(self.workspaceFile) + '*')
+-        
+-    def OnSettingsChanged(self, event):
+-        """!Here can be functions which have to be called after EVT_SETTINGS_CHANGED. 
+-        Now only set copying of selected text to clipboard (in goutput).
+-        """
+-        ### self._createMenuBar() # bug when menu is re-created on the fly
+-        self._setCopyingOfSelectedText()
+-        
+-    def OnGCPManager(self, event):
+-        """!Launch georectifier module
+-        """
+-        from gui_modules import gcpmanager
+-        gcpmanager.GCPWizard(self)
+-
+-    def OnGModeler(self, event):
+-        """!Launch Graphical Modeler"""
+-        win = gmodeler.ModelFrame(parent = self)
+-        win.CentreOnScreen()
+-        
+-        win.Show()
+-        
+-    def OnPsMap(self, event):
+-        """!Launch Hardcopy Map Output Utility
+-        """
+-        try:
+-            from gui_modules import psmap
+-        except:
+-            gcmd.GError(parent = self.parent,
+-                        message = _("Hardcopy Map Output Utility is not available. You can install it by %s") % \
+-                            'g.extension -s svnurl=https://svn.osgeo.org/grass/grass-addons extension=wx.psmap')
+-            return
+-        
+-        win = psmap.PsMapFrame(parent = self)
+-        win.CentreOnScreen()
+-        
+-        win.Show()
+-        
+-    def OnDone(self, returncode):
+-        """Command execution finised"""
+-        if hasattr(self, "model"):
+-            self.model.DeleteIntermediateData(log = self.goutput)
+-            del self.model
+-        self.SetStatusText('')
+-        
+-    def OnRunModel(self, event):
+-        """!Run model"""
+-        filename = ''
+-        dlg = wx.FileDialog(parent = self, message=_("Choose model to run"),
+-                            defaultDir = os.getcwd(),
+-                            wildcard=_("GRASS Model File (*.gxm)|*.gxm"))
+-        if dlg.ShowModal() == wx.ID_OK:
+-            filename = dlg.GetPath()
+-        
+-        if not filename:
+-            return
+-        
+-        self.model = gmodeler.Model()
+-        self.model.LoadModel(filename)
+-        self.SetStatusText(_('Validating model...'), 0)
+-        result =  self.model.Validate()
+-        if result:
+-            dlg = wx.MessageDialog(parent = self,
+-                                   message = _('Model is not valid. Do you want to '
+-                                               'run the model anyway?\n\n%s') % '\n'.join(errList),
+-                                   caption=_("Run model?"),
+-                                   style = wx.YES_NO | wx.NO_DEFAULT |
+-                                   wx.ICON_QUESTION | wx.CENTRE)
+-            ret = dlg.ShowModal()
+-            if ret != wx.ID_YES:
+-                return
+-        
+-        self.SetStatusText(_('Running model...'), 0)
+-        self.model.Run(log = self.goutput,
+-                       onDone = self.OnDone)
+-        
+-    def OnMapsets(self, event):
+-        """!Launch mapset access dialog
+-        """
+-        dlg = preferences.MapsetAccess(parent = self, id = wx.ID_ANY)
+-        dlg.CenterOnScreen()
+-        
+-        if dlg.ShowModal() == wx.ID_OK:
+-            ms = dlg.GetMapsets()
+-            gcmd.RunCommand('g.mapsets',
+-                            parent = self,
+-                            mapset = '%s' % ','.join(ms))
+-        
+-    def OnCBPageChanged(self, event):
+-        """!Page in notebook (display) changed"""
+-        old_pgnum = event.GetOldSelection()
+-        new_pgnum = event.GetSelection()
+-        
+-        self.curr_page   = self.gm_cb.GetCurrentPage()
+-        self.curr_pagenum = self.gm_cb.GetSelection()
+-        try:
+-            self.curr_page.maptree.mapdisplay.SetFocus()
+-            self.curr_page.maptree.mapdisplay.Raise()
+-        except:
+-            pass
+-        
+-        event.Skip()
+-
+-    def OnPageChanged(self, event):
+-        """!Page in notebook changed"""
+-        page = event.GetSelection()
+-        if page == self.notebook.GetPageIndexByName('output'):
+-            # remove '(...)'
+-            self.notebook.SetPageText(page, _("Command console"))
+-            wx.CallAfter(self.goutput.cmd_prompt.SetFocus)
+-        self.SetStatusText('', 0)
+-        
+-        event.Skip()
+-
+-    def OnCBPageClosed(self, event):
+-        """!Page of notebook closed
+-        Also close associated map display
+-        """
+-        if UserSettings.Get(group = 'manager', key = 'askOnQuit', subkey = 'enabled'):
+-            maptree = self.curr_page.maptree
+-            
+-            if self.workspaceFile:
+-                message = _("Do you want to save changes in the workspace?")
+-            else:
+-                message = _("Do you want to store current settings "
+-                            "to workspace file?")
+-            
+-            # ask user to save current settings
+-            if maptree.GetCount() > 0:
+-                dlg = wx.MessageDialog(self,
+-                                       message = message,
+-                                       caption = _("Close Map Display %d") % (self.curr_pagenum + 1),
+-                                       style = wx.YES_NO | wx.YES_DEFAULT |
+-                                       wx.CANCEL | wx.ICON_QUESTION | wx.CENTRE)
+-                ret = dlg.ShowModal()
+-                if ret == wx.ID_YES:
+-                    if not self.workspaceFile:
+-                        self.OnWorkspaceSaveAs()
+-                    else:
+-                        self.SaveToWorkspaceFile(self.workspaceFile)
+-                elif ret == wx.ID_CANCEL:
+-                    event.Veto()
+-                    dlg.Destroy()
+-                    return
+-                dlg.Destroy()
+-
+-        self.gm_cb.GetPage(event.GetSelection()).maptree.Map.Clean()
+-        self.gm_cb.GetPage(event.GetSelection()).maptree.Close(True)
+-
+-        self.curr_page = None
+-
+-        event.Skip()
+-
+-    def GetLayerTree(self):
+-        """!Get current layer tree"""
+-        return self.curr_page.maptree
+-    
+-    def GetLogWindow(self):
+-        """!Get widget for command output"""
+-        return self.goutput
+-    
+-    def GetMenuCmd(self, event):
+-        """!Get GRASS command from menu item
+-
+-        Return command as a list"""
+-        layer = None
+-        
+-        if event:
+-            cmd = self.menucmd[event.GetId()]
+-        
+-        try:
+-            cmdlist = cmd.split(' ')
+-        except: # already list?
+-            cmdlist = cmd
+-        
+-        # check list of dummy commands for GUI modules that do not have GRASS
+-        # bin modules or scripts. 
+-        if cmd in ['vcolors', 'r.mapcalc', 'r3.mapcalc']:
+-            return cmdlist
+-
+-        try:
+-            layer = self.curr_page.maptree.layer_selected
+-            name = self.curr_page.maptree.GetPyData(layer)[0]['maplayer'].name
+-            type = self.curr_page.maptree.GetPyData(layer)[0]['type']
+-        except:
+-            layer = None
+-
+-        if layer and len(cmdlist) == 1: # only if no paramaters given
+-            if (type == 'raster' and cmdlist[0][0] == 'r' and cmdlist[0][1] != '3') or \
+-                    (type == 'vector' and cmdlist[0][0] == 'v'):
+-                input = menuform.GUI().GetCommandInputMapParamKey(cmdlist[0])
+-                if input:
+-                    cmdlist.append("%s=%s" % (input, name))
+-        
+-        return cmdlist
+-
+-    def RunMenuCmd(self, event = None, cmd = []):
+-        """!Run command selected from menu"""
+-        if event:
+-            cmd = self.GetMenuCmd(event)
+-        self.goutput.RunCmd(cmd, switchPage = False)
+-
+-    def OnMenuCmd(self, event = None, cmd = []):
+-        """!Parse command selected from menu"""
+-        if event:
+-            cmd = self.GetMenuCmd(event)
+-        menuform.GUI(parent = self).ParseCommand(cmd)
+-        
+-    def OnVDigit(self, event):
+-        """!Start vector digitizer
+-        """
+-        if not self.curr_page:
+-            self.MsgNoLayerSelected()
+-            return
+-        
+-        tree = self.GetLayerTree()
+-        layer = tree.layer_selected
+-        # no map layer selected
+-        if not layer:
+-            self.MsgNoLayerSelected()
+-            return
+-        
+-        # available only for vector map layers
+-        try:
+-            mapLayer = tree.GetPyData(layer)[0]['maplayer']
+-        except:
+-            mapLayer = None
+-        
+-        if not mapLayer or mapLayer.GetType() != 'vector':
+-            gcmd.GMessage(parent = self,
+-                          message = _("Selected map layer is not vector."))
+-            return
+-        
+-        if mapLayer.GetMapset() != grass.gisenv()['MAPSET']:
+-            gcmd.GMessage(parent = self,
+-                          message = _("Editing is allowed only for vector maps from the "
+-                                      "current mapset."))
+-            return
+-        
+-        if not tree.GetPyData(layer)[0]:
+-            return
+-        dcmd = tree.GetPyData(layer)[0]['cmd']
+-        if not dcmd:
+-            return
+-        
+-        tree.OnStartEditing(None)
+-        
+-    def OnRunScript(self, event):
+-        """!Run script"""
+-        # open dialog and choose script file
+-        dlg = wx.FileDialog(parent = self, message = _("Choose script file to run"),
+-                            defaultDir = os.getcwd(),
+-                            wildcard = _("Python script (*.py)|*.py|Bash script (*.sh)|*.sh"))
+-        
+-        filename = None
+-        if dlg.ShowModal() == wx.ID_OK:
+-            filename = dlg.GetPath()
+-        
+-        if not filename:
+-            return False
+-
+-        if not os.path.exists(filename):
+-            gcmd.GError(parent = self,
+-                        message = _("Script file '%s' doesn't exist. "
+-                                    "Operation cancelled.") % filename)
+-            return
+-        
+-        self.goutput.WriteCmdLog(_("Launching script '%s'...") % filename)
+-        self.goutput.RunCmd([filename], switchPage = True)
+-        
+-    def OnChangeLocation(self, event):
+-        """Change current location"""
+-        dlg = gdialogs.LocationDialog(parent = self)
+-        if dlg.ShowModal() == wx.ID_OK:
+-            location, mapset = dlg.GetValues()
+-            if location and mapset:
+-                ret = gcmd.RunCommand("g.gisenv",
+-                                      set = "LOCATION_NAME=%s" % location)
+-                ret += gcmd.RunCommand("g.gisenv",
+-                                       set = "MAPSET=%s" % mapset)
+-                if ret > 0:
+-                    wx.MessageBox(parent = self,
+-                                  message = _("Unable to switch to location <%(loc)s> mapset <%(mapset)s>.") % \
+-                                      { 'loc' : location, 'mapset' : mapset },
+-                                  caption = _("Error"), style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
+-                else:
+-                    # close workspace
+-                    self.OnWorkspaceClose()
+-                    self.OnWorkspaceNew()
+-                    wx.MessageBox(parent = self,
+-                                  message = _("Current location is <%(loc)s>.\n"
+-                                              "Current mapset is <%(mapset)s>.") % \
+-                                      { 'loc' : location, 'mapset' : mapset },
+-                                  caption = _("Info"), style = wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+-                    
+-    def OnChangeMapset(self, event):
+-        """Change current mapset"""
+-        dlg = gdialogs.MapsetDialog(parent = self)
+-        if dlg.ShowModal() == wx.ID_OK:
+-            mapset = dlg.GetMapset()
+-            if mapset:
+-                if gcmd.RunCommand("g.gisenv",
+-                                   set = "MAPSET=%s" % mapset) != 0:
+-                    wx.MessageBox(parent = self,
+-                                  message = _("Unable to switch to mapset <%s>.") % mapset,
+-                                  caption = _("Error"), style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
+-                else:
+-                    wx.MessageBox(parent = self,
+-                                  message = _("Current mapset is <%s>.") % mapset,
+-                                  caption = _("Info"), style = wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+-        
+-    def OnNewVector(self, event):
+-        """!Create new vector map layer"""
+-        name, add = gdialogs.CreateNewVector(self, log = self.goutput,
+-                                             cmd = (('v.edit',
+-                                                     { 'tool' : 'create' },
+-                                                     'map')))
+-        
+-        if name and add:
+-            # add layer to map layer tree
+-            self.curr_page.maptree.AddLayer(ltype = 'vector',
+-                                            lname = name,
+-                                            lchecked = True,
+-                                            lopacity = 1.0,
+-                                            lcmd = ['d.vect', 'map=%s' % name])
+-        
+-    def OnAboutGRASS(self, event):
+-        """!Display 'About GRASS' dialog"""
+-        win = AboutWindow(self)
+-        win.CentreOnScreen()
+-        win.Show(True)  
+-        
+-    def _popupMenu(self, data):
+-        """!Create popup menu
+-        """
+-        point = wx.GetMousePosition()
+-        menu = wx.Menu()
+-        
+-        for key, handler in data:
+-            if key is None:
+-                menu.AppendSeparator()
+-                continue
+-            item = wx.MenuItem(menu, wx.ID_ANY, Icons['layerManager'][key].GetLabel())
+-            item.SetBitmap(Icons['layerManager'][key].GetBitmap(self.iconsize))
+-            menu.AppendItem(item)
+-            self.Bind(wx.EVT_MENU, handler, item)
+-        
+-        # create menu
+-        self.PopupMenu(menu)
+-        menu.Destroy()
+-
+-    def OnImportMenu(self, event):
+-        """!Import maps menu (import, link)
+-        """
+-        self._popupMenu((('rastImport',    self.OnImportGdalLayers),
+-                         ('rastLink',      self.OnLinkGdalLayers),
+-                         (None, None),
+-                         ('vectImport',    self.OnImportOgrLayers),
+-                         ('vectLink',      self.OnLinkOgrLayers)))
+-        
+-    def OnWorkspaceNew(self, event = None):
+-        """!Create new workspace file
+-
+-        Erase current workspace settings first
+-        """
+-        Debug.msg(4, "GMFrame.OnWorkspaceNew():")
+-        
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay()
+-        
+-        maptree = self.curr_page.maptree
+-        
+-        # ask user to save current settings
+-        if self.workspaceFile and self.workspaceChanged:
+-            self.OnWorkspaceSave()
+-        elif self.workspaceFile is None and maptree.GetCount() > 0:
+-             dlg = wx.MessageDialog(self, message = _("Current workspace is not empty. "
+-                                                    "Do you want to store current settings "
+-                                                    "to workspace file?"),
+-                                    caption = _("Create new workspace?"),
+-                                    style = wx.YES_NO | wx.YES_DEFAULT | \
+-                                        wx.CANCEL | wx.ICON_QUESTION)
+-             ret = dlg.ShowModal()
+-             if ret == wx.ID_YES:
+-                 self.OnWorkspaceSaveAs()
+-             elif ret == wx.ID_CANCEL:
+-                 dlg.Destroy()
+-                 return
+-             
+-             dlg.Destroy()
+-        
+-        # delete all items
+-        maptree.DeleteAllItems()
+-        
+-        # add new root element
+-        maptree.root = maptree.AddRoot("Map Layers")
+-        self.curr_page.maptree.SetPyData(maptree.root, (None,None))
+-        
+-        # no workspace file loaded
+-        self.workspaceFile = None
+-        self.workspaceChanged = False
+-        self.SetTitle(self.baseTitle)
+-        
+-    def OnWorkspaceOpen(self, event = None):
+-        """!Open file with workspace definition"""
+-        dlg = wx.FileDialog(parent = self, message = _("Choose workspace file"),
+-                            defaultDir = os.getcwd(), wildcard = _("GRASS Workspace File (*.gxw)|*.gxw"))
+-
+-        filename = ''
+-        if dlg.ShowModal() == wx.ID_OK:
+-            filename = dlg.GetPath()
+-
+-        if filename == '':
+-            return
+-
+-        Debug.msg(4, "GMFrame.OnWorkspaceOpen(): filename=%s" % filename)
+-
+-        # delete current layer tree content
+-        self.OnWorkspaceClose()
+-        
+-        self.LoadWorkspaceFile(filename)
+-
+-        self.workspaceFile = filename
+-        self.SetTitle(self.baseTitle + " - " +  os.path.basename(self.workspaceFile))
+-
+-    def LoadWorkspaceFile(self, filename):
+-        """!Load layer tree definition stored in GRASS Workspace XML file (gxw)
+-
+-        @todo Validate against DTD
+-        
+-        @return True on success
+-        @return False on error
+-        """
+-        # dtd
+-        dtdFilename = os.path.join(globalvar.ETCWXDIR, "xml", "grass-gxw.dtd")
+-        
+-        # parse workspace file
+-        try:
+-            gxwXml = workspace.ProcessWorkspaceFile(etree.parse(filename))
+-        except Exception, e:
+-            gcmd.GError(parent = self,
+-                        message = _("Reading workspace file <%s> failed.\n"
+-                                    "Invalid file, unable to parse XML document.") % filename)
+-            return
+-        
+-        busy = wx.BusyInfo(message = _("Please wait, loading workspace..."),
+-                           parent = self)
+-        wx.Yield()
+-
+-        #
+-        # load layer manager window properties
+-        #
+-        if UserSettings.Get(group = 'workspace', key = 'posManager', subkey = 'enabled') is False:
+-            if gxwXml.layerManager['pos']:
+-                self.SetPosition(gxwXml.layerManager['pos'])
+-            if gxwXml.layerManager['size']:
+-                self.SetSize(gxwXml.layerManager['size'])
+-        
+-        #
+-        # start map displays first (list of layers can be empty)
+-        #
+-        displayId = 0
+-        mapdisplay = list()
+-        for display in gxwXml.displays:
+-            mapdisp = self.NewDisplay(show = False)
+-            mapdisplay.append(mapdisp)
+-            maptree = self.gm_cb.GetPage(displayId).maptree
+-            
+-            # set windows properties
+-            mapdisp.SetProperties(render = display['render'],
+-                                  mode = display['mode'],
+-                                  showCompExtent = display['showCompExtent'],
+-                                  constrainRes = display['constrainRes'],
+-                                  projection = display['projection']['enabled'])
+-
+-            if display['projection']['enabled']:
+-                if display['projection']['epsg']:
+-                    UserSettings.Set(group = 'display', key = 'projection', subkey = 'epsg',
+-                                     value = display['projection']['epsg'])
+-                    if display['projection']['proj']:
+-                        UserSettings.Set(group = 'display', key = 'projection', subkey = 'proj4',
+-                                         value = display['projection']['proj'])
+-            
+-            # set position and size of map display
+-            if UserSettings.Get(group = 'workspace', key = 'posDisplay', subkey = 'enabled') is False:
+-                if display['pos']:
+-                    mapdisp.SetPosition(display['pos'])
+-                if display['size']:
+-                    mapdisp.SetSize(display['size'])
+-                    
+-            # set extent if defined
+-            if display['extent']:
+-                w, s, e, n = display['extent']
+-                region = maptree.Map.region = maptree.Map.GetRegion(w = w, s = s, e = e, n = n)
+-                mapdisp.GetWindow().ResetZoomHistory()
+-                mapdisp.GetWindow().ZoomHistory(region['n'],
+-                                                region['s'],
+-                                                region['e'],
+-                                                region['w'])
+-                
+-            mapdisp.Show()
+-            
+-            displayId += 1
+-    
+-        maptree = None 
+-        selected = [] # list of selected layers
+-        # 
+-        # load list of map layers
+-        #
+-        for layer in gxwXml.layers:
+-            display = layer['display']
+-            maptree = self.gm_cb.GetPage(display).maptree
+-            
+-            newItem = maptree.AddLayer(ltype = layer['type'],
+-                                       lname = layer['name'],
+-                                       lchecked = layer['checked'],
+-                                       lopacity = layer['opacity'],
+-                                       lcmd = layer['cmd'],
+-                                       lgroup = layer['group'],
+-                                       lnviz = layer['nviz'],
+-                                       lvdigit = layer['vdigit'])
+-            
+-            if layer.has_key('selected'):
+-                if layer['selected']:
+-                    selected.append((maptree, newItem))
+-                else:
+-                    maptree.SelectItem(newItem, select = False)
+-            
+-        for maptree, layer in selected:
+-            if not maptree.IsSelected(layer):
+-                maptree.SelectItem(layer, select = True)
+-                maptree.layer_selected = layer
+-                
+-        busy.Destroy()
+-        
+-        if maptree:
+-            # reverse list of map layers
+-            maptree.Map.ReverseListOfLayers()
+-            
+-        for mdisp in mapdisplay:
+-            mdisp.MapWindow2D.UpdateMap()
+-
+-        return True
+-    
+-    def OnWorkspaceLoadGrcFile(self, event):
+-        """!Load map layers from GRC file (Tcl/Tk GUI) into map layer tree"""
+-        dlg = wx.FileDialog(parent = self, message = _("Choose GRC file to load"),
+-                            defaultDir = os.getcwd(), wildcard = _("Old GRASS Workspace File (*.grc)|*.grc"))
+-
+-        filename = ''
+-        if dlg.ShowModal() == wx.ID_OK:
+-            filename = dlg.GetPath()
+-
+-        if filename == '':
+-            return
+-
+-        Debug.msg(4, "GMFrame.OnWorkspaceLoadGrcFile(): filename=%s" % filename)
+-
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay()
+-
+-        busy = wx.BusyInfo(message = _("Please wait, loading workspace..."),
+-                           parent = self)
+-        wx.Yield()
+-
+-        maptree = None
+-        for layer in workspace.ProcessGrcFile(filename).read(self):
+-            maptree = self.gm_cb.GetPage(layer['display']).maptree
+-            newItem = maptree.AddLayer(ltype = layer['type'],
+-                                       lname = layer['name'],
+-                                       lchecked = layer['checked'],
+-                                       lopacity = layer['opacity'],
+-                                       lcmd = layer['cmd'],
+-                                       lgroup = layer['group'])
+-
+-            busy.Destroy()
+-            
+-        if maptree:
+-            # reverse list of map layers
+-            maptree.Map.ReverseListOfLayers()
+-
+-    def OnWorkspaceSaveAs(self, event = None):
+-        """!Save workspace definition to selected file"""
+-        dlg = wx.FileDialog(parent = self, message = _("Choose file to save current workspace"),
+-                            defaultDir = os.getcwd(), wildcard = _("GRASS Workspace File (*.gxw)|*.gxw"), style = wx.FD_SAVE)
+-
+-        filename = ''
+-        if dlg.ShowModal() == wx.ID_OK:
+-            filename = dlg.GetPath()
+-
+-        if filename == '':
+-            return False
+-
+-        # check for extension
+-        if filename[-4:] != ".gxw":
+-            filename += ".gxw"
+-
+-        if os.path.exists(filename):
+-            dlg = wx.MessageDialog(self, message = _("Workspace file <%s> already exists. "
+-                                                   "Do you want to overwrite this file?") % filename,
+-                                   caption = _("Save workspace"), style = wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+-            if dlg.ShowModal() != wx.ID_YES:
+-                dlg.Destroy()
+-                return False
+-
+-        Debug.msg(4, "GMFrame.OnWorkspaceSaveAs(): filename=%s" % filename)
+-
+-        self.SaveToWorkspaceFile(filename)
+-        self.workspaceFile = filename
+-        self.SetTitle(self.baseTitle + " - " + os.path.basename(self.workspaceFile))
+-
+-    def OnWorkspaceSave(self, event = None):
+-        """!Save file with workspace definition"""
+-        if self.workspaceFile:
+-            dlg = wx.MessageDialog(self, message = _("Workspace file <%s> already exists. "
+-                                                   "Do you want to overwrite this file?") % \
+-                                       self.workspaceFile,
+-                                   caption = _("Save workspace"), style = wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+-            if dlg.ShowModal() == wx.ID_NO:
+-                dlg.Destroy()
+-            else:
+-                Debug.msg(4, "GMFrame.OnWorkspaceSave(): filename=%s" % self.workspaceFile)
+-                self.SaveToWorkspaceFile(self.workspaceFile)
+-                self.SetTitle(self.baseTitle + " - " + os.path.basename(self.workspaceFile))
+-                self.workspaceChanged = False
+-        else:
+-            self.OnWorkspaceSaveAs()
+-
+-    def SaveToWorkspaceFile(self, filename):
+-        """!Save layer tree layout to workspace file
+-        
+-        Return True on success, False on error
+-        """
+-        tmpfile = tempfile.TemporaryFile(mode = 'w+b')
+-        try:
+-            workspace.WriteWorkspaceFile(lmgr = self, file = tmpfile)
+-        except StandardError, e:
+-            gcmd.GError(parent = self,
+-                        message = _("Writing current settings to workspace file "
+-                                    "failed."))
+-            return False
+-        
+-        try:
+-            mfile = open(filename, "w")
+-            tmpfile.seek(0)
+-            for line in tmpfile.readlines():
+-                mfile.write(line)
+-        except IOError:
+-            gcmd.GError(parent = self,
+-                        message = _("Unable to open file <%s> for writing.") % filename)
+-            return False
+-        
+-        mfile.close()
+-        
+-        return True
+-    
+-    def OnWorkspaceClose(self, event = None):
+-        """!Close file with workspace definition
+-        
+-        If workspace has been modified ask user to save the changes.
+-        """
+-        Debug.msg(4, "GMFrame.OnWorkspaceClose(): file=%s" % self.workspaceFile)
+-        
+-        self.OnDisplayCloseAll()
+-        self.workspaceFile = None
+-        self.workspaceChanged = False
+-        self.SetTitle(self.baseTitle)
+-        self.disp_idx = 0
+-        self.curr_page = None
+-        
+-    def OnDisplayClose(self, event = None):
+-        """!Close current map display window
+-        """
+-        if self.curr_page and self.curr_page.maptree.mapdisplay:
+-            self.curr_page.maptree.mapdisplay.OnCloseWindow(event)
+-        
+-    def OnDisplayCloseAll(self, event = None):
+-        """!Close all open map display windows
+-        """
+-        displays = list()
+-        for page in range(0, self.gm_cb.GetPageCount()):
+-            displays.append(self.gm_cb.GetPage(page).maptree.mapdisplay)
+-        
+-        for display in displays:
+-            display.OnCloseWindow(event)
+-        
+-    def RulesCmd(self, event):
+-        """!Launches dialog for commands that need rules input and
+-        processes rules
+-        """
+-        cmd = self.GetMenuCmd(event)
+-        
+-        if cmd[0] == 'r.colors':
+-            ctable = colorrules.ColorTable(self, raster = True)
+-        else:
+-            ctable = colorrules.ColorTable(self, raster = False)
+-        ctable.CentreOnScreen()
+-        ctable.Show()
+-        
+-    def OnInstallExtension(self, event):
+-        """!Install extension from GRASS Addons SVN repository"""
+-        win = InstallExtensionWindow(self, size = (650, 550))
+-        win.CentreOnScreen()
+-        win.Show()
+-        
+-    def OnPreferences(self, event):
+-        """!General GUI preferences/settings
+-        """
+-        if not self.dialogs['preferences']:
+-            dlg = preferences.PreferencesDialog(parent = self)
+-            self.dialogs['preferences'] = dlg
+-            self.dialogs['preferences'].CenterOnScreen()
+-            
+-            dlg.Bind(preferences.EVT_SETTINGS_CHANGED, self.OnSettingsChanged)
+-        
+-        self.dialogs['preferences'].ShowModal()
+-        
+-    def OnHelp(self, event):
+-        """!Show help
+-        """
+-        self.goutput.RunCmd(['g.manual','-i'])
+-        
+-    def DispHistogram(self, event):
+-        """
+-        Init histogram display canvas and tools
+-        """
+-        self.histogram = histogram.HistFrame(self,
+-                                             id = wx.ID_ANY, pos = wx.DefaultPosition, size = (400,300),
+-                                             style = wx.DEFAULT_FRAME_STYLE)
+-
+-        #show new display
+-        self.histogram.Show()
+-        self.histogram.Refresh()
+-        self.histogram.Update()
+-
+-    def DispProfile(self, event):
+-        """
+-        Init profile canvas and tools
+-        """
+-        self.profile = profile.ProfileFrame(self,
+-                                           id = wx.ID_ANY, pos = wx.DefaultPosition, size = (400,300),
+-                                           style = wx.DEFAULT_FRAME_STYLE)
+-        self.profile.Show()
+-        self.profile.Refresh()
+-        self.profile.Update()
+-        
+-    def OnMapCalculator(self, event, cmd = ''):
+-        """!Init map calculator for interactive creation of mapcalc statements
+-        """
+-        if event:
+-            try:
+-                cmd = self.GetMenuCmd(event)
+-            except KeyError:
+-                cmd = ['r.mapcalc']
+-        
+-        win = mapcalculator.MapCalcFrame(parent = self,
+-                                         cmd = cmd[0])
+-        win.CentreOnScreen()
+-        win.Show()
+-    
+-    def OnVectorCleaning(self, event, cmd = ''):
+-        """!Init interactive vector cleaning
+-        """
+-        
+-        if event:
+-            cmd = self.GetMenuCmd(event)
+-
+-        win = vclean.VectorCleaningFrame(parent = self, cmd = cmd[0])
+-        win.CentreOnScreen()
+-        win.Show()
+-        
+-    def OnImportDxfFile(self, event, cmd = None):
+-        """!Convert multiple DXF layers to GRASS vector map layers"""
+-        dlg = gdialogs.DxfImportDialog(parent = self)
+-        dlg.CentreOnScreen()
+-        dlg.Show()
+-
+-    def OnImportGdalLayers(self, event, cmd = None):
+-        """!Convert multiple GDAL layers to GRASS raster map layers"""
+-        dlg = gdialogs.GdalImportDialog(parent = self)
+-        dlg.CentreOnScreen()
+-        dlg.Show()
+-
+-    def OnLinkGdalLayers(self, event, cmd = None):
+-        """!Link multiple GDAL layers to GRASS raster map layers"""
+-        dlg = gdialogs.GdalImportDialog(parent = self, link = True)
+-        dlg.CentreOnScreen()
+-        dlg.Show()
+-        
+-    def OnImportOgrLayers(self, event, cmd = None):
+-        """!Convert multiple OGR layers to GRASS vector map layers"""
+-        dlg = gdialogs.GdalImportDialog(parent = self, ogr = True)
+-        dlg.CentreOnScreen()
+-        dlg.Show()
+-        
+-    def OnLinkOgrLayers(self, event, cmd = None):
+-        """!Links multiple OGR layers to GRASS vector map layers"""
+-        dlg = gdialogs.GdalImportDialog(parent = self, ogr = True, link = True)
+-        dlg.CentreOnScreen()
+-        dlg.Show()
+-        
+-    def OnImportWMS(self, event):
+-        """!Import data from OGC WMS server"""
+-        dlg = ogc_services.WMSDialog(parent = self, service = 'wms')
+-        dlg.CenterOnScreen()
+-        
+-        if dlg.ShowModal() == wx.ID_OK: # -> import layers
+-            layers = dlg.GetLayers()
+-            
+-            if len(layers.keys()) > 0:
+-                for layer in layers.keys():
+-                    cmd = ['r.in.wms',
+-                           'mapserver=%s' % dlg.GetSettings()['server'],
+-                           'layers=%s' % layer,
+-                           'output=%s' % layer,
+-                           'format=png',
+-                           '--overwrite']
+-                    styles = ','.join(layers[layer])
+-                    if styles:
+-                        cmd.append('styles=%s' % styles)
+-                    self.goutput.RunCmd(cmd, switchPage = True)
+-
+-                    self.curr_page.maptree.AddLayer(ltype = 'raster',
+-                                                    lname = layer,
+-                                                    lcmd = ['d.rast', 'map=%s' % layer],
+-                                                    multiple = False)
+-            else:
+-                self.goutput.WriteWarning(_("Nothing to import. No WMS layer selected."))
+-                
+-                
+-        dlg.Destroy()
+-        
+-    def OnShowAttributeTable(self, event):
+-        """!Show attribute table of the given vector map layer
+-        """
+-        if not self.curr_page:
+-            self.MsgNoLayerSelected()
+-            return
+-        
+-        tree = self.GetLayerTree()
+-        layer = tree.layer_selected
+-        # no map layer selected
+-        if not layer:
+-            self.MsgNoLayerSelected()
+-            return
+-        
+-        # available only for vector map layers
+-        try:
+-            maptype = tree.GetPyData(layer)[0]['maplayer'].type
+-        except:
+-            maptype = None
+-        
+-        if not maptype or maptype != 'vector':
+-            gcmd.GMessage(parent = self,
+-                          message = _("Selected map layer is not vector."))
+-            return
+-        
+-        if not tree.GetPyData(layer)[0]:
+-            return
+-        dcmd = tree.GetPyData(layer)[0]['cmd']
+-        if not dcmd:
+-            return
+-        
+-        busy = wx.BusyInfo(message = _("Please wait, loading attribute data..."),
+-                           parent = self)
+-        wx.Yield()
+-        
+-        dbmanager = dbm.AttributeManager(parent = self, id = wx.ID_ANY,
+-                                         size = wx.Size(500, 300),
+-                                         item = layer, log = self.goutput)
+-        
+-        busy.Destroy()
+-        
+-        # register ATM dialog
+-        self.dialogs['atm'].append(dbmanager)
+-        
+-        # show ATM window
+-        dbmanager.Show()
+-        
+-    def OnNewDisplay(self, event = None):
+-        """!Create new layer tree and map display instance"""
+-        self.NewDisplay()
+-
+-    def NewDisplay(self, show = True):
+-        """!Create new layer tree, which will
+-        create an associated map display frame
+-
+-        @param show show map display window if True
+-
+-        @return reference to mapdisplay intance
+-        """
+-        Debug.msg(1, "GMFrame.NewDisplay(): idx=%d" % self.disp_idx)
+-        
+-        # make a new page in the bookcontrol for the layer tree (on page 0 of the notebook)
+-        self.pg_panel = wx.Panel(self.gm_cb, id = wx.ID_ANY, style = wx.EXPAND)
+-        self.gm_cb.AddPage(self.pg_panel, text = "Display "+ str(self.disp_idx + 1), select = True)
+-        self.curr_page = self.gm_cb.GetCurrentPage()
+-        
+-        # create layer tree (tree control for managing GIS layers)  and put on new notebook page
+-        self.curr_page.maptree = layertree.LayerTree(self.curr_page, id = wx.ID_ANY, pos = wx.DefaultPosition,
+-                                                     size = wx.DefaultSize, style = wx.TR_HAS_BUTTONS |
+-                                                     wx.TR_LINES_AT_ROOT| wx.TR_HIDE_ROOT |
+-                                                     wx.TR_DEFAULT_STYLE| wx.NO_BORDER | wx.FULL_REPAINT_ON_RESIZE,
+-                                                     idx = self.disp_idx, lmgr = self, notebook = self.gm_cb,
+-                                                     auimgr = self._auimgr, showMapDisplay = show)
+-        
+-        # layout for controls
+-        cb_boxsizer = wx.BoxSizer(wx.VERTICAL)
+-        cb_boxsizer.Add(self.curr_page.maptree, proportion = 1, flag = wx.EXPAND, border = 1)
+-        self.curr_page.SetSizer(cb_boxsizer)
+-        cb_boxsizer.Fit(self.curr_page.maptree)
+-        self.curr_page.Layout()
+-        self.curr_page.maptree.Layout()
+-        
+-        # use default window layout
+-        if UserSettings.Get(group = 'general', key = 'defWindowPos', subkey = 'enabled'):
+-            dim = UserSettings.Get(group = 'general', key = 'defWindowPos', subkey = 'dim')
+-            idx = 4 + self.disp_idx * 4
+-            try:
+-                x, y = map(int, dim.split(',')[idx:idx + 2])
+-                w, h = map(int, dim.split(',')[idx + 2:idx + 4])
+-                self.curr_page.maptree.mapdisplay.SetPosition((x, y))
+-                self.curr_page.maptree.mapdisplay.SetSize((w, h))
+-            except:
+-                pass
+-        
+-        self.disp_idx += 1
+-        
+-        return self.curr_page.maptree.mapdisplay
+-    
+-    def OnAddMaps(self, event = None):
+-        """!Add selected map layers into layer tree"""
+-        dialog = gdialogs.AddMapLayersDialog(parent = self, title = _("Add selected map layers into layer tree"))
+-
+-        if dialog.ShowModal() == wx.ID_OK:
+-            # start new map display if no display is available
+-            if not self.curr_page:
+-                self.NewDisplay()
+-
+-            maptree = self.curr_page.maptree
+-            busy = wx.BusyInfo(message = _("Please wait, loading workspace..."),
+-                               parent = self)
+-            wx.Yield()
+-            
+-            for layerName in dialog.GetMapLayers():
+-                if dialog.GetLayerType() == 'raster':
+-                    cmd = ['d.rast', 'map=%s' % layerName]
+-                elif dialog.GetLayerType() == 'vector':
+-                    cmd = ['d.vect', 'map=%s' % layerName]
+-                newItem = maptree.AddLayer(ltype = dialog.GetLayerType(),
+-                                           lname = layerName,
+-                                           lchecked = False,
+-                                           lopacity = 1.0,
+-                                           lcmd = cmd,
+-                                           lgroup = None)
+-
+-            busy.Destroy()
+-    
+-    def OnAddRaster(self, event):
+-        """!Add raster map layer"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-        
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('raster')
+-        
+-    def OnAddRaster3D(self, event):
+-        """!Add 3D raster map layer"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-        
+-        self.AddRaster3D(event)
+-        
+-    def OnAddRasterMisc(self, event):
+-        """!Create misc raster popup-menu"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-        
+-        self._popupMenu((('addRast3d', self.OnAddRaster3D),
+-                         (None, None),
+-                         ('addRgb',    self.OnAddRasterRGB),
+-                         ('addHis',    self.OnAddRasterHIS),
+-                         (None, None),
+-                         ('addShaded', self.OnAddRasterShaded),
+-                         (None, None),
+-                         ('addRArrow', self.OnAddRasterArrow),
+-                         ('addRNum',   self.OnAddRasterNum)))
+-        
+-        # show map display
+-        self.curr_page.maptree.mapdisplay.Show()
+-        
+-    def OnAddVector(self, event):
+-        """!Add vector map to the current layer tree"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-        
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('vector')
+-
+-    def OnAddVectorMisc(self, event):
+-        """!Create misc vector popup-menu"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-
+-        self._popupMenu((('addThematic', self.OnAddVectorTheme),
+-                         ('addChart',    self.OnAddVectorChart)))
+-        
+-        # show map display
+-        self.curr_page.maptree.mapdisplay.Show()
+-
+-    def OnAddVectorTheme(self, event):
+-        """!Add thematic vector map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('thememap')
+-
+-    def OnAddVectorChart(self, event):
+-        """!Add chart vector map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('themechart')
+-
+-    def OnAddOverlay(self, event):
+-        """!Create decoration overlay menu""" 
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-
+-        self._popupMenu((('addGrid',     self.OnAddGrid),
+-                         ('addLabels',   self.OnAddLabels),
+-                         ('addGeodesic', self.OnAddGeodesic),
+-                         ('addRhumb',    self.OnAddRhumb),
+-                         (None, None),
+-                         ('addCmd',      self.OnAddCommand)))
+-        
+-        # show map display
+-        self.curr_page.maptree.mapdisplay.Show()
+-        
+-    def OnAddRaster3D(self, event):
+-        """!Add 3D raster map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('3d-raster')
+-
+-    def OnAddRasterRGB(self, event):
+-        """!Add RGB raster map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('rgb')
+-
+-    def OnAddRasterHIS(self, event):
+-        """!Add HIS raster map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('his')
+-
+-    def OnAddRasterShaded(self, event):
+-        """!Add shaded relief raster map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('shaded')
+-
+-    def OnAddRasterArrow(self, event):
+-        """!Add flow arrows raster map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('rastarrow')
+-
+-    def OnAddRasterNum(self, event):
+-        """!Add cell number raster map to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('rastnum')
+-
+-    def OnAddCommand(self, event):
+-        """!Add command line map layer to the current layer tree"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('command')
+-
+-        # show map display
+-        self.curr_page.maptree.mapdisplay.Show()
+-
+-    def OnAddGroup(self, event):
+-        """!Add layer group"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('group')
+-
+-        # show map display
+-        self.curr_page.maptree.mapdisplay.Show()
+-
+-    def OnAddGrid(self, event):
+-        """!Add grid map layer to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('grid')
+-
+-    def OnAddGeodesic(self, event):
+-        """!Add geodesic line map layer to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('geodesic')
+-
+-    def OnAddRhumb(self, event):
+-        """!Add rhumb map layer to the current layer tree"""
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('rhumb')
+-
+-    def OnAddLabels(self, event):
+-        """!Add vector labels map layer to the current layer tree"""
+-        # start new map display if no display is available
+-        if not self.curr_page:
+-            self.NewDisplay(show = True)
+-
+-        self.notebook.SetSelectionByName('layers')
+-        self.curr_page.maptree.AddLayer('labels')
+-
+-        # show map display
+-        self.curr_page.maptree.mapdisplay.Show()
+-
+-    def OnDeleteLayer(self, event):
+-        """!Remove selected map layer from the current layer Tree
+-        """
+-        if not self.curr_page or not self.curr_page.maptree.layer_selected:
+-            self.MsgNoLayerSelected()
+-            return
+-
+-        if UserSettings.Get(group = 'manager', key = 'askOnRemoveLayer', subkey = 'enabled'):
+-            layerName = ''
+-            for item in self.curr_page.maptree.GetSelections():
+-                name = str(self.curr_page.maptree.GetItemText(item))
+-                idx = name.find('(opacity')
+-                if idx > -1:
+-                    layerName += '<' + name[:idx].strip(' ') + '>,\n'
+-                else:
+-                    layerName += '<' + name + '>,\n'
+-            layerName = layerName.rstrip(',\n')
+-            
+-            if len(layerName) > 2: # <>
+-                message = _("Do you want to remove map layer(s)\n%s\n"
+-                            "from layer tree?") % layerName
+-            else:
+-                message = _("Do you want to remove selected map layer(s) "
+-                            "from layer tree?")
+-
+-            dlg = wx.MessageDialog (parent = self, message = message,
+-                                    caption = _("Remove map layer"),
+-                                    style  =  wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+-
+-            if dlg.ShowModal() != wx.ID_YES:
+-                dlg.Destroy()
+-                return
+-            
+-            dlg.Destroy()
+-
+-        for layer in self.curr_page.maptree.GetSelections():
+-            if self.curr_page.maptree.GetPyData(layer)[0]['type'] == 'group':
+-                self.curr_page.maptree.DeleteChildren(layer)
+-            self.curr_page.maptree.Delete(layer)
+-        
+-    def OnKeyDown(self, event):
+-        """!Key pressed"""
+-        kc = event.GetKeyCode()
+-        
+-        if event.ControlDown():
+-            if kc == wx.WXK_TAB:
+-                # switch layer list / command output
+-                if self.notebook.GetSelection() == self.notebook.GetPageIndexByName('layers'):
+-                    self.notebook.SetSelectionByName('output')
+-                else:
+-                    self.notebook.SetSelectionByName('layers')
+-        
+-        try:
+-            ckc = chr(kc)
+-        except ValueError:
+-            event.Skip()
+-            return
+-        
+-        if event.CtrlDown():
+-            if kc == 'R':
+-                self.OnAddRaster(None)
+-            elif kc == 'V':
+-                self.OnAddVector(None)
+-        
+-        event.Skip()
+-
+-    def OnCloseWindow(self, event):
+-        """!Cleanup when wxGUI is quitted"""
+-        if not self.curr_page:
+-            self._auimgr.UnInit()
+-            self.Destroy()
+-            return
+-        
+-        maptree = self.curr_page.maptree
+-        if self.workspaceChanged and \
+-                UserSettings.Get(group = 'manager', key = 'askOnQuit', subkey = 'enabled'):
+-            if self.workspaceFile:
+-                message = _("Do you want to save changes in the workspace?")
+-            else:
+-                message = _("Do you want to store current settings "
+-                            "to workspace file?")
+-            
+-            # ask user to save current settings
+-            if maptree.GetCount() > 0:
+-                dlg = wx.MessageDialog(self,
+-                                       message = message,
+-                                       caption = _("Quit GRASS GUI"),
+-                                       style = wx.YES_NO | wx.YES_DEFAULT |
+-                                       wx.CANCEL | wx.ICON_QUESTION | wx.CENTRE)
+-                ret = dlg.ShowModal()
+-                if ret == wx.ID_YES:
+-                    if not self.workspaceFile:
+-                        self.OnWorkspaceSaveAs()
+-                    else:
+-                        self.SaveToWorkspaceFile(self.workspaceFile)
+-                elif ret == wx.ID_CANCEL:
+-                    event.Veto()
+-                    dlg.Destroy()
+-                    return
+-                dlg.Destroy()
+-        
+-        # don't ask any more...
+-        UserSettings.Set(group = 'manager', key = 'askOnQuit', subkey = 'enabled',
+-                         value = False)
+-        
+-        self.OnDisplayCloseAll()
+-        
+-        self.gm_cb.DeleteAllPages()
+-        
+-        self._auimgr.UnInit()
+-        self.Destroy()
+-        
+-    def MsgNoLayerSelected(self):
+-        """!Show dialog message 'No layer selected'"""
+-        wx.MessageBox(parent = self,
+-                      message = _("No map layer selected. Operation cancelled."),
+-                      caption = _("Message"),
+-                      style = wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+-    
+-class GMApp(wx.App):
+-    def __init__(self, workspace = None):
+-        """!Main GUI class.
+-
+-        @param workspace path to the workspace file
+-        """
+-        self.workspaceFile = workspace
+-        
+-        # call parent class initializer
+-        wx.App.__init__(self, False)
+-        
+-        self.locale = wx.Locale(language = wx.LANGUAGE_DEFAULT)
+-        
+-    def OnInit(self):
+-        """!Initialize all available image handlers
+-        
+-        @return True
+-        """
+-        wx.InitAllImageHandlers()
+-
+-        # create splash screen
+-        introImagePath = os.path.join(globalvar.ETCIMGDIR, "silesia_splash.png")
+-        introImage     = wx.Image(introImagePath, wx.BITMAP_TYPE_PNG)
+-        introBmp       = introImage.ConvertToBitmap()
+-        if SC:
+-            splash = SC.AdvancedSplash(bitmap = introBmp, 
+-                                       timeout = 2000, parent = None, id = wx.ID_ANY)
+-            splash.SetText(_('Starting GRASS GUI...'))
+-            splash.SetTextColour(wx.Colour(45, 52, 27))
+-            splash.SetTextFont(wx.Font(pointSize = 15, family = wx.DEFAULT, style = wx.NORMAL,
+-                                       weight = wx.BOLD))
+-            splash.SetTextPosition((150, 430))
+-        else:
+-            wx.SplashScreen (bitmap = introBmp, splashStyle = wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,
+-                             milliseconds = 2000, parent = None, id = wx.ID_ANY)
+-        
+-        wx.Yield()
+-        
+-        ### TODO: adjust initial window layout if necessary
+-        w, h = wx.GetDisplaySize()
+-        # only neccessary if one of the windows is falling out of
+-        # the current display size
+-        
+-        # check if settings file exists
+-        # if settings file exists, check if we should use the stored settings
+-        #     if we should use stored settings, use stored settings
+-        #     else use default settings
+-        # else if settings file does not exist, use default settings
+-        # check if any of the windows is falling out of the current display
+-        # if yes, pull it in
+-        #   falling out to the right
+-        #   x pos = display width - window width
+-        #   falling out to the bottom
+-        #   y pos = 0
+-        # update settings
+-        # if settings file exists, update settings but keep settings for
+-        # additional map display windows, or update them too
+-        # do not erase settings for additional map display windows !
+-        
+-        # create and show main frame
+-        mainframe = GMFrame(parent = None, id = wx.ID_ANY,
+-                            workspace = self.workspaceFile)
+-
+-        mainframe.Show()
+-        self.SetTopWindow(mainframe)
+-
+-        return True
+-
+-class Usage(Exception):
+-    def __init__(self, msg):
+-        self.msg = msg
+-
+-def printHelp():
+-    """!Print program help"""
+-    print >> sys.stderr, "Usage:"
+-    print >> sys.stderr, " python wxgui.py [options]"
+-    print >> sys.stderr, "%sOptions:" % os.linesep
+-    print >> sys.stderr, " -w\t--workspace file\tWorkspace file to load"
+-    sys.exit(0)
+-
+-def process_opt(opts, args):
+-    """!Process command-line arguments"""
+-    workspaceFile = None
+-    for o, a in opts:
+-        if o in ("-h", "--help"):
+-            printHelp()
+-            
+-        if o in ("-w", "--workspace"):
+-            if a != '':
+-                workspaceFile = str(a)
+-            else:
+-                workspaceFile = args.pop(0)
+-
+-    return (workspaceFile,)
+-
+-def main(argv = None):
+-    #
+-    # process command-line arguments
+-    #
+-    if argv is None:
+-        argv = sys.argv
+-    try:
+-        try:
+-            opts, args = getopt.getopt(argv[1:], "hw:",
+-                                       ["help", "workspace"])
+-        except getopt.error, msg:
+-            raise Usage(msg)
+-
+-    except Usage, err:
+-        print >> sys.stderr, err.msg
+-        print >> sys.stderr, "for help use --help"
+-        printHelp()
+-
+-    workspaceFile = process_opt(opts, args)[0]
+-
+-    #
+-    # run application
+-    #
+-    app = GMApp(workspaceFile)
+-    # suppress wxPython logs
+-    q = wx.LogNull()
+-
+-    app.MainLoop()
+-
+-if __name__ == "__main__":
+-    sys.exit(main())
+Index: gui/wxpython/gui_modules/toolbars.py
+===================================================================
+--- gui/wxpython/gui_modules/toolbars.py	(revision 46749)
++++ gui/wxpython/gui_modules/toolbars.py	(working copy)
+@@ -270,6 +270,8 @@
+         icons = Icons['displayWindow']
+         return self._getToolbarData((('displaymap', icons['display'],
+                                       self.parent.OnDraw),
++                                      ('displaymap', icons['display'],
++                                      self.parent.OnDraw),
+                                      ('rendermap', icons['render'],
+                                       self.parent.OnRender),
+                                      ('erase', icons['erase'],
+@@ -1472,6 +1474,8 @@
+         icons = Icons['layerManager']
+         return self._getToolbarData((('newdisplay', icons["newdisplay"],
+                                       self.parent.OnNewDisplay),
++                                      ('newdisplay', icons["newdisplay"],
++                                      self.parent.OnNewDisplay1),
+                                      (None, ),
+                                      ('workspaceNew', icons["workspaceNew"],
+                                       self.parent.OnWorkspaceNew),



More information about the grass-commit mailing list