Skip to content

Commit 29a72b5

Browse files
nyalldawsonnyalldawson
committedFeb 2, 2016
Dialog tab order fixes
·
ltr-3_40archive/master_2
1 parent c3ed6b9 commit 29a72b5

20 files changed

+497
-191
lines changed
 

‎src/plugins/evis/ui/evisdatabaselayerfieldselectionguibase.ui

Lines changed: 56 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,114 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>eVisDatabaseLayerFieldSelectionGuiBase</class>
3-
<widget class="QDialog" name="eVisDatabaseLayerFieldSelectionGuiBase" >
4-
<property name="windowModality" >
4+
<widget class="QDialog" name="eVisDatabaseLayerFieldSelectionGuiBase">
5+
<property name="windowModality">
56
<enum>Qt::WindowModal</enum>
67
</property>
7-
<property name="geometry" >
8+
<property name="geometry">
89
<rect>
910
<x>0</x>
1011
<y>0</y>
1112
<width>319</width>
1213
<height>185</height>
1314
</rect>
1415
</property>
15-
<property name="windowTitle" >
16+
<property name="windowTitle">
1617
<string>Database File Selection</string>
1718
</property>
18-
<property name="windowIcon" >
19-
<iconset resource="../resources/evis.qrc" >
19+
<property name="windowIcon">
20+
<iconset resource="../resources/evis.qrc">
2021
<normaloff>:/evis/eVisDatabaseConnection.png</normaloff>:/evis/eVisDatabaseConnection.png</iconset>
2122
</property>
22-
<layout class="QGridLayout" >
23-
<property name="margin" >
23+
<layout class="QGridLayout">
24+
<property name="leftMargin">
2425
<number>9</number>
2526
</property>
26-
<property name="spacing" >
27+
<property name="topMargin">
28+
<number>9</number>
29+
</property>
30+
<property name="rightMargin">
31+
<number>9</number>
32+
</property>
33+
<property name="bottomMargin">
34+
<number>9</number>
35+
</property>
36+
<property name="spacing">
2737
<number>6</number>
2838
</property>
29-
<item row="3" column="0" colspan="2" >
30-
<widget class="QDialogButtonBox" name="buttonBox" >
31-
<property name="orientation" >
39+
<item row="3" column="0" colspan="2">
40+
<widget class="QDialogButtonBox" name="buttonBox">
41+
<property name="orientation">
3242
<enum>Qt::Horizontal</enum>
3343
</property>
34-
<property name="standardButtons" >
44+
<property name="standardButtons">
3545
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
3646
</property>
3747
</widget>
3848
</item>
39-
<item row="2" column="1" >
40-
<widget class="QComboBox" name="cboxYCoordinate" >
41-
<property name="toolTip" >
49+
<item row="2" column="1">
50+
<widget class="QComboBox" name="cboxYCoordinate">
51+
<property name="toolTip">
4252
<string/>
4353
</property>
44-
<property name="whatsThis" >
54+
<property name="whatsThis">
4555
<string>The name of the field that contains the Y coordinate of the points.</string>
4656
</property>
4757
</widget>
4858
</item>
49-
<item row="1" column="1" >
50-
<widget class="QComboBox" name="cboxXCoordinate" >
51-
<property name="toolTip" >
59+
<item row="1" column="1">
60+
<widget class="QComboBox" name="cboxXCoordinate">
61+
<property name="toolTip">
5262
<string/>
5363
</property>
54-
<property name="statusTip" >
64+
<property name="statusTip">
5565
<string/>
5666
</property>
57-
<property name="whatsThis" >
67+
<property name="whatsThis">
5868
<string>The name of the field that contains the X coordinate of the points.</string>
5969
</property>
6070
</widget>
6171
</item>
62-
<item row="0" column="1" >
63-
<widget class="QLineEdit" name="leLayerName" >
64-
<property name="toolTip" >
72+
<item row="0" column="1">
73+
<widget class="QLineEdit" name="leLayerName">
74+
<property name="toolTip">
6575
<string/>
6676
</property>
67-
<property name="whatsThis" >
77+
<property name="whatsThis">
6878
<string>Enter the name for the new layer that will be created and displayed in QGIS.</string>
6979
</property>
7080
</widget>
7181
</item>
72-
<item row="2" column="0" >
73-
<widget class="QLabel" name="label_3" >
74-
<property name="text" >
82+
<item row="2" column="0">
83+
<widget class="QLabel" name="label_3">
84+
<property name="text">
7585
<string>Y Coordinate</string>
7686
</property>
7787
</widget>
7888
</item>
79-
<item row="1" column="0" >
80-
<widget class="QLabel" name="label_2" >
81-
<property name="text" >
89+
<item row="1" column="0">
90+
<widget class="QLabel" name="label_2">
91+
<property name="text">
8292
<string>X Coordinate</string>
8393
</property>
8494
</widget>
8595
</item>
86-
<item row="0" column="0" >
87-
<widget class="QLabel" name="label" >
88-
<property name="text" >
96+
<item row="0" column="0">
97+
<widget class="QLabel" name="label">
98+
<property name="text">
8999
<string>Name of New Layer</string>
90100
</property>
91101
</widget>
92102
</item>
93103
</layout>
94104
</widget>
105+
<tabstops>
106+
<tabstop>leLayerName</tabstop>
107+
<tabstop>cboxXCoordinate</tabstop>
108+
<tabstop>cboxYCoordinate</tabstop>
109+
</tabstops>
95110
<resources>
96-
<include location="../resources/evis.qrc" />
111+
<include location="../resources/evis.qrc"/>
97112
</resources>
98113
<connections>
99114
<connection>
@@ -102,11 +117,11 @@
102117
<receiver>eVisDatabaseLayerFieldSelectionGuiBase</receiver>
103118
<slot>accept()</slot>
104119
<hints>
105-
<hint type="sourcelabel" >
120+
<hint type="sourcelabel">
106121
<x>248</x>
107122
<y>254</y>
108123
</hint>
109-
<hint type="destinationlabel" >
124+
<hint type="destinationlabel">
110125
<x>157</x>
111126
<y>274</y>
112127
</hint>
@@ -118,11 +133,11 @@
118133
<receiver>eVisDatabaseLayerFieldSelectionGuiBase</receiver>
119134
<slot>reject()</slot>
120135
<hints>
121-
<hint type="sourcelabel" >
136+
<hint type="sourcelabel">
122137
<x>316</x>
123138
<y>260</y>
124139
</hint>
125-
<hint type="destinationlabel" >
140+
<hint type="destinationlabel">
126141
<x>286</x>
127142
<y>274</y>
128143
</hint>

‎src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.ui

