diff --git a/python/gui/auto_generated/qgisinterface.sip.in b/python/gui/auto_generated/qgisinterface.sip.in index 49c686a4ac4..03e1f356161 100644 --- a/python/gui/auto_generated/qgisinterface.sip.in +++ b/python/gui/auto_generated/qgisinterface.sip.in @@ -1246,7 +1246,8 @@ mOptsPage_Information, mOptsPage_Source, mOptsPage_Style, mOptsPage_StyleContent mOptsPage_Rendering, mOptsPage_Temporal, mOptsPage_Metadata Point Cloud Layer: -mOptsPage_Information, mOptsPage_Source, mOptsPage_Metadata, mOptsPage_Statistics +mOptsPage_Information, mOptsPage_Source, mOptsPage_Metadata, mOptsPage_Statistics, +mOptsPage_Rendering Vector Tile Layer: mOptsPage_Information, mOptsPage_Style, mOptsPage_Labeling, mOptsPage_Metadata diff --git a/src/app/3d/qgsmeshlayer3drendererwidget.cpp b/src/app/3d/qgsmeshlayer3drendererwidget.cpp index 3a94380b58b..00daff303fe 100644 --- a/src/app/3d/qgsmeshlayer3drendererwidget.cpp +++ b/src/app/3d/qgsmeshlayer3drendererwidget.cpp @@ -28,6 +28,7 @@ QgsMeshLayer3DRendererWidget::QgsMeshLayer3DRendererWidget( QgsMeshLayer *layer, : QgsMapLayerConfigWidget( layer, canvas, parent ) { setPanelTitle( tr( "3D View" ) ); + setObjectName( QStringLiteral( "mOptsPage_3DView" ) ); QgsVScrollArea *scrollArea = new QgsVScrollArea( this ); scrollArea->setFrameShape( QFrame::NoFrame ); @@ -52,6 +53,8 @@ QgsMeshLayer3DRendererWidget::QgsMeshLayer3DRendererWidget( QgsMeshLayer *layer, connect( mChkEnabled, &QCheckBox::clicked, this, &QgsMeshLayer3DRendererWidget::onEnabledClicked ); connect( mWidgetMesh, &QgsMesh3dSymbolWidget::changed, this, &QgsMeshLayer3DRendererWidget::widgetChanged ); + + setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#d-view-properties" ) ); } void QgsMeshLayer3DRendererWidget::setRenderer( const QgsMeshLayer3DRenderer *renderer ) diff --git a/src/app/3d/qgspointcloudlayer3drendererwidget.cpp b/src/app/3d/qgspointcloudlayer3drendererwidget.cpp index 84759cd7b02..f7f92c247fb 100644 --- a/src/app/3d/qgspointcloudlayer3drendererwidget.cpp +++ b/src/app/3d/qgspointcloudlayer3drendererwidget.cpp @@ -28,6 +28,7 @@ QgsPointCloudLayer3DRendererWidget::QgsPointCloudLayer3DRendererWidget( QgsPoint : QgsMapLayerConfigWidget( layer, canvas, parent ) { setPanelTitle( tr( "3D View" ) ); + setObjectName( QStringLiteral( "mOptsPage_3DView" ) ); QVBoxLayout *layout = new QVBoxLayout( this ); layout->setContentsMargins( 0, 0, 0, 0 ); @@ -38,6 +39,7 @@ QgsPointCloudLayer3DRendererWidget::QgsPointCloudLayer3DRendererWidget( QgsPoint mWidgetPointCloudSymbol->connectChildPanels( this ); connect( mWidgetPointCloudSymbol, &QgsPointCloud3DSymbolWidget::changed, this, &QgsPointCloudLayer3DRendererWidget::widgetChanged ); + setProperty( "helpPage", QStringLiteral( "working_with_point_clouds/point_clouds.html#d-view-properties" ) ); } void QgsPointCloudLayer3DRendererWidget::setRenderer( const QgsPointCloudLayer3DRenderer *renderer ) diff --git a/src/app/3d/qgsvectorlayer3drendererwidget.cpp b/src/app/3d/qgsvectorlayer3drendererwidget.cpp index 0785bc030a2..283f994bf88 100644 --- a/src/app/3d/qgsvectorlayer3drendererwidget.cpp +++ b/src/app/3d/qgsvectorlayer3drendererwidget.cpp @@ -84,6 +84,7 @@ QgsVectorLayer3DRendererWidget::QgsVectorLayer3DRendererWidget( QgsMapLayer *lay : QgsMapLayerConfigWidget( layer, canvas, parent ) { setPanelTitle( tr( "3D View" ) ); + setObjectName( QStringLiteral( "mOptsPage_3DView" ) ); QVBoxLayout *layout = new QVBoxLayout( this ); layout->setContentsMargins( 0, 0, 0, 0 ); @@ -114,6 +115,8 @@ QgsVectorLayer3DRendererWidget::QgsVectorLayer3DRendererWidget( QgsMapLayer *lay connect( widgetRuleBasedRenderer, &QgsRuleBased3DRendererWidget::showPanel, this, &QgsPanelWidget::openPanel ); connect( widgetBaseProperties, &QgsVectorLayer3DPropertiesWidget::changed, this, &QgsVectorLayer3DRendererWidget::widgetChanged ); + setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#d-view-properties" ) ); + syncToLayer( layer ); } diff --git a/src/app/mesh/qgsmeshelevationpropertieswidget.cpp b/src/app/mesh/qgsmeshelevationpropertieswidget.cpp index 4efde43edfc..c6a731becc1 100644 --- a/src/app/mesh/qgsmeshelevationpropertieswidget.cpp +++ b/src/app/mesh/qgsmeshelevationpropertieswidget.cpp @@ -55,6 +55,8 @@ QgsMeshElevationPropertiesWidget::QgsMeshElevationPropertiesWidget( QgsMeshLayer onChanged(); } ); + + setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#elevation-properties" ) ); } void QgsMeshElevationPropertiesWidget::syncToLayer( QgsMapLayer *layer ) diff --git a/src/app/pointcloud/qgspointcloudelevationpropertieswidget.cpp b/src/app/pointcloud/qgspointcloudelevationpropertieswidget.cpp index ebb12071747..e102eb72477 100644 --- a/src/app/pointcloud/qgspointcloudelevationpropertieswidget.cpp +++ b/src/app/pointcloud/qgspointcloudelevationpropertieswidget.cpp @@ -57,6 +57,8 @@ QgsPointCloudElevationPropertiesWidget::QgsPointCloudElevationPropertiesWidget( connect( mPointColorButton, &QgsColorButton::colorChanged, this, &QgsPointCloudElevationPropertiesWidget::onChanged ); connect( mCheckBoxRespectLayerColors, &QCheckBox::toggled, this, &QgsPointCloudElevationPropertiesWidget::onChanged ); connect( mOpacityByDistanceCheckBox, &QCheckBox::toggled, this, &QgsPointCloudElevationPropertiesWidget::onChanged ); + + setProperty( "helpPage", QStringLiteral( "working_with_point_clouds/point_clouds.html#elevation-properties" ) ); } void QgsPointCloudElevationPropertiesWidget::syncToLayer( QgsMapLayer *layer ) diff --git a/src/app/pointcloud/qgspointcloudlayerproperties.cpp b/src/app/pointcloud/qgspointcloudlayerproperties.cpp index 401bf9eebb8..db55031c2d7 100644 --- a/src/app/pointcloud/qgspointcloudlayerproperties.cpp +++ b/src/app/pointcloud/qgspointcloudlayerproperties.cpp @@ -110,6 +110,13 @@ QgsPointCloudLayerProperties::QgsPointCloudLayerProperties( QgsPointCloudLayer * mBtnMetadata->setMenu( menuMetadata ); buttonBox->addButton( mBtnMetadata, QDialogButtonBox::ResetRole ); + //Add help page references + mOptsPage_Information->setProperty( "helpPage", QStringLiteral( "working_with_point_clouds/point_clouds.html#information-properties" ) ); + mOptsPage_Source->setProperty( "helpPage", QStringLiteral( "working_with_point_clouds/point_clouds.html#source-properties" ) ); + mOptsPage_Rendering->setProperty( "helpPage", QStringLiteral( "working_with_point_clouds/point_clouds.html#rendering-properties" ) ); + mOptsPage_Metadata->setProperty( "helpPage", QStringLiteral( "working_with_point_clouds/point_clouds.html#metadata-properties" ) ); + mOptsPage_Statistics->setProperty( "helpPage", QStringLiteral( "working_with_point_clouds/point_clouds.html#statistics-properties" ) ); + mStatisticsTableView->setModel( new QgsPointCloudAttributeStatisticsModel( mLayer, mStatisticsTableView ) ); mStatisticsTableView->verticalHeader()->hide(); @@ -441,7 +448,7 @@ void QgsPointCloudLayerProperties::showHelp() } else { - QgsHelp::openHelp( QStringLiteral( "working_with_vector_tiles/vector_tiles_properties.html" ) ); + QgsHelp::openHelp( QStringLiteral( "working_with_point_clouds/point_clouds.html" ) ); } } diff --git a/src/app/qgsvectorlayerdigitizingproperties.cpp b/src/app/qgsvectorlayerdigitizingproperties.cpp index ae2d7ac611d..d5f38c076c8 100644 --- a/src/app/qgsvectorlayerdigitizingproperties.cpp +++ b/src/app/qgsvectorlayerdigitizingproperties.cpp @@ -31,6 +31,7 @@ QgsVectorLayerDigitizingPropertiesPage::QgsVectorLayerDigitizingPropertiesPage( : QgsMapLayerConfigWidget( layer, canvas, parent ) { setupUi( this ); + setObjectName( QStringLiteral( "mOptsPage_Digitizing" ) ); QgsVectorLayer *vlayer = qobject_cast( mLayer ); diff --git a/src/app/raster/qgsrasterelevationpropertieswidget.cpp b/src/app/raster/qgsrasterelevationpropertieswidget.cpp index 2aece49b372..6c9c24aadd2 100644 --- a/src/app/raster/qgsrasterelevationpropertieswidget.cpp +++ b/src/app/raster/qgsrasterelevationpropertieswidget.cpp @@ -58,6 +58,8 @@ QgsRasterElevationPropertiesWidget::QgsRasterElevationPropertiesWidget( QgsRaste onChanged(); } ); + + setProperty( "helpPage", QStringLiteral( "working_with_raster/raster_properties.html#elevation-properties" ) ); } void QgsRasterElevationPropertiesWidget::syncToLayer( QgsMapLayer *layer ) diff --git a/src/app/vector/qgsvectorelevationpropertieswidget.cpp b/src/app/vector/qgsvectorelevationpropertieswidget.cpp index c0aec562c51..e145782d450 100644 --- a/src/app/vector/qgsvectorelevationpropertieswidget.cpp +++ b/src/app/vector/qgsvectorelevationpropertieswidget.cpp @@ -105,6 +105,8 @@ QgsVectorElevationPropertiesWidget::QgsVectorElevationPropertiesWidget( QgsVecto connect( mSurfaceLineStyleButton, &QgsSymbolButton::changed, this, &QgsVectorElevationPropertiesWidget::onChanged ); connect( mSurfaceMarkerStyleButton, &QgsSymbolButton::changed, this, &QgsVectorElevationPropertiesWidget::onChanged ); connect( mExtrusionGroupBox, &QGroupBox::toggled, this, &QgsVectorElevationPropertiesWidget::toggleSymbolWidgets ); + + setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#elevation-properties" ) ); } void QgsVectorElevationPropertiesWidget::syncToLayer( QgsMapLayer *layer ) diff --git a/src/gui/mesh/qgsmeshlayerproperties.cpp b/src/gui/mesh/qgsmeshlayerproperties.cpp index b08061b3682..71a2d16b84f 100644 --- a/src/gui/mesh/qgsmeshlayerproperties.cpp +++ b/src/gui/mesh/qgsmeshlayerproperties.cpp @@ -135,6 +135,8 @@ QgsMeshLayerProperties::QgsMeshLayerProperties( QgsMapLayer *lyr, QgsMapCanvas * mOptsPage_Source->setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#source-properties" ) ); mOptsPage_Style->setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#symbology-properties" ) ); mOptsPage_Rendering->setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#rendering-properties" ) ); + mOptsPage_Temporal->setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#temporal-properties" ) ); + mOptsPage_Metadata->setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#metadata-properties" ) ); mBtnStyle = new QPushButton( tr( "Style" ) ); QMenu *menuStyle = new QMenu( this ); @@ -172,8 +174,6 @@ void QgsMeshLayerProperties::addPropertiesPageFactory( const QgsMapLayerConfigWi QgsMapLayerConfigWidget *page = factory->createWidget( mMeshLayer, mCanvas, false, this ); mConfigWidgets << page; - page->setProperty( "helpPage", QStringLiteral( "working_with_mesh/mesh_properties.html#d-view-properties" ) ); - const QString beforePage = factory->layerPropertiesPagePositionHint(); if ( beforePage.isEmpty() ) addPage( factory->title(), factory->title(), factory->icon(), page ); diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index b9a739b02f9..8a92251bf30 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -1078,7 +1078,8 @@ class GUI_EXPORT QgisInterface : public QObject * mOptsPage_Rendering, mOptsPage_Temporal, mOptsPage_Metadata * * Point Cloud Layer: - * mOptsPage_Information, mOptsPage_Source, mOptsPage_Metadata, mOptsPage_Statistics + * mOptsPage_Information, mOptsPage_Source, mOptsPage_Metadata, mOptsPage_Statistics, + * mOptsPage_Rendering * * Vector Tile Layer: * mOptsPage_Information, mOptsPage_Style, mOptsPage_Labeling, mOptsPage_Metadata diff --git a/src/gui/raster/qgsrasterlayerproperties.cpp b/src/gui/raster/qgsrasterlayerproperties.cpp index a34e4df9ed9..dbd4d1a7f1c 100644 --- a/src/gui/raster/qgsrasterlayerproperties.cpp +++ b/src/gui/raster/qgsrasterlayerproperties.cpp @@ -525,6 +525,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv mOptsPage_Histogram->setProperty( "helpPage", QStringLiteral( "working_with_raster/raster_properties.html#histogram-properties" ) ); mOptsPage_Rendering->setProperty( "helpPage", QStringLiteral( "working_with_raster/raster_properties.html#rendering-properties" ) ); + mOptsPage_Temporal->setProperty( "helpPage", QStringLiteral( "working_with_raster/raster_properties.html#temporal-properties" ) ); if ( mOptsPage_Pyramids ) mOptsPage_Pyramids->setProperty( "helpPage", QStringLiteral( "working_with_raster/raster_properties.html#pyramids-properties" ) ); diff --git a/src/gui/vector/qgsvectorlayerproperties.cpp b/src/gui/vector/qgsvectorlayerproperties.cpp index ab60e4dfdfa..9406a3d2227 100644 --- a/src/gui/vector/qgsvectorlayerproperties.cpp +++ b/src/gui/vector/qgsvectorlayerproperties.cpp @@ -454,6 +454,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( mOptsPage_Actions->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#actions-properties" ) ); mOptsPage_Display->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#display-properties" ) ); mOptsPage_Rendering->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#rendering-properties" ) ); + mOptsPage_Temporal->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#temporal-properties" ) ); mOptsPage_Variables->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#variables-properties" ) ); mOptsPage_Metadata->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#metadata-properties" ) ); mOptsPage_DataDependencies->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#dependencies-properties" ) ) ;