Skip to content

Commit 0ff10ae

Browse files
NathanW2NathanW2
committedMay 17, 2016
[styledock] more widget changes
·
ltr-3_40archive/master_2
1 parent e92dc26 commit 0ff10ae

16 files changed

+1622
-1684
lines changed
 

‎src/ui/symbollayer/qgsarrowsymbollayerwidgetbase.ui

Lines changed: 116 additions & 117 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>899</width>
10-
<height>471</height>
9+
<width>306</width>
10+
<height>267</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -17,23 +17,41 @@
1717
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Symbols clip the geometry to the current canvas extent by default. This could result in undesired renderings for this kind of symbol layer. Make sure to check the corresponding &amp;quot;Clip features to canvas extent&amp;quot; advanced option of the symbol.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
1818
</property>
1919
<layout class="QGridLayout" name="gridLayout">
20-
<item row="10" column="0">
21-
<spacer name="verticalSpacer">
22-
<property name="orientation">
23-
<enum>Qt::Vertical</enum>
20+
<item row="2" column="0">
21+
<widget class="QLabel" name="label">
22+
<property name="text">
23+
<string>Arrow width at start</string>
2424
</property>
25-
<property name="sizeHint" stdset="0">
26-
<size>
27-
<width>20</width>
28-
<height>40</height>
29-
</size>
25+
</widget>
26+
</item>
27+
<item row="2" column="2">
28+
<widget class="QgsDataDefinedButton" name="mArrowStartWidthDDBtn">
29+
<property name="text">
30+
<string>...</string>
3031
</property>
31-
</spacer>
32+
</widget>
3233
</item>
33-
<item row="7" column="1" colspan="2">
34-
<layout class="QHBoxLayout" name="horizontalLayout_7">
34+
<item row="1" column="0">
35+
<widget class="QLabel" name="label_8">
36+
<property name="text">
37+
<string>Arrow width</string>
38+
</property>
39+
<property name="alignment">
40+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
41+
</property>
42+
</widget>
43+
</item>
44+
<item row="4" column="2">
45+
<widget class="QgsDataDefinedButton" name="mOffsetDDBtn">
46+
<property name="text">
47+
<string>...</string>
48+
</property>
49+
</widget>
50+
</item>
51+
<item row="1" column="1">
52+
<layout class="QHBoxLayout" name="horizontalLayout_6">
3553
<item>
36-
<widget class="QgsDoubleSpinBox" name="mHeadSizeSpin">
54+
<widget class="QgsDoubleSpinBox" name="mArrowWidthSpin">
3755
<property name="sizePolicy">
3856
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
3957
<horstretch>1</horstretch>
@@ -55,18 +73,42 @@
5573
</widget>
5674
</item>
5775
<item>
58-
<widget class="QgsDataDefinedButton" name="mHeadSizeDDBtn">
59-
<property name="text">
60-
<string>...</string>
61-
</property>
62-
</widget>
63-
</item>
64-
<item>
65-
<widget class="QgsUnitSelectionWidget" name="mHeadSizeUnitWidget" native="true"/>
76+
<widget class="QgsUnitSelectionWidget" name="mArrowWidthUnitWidget" native="true"/>
6677
</item>
6778
</layout>
6879
</item>
69-
<item row="9" column="1" colspan="2">
80+
<item row="3" column="2">
81+
<widget class="QgsDataDefinedButton" name="mHeadSizeDDBtn">
82+
<property name="text">
83+
<string>...</string>
84+
</property>
85+
</widget>
86+
</item>
87+
<item row="4" column="0">
88+
<widget class="QLabel" name="label_6">
89+
<property name="text">
90+
<string>Offset</string>
91+
</property>
92+
<property name="alignment">
93+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
94+
</property>
95+
</widget>
96+
</item>
97+
<item row="0" column="0">
98+
<widget class="QLabel" name="label_10">
99+
<property name="text">
100+
<string>Head type</string>
101+
</property>
102+
</widget>
103+
</item>
104+
<item row="0" column="2">
105+
<widget class="QgsDataDefinedButton" name="mHeadTypeDDBtn">
106+
<property name="text">
107+
<string>...</string>
108+
</property>
109+
</widget>
110+
</item>
111+
<item row="5" column="1">
70112
<widget class="QCheckBox" name="mCurvedArrowChck">
71113
<property name="text">
72114
<string>Curved arrows</string>
@@ -79,7 +121,17 @@
79121
</property>
80122
</widget>
81123
</item>
82-
<item row="8" column="1" colspan="2">
124+
<item row="3" column="0">
125+
<widget class="QLabel" name="label_9">
126+
<property name="text">
127+
<string>Head size</string>
128+
</property>
129+
<property name="alignment">
130+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
131+
</property>
132+
</widget>
133+
</item>
134+
<item row="4" column="1">
83135
<layout class="QHBoxLayout" name="horizontalLayout">
84136
<item>
85137
<widget class="QgsDoubleSpinBox" name="mOffsetSpin">
@@ -103,13 +155,6 @@
103155
</property>
104156
</widget>
105157
</item>
106-
<item>
107-
<widget class="QgsDataDefinedButton" name="mOffsetDDBtn">
108-
<property name="text">
109-
<string/>
110-
</property>
111-
</widget>
112-
</item>
113158
<item>
114159
<widget class="QgsUnitSelectionWidget" name="mOffsetUnitWidget" native="true">
115160
<property name="focusPolicy">
@@ -119,17 +164,20 @@
119164
</item>
120165
</layout>
121166
</item>
122-
<item row="7" column="0">
123-
<widget class="QLabel" name="label_9">
124-
<property name="text">
125-
<string>Head size</string>
167+
<item row="6" column="0">
168+
<spacer name="verticalSpacer">
169+
<property name="orientation">
170+
<enum>Qt::Vertical</enum>
126171
</property>
127-
<property name="alignment">
128-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
172+
<property name="sizeHint" stdset="0">
173+
<size>
174+
<width>20</width>
175+
<height>40</height>
176+
</size>
129177
</property>
130-
</widget>
178+
</spacer>
131179
</item>
132-
<item row="5" column="1" colspan="2">
180+
<item row="2" column="1">
133181
<layout class="QHBoxLayout" name="horizontalLayout_9">
134182
<item>
135183
<widget class="QgsDoubleSpinBox" name="mArrowStartWidthSpin">
@@ -153,86 +201,22 @@
153201
</property>
154202
</widget>
155203
</item>
156-
<item>
157-
<widget class="QgsDataDefinedButton" name="mArrowStartWidthDDBtn">
158-
<property name="text">
159-
<string>...</string>
160-
</property>
161-
</widget>
162-
</item>
163204
<item>
164205
<widget class="QgsUnitSelectionWidget" name="mArrowStartWidthUnitWidget" native="true"/>
165206
</item>
166207
</layout>
167208
</item>
168-
<item row="0" column="1" colspan="2">
169-
<layout class="QHBoxLayout" name="horizontalLayout_8">
170-
<item>
171-
<widget class="QComboBox" name="mHeadTypeCombo">
172-
<item>
173-
<property name="text">
174-
<string>Single</string>
175-
</property>
176-
</item>
177-
<item>
178-
<property name="text">
179-
<string>Single, reversed</string>
180-
</property>
181-
</item>
182-
<item>
183-
<property name="text">
184-
<string>Double</string>
185-
</property>
186-
</item>
187-
</widget>
188-
</item>
189-
<item>
190-
<widget class="QgsDataDefinedButton" name="mHeadTypeDDBtn">
191-
<property name="text">
192-
<string>...</string>
193-
</property>
194-
</widget>
195-
</item>
196-
</layout>
197-
</item>
198-
<item row="8" column="0">
199-
<widget class="QLabel" name="label_6">
209+
<item row="1" column="2">
210+
<widget class="QgsDataDefinedButton" name="mArrowWidthDDBtn">
200211
<property name="text">
201-
<string>Offset</string>
202-
</property>
203-
<property name="alignment">
204-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
212+
<string>...</string>
205213
</property>
206214
</widget>
207215
</item>
208-
<item row="5" column="0">
209-
<widget class="QLabel" name="label">
210-
<property name="text">
211-
<string>Arrow width at start</string>
212-
</property>
213-
</widget>
214-
</item>
215-
<item row="0" column="0">
216-
<widget class="QLabel" name="label_10">
217-
<property name="text">
218-
<string>Head type</string>
219-
</property>
220-
</widget>
221-
</item>
222-
<item row="4" column="0">
223-
<widget class="QLabel" name="label_8">
224-
<property name="text">
225-
<string>Arrow width</string>
226-
</property>
227-
<property name="alignment">
228-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
229-
</property>
230-
</widget>
231-
</item>
232-
<item row="4" column="1" colspan="2">
233-
<layout class="QHBoxLayout" name="horizontalLayout_6">
216+
<item row="3" column="1">
217+
<layout class="QHBoxLayout" name="horizontalLayout_7">
234218
<item>
235-
<widget class="QgsDoubleSpinBox" name="mArrowWidthSpin">
219+
<widget class="QgsDoubleSpinBox" name="mHeadSizeSpin">
236220
<property name="sizePolicy">
237221
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
238222
<horstretch>1</horstretch>
@@ -254,14 +238,30 @@
254238
</widget>
255239
</item>
256240
<item>
257-
<widget class="QgsDataDefinedButton" name="mArrowWidthDDBtn">
258-
<property name="text">
259-
<string>...</string>
260-
</property>
261-
</widget>
241+
<widget class="QgsUnitSelectionWidget" name="mHeadSizeUnitWidget" native="true"/>
262242
</item>
243+
</layout>
244+
</item>
245+
<item row="0" column="1">
246+
<layout class="QHBoxLayout" name="horizontalLayout_8">
263247
<item>
264-
<widget class="QgsUnitSelectionWidget" name="mArrowWidthUnitWidget" native="true"/>
248+
<widget class="QComboBox" name="mHeadTypeCombo">
249+
<item>
250+
<property name="text">
251+
<string>Single</string>
252+
</property>
253+
</item>
254+
<item>
255+
<property name="text">
256+
<string>Single, reversed</string>
257+
</property>
258+
</item>
259+
<item>
260+
<property name="text">
261+
<string>Double</string>
262+
</property>
263+
</item>
264+
</widget>
265265
</item>
266266
</layout>
267267
</item>
@@ -286,7 +286,6 @@
286286
</customwidget>
287287
</customwidgets>
288288
<tabstops>
289-
<tabstop>mArrowWidthDDBtn</tabstop>
290289
<tabstop>mOffsetSpin</tabstop>
291290
<tabstop>mOffsetUnitWidget</tabstop>
292291
</tabstops>