Lines changed: 76 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout_4">
17-
<property name="margin">
17+
<property name="leftMargin">
18+
<number>0</number>
19+
</property>
20+
<property name="topMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="rightMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="bottomMargin">
1827
<number>0</number>
1928
</property>
2029
<item row="0" column="0">
@@ -30,8 +39,8 @@
3039
<rect>
3140
<x>0</x>
3241
<y>0</y>
33-
<width>572</width>
34-
<height>416</height>
42+
<width>571</width>
43+
<height>395</height>
3544
</rect>
3645
</property>
3746
<layout class="QGridLayout" name="gridLayout_3">
@@ -98,7 +107,16 @@
98107
<property name="spacing">
99108
<number>0</number>
100109
</property>
101-
<property name="margin">
110+
<property name="leftMargin">
111+
<number>0</number>
112+
</property>
113+
<property name="topMargin">
114+
<number>0</number>
115+
</property>
116+
<property name="rightMargin">
117+
<number>0</number>
118+
</property>
119+
<property name="bottomMargin">
102120
<number>0</number>
103121
</property>
104122
<item>
@@ -143,7 +161,16 @@
143161
<bool>true</bool>
144162
</property>
145163
<layout class="QGridLayout" name="gridLayout_2">
146-
<property name="margin">
164+
<property name="leftMargin">
165+
<number>0</number>
166+
</property>
167+
<property name="topMargin">
168+
<number>0</number>
169+
</property>
170+
<property name="rightMargin">
171+
<number>0</number>
172+
</property>
173+
<property name="bottomMargin">
147174
<number>0</number>
148175
</property>
149176
<property name="spacing">
@@ -204,7 +231,16 @@
204231
<property name="spacing">
205232
<number>0</number>
206233
</property>
207-
<property name="margin">
234+
<property name="leftMargin">
235+
<number>0</number>
236+
</property>
237+
<property name="topMargin">
238+
<number>0</number>
239+
</property>
240+
<property name="rightMargin">
241+
<number>0</number>
242+
</property>
243+
<property name="bottomMargin">
208244
<number>0</number>
209245
</property>
210246
</layout>
@@ -216,7 +252,16 @@
216252
<bool>true</bool>
217253
</property>
218254
<layout class="QGridLayout" name="gridLayout">
219-
<property name="margin">
255+
<property name="leftMargin">
256+
<number>0</number>
257+
</property>
258+
<property name="topMargin">
259+
<number>0</number>
260+
</property>
261+
<property name="rightMargin">
262+
<number>0</number>
263+
</property>
264+
<property name="bottomMargin">
220265
<number>0</number>
221266
</property>
222267
<item row="3" column="1">
@@ -325,7 +370,16 @@
325370
<item row="6" column="0">
326371
<widget class="QWidget" name="widgetMergeAttribute" native="true">
327372
<layout class="QHBoxLayout" name="horizontalLayout_2">
328-
<property name="margin">
373+
<property name="leftMargin">
374+
<number>0</number>
375+
</property>
376+
<property name="topMargin">
377+
<number>0</number>
378+
</property>
379+
<property name="rightMargin">
380+
<number>0</number>
381+
</property>
382+
<property name="bottomMargin">
329383
<number>0</number>
330384
</property>
331385
<item>
@@ -347,6 +401,20 @@
347401
</item>
348402
</layout>
349403
</widget>
404+
<tabstops>
405+
<tabstop>scrollArea</tabstop>
406+
<tabstop>tableWidgetErrors</tabstop>
407+
<tabstop>pushButtonExport</tabstop>
408+
<tabstop>radioButtonError</tabstop>
409+
<tabstop>radioButtonFeature</tabstop>
410+
<tabstop>radioButtonDontMove</tabstop>
411+
<tabstop>checkBoxHighlight</tabstop>
412+
<tabstop>pushButtonOpenAttributeTable</tabstop>
413+
<tabstop>pushButtonFixWithDefault</tabstop>
414+
<tabstop>pushButtonFixWithPrompt</tabstop>
415+
<tabstop>pushButtonErrorResolutionSettings</tabstop>
416+
<tabstop>comboBoxMergeAttribute</tabstop>
417+
</tabstops>
350418
<resources>
351419
<include location="../../../../images/images.qrc"/>
352420
</resources>

‎src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.ui

