[GRASS-SVN] r62542 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-11-02 05:59:33 -0800 (Sun, 02 Nov 2014)
New Revision: 62542

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py
Log:
wxGUI: fix zoom to saved region, broken by r61356 (merge from trunk, r62541)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:62179-62180,62182,62403,62466,62487,62491,62494,62506,62508-62509,62515,62519,62521,62526,62533,62539
   + /grass/trunk:62179-62180,62182,62403,62466,62487,62491,62494,62506,62508-62509,62515,62519,62521,62526,62533,62539,62541

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py	2014-11-02 13:58:06 UTC (rev 62541)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/dialogs.py	2014-11-02 13:59:33 UTC (rev 62542)
@@ -509,8 +509,7 @@
         
         box.Add(item=self._selection, proportion=0, flag=wx.ALIGN_CENTRE | wx.ALL, border=5)
         self._selection.SetFocus()
-        if self.loadsave == 'save':
-            self._selection.Bind(wx.EVT_TEXT, self.OnRegion)
+        self._selection.Bind(wx.EVT_TEXT, self.OnRegion)
         
         sizer.Add(item = box, proportion = 0, flag = wx.GROW | wx.ALIGN_CENTER_VERTICAL | wx.ALL,
                   border = 5)
@@ -537,6 +536,8 @@
 
     def OnRegion(self, event):
         value = self._selection.GetValue()
+        if '@' in value:
+            value = value.rsplit('@', 1)[0]
         if not grass.legal_name(value):
             GMessage(parent=self,
                      message=_("Name cannot begin with '.' "