Skip to content

Commit 4f9f67e

Browse files
nyalldawsonnyalldawson
committedOct 20, 2014
[composer] Fix tab order in some item widgets
·
ltr-3_44archive/master_2
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>

‎src/ui/qgscomposerlegenditemdialogbase.ui‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsComposerLegendItemDialogBase</class>
3-
<widget class="QDialog" name="QgsComposerLegendItemDialogBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsComposerLegendItemDialogBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
89
<width>360</width>
910
<height>91</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Legend item properties</string>
1415
</property>
15-
<layout class="QGridLayout" >
16-
<item row="0" column="0" >
17-
<widget class="QLabel" name="mItemTextLabel" >
18-
<property name="text" >
16+
<layout class="QGridLayout">
17+
<item row="0" column="0">
18+
<widget class="QLabel" name="mItemTextLabel">
19+
<property name="text">
1920
<string>Item text</string>
2021
</property>
21-
<property name="buddy" >
22+
<property name="buddy">
2223
<cstring>mItemTextLineEdit</cstring>
2324
</property>
2425
</widget>
2526
</item>
26-
<item row="0" column="1" >
27-
<widget class="QLineEdit" name="mItemTextLineEdit" />
27+
<item row="0" column="1">
28+
<widget class="QLineEdit" name="mItemTextLineEdit"/>
2829
</item>
29-
<item row="1" column="0" colspan="2" >
30-
<widget class="QDialogButtonBox" name="buttonBox" >
31-
<property name="orientation" >
30+
<item row="1" column="0" colspan="2">
31+
<widget class="QDialogButtonBox" name="buttonBox">
32+
<property name="orientation">
3233
<enum>Qt::Horizontal</enum>
3334
</property>
34-
<property name="standardButtons" >
35-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
35+
<property name="standardButtons">
36+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
3637
</property>
3738
</widget>
3839
</item>
3940
</layout>
4041
</widget>
42+
<tabstops>
43+
<tabstop>mItemTextLineEdit</tabstop>
44+
<tabstop>buttonBox</tabstop>
45+
</tabstops>
4146
<resources/>
4247
<connections>
4348
<connection>
@@ -46,11 +51,11 @@
4651
<receiver>QgsComposerLegendItemDialogBase</receiver>
4752
<slot>accept()</slot>
4853
<hints>
49-
<hint type="sourcelabel" >
54+
<hint type="sourcelabel">
5055
<x>257</x>
5156
<y>76</y>
5257
</hint>
53-
<hint type="destinationlabel" >
58+
<hint type="destinationlabel">
5459
<x>157</x>
5560
<y>274</y>
5661
</hint>
@@ -62,11 +67,11 @@
6267
<receiver>QgsComposerLegendItemDialogBase</receiver>
6368
<slot>reject()</slot>
6469
<hints>
65-
<hint type="sourcelabel" >
70+
<hint type="sourcelabel">
6671
<x>325</x>
6772
<y>76</y>
6873
</hint>
69-
<hint type="destinationlabel" >
74+
<hint type="destinationlabel">
7075
<x>286</x>
7176
<y>274</y>
7277
</hint>

‎src/ui/qgscomposerlegendwidgetbase.ui‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<property name="geometry">
5555
<rect>
5656
<x>0</x>
57-
<y>0</y>
58-
<width>372</width>
59-
<height>1327</height>
57+
<y>-319</y>
58+
<width>375</width>
59+
<height>1291</height>
6060
</rect>
6161
</property>
6262
<layout class="QVBoxLayout" name="mainLayout">
@@ -868,9 +868,9 @@
868868
<tabstops>
869869
<tabstop>scrollArea</tabstop>
870870
<tabstop>mTitleLineEdit</tabstop>
871+
<tabstop>mTitleAlignCombo</tabstop>
871872
<tabstop>mMapComboBox</tabstop>
872873
<tabstop>mWrapCharLineEdit</tabstop>
873-
<tabstop>mTitleAlignCombo</tabstop>
874874
<tabstop>mCheckBoxAutoUpdate</tabstop>
875875
<tabstop>mUpdateAllPushButton</tabstop>
876876
<tabstop>mItemTreeView</tabstop>
@@ -894,13 +894,13 @@
894894
<tabstop>mSymbolHeightSpinBox</tabstop>
895895
<tabstop>mWmsLegendWidthSpinBox</tabstop>
896896
<tabstop>mWmsLegendHeightSpinBox</tabstop>
897+
<tabstop>mTitleSpaceBottomSpinBox</tabstop>
897898
<tabstop>mGroupSpaceSpinBox</tabstop>
898899
<tabstop>mLayerSpaceSpinBox</tabstop>
899900
<tabstop>mSymbolSpaceSpinBox</tabstop>
900901
<tabstop>mIconLabelSpaceSpinBox</tabstop>
901902
<tabstop>mBoxSpaceSpinBox</tabstop>
902903
<tabstop>mColumnSpaceSpinBox</tabstop>
903-
<tabstop>mTitleSpaceBottomSpinBox</tabstop>
904904
</tabstops>
905905
<resources>
906906
<include location="../../images/images.qrc"/>