Lines changed: 150 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout_7">
17-
<property name="margin">
17+
<property name="leftMargin">
18+
<number>0</number>
19+
</property>
20+
<property name="topMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="rightMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="bottomMargin">
1827
<number>0</number>
1928
</property>
2029
<item row="0" column="0">
@@ -32,9 +41,9 @@
3241
<property name="geometry">
3342
<rect>
3443
<x>0</x>
35-
<y>0</y>
36-
<width>625</width>
37-
<height>767</height>
44+
<y>-301</y>
45+
<width>670</width>
46+
<height>776</height>
3847
</rect>
3948
</property>
4049
<layout class="QGridLayout" name="gridLayout_4">
@@ -68,7 +77,16 @@
6877
<property name="spacing">
6978
<number>2</number>
7079
</property>
71-
<property name="margin">
80+
<property name="leftMargin">
81+
<number>2</number>
82+
</property>
83+
<property name="topMargin">
84+
<number>2</number>
85+
</property>
86+
<property name="rightMargin">
87+
<number>2</number>
88+
</property>
89+
<property name="bottomMargin">
7290
<number>2</number>
7391
</property>
7492
<item>
@@ -103,7 +121,16 @@
103121
<property name="spacing">
104122
<number>2</number>
105123
</property>
106-
<property name="margin">
124+
<property name="leftMargin">
125+
<number>2</number>
126+
</property>
127+
<property name="topMargin">
128+
<number>2</number>
129+
</property>
130+
<property name="rightMargin">
131+
<number>2</number>
132+
</property>
133+
<property name="bottomMargin">
107134
<number>2</number>
108135
</property>
109136
<item>
@@ -148,7 +175,16 @@
148175
<bool>true</bool>
149176
</property>
150177
<layout class="QGridLayout" name="gridLayout">
151-
<property name="margin">
178+
<property name="leftMargin">
179+
<number>2</number>
180+
</property>
181+
<property name="topMargin">
182+
<number>2</number>
183+
</property>
184+
<property name="rightMargin">
185+
<number>2</number>
186+
</property>
187+
<property name="bottomMargin">
152188
<number>2</number>
153189
</property>
154190
<property name="spacing">
@@ -211,7 +247,16 @@
211247
<property name="spacing">
212248
<number>2</number>
213249
</property>
214-
<property name="margin">
250+
<property name="leftMargin">
251+
<number>2</number>
252+
</property>
253+
<property name="topMargin">
254+
<number>2</number>
255+
</property>
256+
<property name="rightMargin">
257+
<number>2</number>
258+
</property>
259+
<property name="bottomMargin">
215260
<number>2</number>
216261
</property>
217262
<item>
@@ -240,7 +285,16 @@
240285
<bool>true</bool>
241286
</property>
242287
<layout class="QGridLayout" name="gridLayout_2">
243-
<property name="margin">
288+
<property name="leftMargin">
289+
<number>2</number>
290+
</property>
291+
<property name="topMargin">
292+
<number>2</number>
293+
</property>
294+
<property name="rightMargin">
295+
<number>2</number>
296+
</property>
297+
<property name="bottomMargin">
244298
<number>2</number>
245299
</property>
246300
<property name="spacing">
@@ -310,7 +364,16 @@
310364
<bool>false</bool>
311365
</property>
312366
<layout class="QGridLayout" name="gridLayout_6">
313-
<property name="margin">
367+
<property name="leftMargin">
368+
<number>0</number>
369+
</property>
370+
<property name="topMargin">
371+
<number>0</number>
372+
</property>
373+
<property name="rightMargin">
374+
<number>0</number>
375+
</property>
376+
<property name="bottomMargin">
314377
<number>0</number>
315378
</property>
316379
<property name="spacing">
@@ -393,7 +456,16 @@
393456
<bool>true</bool>
394457
</property>
395458
<layout class="QGridLayout" name="gridLayout_3">
396-
<property name="margin">
459+
<property name="leftMargin">
460+
<number>2</number>
461+
</property>
462+
<property name="topMargin">
463+
<number>2</number>
464+
</property>
465+
<property name="rightMargin">
466+
<number>2</number>
467+
</property>
468+
<property name="bottomMargin">
397469
<number>2</number>
398470
</property>
399471
<property name="spacing">
@@ -474,7 +546,16 @@
474546
<property name="spacing">
475547
<number>2</number>
476548
</property>
477-
<property name="margin">
549+
<property name="leftMargin">
550+
<number>2</number>
551+
</property>
552+
<property name="topMargin">
553+
<number>2</number>
554+
</property>
555+
<property name="rightMargin">
556+
<number>2</number>
557+
</property>
558+
<property name="bottomMargin">
478559
<number>2</number>
479560
</property>
480561
<item>
@@ -518,7 +599,16 @@
518599
<bool>true</bool>
519600
</property>
520601
<layout class="QGridLayout" name="gridLayout_5">
521-
<property name="margin">
602+
<property name="leftMargin">
603+
<number>2</number>
604+
</property>
605+
<property name="topMargin">
606+
<number>2</number>
607+
</property>
608+
<property name="rightMargin">
609+
<number>2</number>
610+
</property>
611+
<property name="bottomMargin">
522612
<number>2</number>
523613
</property>
524614
<property name="spacing">
@@ -583,7 +673,16 @@
583673
<property name="spacing">
584674
<number>0</number>
585675
</property>
586-
<property name="margin">
676+
<property name="leftMargin">
677+
<number>0</number>
678+
</property>
679+
<property name="topMargin">
680+
<number>0</number>
681+
</property>
682+
<property name="rightMargin">
683+
<number>0</number>
684+
</property>
685+
<property name="bottomMargin">
587686
<number>0</number>
588687
</property>
589688
<item>
@@ -623,6 +722,43 @@
623722
<header location="global">qgsmaplayercombobox.h</header>
624723
</customwidget>
625724
</customwidgets>
725+
<tabstops>
726+
<tabstop>scrollArea</tabstop>
727+
<tabstop>comboBoxInputLayer</tabstop>
728+
<tabstop>checkBoxInputSelectedOnly</tabstop>
729+
<tabstop>checkBoxSelfIntersections</tabstop>
730+
<tabstop>checkBoxDuplicateNodes</tabstop>
731+
<tabstop>checkBoxDegeneratePolygon</tabstop>
732+
<tabstop>checkBoxPoint</tabstop>
733+
<tabstop>checkBoxMultipoint</tabstop>
734+
<tabstop>checkBoxLine</tabstop>
735+
<tabstop>checkBoxMultiline</tabstop>
736+
<tabstop>checkBoxPolygon</tabstop>
737+
<tabstop>checkBoxMultipolygon</tabstop>
738+
<tabstop>checkBoxNoHoles</tabstop>
739+
<tabstop>checkBoxMultipart</tabstop>
740+
<tabstop>checkBoxSegmentLength</tabstop>
741+
<tabstop>doubleSpinBoxSegmentLength</tabstop>
742+
<tabstop>checkBoxAngle</tabstop>
743+
<tabstop>doubleSpinBoxAngle</tabstop>
744+
<tabstop>checkBoxArea</tabstop>
745+
<tabstop>doubleSpinBoxArea</tabstop>
746+
<tabstop>checkBoxSliverPolygons</tabstop>
747+
<tabstop>doubleSpinBoxSliverThinness</tabstop>
748+
<tabstop>checkBoxSliverArea</tabstop>
749+
<tabstop>doubleSpinBoxSliverArea</tabstop>
750+
<tabstop>checkBoxDuplicates</tabstop>
751+
<tabstop>checkBoxCovered</tabstop>
752+
<tabstop>checkBoxOverlaps</tabstop>
753+
<tabstop>doubleSpinBoxOverlapArea</tabstop>
754+
<tabstop>checkBoxGaps</tabstop>
755+
<tabstop>doubleSpinBoxGapArea</tabstop>
756+
<tabstop>spinBoxTolerance</tabstop>
757+
<tabstop>radioButtonOuputModifyInput</tabstop>
758+
<tabstop>radioButtonOutputNew</tabstop>
759+
<tabstop>lineEditOutput</tabstop>
760+
<tabstop>pushButtonOutputBrowse</tabstop>
761+
</tabstops>
626762
<resources>
627763
<include location="../pluginres.qrc"/>
628764
</resources>

‎src/plugins/heatmap/heatmapguibase.ui

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>460</width>
10-
<height>493</height>
9+
<width>493</width>
10+
<height>526</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -327,7 +327,7 @@
327327
<customwidget>
328328
<class>QgsCollapsibleGroupBoxBasic</class>
329329
<extends>QGroupBox</extends>
330-
<header>qgscollapsiblegroupbox.h</header>
330+
<header location="global">qgscollapsiblegroupbox.h</header>
331331
<container>1</container>
332332
</customwidget>
333333
<customwidget>
@@ -347,6 +347,7 @@
347347
<tabstop>mFormatCombo</tabstop>
348348
<tabstop>mBufferSizeLineEdit</tabstop>
349349
<tabstop>mBufferUnitCombo</tabstop>
350+
<tabstop>mAddToCanvas</tabstop>
350351
<tabstop>mAdvancedGroupBox</tabstop>
351352
<tabstop>mRowsSpinBox</tabstop>
352353
<tabstop>mColumnsSpinBox</tabstop>
@@ -359,7 +360,7 @@
359360
<tabstop>mWeightFieldCheckBox</tabstop>
360361
<tabstop>mWeightFieldCombo</tabstop>
361362
<tabstop>mDecayLineEdit</tabstop>
362-
<tabstop>mButtonBox</tabstop>
363+
<tabstop>mOutputValuesComboBox</tabstop>
363364
</tabstops>
364365
<resources/>
365366
<connections>

‎src/plugins/spatialquery/qgsspatialquerydialogbase.ui

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<rect>
1010
<x>0</x>
1111
<y>0</y>
12-
<width>353</width>
12+
<width>407</width>
1313
<height>510</height>
1414
</rect>
1515
</property>
@@ -413,9 +413,17 @@ p, li { white-space: pre-wrap; }
413413
<tabstops>
414414
<tabstop>cbTargetLayer</tabstop>
415415
<tabstop>ckbUsingSelectedTarget</tabstop>
416+
<tabstop>cbOperation</tabstop>
416417
<tabstop>cbReferenceLayer</tabstop>
417418
<tabstop>ckbUsingSelectedReference</tabstop>
418-
<tabstop>bbMain</tabstop>
419+
<tabstop>cbResultFor</tabstop>
420+
<tabstop>pbCreateLayerSelected</tabstop>
421+
<tabstop>cbTypeItems</tabstop>
422+
<tabstop>lwFeatures</tabstop>
423+
<tabstop>pbCreateLayerItems</tabstop>
424+
<tabstop>ckbZoomItem</tabstop>
425+
<tabstop>ckbLogProcessing</tabstop>
426+
<tabstop>teStatus</tabstop>
419427
</tabstops>
420428
<resources>
421429
<include location="qgsspatialquerydialogbase.qrc"/>