‎src/ui/symbollayer/widget_ellipse.ui

Lines changed: 2 additions & 2 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>386</width>
10-
<height>660</height>
9+
<width>305</width>
10+
<height>680</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_filledmarker.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>275</width>
10-
<height>532</height>
10+
<height>312</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_gradientfill.ui

Lines changed: 347 additions & 368 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_linepatternfill.ui

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,68 +6,36 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>247</width>
10-
<height>176</height>
9+
<width>245</width>
10+
<height>163</height>
1111
</rect>
1212
</property>
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>
29-
<item row="1" column="0">
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="0" column="0">
3018
<widget class="QLabel" name="mRotationLabel">
3119
<property name="text">
3220
<string>Rotation</string>
3321
</property>
3422
</widget>
3523
</item>
36-
<item row="1" column="1">
37-
<layout class="QHBoxLayout" name="horizontalLayout_2">
38-
<item>
39-
<widget class="QgsDoubleSpinBox" name="mAngleSpinBox">
40-
<property name="suffix">
41-
<string> °</string>
42-
</property>
43-
<property name="maximum">
44-
<double>360.000000000000000</double>
45-
</property>
46-
<property name="singleStep">
47-
<double>0.500000000000000</double>
48-
</property>
49-
<property name="showClearButton" stdset="0">
50-
<bool>true</bool>
51-
</property>
52-
</widget>
53-
</item>
54-
<item>
55-
<widget class="QgsDataDefinedButton" name="mAngleDDBtn">
56-
<property name="text">
57-
<string>...</string>
58-
</property>
59-
</widget>
60-
</item>
61-
</layout>
24+
<item row="0" column="2">
25+
<widget class="QgsDataDefinedButton" name="mAngleDDBtn">
26+
<property name="text">
27+
<string>...</string>
28+
</property>
29+
</widget>
6230
</item>
63-
<item row="3" column="0">
31+
<item row="1" column="0">
6432
<widget class="QLabel" name="mDistanceLabel">
6533
<property name="text">
6634
<string>Distance</string>
6735
</property>
6836
</widget>
6937
</item>
70-
<item row="3" column="1">
38+
<item row="1" column="1">
7139
<layout class="QHBoxLayout" name="horizontalLayout">
7240
<item>
7341
<widget class="QgsDoubleSpinBox" name="mDistanceSpinBox">
@@ -91,13 +59,6 @@
9159
</property>
9260
</widget>
9361
</item>
94-
<item>
95-
<widget class="QgsDataDefinedButton" name="mDistanceDDBtn">
96-
<property name="text">
97-
<string>...</string>
98-
</property>
99-
</widget>
100-
</item>
10162
<item>
10263
<widget class="QgsUnitSelectionWidget" name="mDistanceUnitWidget" native="true">
10364
<property name="minimumSize">
@@ -110,14 +71,14 @@
11071
</item>
11172
</layout>
11273
</item>
113-
<item row="4" column="0">
74+
<item row="2" column="0">
11475
<widget class="QLabel" name="mOffsetLabel">
11576
<property name="text">
11677
<string>Offset</string>
11778
</property>
11879
</widget>
11980
</item>
120-
<item row="4" column="1">
81+
<item row="2" column="1">
12182
<layout class="QHBoxLayout" name="horizontalLayout_4">
12283
<item>
12384
<widget class="QgsDoubleSpinBox" name="mOffsetSpinBox">
@@ -149,6 +110,46 @@
149110
</item>
150111
</layout>
151112
</item>
113+
<item row="1" column="2">
114+
<widget class="QgsDataDefinedButton" name="mDistanceDDBtn">
115+
<property name="text">
116+
<string>...</string>
117+
</property>
118+
</widget>
119+
</item>
120+
<item row="0" column="1">
121+
<layout class="QHBoxLayout" name="horizontalLayout_2">
122+
<item>
123+
<widget class="QgsDoubleSpinBox" name="mAngleSpinBox">
124+
<property name="suffix">
125+
<string> °</string>
126+
</property>
127+
<property name="maximum">
128+
<double>360.000000000000000</double>
129+
</property>
130+
<property name="singleStep">
131+
<double>0.500000000000000</double>
132+
</property>
133+
<property name="showClearButton" stdset="0">
134+
<bool>true</bool>
135+
</property>
136+
</widget>
137+
</item>
138+
</layout>
139+
</item>
140+
<item row="3" column="1">
141+
<spacer name="verticalSpacer">
142+
<property name="orientation">
143+
<enum>Qt::Vertical</enum>
144+
</property>
145+
<property name="sizeHint" stdset="0">
146+
<size>
147+
<width>20</width>
148+
<height>40</height>
149+
</size>
150+
</property>
151+
</spacer>
152+
</item>
152153
</layout>
153154
</widget>
154155
<customwidgets>

