Skip to content

Commit 02c4344

Browse files
DelazJm-kuhn
authored andcommitted
Set the most accurate User Manual page to Project Properties tabs
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.
1 parent f0cf4c3 commit 02c4344

File tree

2 files changed

+50
-35
lines changed

2 files changed

+50
-35
lines changed

src/app/qgsprojectproperties.cpp

+16-1
Original file line numberDiff line numberDiff line change
@@ -1984,5 +1984,20 @@ void QgsProjectProperties::scaleItemChanged( QListWidgetItem *changedScaleItem )
19841984

19851985
void QgsProjectProperties::showHelp()
19861986
{
1987-
QgsHelp::openHelp( QStringLiteral( "introduction/qgis_configuration.html#project-properties" ) );
1987+
QWidget *activeTab = mOptionsStackedWidget->currentWidget();
1988+
QString link = QStringLiteral( "introduction/qgis_configuration.html#project-properties" );
1989+
1990+
if ( activeTab == mTabRelations )
1991+
{
1992+
link = QStringLiteral( "working_with_vector/attribute_table.html#creating-one-or-many-to-many-relations" );
1993+
}
1994+
else if ( activeTab == mTab_Variables )
1995+
{
1996+
link = QStringLiteral( "introduction/general_tools.html#variables" );
1997+
}
1998+
else if ( activeTab == mProjOptsCRS )
1999+
{
2000+
link = QStringLiteral( "working_with_projections/working_with_projections.html" );
2001+
}
2002+
QgsHelp::openHelp( link );
19882003
}

src/ui/qgsprojectpropertiesbase.ui

