Skip to content
Permalink
Browse files

Merge pull request #9195 from m-kuhn/fix-help-button-group

Fix link to drag and drop designer help
  • Loading branch information
m-kuhn committed Feb 19, 2019
2 parents 5297d83 + 2e6005e commit 79490461ddc9ec92362f95b87985904d88f4d22b
Showing with 39 additions and 45 deletions.
  1. +1 −1 src/app/qgsaddtaborgroup.cpp
  2. +24 −2 src/app/qgsvectorlayerproperties.cpp
  3. +14 −42 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -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" ) );
}
@@ -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#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() );
}

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

0 comments on commit 7949046

Please sign in to comment.
You can’t perform that action at this time.