‎src/ui/symbollayer/widget_markerline.ui

Lines changed: 48 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@
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>
16+
<layout class="QGridLayout" name="gridLayout_2">
2317
<property name="leftMargin">
2418
<number>1</number>
2519
</property>
@@ -35,24 +29,41 @@
3529
<string>Marker placement</string>
3630
</property>
3731
<layout class="QGridLayout" name="gridLayout">
32+
<item row="4" column="1">
33+
<widget class="QRadioButton" name="radCentralPoint">
34+
<property name="text">
35+
<string>on central point</string>
36+
</property>
37+
</widget>
38+
</item>
3839
<item row="1" column="1">
3940
<widget class="QRadioButton" name="radVertex">
4041
<property name="text">
4142
<string>on every vertex</string>
4243
</property>
4344
</widget>
4445
</item>
45-
<item row="6" column="1">
46-
<layout class="QHBoxLayout" name="horizontalLayout">
46+
<item row="5" column="1">
47+
<widget class="QRadioButton" name="radCurvePoint">
48+
<property name="text">
49+
<string>on every curve point</string>
50+
</property>
51+
</widget>
52+
</item>
53+
<item row="0" column="1">
54+
<layout class="QHBoxLayout" name="horizontalLayout_4">
4755
<item>
48-
<widget class="QLabel" name="label">
56+
<widget class="QRadioButton" name="radInterval">
4957
<property name="text">
50-
<string>Offset along line</string>
58+
<string>with interval</string>
59+
</property>
60+
<property name="checked">
61+
<bool>true</bool>
5162
</property>
5263
</widget>
5364
</item>
5465
<item>
55-
<widget class="QgsDoubleSpinBox" name="mSpinOffsetAlongLine">
66+
<widget class="QgsDoubleSpinBox" name="spinInterval">
5667
<property name="sizePolicy">
5768
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
5869
<horstretch>1</horstretch>
@@ -71,17 +82,13 @@
7182
<property name="value">
7283
<double>1.000000000000000</double>
7384
</property>
74-
</widget>
75-
</item>
76-
<item>
77-
<widget class="QgsDataDefinedButton" name="mOffsetAlongLineDDBtn">
78-
<property name="text">
79-
<string>...</string>
85+
<property name="showClearButton" stdset="0">
86+
<bool>false</bool>
8087
</property>
8188
</widget>
8289
</item>
8390
<item>
84-
<widget class="QgsUnitSelectionWidget" name="mOffsetAlongLineUnitWidget" native="true">
91+
<widget class="QgsUnitSelectionWidget" name="mIntervalUnitWidget" native="true">
8592
<property name="minimumSize">
8693
<size>
8794
<width>0</width>
@@ -92,20 +99,24 @@
9299
</item>
93100
</layout>
94101
</item>
95-
<item row="0" column="1">
96-
<layout class="QHBoxLayout" name="horizontalLayout_4">
102+
<item row="2" column="1">
103+
<widget class="QRadioButton" name="radVertexLast">
104+
<property name="text">
105+
<string>on last vertex only</string>
106+
</property>
107+
</widget>
108+
</item>
109+
<item row="6" column="1">
110+
<layout class="QHBoxLayout" name="horizontalLayout">
97111
<item>
98-
<widget class="QRadioButton" name="radInterval">
112+
<widget class="QLabel" name="label">
99113
<property name="text">
100-
<string>with interval</string>
101-
</property>
102-
<property name="checked">
103-
<bool>true</bool>
114+
<string>Offset along line</string>
104115
</property>
105116
</widget>
106117
</item>
107118
<item>
108-
<widget class="QgsDoubleSpinBox" name="spinInterval">
119+
<widget class="QgsDoubleSpinBox" name="mSpinOffsetAlongLine">
109120
<property name="sizePolicy">
110121
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
111122
<horstretch>1</horstretch>
@@ -124,20 +135,10 @@
124135
<property name="value">
125136
<double>1.000000000000000</double>
126137
</property>
127-
<property name="showClearButton" stdset="0">
128-
<bool>false</bool>
129-
</property>
130138
</widget>
131139
</item>
132140
<item>
133-
<widget class="QgsDataDefinedButton" name="mIntervalDDBtn">
134-
<property name="text">
135-
<string>...</string>
136-
</property>
137-
</widget>
138-
</item>
139-
<item>
140-
<widget class="QgsUnitSelectionWidget" name="mIntervalUnitWidget" native="true">
141+
<widget class="QgsUnitSelectionWidget" name="mOffsetAlongLineUnitWidget" native="true">
141142
<property name="minimumSize">
142143
<size>
143144
<width>0</width>
@@ -162,24 +163,17 @@
162163
</property>
163164
</widget>
164165
</item>
165-
<item row="2" column="1">
166-
<widget class="QRadioButton" name="radVertexLast">
167-
<property name="text">
168-
<string>on last vertex only</string>
169-
</property>
170-
</widget>
171-
</item>
172-
<item row="4" column="1">
173-
<widget class="QRadioButton" name="radCentralPoint">
166+
<item row="0" column="2">
167+
<widget class="QgsDataDefinedButton" name="mIntervalDDBtn">
174168
<property name="text">
175-
<string>on central point</string>
169+
<string>...</string>
176170
</property>
177171
</widget>
178172
</item>
179-
<item row="5" column="1">
180-
<widget class="QRadioButton" name="radCurvePoint">
173+
<item row="6" column="2">
174+
<widget class="QgsDataDefinedButton" name="mOffsetAlongLineDDBtn">
181175
<property name="text">
182-
<string>on every curve point</string>
176+
<string>...</string>
183177
</property>
184178
</widget>
185179
</item>
@@ -193,14 +187,14 @@
193187
</property>
194188
</widget>
195189
</item>
196-
<item row="3" column="0">
190+
<item row="2" column="0">
197191
<widget class="QLabel" name="label_3">
198192
<property name="text">
199193
<string>Line offset</string>
200194
</property>
201195
</widget>
202196
</item>
203-
<item row="3" column="1">
197+
<item row="2" column="1">
204198
<layout class="QHBoxLayout" name="horizontalLayout_3">
205199
<item>
206200
<widget class="QgsDoubleSpinBox" name="spinOffset">
@@ -243,7 +237,7 @@
243237
</item>
244238
</layout>
245239
</item>
246-
<item row="4" column="0">
240+
<item row="3" column="0" colspan="2">
247241
<spacer name="verticalSpacer">
248242
<property name="orientation">
249243
<enum>Qt::Vertical</enum>
@@ -280,17 +274,14 @@
280274
<tabstop>mPlacementDDBtn</tabstop>
281275
<tabstop>radInterval</tabstop>
282276
<tabstop>spinInterval</tabstop>
283-
<tabstop>mIntervalDDBtn</tabstop>
284277
<tabstop>radVertex</tabstop>
285278
<tabstop>radVertexLast</tabstop>
286279
<tabstop>radVertexFirst</tabstop>
287280
<tabstop>radCentralPoint</tabstop>
288281
<tabstop>radCurvePoint</tabstop>
289282
<tabstop>mSpinOffsetAlongLine</tabstop>
290-
<tabstop>mOffsetAlongLineDDBtn</tabstop>
291283
<tabstop>chkRotateMarker</tabstop>
292284
<tabstop>spinOffset</tabstop>
293-
<tabstop>mLineOffsetDDBtn</tabstop>
294285
</tabstops>
295286
<resources/>
296287
<connections/>