‎src/ui/qgscomposermanagerbase.ui‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@
145145
</customwidgets>
146146
<tabstops>
147147
<tabstop>mComposerListWidget</tabstop>
148+
<tabstop>mTemplate</tabstop>
149+
<tabstop>mAddButton</tabstop>
150+
<tabstop>mTemplatePathLineEdit</tabstop>
151+
<tabstop>mTemplatePathBtn</tabstop>
152+
<tabstop>mTemplatesUserDirBtn</tabstop>
153+
<tabstop>mTemplatesDefaultDirBtn</tabstop>
148154
<tabstop>mButtonBox</tabstop>
149155
</tabstops>
150156
<resources/>

‎src/ui/qgscomposermapwidgetbase.ui‎

Lines changed: 13 additions & 21 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>
@@ -63,9 +54,9 @@
6354
<property name="geometry">
6455
<rect>
6556
<x>0</x>
66-
<y>-805</y>
67-
<width>438</width>
68-
<height>1872</height>
57+
<y>0</y>
58+
<width>444</width>
59+
<height>2196</height>
6960
</rect>
7061
</property>
7162
<property name="sizePolicy">
@@ -1300,14 +1291,14 @@
13001291
<container>1</container>
13011292
</customwidget>
13021293
<customwidget>
1303-
<class>QgsColorButtonV2</class>
1294+
<class>QgsDataDefinedButton</class>
13041295
<extends>QToolButton</extends>
1305-
<header>qgscolorbuttonv2.h</header>
1296+
<header>qgsdatadefinedbutton.h</header>
13061297
</customwidget>
13071298
<customwidget>
1308-
<class>QgsDataDefinedButton</class>
1299+
<class>QgsColorButtonV2</class>
13091300
<extends>QToolButton</extends>
1310-
<header>qgsdatadefinedbutton.h</header>
1301+
<header>qgscolorbuttonv2.h</header>
13111302
</customwidget>
13121303
<customwidget>
13131304
<class>QgsBlendModeComboBox</class>
@@ -1337,10 +1328,11 @@
13371328
<tabstop>mSetToMapCanvasExtentButton</tabstop>
13381329
<tabstop>mViewExtentInCanvasButton</tabstop>
13391330
<tabstop>mAtlasCheckBox</tabstop>
1331+
<tabstop>mAtlasMarginRadio</tabstop>
13401332
<tabstop>mAtlasMarginSpinBox</tabstop>
1333+
<tabstop>mAtlasMarginDDBtn</tabstop>
13411334
<tabstop>mAtlasPredefinedScaleRadio</tabstop>
13421335
<tabstop>mAtlasFixedScaleRadio</tabstop>
1343-
<tabstop>mAtlasMarginRadio</tabstop>
13441336
<tabstop>mAddGridPushButton</tabstop>
13451337
<tabstop>mRemoveGridPushButton</tabstop>
13461338
<tabstop>mGridUpButton</tabstop>
@@ -1356,7 +1348,10 @@
13561348
<tabstop>mOffsetYSpinBox</tabstop>
13571349
<tabstop>mCrossWidthSpinBox</tabstop>
13581350
<tabstop>mGridLineStyleButton</tabstop>
1351+
<tabstop>mGridMarkerStyleButton</tabstop>
13591352
<tabstop>mGridBlendComboBox</tabstop>
1353+
<tabstop>mFrameStyleComboBox</tabstop>
1354+
<tabstop>mFrameWidthSpinBox</tabstop>
13601355
<tabstop>mGridFramePenSizeSpinBox</tabstop>
13611356
<tabstop>mGridFramePenColorButton</tabstop>
13621357
<tabstop>mGridFrameFill1ColorButton</tabstop>
@@ -1365,8 +1360,6 @@
13651360
<tabstop>mCheckGridRightSide</tabstop>
13661361
<tabstop>mCheckGridTopSide</tabstop>
13671362
<tabstop>mCheckGridBottomSide</tabstop>
1368-
<tabstop>mFrameStyleComboBox</tabstop>
1369-
<tabstop>mFrameWidthSpinBox</tabstop>
13701363
<tabstop>mDrawAnnotationGroupBox</tabstop>
13711364
<tabstop>mAnnotationFormatComboBox</tabstop>
13721365
<tabstop>mAnnotationPositionLeftComboBox</tabstop>
@@ -1381,7 +1374,6 @@
13811374
<tabstop>mAnnotationFontColorButton</tabstop>
13821375
<tabstop>mDistanceToMapFrameSpinBox</tabstop>
13831376
<tabstop>mCoordinatePrecisionSpinBox</tabstop>
1384-
<tabstop>mGridMarkerStyleButton</tabstop>
13851377
<tabstop>mAddOverviewPushButton</tabstop>
13861378
<tabstop>mRemoveOverviewPushButton</tabstop>
13871379
<tabstop>mOverviewUpButton</tabstop>

