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

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-09-17 07:07:36 -0700 (Wed, 17 Sep 2014)
New Revision: 62014

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
Log:
wxGUI: extend import GeoTIFF wildcard to work with double f (merge from trunk, r61986)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61808,61829,61831,61840,61851-61854,61858,61888,61891,61905,61907,61913-61914,61916,61918,61921,61938,61967-61968,61975,61980,62005
   + /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61808,61829,61831,61840,61851-61854,61858,61888,61891,61905,61907,61913-61914,61916,61918,61921,61938,61967-61968,61975,61980,61986,62005

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-09-17 14:00:48 UTC (rev 62013)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-09-17 14:07:36 UTC (rev 62014)
@@ -1353,7 +1353,9 @@
         # file
         if not ogr:
             extList = rasterFormatExtension
-            fileMask = '%(name)s (*.%(low)s;*.%(up)s)|*.%(low)s;*.%(up)s|' % {'name': 'GeoTIFF', 'low': 'tif', 'up': 'TIF'}
+            fileMask = ('%(name)s (*.%(low1)s;*.%(low2)s;*.%(up1)s;*.%(up2)s)|'
+                        '*.%(low1)s;*.%(low2)s;*.%(up1)s;*.%(up2)s|' %
+                        {'name': 'GeoTIFF', 'low1': 'tif', 'low2': 'tiff', 'up1': 'TIF', 'up2': 'TIFF'})
         else:
             extList = vectorFormatExtension
             fileMask = '%(name)s (*.%(low)s;*.%(up)s)|*.%(low)s;*.%(up)s|' % {'name': 'ESRI Shapefile', 'low': 'shp', 'up': 'SHP'}