‎src/plugins/topology/rulesDialog.ui

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,15 @@
151151
</item>
152152
</layout>
153153
</widget>
154+
<tabstops>
155+
<tabstop>mLayer1Box</tabstop>
156+
<tabstop>mRuleBox</tabstop>
157+
<tabstop>mLayer2Box</tabstop>
158+
<tabstop>mToleranceBox</tabstop>
159+
<tabstop>mAddTestButton</tabstop>
160+
<tabstop>mDeleteTestButton</tabstop>
161+
<tabstop>mRulesTable</tabstop>
162+
</tabstops>
154163
<resources/>
155164
<connections>
156165
<connection>

‎src/ui/composer/qgscomposerlegendwidgetbase.ui

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
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">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -54,9 +63,9 @@
5463
<property name="geometry">
5564
<rect>
5665
<x>0</x>
57-
<y>-420</y>
66+
<y>-334</y>
5867
<width>375</width>
59-
<height>1392</height>
68+
<height>1306</height>
6069
</rect>
6170
</property>
6271
<layout class="QVBoxLayout" name="mainLayout">
@@ -1026,6 +1035,8 @@
10261035
<tabstop>mEditPushButton</tabstop>
10271036
<tabstop>mCountToolButton</tabstop>
10281037
<tabstop>mFilterByMapToolButton</tabstop>
1038+
<tabstop>mExpressionFilterButton</tabstop>
1039+
<tabstop>mFilterLegendByAtlasCheckBox</tabstop>
10291040
<tabstop>mFontsColGroupBox</tabstop>
10301041
<tabstop>mTitleFontButton</tabstop>
10311042
<tabstop>mLayerFontButton</tabstop>

‎src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,24 @@
347347
</item>
348348
</layout>
349349
</widget>
350+
<tabstops>
351+
<tabstop>mRootPath</tabstop>
352+
<tabstop>mRootPathButton</tabstop>
353+
<tabstop>mRelativeGroupBox</tabstop>
354+
<tabstop>mRelativeProject</tabstop>
355+
<tabstop>mRelativeDefault</tabstop>
356+
<tabstop>mStoreFilesButton</tabstop>
357+
<tabstop>mStoreDirsButton</tabstop>
358+
<tabstop>mFileWidgetGroupBox</tabstop>
359+
<tabstop>mFileWidgetButtonGroupBox</tabstop>
360+
<tabstop>mFileWidgetFilterLineEdit</tabstop>
361+
<tabstop>mUseLink</tabstop>
362+
<tabstop>mFullUrl</tabstop>
363+
<tabstop>mDocumentViewerGroupBox</tabstop>
364+
<tabstop>mDocumentViewerContentComboBox</tabstop>
365+
<tabstop>mDocumentViewerWidth</tabstop>
366+
<tabstop>mDocumentViewerHeight</tabstop>
367+
</tabstops>
350368
<resources/>
351369
<connections/>
352370
<buttongroups>

‎src/ui/qgsattributetabledialog.ui

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -857,13 +857,33 @@
857857
</customwidget>
858858
</customwidgets>
859859
<tabstops>
860+
<tabstop>mToggleEditingButton</tabstop>
861+
<tabstop>mSaveEditsButton</tabstop>
862+
<tabstop>mReloadButton</tabstop>
863+
<tabstop>mAddFeature</tabstop>
864+
<tabstop>mDeleteSelectedButton</tabstop>
865+
<tabstop>mExpressionSelectButton</tabstop>
860866
<tabstop>mRemoveSelectionButton</tabstop>
861867
<tabstop>mSelectAllButton</tabstop>
862868
<tabstop>mSelectedToTopButton</tabstop>
863869
<tabstop>mInvertSelectionButton</tabstop>
870+
<tabstop>mPanMapToSelectedRowsButton</tabstop>
871+
<tabstop>mZoomMapToSelectedRowsButton</tabstop>
864872
<tabstop>mCopySelectedRowsButton</tabstop>
873+
<tabstop>mPasteFeatures</tabstop>
865874
<tabstop>mRemoveAttribute</tabstop>
875+
<tabstop>mAddAttribute</tabstop>
866876
<tabstop>mOpenFieldCalculator</tabstop>
877+
<tabstop>mSetStyles</tabstop>
878+
<tabstop>mHelpButton</tabstop>
879+
<tabstop>mFieldCombo</tabstop>
880+
<tabstop>mRunFieldCalc</tabstop>
881+
<tabstop>mRunFieldCalcSelected</tabstop>
882+
<tabstop>mFilterButton</tabstop>
883+
<tabstop>mFilterQuery</tabstop>
884+
<tabstop>mApplyFilterButton</tabstop>
885+
<tabstop>mAttributeViewButton</tabstop>
886+
<tabstop>mTableViewButton</tabstop>
867887
</tabstops>
868888
<resources>
869889
<include location="../../images/images.qrc"/>

‎src/ui/qgsfieldspropertiesbase.ui

Lines changed: 7 additions & 3 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>614</width>
9+
<width>638</width>
1010
<height>423</height>
1111
</rect>
1212
</property>
@@ -615,18 +615,22 @@ Reference in function name: my_form_open
615615
</customwidgets>
616616
<tabstops>
617617
<tabstop>mEditorLayoutComboBox</tabstop>
618+
<tabstop>mInitCodeSourceComboBox</tabstop>
619+
<tabstop>mInitFunctionLineEdit</tabstop>
620+
<tabstop>mInitFilePathLineEdit</tabstop>
621+
<tabstop>pbtnSelectInitFilePath</tabstop>
618622
<tabstop>mAddAttributeButton</tabstop>
619623
<tabstop>mDeleteAttributeButton</tabstop>
620624
<tabstop>mToggleEditingButton</tabstop>
621625
<tabstop>mCalculateFieldButton</tabstop>
622-
<tabstop>mEditFormLineEdit</tabstop>
623-
<tabstop>pbnSelectEditForm</tabstop>
624626
<tabstop>mAddTabOrGroupButton</tabstop>
625627
<tabstop>mRemoveTabGroupItemButton</tabstop>
626628
<tabstop>mAddItemButton</tabstop>
627629
<tabstop>mMoveUpItem</tabstop>
628630
<tabstop>mMoveDownItem</tabstop>
629631
<tabstop>mFormSuppressCmbBx</tabstop>
632+
<tabstop>pbnSelectEditForm</tabstop>
633+
<tabstop>mEditFormLineEdit</tabstop>
630634
</tabstops>
631635
<resources>
632636
<include location="../../images/images.qrc"/>

