[GRASS-SVN] r53476 - grass/trunk/gui/wxpython/lmgr

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-18 11:24:34 -0700 (Thu, 18 Oct 2012)
New Revision: 53476

Modified:
   grass/trunk/gui/wxpython/lmgr/frame.py
   grass/trunk/gui/wxpython/lmgr/layertree.py
   grass/trunk/gui/wxpython/lmgr/toolbars.py
Log:
wxGUI: move WMS import to 'import/link' pop-up menu


Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2012-10-18 17:13:55 UTC (rev 53475)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2012-10-18 18:24:34 UTC (rev 53476)
@@ -886,7 +886,9 @@
                          (None, None),
                          ('vectImport',    self.OnImportOgrLayers),
                          ('vectLink',      self.OnLinkOgrLayers),
-                         ('vectOut',       self.OnVectorOutputFormat)))
+                         ('vectOut',       self.OnVectorOutputFormat),
+                         (None, None),
+                         ('wmsImport',     self.OnImportWMS)))
         
     def OnWorkspaceNew(self, event = None):
         """!Create new workspace file

Modified: grass/trunk/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/layertree.py	2012-10-18 17:13:55 UTC (rev 53475)
+++ grass/trunk/gui/wxpython/lmgr/layertree.py	2012-10-18 18:24:34 UTC (rev 53476)
@@ -59,6 +59,8 @@
                                     label = _('Link external vector data')),
     'vectOut'    : MetaIcon(img = 'layer-export',
                             label = _('Set vector output format')),
+    'wmsImport'  : MetaIcon(img = 'layer-wms-add',
+                            label = _('Import data from WMS server')),
     'addCmd'     : MetaIcon(img = 'layer-command-add',
                             label = _('Add command layer')),
     'quit'       : MetaIcon(img = 'quit',

Modified: grass/trunk/gui/wxpython/lmgr/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/toolbars.py	2012-10-18 17:13:55 UTC (rev 53475)
+++ grass/trunk/gui/wxpython/lmgr/toolbars.py	2012-10-18 18:24:34 UTC (rev 53476)
@@ -132,8 +132,6 @@
         icons = {
             'import'  : MetaIcon(img = 'layer-import',
                                  label = _('Import/link raster or vector data')),
-            'wms'     : MetaIcon(img = 'layer-wms-add',
-                                 label = _("Import data from WMS server")),
             'mapcalc' : MetaIcon(img = 'calculator',
                                  label = _('Raster Map Calculator')),
             'modeler' : MetaIcon(img = 'modeler-main',
@@ -146,8 +144,6 @@
         
         return self._getToolbarData((('importMap', icons["import"],
                                       self.parent.OnImportMenu),
-                                     ('importWMS', icons["wms"],
-                                      self.parent.OnImportWMS),
                                      (None, ),
                                      ('mapCalc', icons["mapcalc"],
                                       self.parent.OnMapCalculator),