+34-34
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@
230230
</sizepolicy>
231231
</property>
232232
<property name="currentIndex">
233-
<number>0</number>
233+
<number>1</number>
234234
</property>
235-
<widget class="QWidget" name="mProjOpts_01">
235+
<widget class="QWidget" name="mProjOptsGeneral">
236236
<layout class="QVBoxLayout" name="verticalLayout_6">
237237
<property name="leftMargin">
238238
<number>0</number>
@@ -259,8 +259,8 @@
259259
<rect>
260260
<x>0</x>
261261
<y>0</y>
262-
<width>685</width>
263-
<height>778</height>
262+
<width>597</width>
263+
<height>656</height>
264264
</rect>
265265
</property>
266266
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -743,7 +743,7 @@
743743
</item>
744744
</layout>
745745
</widget>
746-
<widget class="QWidget" name="mProjOpts_02">
746+
<widget class="QWidget" name="mProjOptsCRS">
747747
<layout class="QVBoxLayout" name="verticalLayout_5">
748748
<property name="leftMargin">
749749
<number>0</number>
@@ -770,8 +770,8 @@
770770
<rect>
771771
<x>0</x>
772772
<y>0</y>
773-
<width>685</width>
774-
<height>778</height>
773+
<width>683</width>
774+
<height>779</height>
775775
</rect>
776776
</property>
777777
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -802,7 +802,7 @@
802802
</item>
803803
</layout>
804804
</widget>
805-
<widget class="QWidget" name="mProjOpts_03">
805+
<widget class="QWidget" name="mProjOptsLayers">
806806
<layout class="QVBoxLayout" name="verticalLayout_9">
807807
<property name="leftMargin">
808808
<number>0</number>
@@ -829,8 +829,8 @@
829829
<rect>
830830
<x>0</x>
831831
<y>0</y>
832-
<width>685</width>
833-
<height>778</height>
832+
<width>133</width>
833+
<height>100</height>
834834
</rect>
835835
</property>
836836
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -888,7 +888,7 @@
888888
</item>
889889
</layout>
890890
</widget>
891-
<widget class="QWidget" name="mProjOpts_04">
891+
<widget class="QWidget" name="mProjOptsSymbols">
892892
<layout class="QVBoxLayout" name="verticalLayout_11">
893893
<property name="leftMargin">
894894
<number>0</number>
@@ -915,8 +915,8 @@
915915
<rect>
916916
<x>0</x>
917917
<y>0</y>
918-
<width>685</width>
919-
<height>778</height>
918+
<width>297</width>
919+
<height>532</height>
920920
</rect>
921921
</property>
922922
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1311,7 +1311,7 @@
13111311
</item>
13121312
</layout>
13131313
</widget>
1314-
<widget class="QWidget" name="mProjOpts_05">
1314+
<widget class="QWidget" name="mProjOptsOWS">
13151315
<layout class="QVBoxLayout" name="verticalLayout_14">
13161316
<property name="leftMargin">
13171317
<number>0</number>
@@ -1338,8 +1338,8 @@
13381338
<rect>
13391339
<x>0</x>
13401340
<y>0</y>
1341-
<width>624</width>
1342-
<height>2451</height>
1341+
<width>667</width>
1342+
<height>2305</height>
13431343
</rect>
13441344
</property>
13451345
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2391,7 +2391,7 @@
23912391
</item>
23922392
</layout>
23932393
</widget>
2394-
<widget class="QWidget" name="mProjOpts_06">
2394+
<widget class="QWidget" name="mProjOptsMacros">
23952395
<layout class="QVBoxLayout" name="verticalLayout_15">
23962396
<property name="leftMargin">
23972397
<number>0</number>
@@ -2418,8 +2418,8 @@
24182418
<rect>
24192419
<x>0</x>
24202420
<y>0</y>
2421-
<width>165</width>
2422-
<height>57</height>
2421+
<width>168</width>
2422+
<height>46</height>
24232423
</rect>
24242424
</property>
24252425
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -2563,9 +2563,9 @@
25632563
</widget>
25642564
<customwidgets>
25652565
<customwidget>
2566-
<class>QgsColorButton</class>
2567-
<extends>QToolButton</extends>
2568-
<header>qgscolorbutton.h</header>
2566+
<class>QgsScrollArea</class>
2567+
<extends>QScrollArea</extends>
2568+
<header>qgsscrollarea.h</header>
25692569
<container>1</container>
25702570
</customwidget>
25712571
<customwidget>
@@ -2580,29 +2580,29 @@
25802580
<header location="global">qgsvariableeditorwidget.h</header>
25812581
<container>1</container>
25822582
</customwidget>
2583-
<customwidget>
2584-
<class>QgsScrollArea</class>
2585-
<extends>QScrollArea</extends>
2586-
<header>qgsscrollarea.h</header>
2587-
<container>1</container>
2588-
</customwidget>
2589-
<customwidget>
2590-
<class>QgsOpacityWidget</class>
2591-
<extends>QWidget</extends>
2592-
<header>qgsopacitywidget.h</header>
2593-
<container>1</container>
2594-
</customwidget>
25952583
<customwidget>
25962584
<class>QgsFilterLineEdit</class>
25972585
<extends>QLineEdit</extends>
25982586
<header>qgsfilterlineedit.h</header>
25992587
</customwidget>
2588+
<customwidget>
2589+
<class>QgsColorButton</class>
2590+
<extends>QToolButton</extends>
2591+
<header>qgscolorbutton.h</header>
2592+
<container>1</container>
2593+
</customwidget>
26002594
<customwidget>
26012595
<class>QgsColorSchemeList</class>
26022596
<extends>QWidget</extends>
26032597
<header location="global">qgscolorschemelist.h</header>
26042598
<container>1</container>
26052599
</customwidget>
2600+
<customwidget>
2601+
<class>QgsOpacityWidget</class>
2602+
<extends>QWidget</extends>
2603+
<header>qgsopacitywidget.h</header>
2604+
<container>1</container>
2605+
</customwidget>
26062606
<customwidget>
26072607
<class>QgsCodeEditorPython</class>
26082608
<extends>QWidget</extends>

0 commit comments

Comments
 (0)