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

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-11-19 06:25:52 -0800 (Wed, 19 Nov 2014)
New Revision: 62813

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
Log:
wxGUI: fix  #2493 (wxgui file import wizards: all files should be defined as *), merge from trunk r62812


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805
   + /grass/trunk:60817,61096,61141,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-11-19 14:24:29 UTC (rev 62812)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-11-19 14:25:52 UTC (rev 62813)
@@ -1378,7 +1378,7 @@
         fileMask += '%s (*.tar;*.TAR)|*.tar;*.TAR|' % _('TAR files')
         fileMask += '%s (*.tar.gz;*.TAR.GZ;*.tgz;*.TGZ)|*.tar.gz;*.TAR.GZ;*.tgz;*.TGZ|' % _('TARGZ files')
         # don't include last '|' - windows and mac throw error
-        fileMask += '%(all)s (*.*)|*.*' % {'all': _('All files')}
+        fileMask += '%(all)s (*)|*' % {'all': _('All files')}
         # only contains formats with extensions hardcoded
 
         self.filePanel = wx.Panel(parent=self)