‎src/ui/qgslabelingguibase.ui

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,8 +1316,8 @@ font-style: italic;</string>
13161316
<rect>
13171317
<x>0</x>
13181318
<y>0</y>
1319-
<width>383</width>
1320-
<height>389</height>
1319+
<width>594</width>
1320+
<height>398</height>
13211321
</rect>
13221322
</property>
13231323
<layout class="QVBoxLayout" name="verticalLayout_14">
@@ -1961,8 +1961,8 @@ font-style: italic;</string>
19611961
<rect>
19621962
<x>0</x>
19631963
<y>0</y>
1964-
<width>301</width>
1965-
<height>257</height>
1964+
<width>594</width>
1965+
<height>398</height>
19661966
</rect>
19671967
</property>
19681968
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -2340,7 +2340,7 @@ font-style: italic;</string>
23402340
<rect>
23412341
<x>0</x>
23422342
<y>0</y>
2343-
<width>454</width>
2343+
<width>578</width>
23442344
<height>697</height>
23452345
</rect>
23462346
</property>
@@ -3170,7 +3170,7 @@ font-style: italic;</string>
31703170
<rect>
31713171
<x>0</x>
31723172
<y>0</y>
3173-
<width>330</width>
3173+
<width>578</width>
31743174
<height>424</height>
31753175
</rect>
31763176
</property>
@@ -3713,7 +3713,7 @@ font-style: italic;</string>
37133713
<enum>QFrame::Sunken</enum>
37143714
</property>
37153715
<property name="currentIndex">
3716-
<number>2</number>
3716+
<number>0</number>
37173717
</property>
37183718
<widget class="QWidget" name="pagePoint">
37193719
<layout class="QGridLayout" name="gridLayout_13" columnstretch="0,0,0,0">
@@ -5274,7 +5274,7 @@ font-style: italic;</string>
52745274
<property name="geometry">
52755275
<rect>
52765276
<x>0</x>
5277-
<y>0</y>
5277+
<y>-398</y>
52785278
<width>578</width>
52795279
<height>799</height>
52805280
</rect>
@@ -6267,17 +6267,6 @@ font-style: italic;</string>
62676267
<extends>QDoubleSpinBox</extends>
62686268
<header>qgsdoublespinbox.h</header>
62696269
</customwidget>
6270-
<customwidget>
6271-
<class>QgsUnitSelectionWidget</class>
6272-
<extends>QWidget</extends>
6273-
<header>qgsunitselectionwidget.h</header>
6274-
<container>1</container>
6275-
</customwidget>
6276-
<customwidget>
6277-
<class>QgsBlendModeComboBox</class>
6278-
<extends>QComboBox</extends>
6279-
<header>qgsblendmodecombobox.h</header>
6280-
</customwidget>
62816270
<customwidget>
62826271
<class>QgsSpinBox</class>
62836272
<extends>QSpinBox</extends>
@@ -6289,15 +6278,27 @@ font-style: italic;</string>
62896278
<header>qgscollapsiblegroupbox.h</header>
62906279
<container>1</container>
62916280
</customwidget>
6292-
<customwidget>
6293-
<class>QgsDataDefinedButton</class>
6294-
<extends>QToolButton</extends>
6295-
<header>qgsdatadefinedbutton.h</header>
6296-
</customwidget>
62976281
<customwidget>
62986282
<class>QgsFieldExpressionWidget</class>
62996283
<extends>QWidget</extends>
63006284
<header>qgsfieldexpressionwidget.h</header>
6285+
<container>1</container>
6286+
</customwidget>
6287+
<customwidget>
6288+
<class>QgsUnitSelectionWidget</class>
6289+
<extends>QWidget</extends>
6290+
<header>qgsunitselectionwidget.h</header>
6291+
<container>1</container>
6292+
</customwidget>
6293+
<customwidget>
6294+
<class>QgsBlendModeComboBox</class>
6295+
<extends>QComboBox</extends>
6296+
<header>qgsblendmodecombobox.h</header>
6297+
</customwidget>
6298+
<customwidget>
6299+
<class>QgsDataDefinedButton</class>
6300+
<extends>QToolButton</extends>
6301+
<header>qgsdatadefinedbutton.h</header>
63016302
</customwidget>
63026303
<customwidget>
63036304
<class>QgsPenJoinStyleComboBox</class>
@@ -6476,25 +6477,25 @@ font-style: italic;</string>
64766477
<tabstop>mCentroidRadioWhole</tabstop>
64776478
<tabstop>mCentroidDDBtn</tabstop>
64786479
<tabstop>mCentroidInsideCheckBox</tabstop>
6480+
<tabstop>mLineDistanceSpnBx</tabstop>
6481+
<tabstop>mLineDistanceDDBtn</tabstop>
6482+
<tabstop>mLineDistanceUnitDDBtn</tabstop>
6483+
<tabstop>mOffsetTypeComboBox</tabstop>
64796484
<tabstop>mPointOffsetAboveLeft</tabstop>
64806485
<tabstop>mPointOffsetAbove</tabstop>
64816486
<tabstop>mPointOffsetAboveRight</tabstop>
6482-
<tabstop>mPointQuadOffsetDDBtn</tabstop>
64836487
<tabstop>mPointOffsetLeft</tabstop>
64846488
<tabstop>mPointOffsetOver</tabstop>
64856489
<tabstop>mPointOffsetRight</tabstop>
64866490
<tabstop>mPointOffsetBelowLeft</tabstop>
64876491
<tabstop>mPointOffsetBelow</tabstop>
64886492
<tabstop>mPointOffsetBelowRight</tabstop>
6493+
<tabstop>mPointQuadOffsetDDBtn</tabstop>
6494+
<tabstop>mPointPositionOrderDDBtn</tabstop>
64896495
<tabstop>mPointOffsetXSpinBox</tabstop>
64906496
<tabstop>mPointOffsetYSpinBox</tabstop>
64916497
<tabstop>mPointOffsetDDBtn</tabstop>
64926498
<tabstop>mPointOffsetUnitsDDBtn</tabstop>
6493-
<tabstop>mLineDistanceSpnBx</tabstop>
6494-
<tabstop>mLineDistanceDDBtn</tabstop>
6495-
<tabstop>mLineDistanceUnitDDBtn</tabstop>
6496-
<tabstop>mOffsetTypeComboBox</tabstop>
6497-
<tabstop>mPointPositionOrderDDBtn</tabstop>
64986499
<tabstop>mPointAngleSpinBox</tabstop>
64996500
<tabstop>mPointAngleDDBtn</tabstop>
65006501
<tabstop>mRepeatDistanceSpinBox</tabstop>
@@ -6510,6 +6511,7 @@ font-style: italic;</string>
65106511
<tabstop>mCoordRotationDDBtn</tabstop>
65116512
<tabstop>chkPreserveRotation</tabstop>
65126513
<tabstop>mPrioritySlider</tabstop>
6514+
<tabstop>mPriorityDDBtn</tabstop>
65136515
<tabstop>scrollArea_4</tabstop>
65146516
<tabstop>mScaleBasedVisibilityChkBx</tabstop>
65156517
<tabstop>mScaleBasedVisibilityDDBtn</tabstop>
@@ -6536,7 +6538,6 @@ font-style: italic;</string>
65366538
<tabstop>mLimitLabelChkBox</tabstop>
65376539
<tabstop>mLimitLabelSpinBox</tabstop>
65386540
<tabstop>mMinSizeSpinBox</tabstop>
6539-
<tabstop>mPriorityDDBtn</tabstop>
65406541
<tabstop>mFitInsidePolygonCheckBox</tabstop>
65416542
<tabstop>mChkNoObstacle</tabstop>
65426543
<tabstop>mIsObstacleDDBtn</tabstop>

