Skip to content

Commit 7495d9e

Browse files
committed
Followup 9dccce8, nicer error messages
1 parent d01307f commit 7495d9e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/app/qgisapp.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6948,8 +6948,8 @@ void QgisApp::copyStyle( QgsMapLayer * sourceLayer )
69486948

69496949
if ( !errorMsg.isEmpty() )
69506950
{
6951-
messageBar()->pushMessage( errorMsg,
6952-
tr( "Cannot copy style: %1" ),
6951+
messageBar()->pushMessage( tr( "Cannot copy style" ),
6952+
errorMsg,
69536953
QgsMessageBar::CRITICAL, messageTimeout() );
69546954
return;
69556955
}
@@ -6978,16 +6978,16 @@ void QgisApp::pasteStyle( QgsMapLayer * destinationLayer )
69786978
if ( !doc.setContent( clipboard()->data( QGSCLIPBOARD_STYLE_MIME ), false, &errorMsg, &errorLine, &errorColumn ) )
69796979
{
69806980

6981-
messageBar()->pushMessage( errorMsg,
6982-
tr( "Cannot parse style: %1:%2:%3" ),
6981+
messageBar()->pushMessage( tr( "Cannot parse style" ),
6982+
errorMsg,
69836983
QgsMessageBar::CRITICAL, messageTimeout() );
69846984
return;
69856985
}
69866986

69876987
if ( !selectionLayer->importNamedStyle( doc, errorMsg ) )
69886988
{
6989-
messageBar()->pushMessage( errorMsg,
6990-
tr( "Cannot paste style: %1" ),
6989+
messageBar()->pushMessage( tr( "Cannot paste style" ),
6990+
errorMsg,
69916991
QgsMessageBar::CRITICAL, messageTimeout() );
69926992
return;
69936993
}

src/app/qgsvectorlayerproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ void QgsVectorLayerProperties::loadStyle_clicked()
854854
else
855855
{
856856
//let the user know what went wrong
857-
QMessageBox::information( this, tr( "Load Style" ), myMessage );
857+
QMessageBox::warning( this, tr( "Load Style" ), myMessage );
858858
}
859859

860860
QFileInfo myFI( myFileName );

0 commit comments

Comments
 (0)