Skip to content

Commit 31c055d

Browse files
nyalldawsonnyalldawson
committedAug 25, 2014
Fix some alignment and tab issues with symbol dialogs (refs #11060)
·
ltr-3_40archive/master_2
1 parent 3d7d240 commit 31c055d

11 files changed

+396
-179
lines changed
 

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,6 +1310,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mRadioUseWholeShape_toggled( bool
13101310
if ( mLayer )
13111311
{
13121312
mLayer->setUseWholeShape( value );
1313+
mDistanceUnitWidget->setEnabled( !value );
13131314
emit changed();
13141315
}
13151316
}

‎src/ui/symbollayer/widget_ellipse.ui

100644100755
Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,19 @@
4141
<property name="text">
4242
<string>Symbol height</string>
4343
</property>
44+
<property name="buddy">
45+
<cstring>mHeightSpinBox</cstring>
46+
</property>
4447
</widget>
4548
</item>
4649
<item row="4" column="0">
4750
<widget class="QLabel" name="mRotationLabel">
4851
<property name="text">
4952
<string>Rotation</string>
5053
</property>
54+
<property name="buddy">
55+
<cstring>mRotationSpinBox</cstring>
56+
</property>
5157
</widget>
5258
</item>
5359
<item row="0" column="1">
@@ -63,6 +69,9 @@
6369
<property name="text">
6470
<string>Fill</string>
6571
</property>
72+
<property name="buddy">
73+
<cstring>btnChangeColorFill</cstring>
74+
</property>
6675
</widget>
6776
</item>
6877
<item>
@@ -95,6 +104,9 @@
95104
<property name="text">
96105
<string>Border</string>
97106
</property>
107+
<property name="buddy">
108+
<cstring>btnChangeColorBorder</cstring>
109+
</property>
98110
</widget>
99111
</item>
100112
<item>
@@ -188,6 +200,9 @@
188200
<property name="text">
189201
<string>Symbol width</string>
190202
</property>
203+
<property name="buddy">
204+
<cstring>mWidthSpinBox</cstring>
205+
</property>
191206
</widget>
192207
</item>
193208
<item row="7" column="1">
@@ -237,10 +252,13 @@
237252
<property name="text">
238253
<string>Outline style</string>
239254
</property>
255+
<property name="buddy">
256+
<cstring>mOutlineStyleComboBox</cstring>
257+
</property>
240258
</widget>
241259
</item>
242260
<item row="2" column="1">
243-
<widget class="QgsPenStyleComboBox" name="mOutlineStyleComboBox" native="true"/>
261+
<widget class="QgsPenStyleComboBox" name="mOutlineStyleComboBox"/>
244262
</item>
245263
<item row="3" column="1">
246264
<layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -273,20 +291,29 @@
273291
<property name="text">
274292
<string>Outline width</string>
275293
</property>
294+
<property name="buddy">
295+
<cstring>mOutlineWidthSpinBox</cstring>
296+
</property>
276297
</widget>
277298
</item>
278299
<item row="7" column="0">
279300
<widget class="QLabel" name="mAnchorPointLabel">
280301
<property name="text">
281302
<string>Anchor point</string>
282303
</property>
304+
<property name="buddy">
305+
<cstring>mHorizontalAnchorComboBox</cstring>
306+
</property>
283307
</widget>
284308
</item>
285309
<item row="6" column="0">
286310
<widget class="QLabel" name="label_5">
287311
<property name="text">
288312
<string>Offset X,Y</string>
289313
</property>
314+
<property name="buddy">
315+
<cstring>spinOffsetX</cstring>
316+
</property>
290317
</widget>
291318
</item>
292319
<item row="6" column="1">
@@ -411,10 +438,29 @@
411438
</customwidget>
412439
<customwidget>
413440
<class>QgsPenStyleComboBox</class>
414-
<extends>QWidget</extends>
441+
<extends>QComboBox</extends>
415442
<header>qgspenstylecombobox.h</header>
416443
</customwidget>
417444
</customwidgets>
445+
<tabstops>
446+
<tabstop>btnChangeColorFill</tabstop>
447+
<tabstop>btnChangeColorBorder</tabstop>
448+
<tabstop>mWidthSpinBox</tabstop>
449+
<tabstop>mSymbolWidthUnitWidget</tabstop>
450+
<tabstop>mOutlineStyleComboBox</tabstop>
451+
<tabstop>mOutlineWidthSpinBox</tabstop>
452+
<tabstop>mOutlineWidthUnitWidget</tabstop>
453+
<tabstop>mRotationSpinBox</tabstop>
454+
<tabstop>mHeightSpinBox</tabstop>
455+
<tabstop>mSymbolHeightUnitWidget</tabstop>
456+
<tabstop>spinOffsetX</tabstop>
457+
<tabstop>spinOffsetY</tabstop>
458+
<tabstop>mOffsetUnitWidget</tabstop>
459+
<tabstop>mHorizontalAnchorComboBox</tabstop>
460+
<tabstop>mVerticalAnchorComboBox</tabstop>
461+
<tabstop>mDataDefinedPropertiesButton</tabstop>
462+
<tabstop>mShapeListWidget</tabstop>
463+
</tabstops>
418464
<resources/>
419465
<connections/>
420466
</ui>

‎src/ui/symbollayer/widget_gradientfill.ui

100644100755
Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,22 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QFormLayout" name="formLayout">
17-
<property name="fieldGrowthPolicy">
18-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
16+
<layout class="QGridLayout" name="gridLayout">
17+
<property name="leftMargin">
18+
<number>1</number>
1919
</property>
20-
<property name="labelAlignment">
21-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
20+
<property name="topMargin">
21+
<number>1</number>
2222
</property>
23-
<property name="horizontalSpacing">
24-
<number>28</number>
23+
<property name="rightMargin">
24+
<number>1</number>
2525
</property>
26-
<property name="margin">
26+
<property name="bottomMargin">
2727
<number>1</number>
2828
</property>
29+
<property name="horizontalSpacing">
30+
<number>28</number>
31+
</property>
2932
<item row="0" column="0">
3033
<widget class="QRadioButton" name="radioTwoColor">
3134
<property name="text">
@@ -257,14 +260,14 @@
257260
</item>
258261
</layout>
259262
</item>
260-
<item row="7" column="0">
263+
<item row="6" column="0">
261264
<widget class="QLabel" name="label_8">
262265
<property name="text">
263266
<string>Reference Point 2</string>
264267
</property>
265268
</widget>
266269
</item>
267-
<item row="7" column="1">
270+
<item row="6" column="1">
268271
<layout class="QHBoxLayout" name="horizontalLayout_7">
269272
<property name="spacing">
270273
<number>12</number>
@@ -331,14 +334,14 @@
331334
</item>
332335
</layout>
333336
</item>
334-
<item row="9" column="0">
337+
<item row="7" column="0">
335338
<widget class="QLabel" name="label_11">
336339
<property name="text">
337340
<string>Angle</string>
338341
</property>
339342
</widget>
340343
</item>
341-
<item row="9" column="1">
344+
<item row="7" column="1">
342345
<widget class="QDoubleSpinBox" name="mSpinAngle">
343346
<property name="suffix">
344347
<string> °</string>
@@ -351,20 +354,14 @@
351354
</property>
352355
</widget>
353356
</item>
354-
<item row="12" column="0" colspan="2">
355-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
356-
<property name="sizePolicy">
357-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
358-
<horstretch>0</horstretch>
359-
<verstretch>0</verstretch>
360-
</sizepolicy>
361-
</property>
357+
<item row="8" column="0">
358+
<widget class="QLabel" name="label_6">
362359
<property name="text">
363-
<string>Data defined properties...</string>
360+
<string>Offset X,Y</string>
364361
</property>
365362
</widget>
366363
</item>
367-
<item row="10" column="1">
364+
<item row="8" column="1">
368365
<layout class="QHBoxLayout" name="horizontalLayout">
369366
<item>
370367
<widget class="QDoubleSpinBox" name="spinOffsetX">
@@ -411,17 +408,36 @@
411408
</widget>
412409
</item>
413410
<item>
414-
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true"/>
411+
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget"/>
415412
</item>
416413
</layout>
417414
</item>
418-
<item row="10" column="0">
419-
<widget class="QLabel" name="label_6">
415+
<item row="9" column="0" colspan="2">
416+
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
417+
<property name="sizePolicy">
418+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
419+
<horstretch>0</horstretch>
420+
<verstretch>0</verstretch>
421+
</sizepolicy>
422+
</property>
420423
<property name="text">
421-
<string>Offset X,Y</string>
424+
<string>Data defined properties...</string>
422425
</property>
423426
</widget>
424427
</item>
428+
<item row="10" column="0">
429+
<spacer name="verticalSpacer">
430+
<property name="orientation">
431+
<enum>Qt::Vertical</enum>
432+
</property>
433+
<property name="sizeHint" stdset="0">
434+
<size>
435+
<width>20</width>
436+
<height>40</height>
437+
</size>
438+
</property>
439+
</spacer>
440+
</item>
425441
</layout>
426442
</widget>
427443
<customwidgets>
@@ -432,7 +448,7 @@
432448
</customwidget>
433449
<customwidget>
434450
<class>QgsUnitSelectionWidget</class>
435-
<extends>QWidget</extends>
451+
<extends>QComboBox</extends>
436452
<header>qgsunitselectionwidget.h</header>
437453
<container>1</container>
438454
</customwidget>

‎src/ui/symbollayer/widget_markerline.ui

100644100755
Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -155,23 +155,6 @@
155155
</property>
156156
</widget>
157157
</item>
158-
<item row="5" column="0" colspan="2">
159-
<layout class="QHBoxLayout" name="horizontalLayout_2">
160-
<item>
161-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
162-
<property name="sizePolicy">
163-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
164-
<horstretch>0</horstretch>
165-
<verstretch>0</verstretch>
166-
</sizepolicy>
167-
</property>
168-
<property name="text">
169-
<string>Data defined properties</string>
170-
</property>
171-
</widget>
172-
</item>
173-
</layout>
174-
</item>
175158
<item row="3" column="1">
176159
<layout class="QHBoxLayout" name="horizontalLayout_3">
177160
<item>
@@ -201,6 +184,32 @@
201184
</item>
202185
</layout>
203186
</item>
187+
<item row="4" column="0" colspan="2">
188+
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
189+
<property name="sizePolicy">
190+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
191+
<horstretch>0</horstretch>
192+
<verstretch>0</verstretch>
193+
</sizepolicy>
194+
</property>
195+
<property name="text">
196+
<string>Data defined properties</string>
197+
</property>
198+
</widget>
199+
</item>
200+
<item row="5" column="0">
201+
<spacer name="verticalSpacer">
202+
<property name="orientation">
203+
<enum>Qt::Vertical</enum>
204+
</property>
205+
<property name="sizeHint" stdset="0">
206+
<size>
207+
<width>20</width>
208+
<height>40</height>
209+
</size>
210+
</property>
211+
</spacer>
212+
</item>
204213
</layout>
205214
</widget>
206215
<customwidgets>
@@ -212,7 +221,19 @@
212221
</customwidget>
213222
</customwidgets>
214223
<tabstops>
224+
<tabstop>radInterval</tabstop>
225+
<tabstop>spinInterval</tabstop>
226+
<tabstop>mIntervalUnitWidget</tabstop>
227+
<tabstop>radVertex</tabstop>
228+
<tabstop>radVertexLast</tabstop>
229+
<tabstop>radVertexFirst</tabstop>
230+
<tabstop>radCentralPoint</tabstop>
231+
<tabstop>mSpinOffsetAlongLine</tabstop>
232+
<tabstop>mOffsetAlongLineUnitWidget</tabstop>
215233
<tabstop>chkRotateMarker</tabstop>
234+
<tabstop>spinOffset</tabstop>
235+
<tabstop>mOffsetUnitWidget</tabstop>
236+
<tabstop>mDataDefinedPropertiesButton</tabstop>
216237
</tabstops>
217238
<resources/>
218239
<connections/>

‎src/ui/symbollayer/widget_shapeburstfill.ui

100644100755
Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QFormLayout" name="formLayout">
16+
<layout class="QGridLayout" name="gridLayout_2">
1717
<item row="0" column="0" colspan="2">
1818
<widget class="QGroupBox" name="mGradientTypeGroupBox">
1919
<property name="title">
2020
<string>Gradient colors</string>
2121
</property>
22-
<layout class="QFormLayout" name="formLayout_2">
23-
<property name="fieldGrowthPolicy">
24-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
25-
</property>
22+
<layout class="QGridLayout" name="gridLayout">
2623
<item row="0" column="0">
2724
<widget class="QRadioButton" name="radioTwoColor">
2825
<property name="text">
@@ -121,7 +118,7 @@
121118
<item row="1" column="0" colspan="2">
122119
<layout class="QHBoxLayout" name="horizontalLayout_3">
123120
<property name="spacing">
124-
<number>0</number>
121+
<number>6</number>
125122
</property>
126123
<item>
127124
<widget class="QRadioButton" name="mRadioUseMaxDistance">
@@ -154,14 +151,14 @@
154151
</layout>
155152
</widget>
156153
</item>
157-
<item row="4" column="0">
154+
<item row="2" column="0">
158155
<widget class="QLabel" name="label">
159156
<property name="text">
160157
<string>Blur strength</string>
161158
</property>
162159
</widget>
163160
</item>
164-
<item row="4" column="1">
161+
<item row="2" column="1">
165162
<layout class="QHBoxLayout" name="horizontalLayout_4">
166163
<item>
167164
<widget class="QSlider" name="mBlurSlider">
@@ -197,14 +194,14 @@
197194
</item>
198195
</layout>
199196
</item>
200-
<item row="5" column="0">
197+
<item row="3" column="0">
201198
<widget class="QLabel" name="label_6">
202199
<property name="text">
203200
<string>Offset X,Y</string>
204201
</property>
205202
</widget>
206203
</item>
207-
<item row="5" column="1">
204+
<item row="3" column="1">
208205
<layout class="QHBoxLayout" name="horizontalLayout">
209206
<item>
210207
<widget class="QDoubleSpinBox" name="spinOffsetX">
@@ -255,7 +252,7 @@
255252
</item>
256253
</layout>
257254
</item>
258-
<item row="6" column="0" colspan="2">
255+
<item row="4" column="0" colspan="2">
259256
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
260257
<property name="sizePolicy">
261258
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -268,6 +265,19 @@
268265
</property>
269266
</widget>
270267
</item>
268+
<item row="5" column="0">
269+
<spacer name="verticalSpacer">
270+
<property name="orientation">
271+
<enum>Qt::Vertical</enum>
272+
</property>
273+
<property name="sizeHint" stdset="0">
274+
<size>
275+
<width>20</width>
276+
<height>40</height>
277+
</size>
278+
</property>
279+
</spacer>
280+
</item>
271281
</layout>
272282
</widget>
273283
<customwidgets>
@@ -288,6 +298,24 @@
288298
<header>qgscolorrampcombobox.h</header>
289299
</customwidget>
290300
</customwidgets>
301+
<tabstops>
302+
<tabstop>radioTwoColor</tabstop>
303+
<tabstop>btnChangeColor</tabstop>
304+
<tabstop>btnChangeColor2</tabstop>
305+
<tabstop>radioColorRamp</tabstop>
306+
<tabstop>cboGradientColorRamp</tabstop>
307+
<tabstop>mRadioUseWholeShape</tabstop>
308+
<tabstop>mRadioUseMaxDistance</tabstop>
309+
<tabstop>mSpinMaxDistance</tabstop>
310+
<tabstop>mDistanceUnitWidget</tabstop>
311+
<tabstop>mIgnoreRingsCheckBox</tabstop>
312+
<tabstop>mBlurSlider</tabstop>
313+
<tabstop>mSpinBlurRadius</tabstop>
314+
<tabstop>spinOffsetX</tabstop>
315+
<tabstop>spinOffsetY</tabstop>
316+
<tabstop>mOffsetUnitWidget</tabstop>
317+
<tabstop>mDataDefinedPropertiesButton</tabstop>
318+
</tabstops>
291319
<resources/>
292320
<connections>
293321
<connection>

‎src/ui/symbollayer/widget_simplefill.ui

100644100755
Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,22 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QFormLayout" name="formLayout">
16+
<layout class="QGridLayout" name="gridLayout">
1717
<item row="0" column="0">
1818
<widget class="QLabel" name="label">
1919
<property name="text">
2020
<string>Colors</string>
2121
</property>
22+
<property name="alignment">
23+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
24+
</property>
2225
</widget>
2326
</item>
2427
<item row="0" column="1">
2528
<layout class="QHBoxLayout" name="horizontalLayout_2">
29+
<property name="spacing">
30+
<number>6</number>
31+
</property>
2632
<item>
2733
<widget class="QLabel" name="label_7">
2834
<property name="sizePolicy">
@@ -34,6 +40,9 @@
3440
<property name="text">
3541
<string>Fill</string>
3642
</property>
43+
<property name="alignment">
44+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
45+
</property>
3746
</widget>
3847
</item>
3948
<item>
@@ -66,6 +75,9 @@
6675
<property name="text">
6776
<string>Border</string>
6877
</property>
78+
<property name="alignment">
79+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
80+
</property>
6981
</widget>
7082
</item>
7183
<item>
@@ -107,6 +119,9 @@
107119
<property name="text">
108120
<string>Fill style</string>
109121
</property>
122+
<property name="alignment">
123+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
124+
</property>
110125
</widget>
111126
</item>
112127
<item row="1" column="1">
@@ -117,16 +132,22 @@
117132
<property name="text">
118133
<string>Border style</string>
119134
</property>
135+
<property name="alignment">
136+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
137+
</property>
120138
</widget>
121139
</item>
122140
<item row="2" column="1">
123-
<widget class="QgsPenStyleComboBox" name="cboBorderStyle" native="true"/>
141+
<widget class="QgsPenStyleComboBox" name="cboBorderStyle"/>
124142
</item>
125143
<item row="3" column="0">
126144
<widget class="QLabel" name="label_8">
127145
<property name="text">
128146
<string>Join style</string>
129147
</property>
148+
<property name="alignment">
149+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
150+
</property>
130151
</widget>
131152
</item>
132153
<item row="3" column="1">
@@ -137,6 +158,9 @@
137158
<property name="text">
138159
<string>Border width</string>
139160
</property>
161+
<property name="alignment">
162+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
163+
</property>
140164
</widget>
141165
</item>
142166
<item row="4" column="1">
@@ -161,7 +185,7 @@
161185
</widget>
162186
</item>
163187
<item>
164-
<widget class="QgsUnitSelectionWidget" name="mBorderWidthUnitWidget" native="true"/>
188+
<widget class="QgsUnitSelectionWidget" name="mBorderWidthUnitWidget"/>
165189
</item>
166190
</layout>
167191
</item>
@@ -170,6 +194,9 @@
170194
<property name="text">
171195
<string>Offset X,Y</string>
172196
</property>
197+
<property name="alignment">
198+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
199+
</property>
173200
</widget>
174201
</item>
175202
<item row="5" column="1">
@@ -219,7 +246,7 @@
219246
</widget>
220247
</item>
221248
<item>
222-
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true"/>
249+
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget"/>
223250
</item>
224251
</layout>
225252
</item>
@@ -236,6 +263,19 @@
236263
</property>
237264
</widget>
238265
</item>
266+
<item row="7" column="0">
267+
<spacer name="verticalSpacer">
268+
<property name="orientation">
269+
<enum>Qt::Vertical</enum>
270+
</property>
271+
<property name="sizeHint" stdset="0">
272+
<size>
273+
<width>20</width>
274+
<height>40</height>
275+
</size>
276+
</property>
277+
</spacer>
278+
</item>
239279
</layout>
240280
</widget>
241281
<customwidgets>
@@ -257,7 +297,7 @@
257297
</customwidget>
258298
<customwidget>
259299
<class>QgsPenStyleComboBox</class>
260-
<extends>QWidget</extends>
300+
<extends>QComboBox</extends>
261301
<header>qgspenstylecombobox.h</header>
262302
</customwidget>
263303
<customwidget>

‎src/ui/symbollayer/widget_simpleline.ui

100644100755
Lines changed: 111 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,35 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QFormLayout" name="formLayout">
17-
<property name="fieldGrowthPolicy">
18-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
19-
</property>
20-
<property name="labelAlignment">
21-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
22-
</property>
23-
<property name="horizontalSpacing">
24-
<number>28</number>
25-
</property>
26-
<property name="margin">
27-
<number>1</number>
28-
</property>
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="7" column="0">
18+
<widget class="QLabel" name="mDashPatternUnitLabel">
19+
<property name="text">
20+
<string>Dash pattern unit</string>
21+
</property>
22+
</widget>
23+
</item>
24+
<item row="5" column="0">
25+
<widget class="QLabel" name="label_6">
26+
<property name="text">
27+
<string>Cap style</string>
28+
</property>
29+
</widget>
30+
</item>
31+
<item row="6" column="0">
32+
<widget class="QCheckBox" name="mCustomCheckBox">
33+
<property name="text">
34+
<string>Use custom dash pattern</string>
35+
</property>
36+
</widget>
37+
</item>
38+
<item row="1" column="0">
39+
<widget class="QLabel" name="label_2">
40+
<property name="text">
41+
<string>Pen width</string>
42+
</property>
43+
</widget>
44+
</item>
2945
<item row="0" column="0">
3046
<widget class="QLabel" name="label">
3147
<property name="text">
@@ -58,14 +74,41 @@
5874
</property>
5975
</widget>
6076
</item>
61-
<item row="1" column="0">
62-
<widget class="QLabel" name="label_2">
77+
<item row="2" column="0">
78+
<widget class="QLabel" name="label_4">
6379
<property name="text">
64-
<string>Pen width</string>
80+
<string>Offset</string>
81+
</property>
82+
</widget>
83+
</item>
84+
<item row="3" column="0">
85+
<widget class="QLabel" name="label_3">
86+
<property name="text">
87+
<string>Pen style</string>
88+
</property>
89+
</widget>
90+
</item>
91+
<item row="4" column="0">
92+
<widget class="QLabel" name="label_5">
93+
<property name="text">
94+
<string>Join style</string>
6595
</property>
6696
</widget>
6797
</item>
68-
<item row="1" column="1">
98+
<item row="0" column="2">
99+
<spacer name="horizontalSpacer">
100+
<property name="orientation">
101+
<enum>Qt::Horizontal</enum>
102+
</property>
103+
<property name="sizeHint" stdset="0">
104+
<size>
105+
<width>40</width>
106+
<height>20</height>
107+
</size>
108+
</property>
109+
</spacer>
110+
</item>
111+
<item row="1" column="1" colspan="2">
69112
<layout class="QHBoxLayout" name="horizontalLayout_2">
70113
<item>
71114
<widget class="QDoubleSpinBox" name="spinWidth">
@@ -97,14 +140,7 @@
97140
</item>
98141
</layout>
99142
</item>
100-
<item row="2" column="0">
101-
<widget class="QLabel" name="label_4">
102-
<property name="text">
103-
<string>Offset</string>
104-
</property>
105-
</widget>
106-
</item>
107-
<item row="2" column="1">
143+
<item row="2" column="1" colspan="2">
108144
<layout class="QHBoxLayout" name="horizontalLayout_3">
109145
<item>
110146
<widget class="QDoubleSpinBox" name="spinOffset">
@@ -136,65 +172,33 @@
136172
</item>
137173
</layout>
138174
</item>
139-
<item row="3" column="0">
140-
<widget class="QLabel" name="label_3">
141-
<property name="text">
142-
<string>Pen style</string>
143-
</property>
144-
</widget>
145-
</item>
146-
<item row="3" column="1">
147-
<widget class="QgsPenStyleComboBox" name="cboPenStyle" native="true"/>
175+
<item row="3" column="1" colspan="2">
176+
<widget class="QgsPenStyleComboBox" name="cboPenStyle"/>
148177
</item>
149-
<item row="4" column="0">
150-
<widget class="QLabel" name="label_5">
151-
<property name="text">
152-
<string>Join style</string>
153-
</property>
154-
</widget>
155-
</item>
156-
<item row="4" column="1">
178+
<item row="4" column="1" colspan="2">
157179
<widget class="QgsPenJoinStyleComboBox" name="cboJoinStyle"/>
158180
</item>
159-
<item row="5" column="0">
160-
<widget class="QLabel" name="label_6">
181+
<item row="5" column="1" colspan="2">
182+
<widget class="QgsPenCapStyleComboBox" name="cboCapStyle"/>
183+
</item>
184+
<item row="6" column="1" colspan="2">
185+
<widget class="QPushButton" name="mChangePatternButton">
161186
<property name="text">
162-
<string>Cap style</string>
187+
<string>Change</string>
163188
</property>
164189
</widget>
165190
</item>
166-
<item row="5" column="1">
167-
<widget class="QgsPenCapStyleComboBox" name="cboCapStyle"/>
168-
</item>
169-
<item row="6" column="0" colspan="2">
170-
<layout class="QHBoxLayout" name="horizontalLayout">
171-
<property name="sizeConstraint">
172-
<enum>QLayout::SetFixedSize</enum>
173-
</property>
174-
<item>
175-
<widget class="QCheckBox" name="mCustomCheckBox">
176-
<property name="text">
177-
<string>Use custom dash pattern</string>
178-
</property>
179-
</widget>
180-
</item>
181-
<item>
182-
<widget class="QPushButton" name="mChangePatternButton">
183-
<property name="text">
184-
<string>Change</string>
185-
</property>
186-
</widget>
187-
</item>
188-
</layout>
191+
<item row="7" column="1" colspan="2">
192+
<widget class="QgsUnitSelectionWidget" name="mDashPatternUnitWidget" native="true"/>
189193
</item>
190-
<item row="7" column="0">
191-
<widget class="QLabel" name="mDashPatternUnitLabel">
194+
<item row="8" column="0" colspan="3">
195+
<widget class="QCheckBox" name="mDrawInsideCheckBox">
192196
<property name="text">
193-
<string>Dash pattern unit</string>
197+
<string>Draw line only inside polygon</string>
194198
</property>
195199
</widget>
196200
</item>
197-
<item row="11" column="0" colspan="2">
201+
<item row="9" column="0" colspan="3">
198202
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
199203
<property name="sizePolicy">
200204
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -207,19 +211,18 @@
207211
</property>
208212
</widget>
209213
</item>
210-
<item row="9" column="0" colspan="2">
211-
<layout class="QHBoxLayout" name="horizontalLayout_4">
212-
<item>
213-
<widget class="QCheckBox" name="mDrawInsideCheckBox">
214-
<property name="text">
215-
<string>Draw line only inside polygon</string>
216-
</property>
217-
</widget>
218-
</item>
219-
</layout>
220-
</item>
221-
<item row="7" column="1">
222-
<widget class="QgsUnitSelectionWidget" name="mDashPatternUnitWidget" native="true"/>
214+
<item row="10" column="0" colspan="3">
215+
<spacer name="verticalSpacer">
216+
<property name="orientation">
217+
<enum>Qt::Vertical</enum>
218+
</property>
219+
<property name="sizeHint" stdset="0">
220+
<size>
221+
<width>20</width>
222+
<height>40</height>
223+
</size>
224+
</property>
225+
</spacer>
223226
</item>
224227
</layout>
225228
</widget>
@@ -229,28 +232,43 @@
229232
<extends>QToolButton</extends>
230233
<header>qgscolorbuttonv2.h</header>
231234
</customwidget>
232-
<customwidget>
233-
<class>QgsPenJoinStyleComboBox</class>
234-
<extends>QComboBox</extends>
235-
<header>qgspenstylecombobox.h</header>
236-
</customwidget>
237235
<customwidget>
238236
<class>QgsUnitSelectionWidget</class>
239237
<extends>QWidget</extends>
240238
<header>qgsunitselectionwidget.h</header>
241239
<container>1</container>
242240
</customwidget>
243241
<customwidget>
244-
<class>QgsPenCapStyleComboBox</class>
242+
<class>QgsPenStyleComboBox</class>
245243
<extends>QComboBox</extends>
246244
<header>qgspenstylecombobox.h</header>
247245
</customwidget>
248246
<customwidget>
249-
<class>QgsPenStyleComboBox</class>
250-
<extends>QWidget</extends>
247+
<class>QgsPenJoinStyleComboBox</class>
248+
<extends>QComboBox</extends>
249+
<header>qgspenstylecombobox.h</header>
250+
</customwidget>
251+
<customwidget>
252+
<class>QgsPenCapStyleComboBox</class>
253+
<extends>QComboBox</extends>
251254
<header>qgspenstylecombobox.h</header>
252255
</customwidget>
253256
</customwidgets>
257+
<tabstops>
258+
<tabstop>btnChangeColor</tabstop>
259+
<tabstop>spinWidth</tabstop>
260+
<tabstop>mPenWidthUnitWidget</tabstop>
261+
<tabstop>spinOffset</tabstop>
262+
<tabstop>mOffsetUnitWidget</tabstop>
263+
<tabstop>cboPenStyle</tabstop>
264+
<tabstop>cboJoinStyle</tabstop>
265+
<tabstop>cboCapStyle</tabstop>
266+
<tabstop>mCustomCheckBox</tabstop>
267+
<tabstop>mChangePatternButton</tabstop>
268+
<tabstop>mDashPatternUnitWidget</tabstop>
269+
<tabstop>mDrawInsideCheckBox</tabstop>
270+
<tabstop>mDataDefinedPropertiesButton</tabstop>
271+
</tabstops>
254272
<resources/>
255273
<connections/>
256274
</ui>

‎src/ui/symbollayer/widget_simplemarker.ui

100644100755
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
</widget>
141141
</item>
142142
<item row="2" column="1">
143-
<widget class="QgsPenStyleComboBox" name="mOutlineStyleComboBox" native="true"/>
143+
<widget class="QgsPenStyleComboBox" name="mOutlineStyleComboBox"/>
144144
</item>
145145
<item row="3" column="0">
146146
<widget class="QLabel" name="mOutlineWidthLabel">
@@ -368,14 +368,26 @@
368368
</customwidget>
369369
<customwidget>
370370
<class>QgsPenStyleComboBox</class>
371-
<extends>QWidget</extends>
371+
<extends>QComboBox</extends>
372372
<header>qgspenstylecombobox.h</header>
373373
</customwidget>
374374
</customwidgets>
375375
<tabstops>
376-
<tabstop>lstNames</tabstop>
376+
<tabstop>btnChangeColorFill</tabstop>
377+
<tabstop>btnChangeColorBorder</tabstop>
378+
<tabstop>spinSize</tabstop>
379+
<tabstop>mSizeUnitWidget</tabstop>
380+
<tabstop>mOutlineStyleComboBox</tabstop>
381+
<tabstop>mOutlineWidthSpinBox</tabstop>
382+
<tabstop>mOutlineWidthUnitWidget</tabstop>
383+
<tabstop>spinAngle</tabstop>
377384
<tabstop>spinOffsetX</tabstop>
378385
<tabstop>spinOffsetY</tabstop>
386+
<tabstop>mOffsetUnitWidget</tabstop>
387+
<tabstop>mHorizontalAnchorComboBox</tabstop>
388+
<tabstop>mVerticalAnchorComboBox</tabstop>
389+
<tabstop>mDataDefinedPropertiesButton</tabstop>
390+
<tabstop>lstNames</tabstop>
379391
</tabstops>
380392
<resources/>
381393
<connections/>

‎src/ui/symbollayer/widget_svgfill.ui

100644100755
Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,7 @@
9191
</layout>
9292
</item>
9393
<item row="0" column="0">
94-
<layout class="QFormLayout" name="formLayout">
95-
<property name="fieldGrowthPolicy">
96-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
97-
</property>
98-
<property name="labelAlignment">
99-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
100-
</property>
94+
<layout class="QGridLayout" name="gridLayout">
10195
<property name="horizontalSpacing">
10296
<number>28</number>
10397
</property>
@@ -299,6 +293,20 @@
299293
<container>1</container>
300294
</customwidget>
301295
</customwidgets>
296+
<tabstops>
297+
<tabstop>mTextureWidthSpinBox</tabstop>
298+
<tabstop>mTextureWidthUnitWidget</tabstop>
299+
<tabstop>mRotationSpinBox</tabstop>
300+
<tabstop>mChangeColorButton</tabstop>
301+
<tabstop>mChangeBorderColorButton</tabstop>
302+
<tabstop>mBorderWidthSpinBox</tabstop>
303+
<tabstop>mSvgOutlineWidthUnitWidget</tabstop>
304+
<tabstop>mDataDefinedPropertiesButton</tabstop>
305+
<tabstop>mSvgTreeView</tabstop>
306+
<tabstop>mSvgListView</tabstop>
307+
<tabstop>mSVGLineEdit</tabstop>
308+
<tabstop>mBrowseToolButton</tabstop>
309+
</tabstops>
302310
<resources/>
303311
<connections/>
304312
</ui>

‎src/ui/symbollayer/widget_svgmarker.ui

100644100755
Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -305,19 +305,6 @@
305305
</item>
306306
</layout>
307307
</item>
308-
<item row="1" column="0">
309-
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
310-
<property name="sizePolicy">
311-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
312-
<horstretch>0</horstretch>
313-
<verstretch>0</verstretch>
314-
</sizepolicy>
315-
</property>
316-
<property name="text">
317-
<string>Data defined properties...</string>
318-
</property>
319-
</widget>
320-
</item>
321308
<item row="2" column="0">
322309
<widget class="QLabel" name="label_5">
323310
<property name="text">
@@ -388,7 +375,20 @@
388375
</property>
389376
</widget>
390377
</item>
391-
<item row="4" column="0">
378+
<item row="1" column="0" colspan="2">
379+
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
380+
<property name="sizePolicy">
381+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
382+
<horstretch>0</horstretch>
383+
<verstretch>0</verstretch>
384+
</sizepolicy>
385+
</property>
386+
<property name="text">
387+
<string>Data defined properties...</string>
388+
</property>
389+
</widget>
390+
</item>
391+
<item row="4" column="0" colspan="2">
392392
<layout class="QHBoxLayout" name="horizontalLayout_2">
393393
<item>
394394
<widget class="QLineEdit" name="mFileLineEdit"/>
@@ -418,8 +418,23 @@
418418
</customwidget>
419419
</customwidgets>
420420
<tabstops>
421+
<tabstop>spinSize</tabstop>
422+
<tabstop>mSizeUnitWidget</tabstop>
423+
<tabstop>spinAngle</tabstop>
424+
<tabstop>mChangeColorButton</tabstop>
425+
<tabstop>mChangeBorderColorButton</tabstop>
426+
<tabstop>mBorderWidthSpinBox</tabstop>
427+
<tabstop>mBorderWidthUnitWidget</tabstop>
421428
<tabstop>spinOffsetX</tabstop>
422429
<tabstop>spinOffsetY</tabstop>
430+
<tabstop>mOffsetUnitWidget</tabstop>
431+
<tabstop>mHorizontalAnchorComboBox</tabstop>
432+
<tabstop>mVerticalAnchorComboBox</tabstop>
433+
<tabstop>mDataDefinedPropertiesButton</tabstop>
434+
<tabstop>viewGroups</tabstop>
435+
<tabstop>viewImages</tabstop>
436+
<tabstop>mFileLineEdit</tabstop>
437+
<tabstop>mFileToolButton</tabstop>
423438
</tabstops>
424439
<resources/>
425440
<connections/>

‎src/ui/symbollayer/widget_symbolslist.ui

100644100755
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,18 @@
341341
<container>1</container>
342342
</customwidget>
343343
</customwidgets>
344+
<tabstops>
345+
<tabstop>viewSymbols</tabstop>
346+
<tabstop>mSymbolUnitWidget</tabstop>
347+
<tabstop>mTransparencySlider</tabstop>
348+
<tabstop>btnColor</tabstop>
349+
<tabstop>spinSize</tabstop>
350+
<tabstop>spinAngle</tabstop>
351+
<tabstop>groupsCombo</tabstop>
352+
<tabstop>openStyleManagerButton</tabstop>
353+
<tabstop>btnAdvanced</tabstop>
354+
<tabstop>spinWidth</tabstop>
355+
</tabstops>
344356
<resources/>
345357
<connections/>
346358
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.