‎src/ui/qgsnewmemorylayerdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
</customwidget>
151151
</customwidgets>
152152
<tabstops>
153-
<tabstop>mNameLineEdit</tabstop>
154153
<tabstop>buttonGroupGeometry</tabstop>
155154
<tabstop>mPointRadioButton</tabstop>
156155
<tabstop>mLineRadioButton</tabstop>
@@ -159,6 +158,7 @@
159158
<tabstop>mMultiLineRadioButton</tabstop>
160159
<tabstop>mMultiPolygonRadioButton</tabstop>
161160
<tabstop>mCrsSelector</tabstop>
161+
<tabstop>mNameLineEdit</tabstop>
162162
</tabstops>
163163
<resources/>
164164
<connections>

‎src/ui/qgsnewspatialitelayerdialogbase.ui

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<x>0</x>
5353
<y>0</y>
5454
<width>432</width>
55-
<height>580</height>
55+
<height>576</height>
5656
</rect>
5757
</property>
5858
<layout class="QVBoxLayout" name="verticalLayout">
@@ -435,16 +435,17 @@
435435
</widget>
436436
<layoutdefault spacing="6" margin="11"/>
437437
<tabstops>
438-
<tabstop>mDatabaseComboBox</tabstop>
439-
<tabstop>toolButtonNewDatabase</tabstop>
440-
<tabstop>leLayerName</tabstop>
441-
<tabstop>leGeometryColumn</tabstop>
438+
<tabstop>scrollArea</tabstop>
442439
<tabstop>mPointRadioButton</tabstop>
443440
<tabstop>mLineRadioButton</tabstop>
444441
<tabstop>mPolygonRadioButton</tabstop>
445442
<tabstop>mMultipointRadioButton</tabstop>
446443
<tabstop>mMultilineRadioButton</tabstop>
447444
<tabstop>mMultipolygonRadioButton</tabstop>
445+
<tabstop>mDatabaseComboBox</tabstop>
446+
<tabstop>toolButtonNewDatabase</tabstop>
447+
<tabstop>leLayerName</tabstop>
448+
<tabstop>leGeometryColumn</tabstop>
448449
<tabstop>leSRID</tabstop>
449450
<tabstop>pbnFindSRID</tabstop>
450451
<tabstop>checkBoxPrimaryKey</tabstop>
@@ -453,7 +454,6 @@
453454
<tabstop>mAddAttributeButton</tabstop>
454455
<tabstop>mAttributeView</tabstop>
455456
<tabstop>mRemoveAttributeButton</tabstop>
456-
<tabstop>scrollArea</tabstop>
457457
</tabstops>
458458
<resources/>
459459
<connections>