‎src/ui/symbollayer/widget_pointpatternfill.ui

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,32 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>337</width>
10-
<height>189</height>
9+
<width>331</width>
10+
<height>198</height>
1111
</rect>
1212
</property>
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">
2917
<item row="0" column="0">
3018
<widget class="QLabel" name="mHorizontalDistanceLabel">
3119
<property name="text">
3220
<string>Horizontal distance</string>
3321
</property>
3422
</widget>
3523
</item>
36-
<item row="0" column="1">
37-
<layout class="QHBoxLayout" name="horizontalLayout">
24+
<item row="2" column="0">
25+
<widget class="QLabel" name="mHorizontalDisplacementLabel">
26+
<property name="text">
27+
<string>Horizontal displacement</string>
28+
</property>
29+
</widget>
30+
</item>
31+
<item row="1" column="1">
32+
<layout class="QHBoxLayout" name="horizontalLayout_2">
3833
<item>
39-
<widget class="QgsDoubleSpinBox" name="mHorizontalDistanceSpinBox">
34+
<widget class="QgsDoubleSpinBox" name="mVerticalDistanceSpinBox">
4035
<property name="sizePolicy">
4136
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
4237
<horstretch>1</horstretch>
@@ -47,7 +42,7 @@
4742
<number>6</number>
4843
</property>
4944
<property name="maximum">
50-
<double>99999999.989999994635582</double>
45+
<double>999999999.990000009536743</double>
5146
</property>
5247
<property name="singleStep">
5348
<double>0.200000000000000</double>
@@ -58,35 +53,28 @@
5853
</widget>
5954
</item>
6055
<item>
61-
<widget class="QgsDataDefinedButton" name="mHorizontalDistanceDDBtn">
62-
<property name="text">
63-
<string>...</string>
64-
</property>
65-
</widget>
66-
</item>
67-
<item>
68-
<widget class="QgsUnitSelectionWidget" name="mHorizontalDistanceUnitWidget" native="true">
69-
<property name="minimumSize">
70-
<size>
71-
<width>0</width>
72-
<height>0</height>
73-
</size>
74-
</property>
75-
</widget>
56+
<widget class="QgsUnitSelectionWidget" name="mVerticalDistanceUnitWidget" native="true"/>
7657
</item>
7758
</layout>
7859
</item>
79-
<item row="1" column="0">
80-
<widget class="QLabel" name="mVerticalDistanceLabel">
60+
<item row="1" column="2">
61+
<widget class="QgsDataDefinedButton" name="mVerticalDistanceDDBtn">
8162
<property name="text">
82-
<string>Vertical distance</string>
63+
<string>...</string>
8364
</property>
8465
</widget>
8566
</item>
86-
<item row="1" column="1">
87-
<layout class="QHBoxLayout" name="horizontalLayout_2">
67+
<item row="3" column="0">
68+
<widget class="QLabel" name="mVerticalDisplacementLabel">
69+
<property name="text">
70+
<string>Vertical displacement</string>
71+
</property>
72+
</widget>
73+
</item>
74+
<item row="3" column="1">
75+
<layout class="QHBoxLayout" name="horizontalLayout_5">
8876
<item>
89-
<widget class="QgsDoubleSpinBox" name="mVerticalDistanceSpinBox">
77+
<widget class="QgsDoubleSpinBox" name="mVerticalDisplacementSpinBox">
9078
<property name="sizePolicy">
9179
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
9280
<horstretch>1</horstretch>
@@ -97,32 +85,39 @@
9785
<number>6</number>
9886
</property>
9987
<property name="maximum">
100-
<double>999999999.990000009536743</double>
88+
<double>99999999.989999994635582</double>
10189
</property>
10290
<property name="singleStep">
10391
<double>0.200000000000000</double>
10492
</property>
10593
<property name="showClearButton" stdset="0">
106-
<bool>false</bool>
94+
<bool>true</bool>
10795
</property>
10896
</widget>
10997
</item>
11098
<item>
111-
<widget class="QgsDataDefinedButton" name="mVerticalDistanceDDBtn">
112-
<property name="text">
113-
<string>...</string>
99+
<widget class="QgsUnitSelectionWidget" name="mVerticalDisplacementUnitWidget" native="true">
100+
<property name="minimumSize">
101+
<size>
102+
<width>0</width>
103+
<height>0</height>
104+
</size>
114105
</property>
115106
</widget>
116107
</item>
117-
<item>
118-
<widget class="QgsUnitSelectionWidget" name="mVerticalDistanceUnitWidget" native="true"/>
119-
</item>
120108
</layout>
121109
</item>
122-
<item row="2" column="0">
123-
<widget class="QLabel" name="mHorizontalDisplacementLabel">
110+
<item row="0" column="2">
111+
<widget class="QgsDataDefinedButton" name="mHorizontalDistanceDDBtn">
124112
<property name="text">
125-
<string>Horizontal displacement</string>
113+
<string>...</string>
114+
</property>
115+
</widget>
116+
</item>
117+
<item row="1" column="0">
118+
<widget class="QLabel" name="mVerticalDistanceLabel">
119+
<property name="text">
120+
<string>Vertical distance</string>
126121
</property>
127122
</widget>
128123
</item>
@@ -150,13 +145,6 @@
150145
</property>
151146
</widget>
152147
</item>
153-
<item>
154-
<widget class="QgsDataDefinedButton" name="mHorizontalDisplacementDDBtn">
155-
<property name="text">
156-
<string>...</string>
157-
</property>
158-
</widget>
159-
</item>
160148
<item>
161149
<widget class="QgsUnitSelectionWidget" name="mHorizontalDisplacementUnitWidget" native="true">
162150
<property name="minimumSize">
@@ -169,17 +157,17 @@
169157
</item>
170158
</layout>
171159
</item>
172-
<item row="3" column="0">
173-
<widget class="QLabel" name="mVerticalDisplacementLabel">
160+
<item row="2" column="2">
161+
<widget class="QgsDataDefinedButton" name="mHorizontalDisplacementDDBtn">
174162
<property name="text">
175-
<string>Vertical displacement</string>
163+
<string>...</string>
176164
</property>
177165
</widget>
178166
</item>
179-
<item row="3" column="1">
180-
<layout class="QHBoxLayout" name="horizontalLayout_5">
167+
<item row="0" column="1">
168+
<layout class="QHBoxLayout" name="horizontalLayout">
181169
<item>
182-
<widget class="QgsDoubleSpinBox" name="mVerticalDisplacementSpinBox">
170+
<widget class="QgsDoubleSpinBox" name="mHorizontalDistanceSpinBox">
183171
<property name="sizePolicy">
184172
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
185173
<horstretch>1</horstretch>
@@ -196,19 +184,12 @@
196184
<double>0.200000000000000</double>
197185
</property>
198186
<property name="showClearButton" stdset="0">
199-
<bool>true</bool>
200-
</property>
201-
</widget>
202-
</item>
203-
<item>
204-
<widget class="QgsDataDefinedButton" name="mVerticalDisplacementDDBtn">
205-
<property name="text">
206-
<string>...</string>
187+
<bool>false</bool>
207188
</property>
208189
</widget>
209190
</item>
210191
<item>
211-
<widget class="QgsUnitSelectionWidget" name="mVerticalDisplacementUnitWidget" native="true">
192+
<widget class="QgsUnitSelectionWidget" name="mHorizontalDistanceUnitWidget" native="true">
212193
<property name="minimumSize">
213194
<size>
214195
<width>0</width>
@@ -219,6 +200,26 @@
219200
</item>
220201
</layout>
221202
</item>
203+
<item row="3" column="2">
204+
<widget class="QgsDataDefinedButton" name="mVerticalDisplacementDDBtn">
205+
<property name="text">
206+
<string>...</string>
207+
</property>
208+
</widget>
209+
</item>
210+
<item row="4" column="0" colspan="2">
211+
<spacer name="verticalSpacer">
212+
<property name="orientation">
213+
<enum>Qt::Vertical</enum>
214+
</property>
215+
<property name="sizeHint" stdset="0">
216+
<size>
217+
<width>20</width>
218+
<height>40</height>
219+
</size>
220+
</property>
221+
</spacer>
222+
</item>
222223
</layout>
223224
</widget>
224225
<customwidgets>

