Skip to content
Permalink
Browse files

Merge pull request #2745 from medspx/gdal_invalid_messagebar

Replace QgsErrorDialog by messageBar for raster loading (fix #6967)
  • Loading branch information
nyalldawson committed Feb 24, 2016
2 parents d11e667 + 61bb01b commit 8abeb8d09e2369f5c1e35978d6fb2399997dd1ae
Showing with 4 additions and 7 deletions.
  1. +4 −7 src/app/qgisapp.cpp
@@ -10369,7 +10369,8 @@ QgsRasterLayer* QgisApp::addRasterLayerPrivate(
// don't show the gui warning if we are loading from command line
if ( guiWarning )
{
QgsErrorDialog::show( error, title );
messageBar()->pushMessage( title, error.message( QgsErrorMessage::Text ),
QgsMessageBar::CRITICAL, messageTimeout() );
}

if ( layer )
@@ -10481,15 +10482,11 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g
// loaded afterwards (see main.cpp)
if ( guiWarning )
{
QgsError error;
QString msg;

msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );
QString msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );
if ( !errMsg.isEmpty() )
msg += '\n' + errMsg;
error.append( QGS_ERROR_MESSAGE( msg, tr( "Raster layer" ) ) );

QgsErrorDialog::show( error, tr( "Unsupported Data Source" ) );
messageBar()->pushMessage( tr( "Unsupported Data Source" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );
}
}
if ( ! ok )

0 comments on commit 8abeb8d

Please sign in to comment.
You can’t perform that action at this time.