‎src/ui/qgscomposerpicturewidgetbase.ui‎

Lines changed: 14 additions & 14 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>
@@ -60,9 +51,9 @@
6051
<property name="geometry">
6152
<rect>
6253
<x>0</x>
63-
<y>0</y>
64-
<width>330</width>
65-
<height>553</height>
54+
<y>-5</y>
55+
<width>314</width>
56+
<height>554</height>
6657
</rect>
6758
</property>
6859
<layout class="QVBoxLayout" name="mainLayout">
@@ -371,10 +362,19 @@
371362
</customwidget>
372363
</customwidgets>
373364
<tabstops>
374-
<tabstop>mSearchDirectoriesComboBox</tabstop>
365+
<tabstop>scrollArea</tabstop>
375366
<tabstop>mPictureLineEdit</tabstop>
376367
<tabstop>mPictureBrowseButton</tabstop>
368+
<tabstop>mSourceDDBtn</tabstop>
369+
<tabstop>mResizeModeComboBox</tabstop>
370+
<tabstop>mAnchorPointComboBox</tabstop>
371+
<tabstop>mPreviewListWidget</tabstop>
372+
<tabstop>mSearchDirectoriesComboBox</tabstop>
373+
<tabstop>mRemoveDirectoryButton</tabstop>
374+
<tabstop>mAddDirectoryButton</tabstop>
375+
<tabstop>mPictureRotationSpinBox</tabstop>
377376
<tabstop>mRotationFromComposerMapCheckBox</tabstop>
377+
<tabstop>mComposerMapComboBox</tabstop>
378378
</tabstops>
379379
<resources/>
380380
<connections/>

‎src/ui/qgscomposerscalebarwidgetbase.ui‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<property name="geometry">
5252
<rect>
5353
<x>0</x>
54-
<y>-124</y>
54+
<y>-427</y>
5555
<width>369</width>
5656
<height>817</height>
5757
</rect>
@@ -585,7 +585,7 @@
585585
<customwidget>
586586
<class>QgsCollapsibleGroupBoxBasic</class>
587587
<extends>QGroupBox</extends>
588-
<header>qgscollapsiblegroupbox.h</header>
588+
<header location="global">qgscollapsiblegroupbox.h</header>
589589
<container>1</container>
590590
</customwidget>
591591
<customwidget>
@@ -604,6 +604,29 @@
604604
<header>qgspenstylecombobox.h</header>
605605
</customwidget>
606606
</customwidgets>
607+
<tabstops>
608+
<tabstop>scrollArea</tabstop>
609+
<tabstop>mMapComboBox</tabstop>
610+
<tabstop>mStyleComboBox</tabstop>
611+
<tabstop>mUnitsComboBox</tabstop>
612+
<tabstop>mUnitLabelLineEdit</tabstop>
613+
<tabstop>mMapUnitsPerBarUnitSpinBox</tabstop>
614+
<tabstop>mSegmentsLeftSpinBox</tabstop>
615+
<tabstop>mNumberOfSegmentsSpinBox</tabstop>
616+
<tabstop>mSegmentSizeSpinBox</tabstop>
617+
<tabstop>mHeightSpinBox</tabstop>
618+
<tabstop>mBoxSizeSpinBox</tabstop>
619+
<tabstop>mLabelBarSpaceSpinBox</tabstop>
620+
<tabstop>mLineWidthSpinBox</tabstop>
621+
<tabstop>mLineJoinStyleCombo</tabstop>
622+
<tabstop>mLineCapStyleCombo</tabstop>
623+
<tabstop>mAlignmentComboBox</tabstop>
624+
<tabstop>mFontButton</tabstop>
625+
<tabstop>mFontColorButton</tabstop>
626+
<tabstop>mFillColorButton</tabstop>
627+
<tabstop>mFillColor2Button</tabstop>
628+
<tabstop>mStrokeColorButton</tabstop>
629+
</tabstops>
607630
<resources/>
608631
<connections/>
609632
</ui>

‎src/ui/qgscomposershapewidgetbase.ui‎