‎src/ui/symbollayer/widget_rasterfill.ui

Lines changed: 153 additions & 144 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_set_dd_value.ui

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,14 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>400</width>
10-
<height>99</height>
9+
<width>194</width>
10+
<height>78</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Dialog</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="0">
18-
<widget class="QLabel" name="mLabel">
19-
<property name="text">
20-
<string>Label</string>
21-
</property>
22-
</widget>
23-
</item>
2417
<item row="0" column="1">
2518
<widget class="QgsDoubleSpinBox" name="mSpinBox">
2619
<property name="maximum">
@@ -35,6 +28,13 @@
3528
</property>
3629
</widget>
3730
</item>
31+
<item row="0" column="0">
32+
<widget class="QLabel" name="mLabel">
33+
<property name="text">
34+
<string>Label</string>
35+
</property>
36+
</widget>
37+
</item>
3838
<item row="1" column="0" colspan="3">
3939
<widget class="QDialogButtonBox" name="buttonBox">
4040
<property name="orientation">
@@ -48,16 +48,16 @@
4848
</layout>
4949
</widget>
5050
<customwidgets>
51-
<customwidget>
52-
<class>QgsDoubleSpinBox</class>
53-
<extends>QDoubleSpinBox</extends>
54-
<header>qgsdoublespinbox.h</header>
55-
</customwidget>
5651
<customwidget>
5752
<class>QgsDataDefinedButton</class>
5853
<extends>QToolButton</extends>
5954
<header>qgsdatadefinedbutton.h</header>
6055
</customwidget>
56+
<customwidget>
57+
<class>QgsDoubleSpinBox</class>
58+
<extends>QDoubleSpinBox</extends>
59+
<header>qgsdoublespinbox.h</header>
60+
</customwidget>
6161
</customwidgets>
6262
<resources/>
6363
<connections>

‎src/ui/symbollayer/widget_shapeburstfill.ui

Lines changed: 320 additions & 298 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_simplefill.ui

Lines changed: 198 additions & 205 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_simpleline.ui

Lines changed: 138 additions & 166 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_simplemarker.ui

Lines changed: 2 additions & 2 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>524</width>
10-
<height>758</height>
9+
<width>305</width>
10+
<height>637</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/ui/symbollayer/widget_svgfill.ui

Lines changed: 152 additions & 172 deletions
Large diffs are not rendered by default.

‎src/ui/symbollayer/widget_svgmarker.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>311</width>
9+
<width>275</width>
1010
<height>663</height>
1111
</rect>
1212
</property>

‎src/ui/symbollayer/widget_svgselector.ui

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,15 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>499</width>
9+
<width>315</width>
1010
<height>490</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
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">
17+
<property name="margin">
2718
<number>0</number>
2819
</property>
2920
<item row="1" column="1">

0 commit comments

Comments
 (0)
Please sign in to comment.