Skip to content

Commit 4f9f67e

Browse files
nyalldawsonnyalldawson
committed
[composer] Fix tab order in some item widgets
1 parent 129ab4a commit 4f9f67e

14 files changed

+284
-146
lines changed

‎src/ui/qgsatlascompositionwidgetbase.ui‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,7 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="leftMargin">
27-
<number>0</number>
28-
</property>
29-
<property name="topMargin">
30-
<number>0</number>
31-
</property>
32-
<property name="rightMargin">
33-
<number>0</number>
34-
</property>
35-
<property name="bottomMargin">
26+
<property name="margin">
3627
<number>0</number>
3728
</property>
3829
<item>
@@ -41,24 +32,15 @@
4132
<enum>QFrame::StyledPanel</enum>
4233
</property>
4334
<layout class="QGridLayout" name="gridLayout">
44-
<property name="leftMargin">
45-
<number>0</number>
46-
</property>
47-
<property name="topMargin">
48-
<number>0</number>
49-
</property>
50-
<property name="rightMargin">
51-
<number>0</number>
52-
</property>
53-
<property name="bottomMargin">
54-
<number>0</number>
55-
</property>
5635
<property name="horizontalSpacing">
5736
<number>0</number>
5837
</property>
5938
<property name="verticalSpacing">
6039
<number>3</number>
6140
</property>
41+
<property name="margin">
42+
<number>0</number>
43+
</property>
6244
<item row="0" column="1">
6345
<widget class="QCheckBox" name="mUseAtlasCheckBox">
6446
<property name="text">
@@ -109,7 +91,7 @@
10991
<x>0</x>
11092
<y>0</y>
11193
<width>431</width>
112-
<height>569</height>
94+
<height>567</height>
11395
</rect>
11496
</property>
11597
<layout class="QVBoxLayout" name="mainLayout">
@@ -302,7 +284,7 @@
302284
<customwidget>
303285
<class>QgsCollapsibleGroupBoxBasic</class>
304286
<extends>QGroupBox</extends>
305-
<header>qgscollapsiblegroupbox.h</header>
287+
<header location="global">qgscollapsiblegroupbox.h</header>
306288
<container>1</container>
307289
</customwidget>
308290
<customwidget>
@@ -316,6 +298,21 @@
316298
<header location="global">qgsfieldcombobox.h</header>
317299
</customwidget>
318300
</customwidgets>
301+
<tabstops>
302+
<tabstop>mUseAtlasCheckBox</tabstop>
303+
<tabstop>scrollArea</tabstop>
304+
<tabstop>mAtlasCoverageLayerComboBox</tabstop>
305+
<tabstop>mAtlasHideCoverageCheckBox</tabstop>
306+
<tabstop>mAtlasFeatureFilterCheckBox</tabstop>
307+
<tabstop>mAtlasFeatureFilterEdit</tabstop>
308+
<tabstop>mAtlasFeatureFilterButton</tabstop>
309+
<tabstop>mAtlasFilenamePatternEdit</tabstop>
310+
<tabstop>mAtlasFilenameExpressionButton</tabstop>
311+
<tabstop>mAtlasSingleFileCheckBox</tabstop>
312+
<tabstop>mAtlasSortFeatureCheckBox</tabstop>
313+
<tabstop>mAtlasSortFeatureKeyComboBox</tabstop>
314+
<tabstop>mAtlasSortFeatureDirectionButton</tabstop>
315+
</tabstops>
319316
<resources>
320317
<include location="../../images/images.qrc"/>
321318
</resources>

