From d7c934001e34aa9ef06c0c868725f99b1c4731a2 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 18 Feb 2019 16:41:05 +0100 Subject: [PATCH 1/3] Fix link to drag and drop designer help --- src/app/qgsaddtaborgroup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/qgsaddtaborgroup.cpp b/src/app/qgsaddtaborgroup.cpp index bd7f06832a50..89bec5f11cb1 100644 --- a/src/app/qgsaddtaborgroup.cpp +++ b/src/app/qgsaddtaborgroup.cpp @@ -115,5 +115,5 @@ void QgsAddTabOrGroup::mTabButton_toggled( bool checked ) void QgsAddTabOrGroup::showHelp() { - QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#customize-a-form-for-your-data" ) ); + QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#the-drag-and-drop-designer" ) ); } From e19ba77ec534c1da5d07f20cbf40f45517d8a7f0 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 18 Feb 2019 17:45:14 +0100 Subject: [PATCH 2/3] Add links to all vector layer property pages Also makes the preexisting link work when translation is enabled. --- src/app/qgsvectorlayerproperties.cpp | 26 +++++++++++- src/ui/qgsvectorlayerpropertiesbase.ui | 56 +++++++------------------- 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 6a96b7f0d6d2..81910cbd5b9e 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -471,6 +471,26 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( mGeometryAutoFixesGroupBox->setEnabled( false ); } + mOptsPage_Information->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#information-properties" ) ); + mOptsPage_Source->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#source-properties" ) ); + mOptsPage_Style->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#symbology-properties" ) ); + mOptsPage_Labels->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#labels-properties" ) ); + mOptsPage_Diagrams->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#diagrams-properties" ) ); + mOptsPage_SourceFields->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#source-fields-properties" ) ); + mOptsPage_AttributesForm->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#attributes-form-properties" ) ); + mOptsPage_Joins->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#joins-properties" ) ); + mOptsPage_AuxiliaryStorage->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#auxiliary-storage-properties" ) ); + mOptsPage_Actions->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#actions-properties" ) ); + mOptsPage_Display->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#disply-properties" ) ); + mOptsPage_Rendering->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#rendering-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" ) ) ; + mOptsPage_Legend->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#legend-properties" ) ); + mOptsPage_Server->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#qgis-server-properties" ) ); + mOptsPage_Digitizing->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#digitizing-properties" ) ); + + optionsStackedWidget_CurrentChanged( mOptStackedWidget->currentIndex() ); } @@ -1623,9 +1643,11 @@ void QgsVectorLayerProperties::updateVariableEditor() void QgsVectorLayerProperties::showHelp() { - if ( mOptionsListWidget->currentIndex().data().toString() == "Form" ) + const QVariant helpPage = mOptionsStackedWidget->currentWidget()->property( "helpPage" ); + + if ( helpPage.isValid() ) { - QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#configure-the-field-behavior" ) ); + QgsHelp::openHelp( helpPage.toString() ); } else { diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui index beffa2ea2bca..8c8f4ba13dea 100644 --- a/src/ui/qgsvectorlayerpropertiesbase.ui +++ b/src/ui/qgsvectorlayerpropertiesbase.ui @@ -313,6 +313,9 @@ Digitizing + + Control geometry and topology constraints for digitizing operations. + :/images/themes/default/propertyicons/digitizing.svg:/images/themes/default/propertyicons/digitizing.svg @@ -433,8 +436,8 @@ 0 0 - 315 - 403 + 662 + 804 @@ -721,8 +724,8 @@ border-radius: 2px; 0 0 - 100 - 30 + 662 + 804 @@ -907,8 +910,8 @@ border-radius: 2px; 0 0 - 185 - 112 + 662 + 804 @@ -1302,8 +1305,8 @@ border-radius: 2px; 0 0 - 100 - 30 + 662 + 804 @@ -1505,7 +1508,7 @@ border-radius: 2px; 0 0 734 - 372 + 790 @@ -1961,8 +1964,8 @@ border-radius: 2px; 0 0 - 378 - 678 + 662 + 804 @@ -2637,37 +2640,6 @@ border-radius: 2px; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 2e6005e832fb392d6eb75d48155dea76a0cdb247 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Mon, 18 Feb 2019 18:27:05 +0100 Subject: [PATCH 3/3] Update src/app/qgsvectorlayerproperties.cpp Co-Authored-By: m-kuhn --- src/app/qgsvectorlayerproperties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 81910cbd5b9e..019cbdd2bcba 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -481,7 +481,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties( mOptsPage_Joins->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#joins-properties" ) ); mOptsPage_AuxiliaryStorage->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#auxiliary-storage-properties" ) ); mOptsPage_Actions->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#actions-properties" ) ); - mOptsPage_Display->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#disply-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_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" ) );