Skip to content

Commit

Permalink
Set the most accurate User Manual page to Project Properties tabs
Browse files Browse the repository at this point in the history
Because some of the tabs in the dialog have a dedicated chapter where they are fully described, better use those links instead of the global one.
  • Loading branch information
DelazJ authored and m-kuhn committed Sep 6, 2017
1 parent f0cf4c3 commit 02c4344
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 35 deletions.
17 changes: 16 additions & 1 deletion src/app/qgsprojectproperties.cpp
Expand Up @@ -1984,5 +1984,20 @@ void QgsProjectProperties::scaleItemChanged( QListWidgetItem *changedScaleItem )

void QgsProjectProperties::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "introduction/qgis_configuration.html#project-properties" ) );
QWidget *activeTab = mOptionsStackedWidget->currentWidget();
QString link = QStringLiteral( "introduction/qgis_configuration.html#project-properties" );

if ( activeTab == mTabRelations )
{
link = QStringLiteral( "working_with_vector/attribute_table.html#creating-one-or-many-to-many-relations" );
}
else if ( activeTab == mTab_Variables )
{
link = QStringLiteral( "introduction/general_tools.html#variables" );
}
else if ( activeTab == mProjOptsCRS )
{
link = QStringLiteral( "working_with_projections/working_with_projections.html" );
}
QgsHelp::openHelp( link );
}
68 changes: 34 additions & 34 deletions src/ui/qgsprojectpropertiesbase.ui
Expand Up @@ -230,9 +230,9 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="mProjOpts_01">
<widget class="QWidget" name="mProjOptsGeneral">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="leftMargin">
<number>0</number>
Expand All @@ -259,8 +259,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>597</width>
<height>656</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
Expand Down Expand Up @@ -743,7 +743,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="mProjOpts_02">
<widget class="QWidget" name="mProjOptsCRS">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="leftMargin">
<number>0</number>
Expand All @@ -770,8 +770,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>683</width>
<height>779</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
Expand Down Expand Up @@ -802,7 +802,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="mProjOpts_03">
<widget class="QWidget" name="mProjOptsLayers">
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="leftMargin">
<number>0</number>
Expand All @@ -829,8 +829,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>133</width>
<height>100</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
Expand Down Expand Up @@ -888,7 +888,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="mProjOpts_04">
<widget class="QWidget" name="mProjOptsSymbols">
<layout class="QVBoxLayout" name="verticalLayout_11">
<property name="leftMargin">
<number>0</number>
Expand All @@ -915,8 +915,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>297</width>
<height>532</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -1311,7 +1311,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="mProjOpts_05">
<widget class="QWidget" name="mProjOptsOWS">
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="leftMargin">
<number>0</number>
Expand All @@ -1338,8 +1338,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>624</width>
<height>2451</height>
<width>667</width>
<height>2305</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
Expand Down Expand Up @@ -2391,7 +2391,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="mProjOpts_06">
<widget class="QWidget" name="mProjOptsMacros">
<layout class="QVBoxLayout" name="verticalLayout_15">
<property name="leftMargin">
<number>0</number>
Expand All @@ -2418,8 +2418,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>165</width>
<height>57</height>
<width>168</width>
<height>46</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
Expand Down Expand Up @@ -2563,9 +2563,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
Expand All @@ -2580,29 +2580,29 @@
<header location="global">qgsvariableeditorwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsFilterLineEdit</class>
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<extends>QWidget</extends>
<header location="global">qgscolorschemelist.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCodeEditorPython</class>
<extends>QWidget</extends>
Expand Down

0 comments on commit 02c4344

Please sign in to comment.