sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace QgsErrorDialog by messageBar for raster loading (fixes Redmine #6967)

Browse Source
This commit is contained in:
Médéric RIBREUX 2016-01-31 15:23:55 +01:00
parent 4825856fd7
commit 61bb01b5b6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/qgisapp.cpp
View File

@ -10380,7 +10380,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 )
@ -10492,15 +10493,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 )