diff --git a/doc/api_break.dox b/doc/api_break.dox index 61724758799..ab49f91f203 100644 --- a/doc/api_break.dox +++ b/doc/api_break.dox @@ -2060,6 +2060,7 @@ QgsRasterDataProvider {#qgis_api_break_3_0_QgsRasterDataProvider} - useSrcNoDataValue() has been renamed to useSourceNoDataValue() - setUseSrcNoDataValue() has been renamed to setUseSourceNoDataValue() - srcNoDataValue() has been renamed to sourceNoDataValue() +- metadata() was renamed to htmlMetadata() - draw() has been removed from the interface as it was not used anywhere. - The progress and progressUpdate signals were removed. Methods which previously emitted these signals now accept a QgsRasterBlockFeedback argument for reporting progress updates. diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 09b6e11419a..03ba6bd946d 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -3987,11 +3987,6 @@ QString QgsVectorLayer::htmlMetadata() const QgsLayerMetadataFormatter htmlFormatter( metadata() ); QString myMetadata = QStringLiteral( "\n\n" ); - // identification section - myMetadata += QStringLiteral( "

" ) + tr( "Identification" ) + QStringLiteral( "

\n
\n" ); - myMetadata += htmlFormatter.identificationSectionHtml( ); - myMetadata += QLatin1String( "

\n" ); - // Begin Provider section myMetadata += QStringLiteral( "

" ) + tr( "Information from provider" ) + QStringLiteral( "

\n
\n" ); myMetadata += QLatin1String( "\n" ); @@ -4048,6 +4043,11 @@ QString QgsVectorLayer::htmlMetadata() const // End Provider section myMetadata += QLatin1String( "
\n

" ); + // identification section + myMetadata += QStringLiteral( "

" ) + tr( "Identification" ) + QStringLiteral( "

\n
\n" ); + myMetadata += htmlFormatter.identificationSectionHtml( ); + myMetadata += QLatin1String( "

\n" ); + // extent section myMetadata += QStringLiteral( "

" ) + tr( "Extent" ) + QStringLiteral( "

\n
\n" ); myMetadata += htmlFormatter.extentSectionHtml( ); diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index 33964a21df8..4819401f141 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -307,11 +307,6 @@ QString QgsRasterLayer::htmlMetadata() const QgsLayerMetadataFormatter htmlFormatter( metadata() ); QString myMetadata = QStringLiteral( "\n\n" ); - // Identification section - myMetadata += QStringLiteral( "

" ) + tr( "Identification" ) + QStringLiteral( "

\n
\n" ); - myMetadata += htmlFormatter.identificationSectionHtml(); - myMetadata += QLatin1String( "

\n" ); - // Begin Provider section myMetadata += QStringLiteral( "

" ) + tr( "Information from provider" ) + QStringLiteral( "

\n
\n" ); myMetadata += QLatin1String( "\n" ); @@ -405,6 +400,11 @@ QString QgsRasterLayer::htmlMetadata() const // End Provider section myMetadata += QLatin1String( "
\n

" ); + // Identification section + myMetadata += QStringLiteral( "

" ) + tr( "Identification" ) + QStringLiteral( "

\n
\n" ); + myMetadata += htmlFormatter.identificationSectionHtml(); + myMetadata += QLatin1String( "

\n" ); + // extent section myMetadata += QStringLiteral( "

" ) + tr( "Extent" ) + QStringLiteral( "

\n
\n" ); myMetadata += htmlFormatter.extentSectionHtml( );