‎src/ui/qgsoptionsbase.ui

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
<item>
309309
<widget class="QStackedWidget" name="mOptionsStackedWidget">
310310
<property name="currentIndex">
311-
<number>2</number>
311+
<number>0</number>
312312
</property>
313313
<widget class="QWidget" name="mOptionsPageGeneral">
314314
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -337,8 +337,8 @@
337337
<rect>
338338
<x>0</x>
339339
<y>0</y>
340-
<width>581</width>
341-
<height>718</height>
340+
<width>949</width>
341+
<height>670</height>
342342
</rect>
343343
</property>
344344
<layout class="QVBoxLayout" name="verticalLayout_28">
@@ -984,8 +984,8 @@
984984
<rect>
985985
<x>0</x>
986986
<y>0</y>
987-
<width>658</width>
988-
<height>1075</height>
987+
<width>949</width>
988+
<height>1057</height>
989989
</rect>
990990
</property>
991991
<layout class="QVBoxLayout" name="verticalLayout_22">
@@ -1421,8 +1421,8 @@
14211421
<rect>
14221422
<x>0</x>
14231423
<y>0</y>
1424-
<width>952</width>
1425-
<height>727</height>
1424+
<width>949</width>
1425+
<height>691</height>
14261426
</rect>
14271427
</property>
14281428
<layout class="QVBoxLayout" name="verticalLayout_27">
@@ -1799,9 +1799,9 @@
17991799
<property name="geometry">
18001800
<rect>
18011801
<x>0</x>
1802-
<y>0</y>
1803-
<width>736</width>
1804-
<height>846</height>
1802+
<y>-224</y>
1803+
<width>949</width>
1804+
<height>802</height>
18051805
</rect>
18061806
</property>
18071807
<layout class="QVBoxLayout" name="verticalLayout_29">
@@ -2520,8 +2520,8 @@
25202520
<rect>
25212521
<x>0</x>
25222522
<y>0</y>
2523-
<width>168</width>
2524-
<height>276</height>
2523+
<width>965</width>
2524+
<height>578</height>
25252525
</rect>
25262526
</property>
25272527
<layout class="QHBoxLayout" name="horizontalLayout_46">
@@ -2625,8 +2625,8 @@
26252625
<rect>
26262626
<x>0</x>
26272627
<y>0</y>
2628-
<width>521</width>
2629-
<height>354</height>
2628+
<width>965</width>
2629+
<height>578</height>
26302630
</rect>
26312631
</property>
26322632
<layout class="QVBoxLayout" name="verticalLayout_25">
@@ -2962,9 +2962,9 @@
29622962
<property name="geometry">
29632963
<rect>
29642964
<x>0</x>
2965-
<y>0</y>
2966-
<width>678</width>
2967-
<height>670</height>
2965+
<y>-24</y>
2966+
<width>949</width>
2967+
<height>602</height>
29682968
</rect>
29692969
</property>
29702970
<layout class="QVBoxLayout" name="verticalLayout_30">
@@ -3458,8 +3458,8 @@
34583458
<rect>
34593459
<x>0</x>
34603460
<y>0</y>
3461-
<width>537</width>
3462-
<height>321</height>
3461+
<width>965</width>
3462+
<height>578</height>
34633463
</rect>
34643464
</property>
34653465
<layout class="QVBoxLayout" name="verticalLayout_39">
@@ -3662,9 +3662,9 @@
36623662
<property name="geometry">
36633663
<rect>
36643664
<x>0</x>
3665-
<y>0</y>
3666-
<width>566</width>
3667-
<height>707</height>
3665+
<y>-90</y>
3666+
<width>949</width>
3667+
<height>668</height>
36683668
</rect>
36693669
</property>
36703670
<layout class="QVBoxLayout" name="verticalLayout_31">
@@ -4208,8 +4208,8 @@
42084208
<rect>
42094209
<x>0</x>
42104210
<y>0</y>
4211-
<width>462</width>
4212-
<height>382</height>
4211+
<width>965</width>
4212+
<height>578</height>
42134213
</rect>
42144214
</property>
42154215
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -4346,9 +4346,9 @@
43464346
<property name="geometry">
43474347
<rect>
43484348
<x>0</x>
4349-
<y>0</y>
4350-
<width>560</width>
4351-
<height>681</height>
4349+
<y>-69</y>
4350+
<width>949</width>
4351+
<height>647</height>
43524352
</rect>
43534353
</property>
43544354
<layout class="QGridLayout" name="gridLayout_15">
@@ -4593,8 +4593,8 @@
45934593
<rect>
45944594
<x>0</x>
45954595
<y>0</y>
4596-
<width>303</width>
4597-
<height>236</height>
4596+
<width>965</width>
4597+
<height>578</height>
45984598
</rect>
45994599
</property>
46004600
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -4701,9 +4701,9 @@
47014701
<property name="geometry">
47024702
<rect>
47034703
<x>0</x>
4704-
<y>0</y>
4705-
<width>552</width>
4706-
<height>791</height>
4704+
<y>-162</y>
4705+
<width>949</width>
4706+
<height>740</height>
47074707
</rect>
47084708
</property>
47094709
<layout class="QVBoxLayout" name="verticalLayout_33">
@@ -5182,9 +5182,9 @@
51825182
<layoutdefault spacing="6" margin="11"/>
51835183
<customwidgets>
51845184
<customwidget>
5185-
<class>QgsProjectionSelectionWidget</class>
5186-
<extends>QWidget</extends>
5187-
<header>qgsprojectionselectionwidget.h</header>
5185+
<class>QgsColorButtonV2</class>
5186+
<extends>QToolButton</extends>
5187+
<header>qgscolorbuttonv2.h</header>
51885188
<container>1</container>
51895189
</customwidget>
51905190
<customwidget>
@@ -5194,9 +5194,9 @@
51945194
<container>1</container>
51955195
</customwidget>
51965196
<customwidget>
5197-
<class>QgsColorButtonV2</class>
5198-
<extends>QToolButton</extends>
5199-
<header>qgscolorbuttonv2.h</header>
5197+
<class>QgsProjectionSelectionWidget</class>
5198+
<extends>QWidget</extends>
5199+
<header location="global">qgsprojectionselectionwidget.h</header>
52005200
<container>1</container>
52015201
</customwidget>
52025202
<customwidget>
@@ -5263,6 +5263,9 @@
52635263
<tabstop>mBtnAddSVGPath</tabstop>
52645264
<tabstop>mBtnRemoveSVGPath</tabstop>
52655265
<tabstop>mListSVGPaths</tabstop>
5266+
<tabstop>mBtnAddTemplatePath</tabstop>
5267+
<tabstop>mBtnRemoveTemplatePath</tabstop>
5268+
<tabstop>mListComposerTemplatePaths</tabstop>
52665269
<tabstop>mBtnAddPluginPath</tabstop>
52675270
<tabstop>mBtnRemovePluginPath</tabstop>
52685271
<tabstop>mListPluginPaths</tabstop>
@@ -5286,6 +5289,9 @@
52865289
<tabstop>cbxAddPostgisDC</tabstop>
52875290
<tabstop>cbxAddOracleDC</tabstop>
52885291
<tabstop>cbxCompileExpressions</tabstop>
5292+
<tabstop>cbxAutoTransaction</tabstop>
5293+
<tabstop>mBtnRemoveHiddenPath</tabstop>
5294+
<tabstop>mListHiddenBrowserPaths</tabstop>
52895295
<tabstop>mOptionsScrollArea_04</tabstop>
52905296
<tabstop>chkAddedVisibility</tabstop>
52915297
<tabstop>chkUseRenderCaching</tabstop>
@@ -5364,6 +5370,7 @@
53645370
<tabstop>mLineWidthSpinBox</tabstop>
53655371
<tabstop>mLineColorToolButton</tabstop>
53665372
<tabstop>mFillColorToolButton</tabstop>
5373+
<tabstop>mLineGhostCheckBox</tabstop>
53675374
<tabstop>cbxSnappingOptionsDocked</tabstop>
53685375
<tabstop>mDefaultSnapModeComboBox</tabstop>
53695376
<tabstop>mDefaultSnappingToleranceSpinBox</tabstop>
@@ -5376,6 +5383,8 @@
53765383
<tabstop>mOffsetJoinStyleComboBox</tabstop>
53775384
<tabstop>mOffsetQuadSegSpinBox</tabstop>
53785385
<tabstop>mCurveOffsetMiterLimitComboBox</tabstop>
5386+
<tabstop>mOptionsScrollArea_02</tabstop>
5387+
<tabstop>cmbEditCreateOptions</tabstop>
53795388
<tabstop>pbnEditCreateOptions</tabstop>
53805389
<tabstop>pbnEditPyramidsOptions</tabstop>
53815390
<tabstop>lstGdalDrivers</tabstop>
@@ -5399,6 +5408,7 @@
53995408
<tabstop>mOptionsScrollArea_10</tabstop>
54005409
<tabstop>leWmsSearch</tabstop>
54015410
<tabstop>mNetworkTimeoutSpinBox</tabstop>
5411+
<tabstop>mDefaultCapabilitiesExpirySpinBox</tabstop>
54025412
<tabstop>mDefaultTileExpirySpinBox</tabstop>
54035413
<tabstop>mDefaultTileMaxRetrySpinBox</tabstop>
54045414
<tabstop>leUserAgent</tabstop>
@@ -5416,15 +5426,6 @@
54165426
<tabstop>mAddUrlPushButton</tabstop>
54175427
<tabstop>mRemoveUrlPushButton</tabstop>
54185428
<tabstop>mAdvancedSettingsEnableButton</tabstop>
5419-
<tabstop>buttonBox</tabstop>
5420-
<tabstop>mBtnAddTemplatePath</tabstop>
5421-
<tabstop>mBtnRemoveTemplatePath</tabstop>
5422-
<tabstop>mListComposerTemplatePaths</tabstop>
5423-
<tabstop>mListHiddenBrowserPaths</tabstop>
5424-
<tabstop>mBtnRemoveHiddenPath</tabstop>
5425-
<tabstop>cmbEditCreateOptions</tabstop>
5426-
<tabstop>mOptionsScrollArea_02</tabstop>
5427-
<tabstop>mDefaultCapabilitiesExpirySpinBox</tabstop>
54285429
</tabstops>
54295430
<resources>
54305431
<include location="../../images/images.qrc"/>

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,9 +1729,9 @@ p, li { white-space: pre-wrap; }
17291729
<property name="geometry">
17301730
<rect>
17311731
<x>0</x>
1732-
<y>-66</y>
1732+
<y>-99</y>
17331733
<width>599</width>
1734-
<height>608</height>
1734+
<height>641</height>
17351735
</rect>
17361736
</property>
17371737
<layout class="QGridLayout" name="gridLayout_12">
@@ -2170,9 +2170,9 @@ p, li { white-space: pre-wrap; }
21702170
</widget>
21712171
<customwidgets>
21722172
<customwidget>
2173-
<class>QgsProjectionSelectionWidget</class>
2174-
<extends>QWidget</extends>
2175-
<header>qgsprojectionselectionwidget.h</header>
2173+
<class>QgsColorButtonV2</class>
2174+
<extends>QToolButton</extends>
2175+
<header>qgscolorbuttonv2.h</header>
21762176
<container>1</container>
21772177
</customwidget>
21782178
<customwidget>
@@ -2181,12 +2181,6 @@ p, li { white-space: pre-wrap; }
21812181
<header>qgscollapsiblegroupbox.h</header>
21822182
<container>1</container>
21832183
</customwidget>
2184-
<customwidget>
2185-
<class>QgsColorButtonV2</class>
2186-
<extends>QToolButton</extends>
2187-
<header>qgscolorbuttonv2.h</header>
2188-
<container>1</container>
2189-
</customwidget>
21902184
<customwidget>
21912185
<class>QgsScaleRangeWidget</class>
21922186
<extends>QWidget</extends>
@@ -2197,6 +2191,12 @@ p, li { white-space: pre-wrap; }
21972191
<extends>QComboBox</extends>
21982192
<header>qgsblendmodecombobox.h</header>
21992193
</customwidget>
2194+
<customwidget>
2195+
<class>QgsProjectionSelectionWidget</class>
2196+
<extends>QWidget</extends>
2197+
<header location="global">qgsprojectionselectionwidget.h</header>
2198+
<container>1</container>
2199+
</customwidget>
22002200
</customwidgets>
22012201
<tabstops>
22022202
<tabstop>mOptionsListWidget</tabstop>
@@ -2244,6 +2244,7 @@ p, li { white-space: pre-wrap; }
22442244
<tabstop>buttonBuildPyramids</tabstop>
22452245
<tabstop>scrollArea_6</tabstop>
22462246
<tabstop>scrollArea_4</tabstop>
2247+
<tabstop>mLayerShortNameLineEdit</tabstop>
22472248
<tabstop>mLayerTitleLineEdit</tabstop>
22482249
<tabstop>mLayerAbstractTextEdit</tabstop>
22492250
<tabstop>mLayerKeywordListLineEdit</tabstop>

