Skip to content

Commit

Permalink
Merge pull request #9195 from m-kuhn/fix-help-button-group
Browse files Browse the repository at this point in the history 
Fix link to drag and drop designer help
  • Loading branch information
@m-kuhn
m-kuhn committed Feb 19, 2019
2 parents 5297d83 + 2e6005e commit 7949046
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 45 deletions.
2 changes: 1 addition & 1 deletion src/app/qgsaddtaborgroup.cpp
View file
Expand Up @@ -115,5 +115,5 @@ void QgsAddTabOrGroup::mTabButton_toggled( bool checked )


void QgsAddTabOrGroup::showHelp() 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" ) );
} }
26 changes: 24 additions & 2 deletions src/app/qgsvectorlayerproperties.cpp
View file
Expand Up @@ -471,6 +471,26 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
mGeometryAutoFixesGroupBox->setEnabled( false ); 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#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" ) );
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() ); optionsStackedWidget_CurrentChanged( mOptStackedWidget->currentIndex() );
} }


Expand Down Expand Up @@ -1623,9 +1643,11 @@ void QgsVectorLayerProperties::updateVariableEditor()


void QgsVectorLayerProperties::showHelp() 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 else
{ {
Expand Down
56 changes: 14 additions & 42 deletions src/ui/qgsvectorlayerpropertiesbase.ui
View file
Expand Up @@ -313,6 +313,9 @@
<property name="text"> <property name="text">
<string>Digitizing</string> <string>Digitizing</string>
</property> </property>
<property name="toolTip">
<string>Control geometry and topology constraints for digitizing operations.</string>
</property>
<property name="icon"> <property name="icon">
<iconset resource="../../images/images.qrc"> <iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/digitizing.svg</normaloff>:/images/themes/default/propertyicons/digitizing.svg</iconset> <normaloff>:/images/themes/default/propertyicons/digitizing.svg</normaloff>:/images/themes/default/propertyicons/digitizing.svg</iconset>
Expand Down Expand Up @@ -433,8 +436,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>315</width> <width>662</width>
<height>403</height> <height>804</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
Expand Down Expand Up @@ -721,8 +724,8 @@ border-radius: 2px;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>100</width> <width>662</width>
<height>30</height> <height>804</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_18"> <layout class="QVBoxLayout" name="verticalLayout_18">
Expand Down Expand Up @@ -907,8 +910,8 @@ border-radius: 2px;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>185</width> <width>662</width>
<height>112</height> <height>804</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_23"> <layout class="QVBoxLayout" name="verticalLayout_23">
Expand Down Expand Up @@ -1302,8 +1305,8 @@ border-radius: 2px;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>100</width> <width>662</width>
<height>30</height> <height>804</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_21"> <layout class="QVBoxLayout" name="verticalLayout_21">
Expand Down Expand Up @@ -1505,7 +1508,7 @@ border-radius: 2px;</string>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>734</width> <width>734</width>
<height>372</height> <height>790</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_32"> <layout class="QVBoxLayout" name="verticalLayout_32">
Expand Down Expand Up @@ -1961,8 +1964,8 @@ border-radius: 2px;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>378</width> <width>662</width>
<height>678</height> <height>804</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
Expand Down Expand Up @@ -2637,37 +2640,6 @@ border-radius: 2px;</string>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
Expand Down

0 comments on commit 7949046

Please sign in to comment.