@@ -303,6 +303,9 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
303
303
// "DMD_EXTENSION=.*". We'll also store the long name of the
304
304
// driver, which will be found in DMD_LONGNAME, which will have the
305
305
// same form.
306
+
307
+ // start with the default case
308
+ theFileFiltersString = tr ( " All files (*)" );
306
309
307
310
for ( int i = 0 ; i < GDALGetDriverCount (); ++i )
308
311
{
@@ -381,7 +384,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
381
384
glob += " *.jpeg" ;
382
385
}
383
386
384
- theFileFiltersString += myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " );; " ;
387
+ theFileFiltersString += " ;; " + myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " )" ;
385
388
386
389
break ; // ... to next driver, if any.
387
390
}
@@ -407,19 +410,19 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
407
410
if ( myGdalDriverDescription.startsWith ( " USGSDEM" ) )
408
411
{
409
412
QString glob = " *.dem" ;
410
- theFileFiltersString += myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " );; " ;
413
+ theFileFiltersString += " ;; " + myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " )" ;
411
414
}
412
415
else if ( myGdalDriverDescription.startsWith ( " DTED" ) )
413
416
{
414
417
// DTED use "*.dt0"
415
418
QString glob = " *.dt0" ;
416
- theFileFiltersString += myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " );; " ;
419
+ theFileFiltersString += " ;; " + myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " )" ;
417
420
}
418
421
else if ( myGdalDriverDescription.startsWith ( " MrSID" ) )
419
422
{
420
423
// MrSID use "*.sid"
421
424
QString glob = " *.sid" ;
422
- theFileFiltersString += myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " );; " ;
425
+ theFileFiltersString += " ;; " + myGdalDriverLongName + " (" + glob.toLower () + " " + glob.toUpper () + " )" ;
423
426
}
424
427
else
425
428
{
@@ -431,8 +434,6 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
431
434
432
435
} // each loaded GDAL driver
433
436
434
- // can't forget the default case
435
- theFileFiltersString += tr ( " All other files (*)" );
436
437
QgsDebugMsg ( " Raster filter list built: " + theFileFiltersString );
437
438
} // buildSupportedRasterFileFilter_()
438
439
0 commit comments