Skip to content

Commit 7949046

Browse files
m-kuhnm-kuhn
authored
Merge pull request #9195 from m-kuhn/fix-help-button-group
Fix link to drag and drop designer help
2 parents 5297d83 + 2e6005e commit 7949046

File tree

3 files changed

+39
-45
lines changed

3 files changed

+39
-45
lines changed

‎src/app/qgsaddtaborgroup.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,5 @@ void QgsAddTabOrGroup::mTabButton_toggled( bool checked )
115115

116116
void QgsAddTabOrGroup::showHelp()
117117
{
118-
QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#customize-a-form-for-your-data" ) );
118+
QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#the-drag-and-drop-designer" ) );
119119
}

‎src/app/qgsvectorlayerproperties.cpp

+24-2
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,26 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
471471
mGeometryAutoFixesGroupBox->setEnabled( false );
472472
}
473473

474+
mOptsPage_Information->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#information-properties" ) );
475+
mOptsPage_Source->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#source-properties" ) );
476+
mOptsPage_Style->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#symbology-properties" ) );
477+
mOptsPage_Labels->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#labels-properties" ) );
478+
mOptsPage_Diagrams->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#diagrams-properties" ) );
479+
mOptsPage_SourceFields->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#source-fields-properties" ) );
480+
mOptsPage_AttributesForm->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#attributes-form-properties" ) );
481+
mOptsPage_Joins->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#joins-properties" ) );
482+
mOptsPage_AuxiliaryStorage->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#auxiliary-storage-properties" ) );
483+
mOptsPage_Actions->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#actions-properties" ) );
484+
mOptsPage_Display->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#display-properties" ) );
485+
mOptsPage_Rendering->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#rendering-properties" ) );
486+
mOptsPage_Variables->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#variables-properties" ) );
487+
mOptsPage_Metadata->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#metadata-properties" ) );
488+
mOptsPage_DataDependencies->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#dependencies-properties" ) ) ;
489+
mOptsPage_Legend->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#legend-properties" ) );
490+
mOptsPage_Server->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#qgis-server-properties" ) );
491+
mOptsPage_Digitizing->setProperty( "helpPage", QStringLiteral( "working_with_vector/vector_properties.html#digitizing-properties" ) );
492+
493+
474494
optionsStackedWidget_CurrentChanged( mOptStackedWidget->currentIndex() );
475495
}
476496

@@ -1623,9 +1643,11 @@ void QgsVectorLayerProperties::updateVariableEditor()
16231643

16241644
void QgsVectorLayerProperties::showHelp()
16251645
{
1626-
if ( mOptionsListWidget->currentIndex().data().toString() == "Form" )
1646+
const QVariant helpPage = mOptionsStackedWidget->currentWidget()->property( "helpPage" );
1647+
1648+
if ( helpPage.isValid() )
16271649
{
1628-
QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#configure-the-field-behavior" ) );
1650+
QgsHelp::openHelp( helpPage.toString() );
16291651
}
16301652
else
16311653
{

‎src/ui/qgsvectorlayerpropertiesbase.ui

+14-42
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,9 @@
313313
<property name="text">
314314
<string>Digitizing</string>
315315
</property>
316+
<property name="toolTip">
317+
<string>Control geometry and topology constraints for digitizing operations.</string>
318+
</property>
316319
<property name="icon">
317320
<iconset resource="../../images/images.qrc">
318321
<normaloff>:/images/themes/default/propertyicons/digitizing.svg</normaloff>:/images/themes/default/propertyicons/digitizing.svg</iconset>
@@ -433,8 +436,8 @@
433436
<rect>
434437
<x>0</x>
435438
<y>0</y>
436-
<width>315</width>
437-
<height>403</height>
439+
<width>662</width>
440+
<height>804</height>
438441
</rect>
439442
</property>
440443
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -721,8 +724,8 @@ border-radius: 2px;</string>
721724
<rect>
722725
<x>0</x>
723726
<y>0</y>
724-
<width>100</width>
725-
<height>30</height>
727+
<width>662</width>
728+
<height>804</height>
726729
</rect>
727730
</property>
728731
<layout class="QVBoxLayout" name="verticalLayout_18">
@@ -907,8 +910,8 @@ border-radius: 2px;</string>
907910
<rect>
908911
<x>0</x>
909912
<y>0</y>
910-
<width>185</width>
911-
<height>112</height>
913+
<width>662</width>
914+
<height>804</height>
912915
</rect>
913916
</property>
914917
<layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1302,8 +1305,8 @@ border-radius: 2px;</string>
13021305
<rect>
13031306
<x>0</x>
13041307
<y>0</y>
1305-
<width>100</width>
1306-
<height>30</height>
1308+
<width>662</width>
1309+
<height>804</height>
13071310
</rect>
13081311
</property>
13091312
<layout class="QVBoxLayout" name="verticalLayout_21">
@@ -1505,7 +1508,7 @@ border-radius: 2px;</string>
15051508
<x>0</x>
15061509
<y>0</y>
15071510
<width>734</width>
1508-
<height>372</height>
1511+
<height>790</height>
15091512
</rect>
15101513
</property>
15111514
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -1961,8 +1964,8 @@ border-radius: 2px;</string>
19611964
<rect>
19621965
<x>0</x>
19631966
<y>0</y>
1964-
<width>378</width>
1965-
<height>678</height>
1967+
<width>662</width>
1968+
<height>804</height>
19661969
</rect>
19671970
</property>
19681971
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2637,37 +2640,6 @@ border-radius: 2px;</string>
26372640
</tabstops>
26382641
<resources>
26392642
<include location="../../images/images.qrc"/>
2640-
<include location="../../images/images.qrc"/>
2641-
<include location="../../images/images.qrc"/>
2642-
<include location="../../images/images.qrc"/>
2643-
<include location="../../images/images.qrc"/>
2644-
<include location="../../images/images.qrc"/>
2645-
<include location="../../images/images.qrc"/>
2646-
<include location="../../images/images.qrc"/>
2647-
<include location="../../images/images.qrc"/>
2648-
<include location="../../images/images.qrc"/>
2649-
<include location="../../images/images.qrc"/>
2650-
<include location="../../images/images.qrc"/>
2651-
<include location="../../images/images.qrc"/>
2652-
<include location="../../images/images.qrc"/>
2653-
<include location="../../images/images.qrc"/>
2654-
<include location="../../images/images.qrc"/>
2655-
<include location="../../images/images.qrc"/>
2656-
<include location="../../images/images.qrc"/>
2657-
<include location="../../images/images.qrc"/>
2658-
<include location="../../images/images.qrc"/>
2659-
<include location="../../images/images.qrc"/>
2660-
<include location="../../images/images.qrc"/>
2661-
<include location="../../images/images.qrc"/>
2662-
<include location="../../images/images.qrc"/>
2663-
<include location="../../images/images.qrc"/>
2664-
<include location="../../images/images.qrc"/>
2665-
<include location="../../images/images.qrc"/>
2666-
<include location="../../images/images.qrc"/>
2667-
<include location="../../images/images.qrc"/>
2668-
<include location="../../images/images.qrc"/>
2669-
<include location="../../images/images.qrc"/>
2670-
<include location="../../images/images.qrc"/>
26712643
</resources>
26722644
<connections>
26732645
<connection>

0 commit comments

Comments
 (0)