‎src/ui/qgscomposerattributetablewidgetbase.ui‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<property name="geometry">
4646
<rect>
4747
<x>0</x>
48-
<y>-91</y>
48+
<y>-400</y>
4949
<width>392</width>
5050
<height>1192</height>
5151
</rect>
@@ -704,6 +704,40 @@
704704
<header location="global">qgsmaplayercombobox.h</header>
705705
</customwidget>
706706
</customwidgets>
707+
<tabstops>
708+
<tabstop>scrollArea</tabstop>
709+
<tabstop>mSourceComboBox</tabstop>
710+
<tabstop>mLayerComboBox</tabstop>
711+
<tabstop>mRelationsComboBox</tabstop>
712+
<tabstop>mRefreshPushButton</tabstop>
713+
<tabstop>mAttributesPushButton</tabstop>
714+
<tabstop>mMaximumRowsSpinBox</tabstop>
715+
<tabstop>mUniqueOnlyCheckBox</tabstop>
716+
<tabstop>mShowOnlyVisibleFeaturesCheckBox</tabstop>
717+
<tabstop>mComposerMapComboBox</tabstop>
718+
<tabstop>mIntersectAtlasCheckBox</tabstop>
719+
<tabstop>mFeatureFilterCheckBox</tabstop>
720+
<tabstop>mFeatureFilterEdit</tabstop>
721+
<tabstop>mFeatureFilterButton</tabstop>
722+
<tabstop>mDrawEmptyCheckBox</tabstop>
723+
<tabstop>mMarginSpinBox</tabstop>
724+
<tabstop>mHeaderModeComboBox</tabstop>
725+
<tabstop>mEmptyModeComboBox</tabstop>
726+
<tabstop>mEmptyMessageLineEdit</tabstop>
727+
<tabstop>mBackgroundColorButton</tabstop>
728+
<tabstop>mShowGridGroupCheckBox</tabstop>
729+
<tabstop>mGridStrokeWidthSpinBox</tabstop>
730+
<tabstop>mGridColorButton</tabstop>
731+
<tabstop>mHeaderFontPushButton</tabstop>
732+
<tabstop>mHeaderFontColorButton</tabstop>
733+
<tabstop>mHeaderHAlignmentComboBox</tabstop>
734+
<tabstop>mContentFontPushButton</tabstop>
735+
<tabstop>mContentFontColorButton</tabstop>
736+
<tabstop>mResizeModeComboBox</tabstop>
737+
<tabstop>mAddFramePushButton</tabstop>
738+
<tabstop>mEmptyFrameCheckBox</tabstop>
739+
<tabstop>mHideEmptyBgCheckBox</tabstop>
740+
</tabstops>
707741
<resources>
708742
<include location="../../images/images.qrc"/>
709743
</resources>

‎src/ui/qgscomposerhtmlwidgetbase.ui‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@
1717
<property name="spacing">
1818
<number>0</number>
1919
</property>
20-
<property name="leftMargin">
21-
<number>0</number>
22-
</property>
23-
<property name="topMargin">
24-
<number>0</number>
25-
</property>
26-
<property name="rightMargin">
27-
<number>0</number>
28-
</property>
29-
<property name="bottomMargin">
20+
<property name="margin">
3021
<number>0</number>
3122
</property>
3223
<item>
@@ -54,9 +45,9 @@
5445
<property name="geometry">
5546
<rect>
5647
<x>0</x>
57-
<y>-84</y>
58-
<width>390</width>
59-
<height>448</height>
48+
<y>-157</y>
49+
<width>391</width>
50+
<height>517</height>
6051
</rect>
6152
</property>
6253
<layout class="QVBoxLayout" name="mainLayout">
@@ -293,6 +284,25 @@
293284
<header>qgsdatadefinedbutton.h</header>
294285
</customwidget>
295286
</customwidgets>
287+
<tabstops>
288+
<tabstop>scrollArea</tabstop>
289+
<tabstop>mRadioUrlSource</tabstop>
290+
<tabstop>mUrlLineEdit</tabstop>
291+
<tabstop>mFileToolButton</tabstop>
292+
<tabstop>mUrlDDBtn</tabstop>
293+
<tabstop>mRadioManualSource</tabstop>
294+
<tabstop>mInsertExpressionButton</tabstop>
295+
<tabstop>mEvaluateExpressionsCheckbox</tabstop>
296+
<tabstop>mReloadPushButton</tabstop>
297+
<tabstop>mResizeModeComboBox</tabstop>
298+
<tabstop>mAddFramePushButton</tabstop>
299+
<tabstop>mEmptyFrameCheckBox</tabstop>
300+
<tabstop>mHideEmptyBgCheckBox</tabstop>
301+
<tabstop>mUseSmartBreaksCheckBox</tabstop>
302+
<tabstop>mMaxDistanceSpinBox</tabstop>
303+
<tabstop>mUserStylesheetCheckBox</tabstop>
304+
<tabstop>mReloadPushButton2</tabstop>
305+
</tabstops>
296306
<resources/>
297307
<connections/>
298308
</ui>

