Skip to content

Commit 31c055d

Browse files
nyalldawsonnyalldawson
committed
Fix some alignment and tab issues with symbol dialogs (refs #11060)
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/>

0 commit comments

Comments
 (0)