Lines changed: 10 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>0</y>
58-
<width>283</width>
59-
<height>129</height>
48+
<y>-22</y>
49+
<width>267</width>
50+
<height>147</height>
6051
</rect>
6152
</property>
6253
<layout class="QVBoxLayout" name="mainLayout">
@@ -135,6 +126,12 @@
135126
<container>1</container>
136127
</customwidget>
137128
</customwidgets>
129+
<tabstops>
130+
<tabstop>scrollArea</tabstop>
131+
<tabstop>mShapeComboBox</tabstop>
132+
<tabstop>mCornerRadiusSpinBox</tabstop>
133+
<tabstop>mShapeStyleButton</tabstop>
134+
</tabstops>
138135
<resources/>
139136
<connections/>
140137
</ui>

‎src/ui/qgscomposertablewidgetbase.ui‎

Lines changed: 22 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>-133</y>
48+
<y>0</y>
4949
<width>392</width>
5050
<height>711</height>
5151
</rect>
@@ -453,6 +453,27 @@
453453
<header location="global">qgsmaplayercombobox.h</header>
454454
</customwidget>
455455
</customwidgets>
456+
<tabstops>
457+
<tabstop>scrollArea</tabstop>
458+
<tabstop>mLayerComboBox</tabstop>
459+
<tabstop>mRefreshPushButton</tabstop>
460+
<tabstop>mAttributesPushButton</tabstop>
461+
<tabstop>mMarginSpinBox</tabstop>
462+
<tabstop>mMaximumColumnsSpinBox</tabstop>
463+
<tabstop>mShowOnlyVisibleFeaturesCheckBox</tabstop>
464+
<tabstop>mComposerMapComboBox</tabstop>
465+
<tabstop>mFeatureFilterCheckBox</tabstop>
466+
<tabstop>mFeatureFilterEdit</tabstop>
467+
<tabstop>mFeatureFilterButton</tabstop>
468+
<tabstop>mShowGridGroupCheckBox</tabstop>
469+
<tabstop>mGridStrokeWidthSpinBox</tabstop>
470+
<tabstop>mGridColorButton</tabstop>
471+
<tabstop>mHeaderFontPushButton</tabstop>
472+
<tabstop>mHeaderFontColorButton</tabstop>
473+
<tabstop>mHeaderHAlignmentComboBox</tabstop>
474+
<tabstop>mContentFontPushButton</tabstop>
475+
<tabstop>mContentFontColorButton</tabstop>
476+
</tabstops>
456477
<resources>
457478
<include location="../../images/images.qrc"/>
458479
</resources>

‎src/ui/qgscompositionwidgetbase.ui‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>294</width>
9+
<width>300</width>
1010
<height>506</height>
1111
</rect>
1212
</property>
@@ -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>
@@ -56,9 +47,9 @@
5647
<property name="geometry">
5748
<rect>
5849
<x>0</x>
59-
<y>0</y>
60-
<width>292</width>
61-
<height>504</height>
50+
<y>-111</y>
51+
<width>284</width>
52+
<height>599</height>
6253
</rect>
6354
</property>
6455
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -488,6 +479,26 @@
488479
</customwidgets>
489480
<tabstops>
490481
<tabstop>scrollArea</tabstop>
482+
<tabstop>mPaperSizeComboBox</tabstop>
483+
<tabstop>mPaperSizeDDBtn</tabstop>
484+
<tabstop>mPaperWidthDoubleSpinBox</tabstop>
485+
<tabstop>mPaperWidthDDBtn</tabstop>
486+
<tabstop>mPaperHeightDoubleSpinBox</tabstop>
487+
<tabstop>mPaperHeightDDBtn</tabstop>
488+
<tabstop>mPaperUnitsComboBox</tabstop>
489+
<tabstop>mNumPagesSpinBox</tabstop>
490+
<tabstop>mNumPagesDDBtn</tabstop>
491+
<tabstop>mPaperOrientationComboBox</tabstop>
492+
<tabstop>mPaperOrientationDDBtn</tabstop>
493+
<tabstop>mPageStyleButton</tabstop>
494+
<tabstop>mResolutionSpinBox</tabstop>
495+
<tabstop>mPrintAsRasterCheckBox</tabstop>
496+
<tabstop>mGenerateWorldFileCheckBox</tabstop>
497+
<tabstop>mWorldFileMapComboBox</tabstop>
498+
<tabstop>mGridResolutionSpinBox</tabstop>
499+
<tabstop>mOffsetXSpinBox</tabstop>
500+
<tabstop>mOffsetYSpinBox</tabstop>
501+
<tabstop>mSnapToleranceSpinBox</tabstop>
491502
</tabstops>
492503
<resources/>
493504
<connections/>

0 commit comments

Comments
 (0)
Please sign in to comment.