diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index 240f8882edb..1aecfd34283 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -446,18 +446,11 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv { mMetadataViewer->setZoomFactor( mMetadataViewer->zoomFactor() * 0.9 ); } - mMetadataViewer->page()->setLinkDelegationPolicy( QWebPage::DelegateExternalLinks ); + mMetadataViewer->page()->setLinkDelegationPolicy( QWebPage::LinkDelegationPolicy::DelegateExternalLinks ); connect( mMetadataViewer->page(), &QWebPage::linkClicked, this, &QgsRasterLayerProperties::urlClicked ); mMetadataViewer->page()->setViewportSize( QSize( 200, 200 ) ); - connect( mMetadataViewer->page(), &QWebPage::loadFinished, this, [ = ] - { - const auto frame { mMetadataViewer->page()->mainFrame() }; - mMetadataViewer->page()->setViewportSize( QSize( 200, 200 ) ); - //mMetadataViewer->resize( frame->contentsSize() ); - } ); mMetadataViewer->page()->settings()->setAttribute( QWebSettings::DeveloperExtrasEnabled, true ); mMetadataViewer->page()->settings()->setAttribute( QWebSettings::JavascriptEnabled, true ); - mMetadataViewer->page()->settings()->setAttribute( QWebSettings::LocalStorageEnabled, true ); #endif @@ -2069,15 +2062,19 @@ bool QgsRasterLayerProperties::rasterIsMultiBandColor() void QgsRasterLayerProperties::updateInformationContent() { + // We are using QgsWebView and the renderer is completely different from QTextBrowser + // add some extra style here QString myStyle = QgsApplication::reportStyleSheet(); - myStyle.append( QStringLiteral( "body { margin: 10px; } " - "table { border-collapse: collapse; } " - "td { word-wrap: break-word; } " - "table.list-view { table-layout:fixed; width: 95%; } " - "table.tabular-view { width: 100%; } " - ".tabular-view th:first-child, .tabular-view td:first-child { width: 30%; } " + myStyle.append( QStringLiteral( "body { margin: auto; width: 97% } " + "table.tabular-view, table.list-view { border-collapse: collapse; table-layout:fixed; width: 100% !important; } " + "h1 { line-height: inherit; } " + "td, th { word-wrap: break-word; vertical-align: top; } " + ".list-view th:first-child, .list-view td:first-child { width: 15%; } " + ".list-view.highlight { padding-left: inherit; } " + ".tabular-view th:first-child, .tabular-view td:first-child { width: 20%; } " + ".tabular-view th.strong { background-color: #eee; }" ".tabular-view th, .tabular-view td { " - " border: none;" + " border: solid 1px #eee;" "} \n " ) ); const QString html { mRasterLayer->htmlMetadata().replace( QStringLiteral( "" ), QStringLiteral( R"raw()raw" ) ).arg( myStyle ) }; mMetadataViewer->setHtml( html ); diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index 7c9b8248d6a..c4d0d877967 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -1903,25 +1903,25 @@ QString QgsWmsProvider::htmlMetadata() if ( !mSettings.mTiled ) { - metadata += QStringLiteral( " " ) % + metadata += QStringLiteral( " " ) % tr( "Selected Layers" ) % - QStringLiteral( " " ) % + QStringLiteral( " " ) % tr( "Other Layers" ) % QStringLiteral( "" ); } else { - metadata += QStringLiteral( " " ) % + metadata += QStringLiteral( " " ) % tr( "Tile Layer Properties" ) % QStringLiteral( " " ) % - QStringLiteral( " " ) % + QStringLiteral( " " ) % tr( "Cache Stats" ) % QStringLiteral( " " ); } metadata += QStringLiteral( "
" ) % // Nested table 1 // Server Properties section - QStringLiteral( "" ) % @@ -2041,14 +2041,13 @@ QString QgsWmsProvider::htmlMetadata() tr( "Tile Layer Count" ) % QStringLiteral( "" ) % QStringLiteral( "" ) % - - QStringLiteral( "" ) % - QStringLiteral( "" ) % + QStringLiteral( "" ) % + QStringLiteral( "" ); if ( mTileLayer ) @@ -2093,15 +2092,15 @@ QString QgsWmsProvider::htmlMetadata() tr( "Image Formats" ) % QStringLiteral( "" ) % QStringLiteral( "" ) % + mCaps.mCapabilities.capability.request.getMap.format.join( QStringLiteral( "
" ) ) % + QStringLiteral( "" ) % - // GetFeatureInfo Request Formats - QStringLiteral( "" ) % - QStringLiteral( "" ) % + QStringLiteral( "" ) % // Layer Count (as managed by this provider) @@ -2120,7 +2119,7 @@ QString QgsWmsProvider::htmlMetadata() // Layer properties if ( !mSettings.mTiled ) { - metadata += QStringLiteral( "" ); @@ -2137,7 +2136,7 @@ QString QgsWmsProvider::htmlMetadata() // Layer properties if ( n < mCaps.mLayersSupported.size() ) { - metadata += QStringLiteral( "" ); @@ -2153,7 +2152,7 @@ QString QgsWmsProvider::htmlMetadata() else { // Tileset properties - metadata += QStringLiteral( "" ) % @@ -2171,8 +2170,8 @@ QString QgsWmsProvider::htmlMetadata() QStringLiteral( "" ) % QStringLiteral( "" ) % QStringLiteral( "" ) % + l.title % + QStringLiteral( "" ) % - QStringLiteral( "" ) % - QStringLiteral( "" ) % + QStringLiteral( "" ) % + QStringLiteral( "" ) % - QStringLiteral( "" ) % - QStringLiteral( "" ); + QStringLiteral( "" ) % + QStringLiteral( "" ); if ( !l.styles.isEmpty() ) { @@ -2233,8 +2232,8 @@ QString QgsWmsProvider::htmlMetadata() { styles << style.identifier; } - metadata += styles.join( QStringLiteral( ", " ) ); - metadata += QStringLiteral( "" ); + metadata += styles.join( QStringLiteral( ", " ) ) % + QStringLiteral( "" ); } metadata += QStringLiteral( "" ); + l.boundingBoxes[i].crs % + QStringLiteral( "" ); } metadata += QStringLiteral( "
" ) % + QStringLiteral( "
" ) % tr( "Server Properties" ) % QStringLiteral( "
" ) % - QString::number( mCaps.mTileLayersSupported.size() ); - QStringLiteral( "
" ) % - tr( "GetTileUrl" ) % - QStringLiteral( "" ) % - getTileUrl(); + QString::number( mCaps.mTileLayersSupported.size() ) % + QStringLiteral( "
" ) % + tr( "GetTileUrl" ) % + QStringLiteral( "" ) % + getTileUrl(); QStringLiteral( "
" ) % - mCaps.mCapabilities.capability.request.getMap.format.join( QStringLiteral( "
" ) ); - QStringLiteral( "
" ) % - tr( "Identify Formats" ) % - QStringLiteral( "" ) % - mCaps.mCapabilities.capability.request.getFeatureInfo.format.join( QStringLiteral( "
" ) ); + // GetFeatureInfo Request Formats + QStringLiteral( "
" ) % + tr( "Identify Formats" ) % + QStringLiteral( "" ) % + mCaps.mCapabilities.capability.request.getFeatureInfo.format.join( QStringLiteral( "
" ) ); QStringLiteral( "
" ) % + metadata += QStringLiteral( "
" ) % tr( "Selected Layers" ) % QStringLiteral( "
" ) % + metadata += QStringLiteral( "
" ) % tr( "Other Layers" ) % QStringLiteral( "
" ) % + metadata += QStringLiteral( "
" ) % tr( "Tileset Properties" ) % QStringLiteral( "
" ) % - l.identifier; - QStringLiteral( "" ); + l.identifier % + QStringLiteral( "" ); if ( l.tileMode == WMTS ) { @@ -2205,22 +2204,22 @@ QString QgsWmsProvider::htmlMetadata() tr( "Title" ) % QStringLiteral( "" ) % - l.title; - QStringLiteral( "
" ) % - tr( "Abstract" ) % - QStringLiteral( "" ) % - l.abstract; - QStringLiteral( "
" ) % + tr( "Abstract" ) % + QStringLiteral( "" ) % + l.abstract % + QStringLiteral( "
" ) % - tr( "Selected" ) % - QStringLiteral( "" ) % - l.identifier == mSettings.mActiveSubLayers.join( QStringLiteral( "," ) ) ? tr( "Yes" ) : tr( "No" ) % - QStringLiteral( "
" ) % + tr( "Selected" ) % + QStringLiteral( "" ) % + l.identifier == mSettings.mActiveSubLayers.join( QStringLiteral( "," ) ) ? tr( "Yes" ) : tr( "No" ) % + QStringLiteral( "
" ) % @@ -2251,13 +2250,12 @@ QString QgsWmsProvider::htmlMetadata() for ( int i = 0; i < l.boundingBoxes.size(); i++ ) { metadata += QStringLiteral( "
" ) % - l.boundingBoxes[i].crs; - QStringLiteral( "" ) % - l.boundingBoxes[i].box.toString(); - QStringLiteral( "
" ) % + l.boundingBoxes[i].box.toString() % + QStringLiteral( "
" ) % // End nested table 4 - QStringLiteral( "" ) % tr( "Available Tilesets" ) % QStringLiteral( "" ); @@ -2392,7 +2390,7 @@ QString QgsWmsProvider::htmlMetadata() const QgsWmsStatistics::Stat &stat = QgsWmsStatistics::statForUri( dataSourceUri() ); - metadata += QStringLiteral( "" ) % + metadata += QStringLiteral( "" ) % tr( "Cache stats" ) % QStringLiteral( "" ) % @@ -2408,22 +2406,22 @@ QString QgsWmsProvider::htmlMetadata() QStringLiteral( "" ) % tr( "Hits" ) % QStringLiteral( "" ) % - QString::number( stat.cacheHits ); - QStringLiteral( "" ) % + QString::number( stat.cacheHits ) % + QStringLiteral( "" ) % - QStringLiteral( "" ) % - tr( "Misses" ) % - QStringLiteral( "" ) % - QString::number( stat.cacheMisses ); - QStringLiteral( "" ) % + QStringLiteral( "" ) % + tr( "Misses" ) % + QStringLiteral( "" ) % + QString::number( stat.cacheMisses ) % + QStringLiteral( "" ) % - QStringLiteral( "" ) % - tr( "Errors" ) % - QStringLiteral( "" ) % - QString::number( stat.errors ); - QStringLiteral( "" ) % + QStringLiteral( "" ) % + tr( "Errors" ) % + QStringLiteral( "" ) % + QString::number( stat.errors ) % + QStringLiteral( "" ) % - QStringLiteral( "" ); // End nested table 3 + QStringLiteral( "" ); // End nested table 3 } metadata += QStringLiteral( "" ) % // End nested table 2