Skip to content

Commit

Permalink
[reports] Add more descriptive tooltips to widgets
Browse files Browse the repository at this point in the history 
Also
- fix widget tab orders
- tweak widget layouts for UI clarity
  • Loading branch information
@nyalldawson
nyalldawson committed Feb 23, 2018
1 parent a1785e2 commit 18ab200
Show file tree
Hide file tree
Showing 3 changed files with 167 additions and 45 deletions.
184 changes: 139 additions & 45 deletions src/ui/layout/qgsreportwidgetfieldgroupsectionbase.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>611</width>
<width>277</width>
<height>415</height>
</rect>
</property>
Expand All @@ -16,35 +16,21 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="6" column="1">
<widget class="QPushButton" name="mButtonEditFooter">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="5" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
<item row="0" column="1">
<widget class="QPushButton" name="mButtonEditHeader">
<property name="toolTip">
<string>Edit the field group header layout</string>
</property>
</spacer>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Field</string>
<string>Edit</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="mSortAscendingCheckBox">
<property name="toolTip">
<string>Sort features ascendingly by field value</string>
</property>
<property name="text">
<string>Sort ascending</string>
</property>
Expand All @@ -57,63 +43,158 @@
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QgsMapLayerComboBox" name="mLayerComboBox"/>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="mButtonEditBody">
<item row="6" column="1">
<widget class="QPushButton" name="mButtonEditFooter">
<property name="toolTip">
<string>Edit the field group footer layout</string>
</property>
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QgsFieldComboBox" name="mFieldComboBox"/>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="mCheckShowFooter">
<property name="toolTip">
<string>Include a footer layout after the last matching feature</string>
</property>
<property name="text">
<string>Include footer</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QCheckBox" name="mCheckFooterAlwaysVisible">
<property name="text">
<string>Show footer when no matching
<item row="3" column="1" colspan="2">
<widget class="QgsFieldComboBox" name="mFieldComboBox">
<property name="toolTip">
<string>Source field to iterate over</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="mCheckHeaderAlwaysVisible">
<property name="toolTip">
<string>If unchecked, the header will only be shown when at least one matching feature is found</string>
</property>
<property name="text">
<string>Show header when no matching
features are found</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="1" colspan="2">
<widget class="QgsMapLayerComboBox" name="mLayerComboBox">
<property name="toolTip">
<string>Source layer to iterate over</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="mCheckShowHeader">
<property name="toolTip">
<string>Include a header layout before the first matching feature</string>
</property>
<property name="text">
<string>Include header</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="mButtonEditHeader">
<item row="5" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="mCheckShowBody">
<property name="toolTip">
<string>Include a separate layout for every matching feature found</string>
</property>
<property name="text">
<string>Edit</string>
<string>Include body</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mCheckHeaderAlwaysVisible">
<item row="5" column="1">
<widget class="QPushButton" name="mButtonEditBody">
<property name="toolTip">
<string>Edit the field group body layout</string>
</property>
<property name="text">
<string>Show header when no matching
features are found</string>
<string>Edit</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="mCheckShowBody">
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Include body</string>
<string>Field</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="mCheckFooterAlwaysVisible">
<property name="toolTip">
<string>If unchecked, the footer will only be shown when at least one matching feature is found</string>
</property>
<property name="text">
<string>Show footer when no matching
features are found</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -143,6 +224,19 @@ features are found</string>
<header>qgsfieldcombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mCheckShowHeader</tabstop>
<tabstop>mButtonEditHeader</tabstop>
<tabstop>mCheckHeaderAlwaysVisible</tabstop>
<tabstop>mLayerComboBox</tabstop>
<tabstop>mFieldComboBox</tabstop>
<tabstop>mSortAscendingCheckBox</tabstop>
<tabstop>mCheckShowBody</tabstop>
<tabstop>mButtonEditBody</tabstop>
<tabstop>mCheckShowFooter</tabstop>
<tabstop>mButtonEditFooter</tabstop>
<tabstop>mCheckFooterAlwaysVisible</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
10 changes: 10 additions & 0 deletions src/ui/layout/qgsreportwidgetlayoutsectionbase.ui
View file
Expand Up @@ -18,13 +18,19 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QPushButton" name="mButtonEditBody">
<property name="toolTip">
<string>Edit the static layout</string>
</property>
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="mCheckShowBody">
<property name="toolTip">
<string>Include a static layout inserted into the report</string>
</property>
<property name="text">
<string>Include section</string>
</property>
Expand Down Expand Up @@ -60,6 +66,10 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>mCheckShowBody</tabstop>
<tabstop>mButtonEditBody</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
18 changes: 18 additions & 0 deletions src/ui/layout/qgsreportwidgetsectionbase.ui
View file
Expand Up @@ -18,13 +18,19 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QPushButton" name="mButtonEditHeader">
<property name="toolTip">
<string>Edit the report header layout</string>
</property>
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="mCheckShowHeader">
<property name="toolTip">
<string>Include a layout at the very beginning of the report</string>
</property>
<property name="text">
<string>Include report header</string>
</property>
Expand All @@ -45,13 +51,19 @@
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="mCheckShowFooter">
<property name="toolTip">
<string>Include a layout at the very end of the report</string>
</property>
<property name="text">
<string>Include report footer</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="mButtonEditFooter">
<property name="toolTip">
<string>Edit the report footer layout</string>
</property>
<property name="text">
<string>Edit</string>
</property>
Expand All @@ -74,6 +86,12 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>mCheckShowHeader</tabstop>
<tabstop>mButtonEditHeader</tabstop>
<tabstop>mCheckShowFooter</tabstop>
<tabstop>mButtonEditFooter</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

0 comments on commit 18ab200

Please sign in to comment.