[GRASS-SVN] r58445 - in grass/trunk/gui: icons/grass wxpython/gui_core wxpython/mapdisp

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-12-11 12:14:22 -0800 (Wed, 11 Dec 2013)
New Revision: 58445

Added:
   grass/trunk/gui/icons/grass/zoom-region.png
Modified:
   grass/trunk/gui/wxpython/gui_core/toolbars.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/mapdisp/toolbars.py
Log:
wxGUI: zoom to region icon added to the map display


Added: grass/trunk/gui/icons/grass/zoom-region.png
===================================================================
(Binary files differ)


Property changes on: grass/trunk/gui/icons/grass/zoom-region.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: grass/trunk/gui/wxpython/gui_core/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/toolbars.py	2013-12-11 19:58:38 UTC (rev 58444)
+++ grass/trunk/gui/wxpython/gui_core/toolbars.py	2013-12-11 20:14:22 UTC (rev 58445)
@@ -53,9 +53,11 @@
                             label = _('Return to previous zoom')),
     'zoomMenu'   : MetaIcon(img = 'zoom-more',
                             label = _('Various zoom options'),
-                            desc = _('Zoom to computational, default, saved region, ...')),
+                            desc = _('Zoom to default or saved region, save to named region, ...')),
     'zoomExtent' : MetaIcon(img = 'zoom-extent',
                             label = _('Zoom to selected map layer(s)')),
+    'zoomRegion' : MetaIcon(img = 'zoom-region',
+                            label = _('Zoom to computational region extent')),
     'pan'        : MetaIcon(img = 'pan',
                             label = _('Pan'),
                             desc = _('Drag with mouse to pan')),

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2013-12-11 19:58:38 UTC (rev 58444)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2013-12-11 20:14:22 UTC (rev 58445)
@@ -1157,8 +1157,7 @@
         """
         zoommenu = wx.Menu()
         
-        for label, handler in ((_('Zoom to computational region'), self.OnZoomToWind),
-                               (_('Zoom to default region'), self.OnZoomToDefault),
+        for label, handler in ((_('Zoom to default region'), self.OnZoomToDefault),
                                (_('Zoom to saved region'), self.OnZoomToSaved),
                                (None, None),
                                (_('Set computational region from display extent'), self.OnSetDisplayToWind),

Modified: grass/trunk/gui/wxpython/mapdisp/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/toolbars.py	2013-12-11 19:58:38 UTC (rev 58444)
+++ grass/trunk/gui/wxpython/mapdisp/toolbars.py	2013-12-11 20:14:22 UTC (rev 58445)
@@ -159,6 +159,8 @@
                                       wx.ITEM_CHECK),
                                      ('zoomExtent', BaseIcons['zoomExtent'],
                                       self.parent.OnZoomToMap),
+                                     ('zoomRegion', BaseIcons['zoomRegion'],
+                                      self.parent.OnZoomToWind),
                                      ('zoomBack', BaseIcons['zoomBack'],
                                       self.parent.OnZoomBack),
                                      ('zoomMenu', BaseIcons['zoomMenu'],