‎src/ui/qgscomposeritemwidgetbase.ui‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,14 @@
671671
<customwidget>
672672
<class>QgsCollapsibleGroupBoxBasic</class>
673673
<extends>QGroupBox</extends>
674-
<header>qgscollapsiblegroupbox.h</header>
674+
<header location="global">qgscollapsiblegroupbox.h</header>
675675
<container>1</container>
676676
</customwidget>
677+
<customwidget>
678+
<class>QgsDataDefinedButton</class>
679+
<extends>QToolButton</extends>
680+
<header>qgsdatadefinedbutton.h</header>
681+
</customwidget>
677682
<customwidget>
678683
<class>QgsColorButtonV2</class>
679684
<extends>QToolButton</extends>
@@ -684,17 +689,48 @@
684689
<extends>QComboBox</extends>
685690
<header>qgspenstylecombobox.h</header>
686691
</customwidget>
687-
<customwidget>
688-
<class>QgsDataDefinedButton</class>
689-
<extends>QToolButton</extends>
690-
<header>qgsdatadefinedbutton.h</header>
691-
</customwidget>
692692
<customwidget>
693693
<class>QgsBlendModeComboBox</class>
694694
<extends>QComboBox</extends>
695695
<header>qgsblendmodecombobox.h</header>
696696
</customwidget>
697697
</customwidgets>
698+
<tabstops>
699+
<tabstop>mPageSpinBox</tabstop>
700+
<tabstop>mXPosSpin</tabstop>
701+
<tabstop>mXPositionDDBtn</tabstop>
702+
<tabstop>mYPosSpin</tabstop>
703+
<tabstop>mYPositionDDBtn</tabstop>
704+
<tabstop>mWidthSpin</tabstop>
705+
<tabstop>mWidthDDBtn</tabstop>
706+
<tabstop>mHeightSpin</tabstop>
707+
<tabstop>mHeightDDBtn</tabstop>
708+
<tabstop>mUpperLeftCheckBox</tabstop>
709+
<tabstop>mUpperMiddleCheckBox</tabstop>
710+
<tabstop>mUpperRightCheckBox</tabstop>
711+
<tabstop>mMiddleLeftCheckBox</tabstop>
712+
<tabstop>mMiddleCheckBox</tabstop>
713+
<tabstop>mMiddleRightCheckBox</tabstop>
714+
<tabstop>mLowerLeftCheckBox</tabstop>
715+
<tabstop>mLowerMiddleCheckBox</tabstop>
716+
<tabstop>mLowerRightCheckBox</tabstop>
717+
<tabstop>mItemRotationSpinBox</tabstop>
718+
<tabstop>mItemRotationDDBtn</tabstop>
719+
<tabstop>mFrameGroupBox</tabstop>
720+
<tabstop>mFrameColorButton</tabstop>
721+
<tabstop>mOutlineWidthSpinBox</tabstop>
722+
<tabstop>mFrameJoinStyleCombo</tabstop>
723+
<tabstop>mBackgroundGroupBox</tabstop>
724+
<tabstop>mBackgroundColorButton</tabstop>
725+
<tabstop>mItemIdLineEdit</tabstop>
726+
<tabstop>mBlendModeCombo</tabstop>
727+
<tabstop>mBlendModeDDBtn</tabstop>
728+
<tabstop>mTransparencySlider</tabstop>
729+
<tabstop>mTransparencySpnBx</tabstop>
730+
<tabstop>mTransparencyDDBtn</tabstop>
731+
<tabstop>mExcludeFromPrintsCheckBox</tabstop>
732+
<tabstop>mExcludePrintsDDBtn</tabstop>
733+
</tabstops>
698734
<resources/>
699735
<connections/>
700736
</ui>

‎src/ui/qgscomposerlabelwidgetbase.ui‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,7 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="leftMargin">
27-
<number>0</number>
28-
</property>
29-
<property name="topMargin">
30-
<number>0</number>
31-
</property>
32-
<property name="rightMargin">
33-
<number>0</number>
34-
</property>
35-
<property name="bottomMargin">
26+
<property name="margin">
3627
<number>0</number>
3728
</property>
3829
<item>
@@ -62,7 +53,7 @@
6253
<x>0</x>
6354
<y>0</y>
6455
<width>302</width>
65-
<height>686</height>
56+
<height>682</height>
6657
</rect>
6758
</property>
6859
<layout class="QVBoxLayout" name="mainLayout">
@@ -324,10 +315,25 @@
324315
<header>qgscolorbuttonv2.h</header>
325316
</customwidget>
326317
</customwidgets>
318+
<tabstops>
319+
<tabstop>scrollArea</tabstop>
320+
<tabstop>mTextEdit</tabstop>
321+
<tabstop>mHtmlCheckBox</tabstop>
322+
<tabstop>mInsertExpressionButton</tabstop>
323+
<tabstop>mFontButton</tabstop>
324+
<tabstop>mFontColorButton</tabstop>
325+
<tabstop>mMarginDoubleSpinBox</tabstop>
326+
<tabstop>mLeftRadioButton</tabstop>
327+
<tabstop>mCenterRadioButton</tabstop>
328+
<tabstop>mRightRadioButton</tabstop>
329+
<tabstop>mTopRadioButton</tabstop>
330+
<tabstop>mMiddleRadioButton</tabstop>
331+
<tabstop>mBottomRadioButton</tabstop>
332+
</tabstops>
327333
<resources/>
328334
<connections/>
329335
<buttongroups>
330-
<buttongroup name="buttonGroup"/>
331336
<buttongroup name="buttonGroup_2"/>
337+
<buttongroup name="buttonGroup"/>
332338
</buttongroups>
333339
</ui>

0 commit comments

Comments
 (0)