‎src/ui/qgsstylev2managerdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ QMenu::item:selected { background-color: gray; } */
548548
<tabstop>tabItemType</tabstop>
549549
<tabstop>listItems</tabstop>
550550
<tabstop>btnAddItem</tabstop>
551-
<tabstop>btnEditItem</tabstop>
552551
<tabstop>btnRemoveItem</tabstop>
552+
<tabstop>btnEditItem</tabstop>
553553
<tabstop>btnShare</tabstop>
554554
</tabstops>
555555
<resources>

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,9 +1415,9 @@
14151415
<property name="geometry">
14161416
<rect>
14171417
<x>0</x>
1418-
<y>-71</y>
1418+
<y>-104</y>
14191419
<width>714</width>
1420-
<height>608</height>
1420+
<height>641</height>
14211421
</rect>
14221422
</property>
14231423
<layout class="QGridLayout" name="gridLayout_3">
@@ -1888,12 +1888,6 @@
18881888
</layout>
18891889
</widget>
18901890
<customwidgets>
1891-
<customwidget>
1892-
<class>QgsProjectionSelectionWidget</class>
1893-
<extends>QWidget</extends>
1894-
<header>qgsprojectionselectionwidget.h</header>
1895-
<container>1</container>
1896-
</customwidget>
18971891
<customwidget>
18981892
<class>QgsCollapsibleGroupBox</class>
18991893
<extends>QGroupBox</extends>
@@ -1905,6 +1899,12 @@
19051899
<extends>QWidget</extends>
19061900
<header>qgsscalerangewidget.h</header>
19071901
</customwidget>
1902+
<customwidget>
1903+
<class>QgsProjectionSelectionWidget</class>
1904+
<extends>QWidget</extends>
1905+
<header location="global">qgsprojectionselectionwidget.h</header>
1906+
<container>1</container>
1907+
</customwidget>
19081908
<customwidget>
19091909
<class>QgsScaleComboBox</class>
19101910
<extends>QComboBox</extends>
@@ -1953,7 +1953,9 @@
19531953
<tabstop>scrollArea_7</tabstop>
19541954
<tabstop>mButtonAddJoin</tabstop>
19551955
<tabstop>mButtonRemoveJoin</tabstop>
1956+
<tabstop>mButtonEditJoin</tabstop>
19561957
<tabstop>scrollArea_2</tabstop>
1958+
<tabstop>mLayerShortNameLineEdit</tabstop>
19571959
<tabstop>mLayerTitleLineEdit</tabstop>
19581960
<tabstop>mLayerAbstractTextEdit</tabstop>
19591961
<tabstop>mLayerKeywordListLineEdit</tabstop>
@@ -1967,7 +1969,6 @@
19671969
<tabstop>mLayerLegendUrlLineEdit</tabstop>
19681970
<tabstop>mLayerLegendUrlFormatComboBox</tabstop>
19691971
<tabstop>teMetadata</tabstop>
1970-
<tabstop>mButtonEditJoin</tabstop>
19711972
</tabstops>
19721973
<resources>
19731974
<include location="../../images/images.qrc"/>

‎src/ui/qgswfssourceselectbase.ui

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,16 @@
178178
<property name="spacing">
179179
<number>6</number>
180180
</property>
181-
<property name="margin">
181+
<property name="leftMargin">
182+
<number>9</number>
183+
</property>
184+
<property name="topMargin">
185+
<number>9</number>
186+
</property>
187+
<property name="rightMargin">
188+
<number>9</number>
189+
</property>
190+
<property name="bottomMargin">
182191
<number>9</number>
183192
</property>
184193
<item>
@@ -260,6 +269,8 @@
260269
<tabstop>btnSave</tabstop>
261270
<tabstop>lineFilter</tabstop>
262271
<tabstop>treeView</tabstop>
272+
<tabstop>cbxUseTitleLayerName</tabstop>
273+
<tabstop>mHoldDialogOpen</tabstop>
263274
<tabstop>cbxFeatureCurrentViewExtent</tabstop>
264275
<tabstop>btnChangeSpatialRefSys</tabstop>
265276
</tabstops>

‎src/ui/symbollayer/widget_size_scale.ui

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,21 +223,22 @@
223223
</layout>
224224
</widget>
225225
<customwidgets>
226-
<customwidget>
227-
<class>QgsFieldExpressionWidget</class>
228-
<extends>QWidget</extends>
229-
<header location="global">qgsfieldexpressionwidget.h</header>
230-
<container>1</container>
231-
</customwidget>
232226
<customwidget>
233227
<class>QgsDoubleSpinBox</class>
234228
<extends>QDoubleSpinBox</extends>
235229
<header>qgsdoublespinbox.h</header>
236230
</customwidget>
231+
<customwidget>
232+
<class>QgsFieldExpressionWidget</class>
233+
<extends>QWidget</extends>
234+
<header>qgsfieldexpressionwidget.h</header>
235+
<container>1</container>
236+
</customwidget>
237237
</customwidgets>
238238
<tabstops>
239239
<tabstop>mExpressionWidget</tabstop>
240240
<tabstop>scaleMethodComboBox</tabstop>
241+
<tabstop>exponentSpinBox</tabstop>
241242
<tabstop>minSizeSpinBox</tabstop>
242243
<tabstop>maxSizeSpinBox</tabstop>
243244
<tabstop>minValueSpinBox</tabstop>

‎src/ui/symbollayer/widget_symbolslist.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,13 +397,13 @@
397397
</customwidgets>
398398
<tabstops>
399399
<tabstop>mTransparencySlider</tabstop>
400+
<tabstop>btnColor</tabstop>
400401
<tabstop>spinSize</tabstop>
401402
<tabstop>mSizeDDBtn</tabstop>
402-
<tabstop>spinWidth</tabstop>
403-
<tabstop>mWidthDDBtn</tabstop>
404-
<tabstop>btnColor</tabstop>
405403
<tabstop>spinAngle</tabstop>
406404
<tabstop>mRotationDDBtn</tabstop>
405+
<tabstop>spinWidth</tabstop>
406+
<tabstop>mWidthDDBtn</tabstop>
407407
<tabstop>groupsCombo</tabstop>
408408
<tabstop>openStyleManagerButton</tabstop>
409409
<tabstop>viewSymbols</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.