Skip to content

Commit 25ad0af

Browse files
nyalldawsonnyalldawson
committed
[symbology] Add explanatory text for 0 line widths (fix #9937)
1 parent 8eb79db commit 25ad0af

6 files changed

+53
-26
lines changed

‎src/ui/symbollayer/widget_ellipse.ui

+7-4
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
<property name="singleStep">
233233
<double>0.200000000000000</double>
234234
</property>
235-
<property name="showClearButton">
235+
<property name="showClearButton" stdset="0">
236236
<bool>false</bool>
237237
</property>
238238
</widget>
@@ -266,6 +266,9 @@
266266
<verstretch>0</verstretch>
267267
</sizepolicy>
268268
</property>
269+
<property name="specialValueText">
270+
<string>Hairline</string>
271+
</property>
269272
<property name="decimals">
270273
<number>6</number>
271274
</property>
@@ -275,8 +278,8 @@
275278
<property name="singleStep">
276279
<double>0.200000000000000</double>
277280
</property>
278-
<property name="showClearButton">
279-
<bool>false</bool>
281+
<property name="showClearButton" stdset="0">
282+
<bool>true</bool>
280283
</property>
281284
</widget>
282285
</item>
@@ -437,7 +440,7 @@
437440
<property name="singleStep">
438441
<double>0.200000000000000</double>
439442
</property>
440-
<property name="showClearButton">
443+
<property name="showClearButton" stdset="0">
441444
<bool>false</bool>
442445
</property>
443446
</widget>

‎src/ui/symbollayer/widget_simplefill.ui

+7-4
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@
219219
<verstretch>0</verstretch>
220220
</sizepolicy>
221221
</property>
222+
<property name="specialValueText">
223+
<string>Hairline</string>
224+
</property>
222225
<property name="decimals">
223226
<number>6</number>
224227
</property>
@@ -228,8 +231,8 @@
228231
<property name="singleStep">
229232
<double>0.200000000000000</double>
230233
</property>
231-
<property name="showClearButton">
232-
<bool>false</bool>
234+
<property name="showClearButton" stdset="0">
235+
<bool>true</bool>
233236
</property>
234237
</widget>
235238
</item>
@@ -360,12 +363,12 @@
360363
<container>1</container>
361364
</customwidget>
362365
<customwidget>
363-
<class>QgsPenStyleComboBox</class>
366+
<class>QgsPenJoinStyleComboBox</class>
364367
<extends>QComboBox</extends>
365368
<header>qgspenstylecombobox.h</header>
366369
</customwidget>
367370
<customwidget>
368-
<class>QgsPenJoinStyleComboBox</class>
371+
<class>QgsPenStyleComboBox</class>
369372
<extends>QComboBox</extends>
370373
<header>qgspenstylecombobox.h</header>
371374
</customwidget>

‎src/ui/symbollayer/widget_simpleline.ui

+11-8
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@
114114
<verstretch>0</verstretch>
115115
</sizepolicy>
116116
</property>
117+
<property name="specialValueText">
118+
<string>Hairline</string>
119+
</property>
117120
<property name="decimals">
118121
<number>6</number>
119122
</property>
@@ -127,7 +130,7 @@
127130
<double>1.000000000000000</double>
128131
</property>
129132
<property name="showClearButton" stdset="0">
130-
<bool>false</bool>
133+
<bool>true</bool>
131134
</property>
132135
</widget>
133136
</item>
@@ -309,6 +312,11 @@
309312
<header>qgscolorbuttonv2.h</header>
310313
<container>1</container>
311314
</customwidget>
315+
<customwidget>
316+
<class>QgsDataDefinedButton</class>
317+
<extends>QToolButton</extends>
318+
<header>qgsdatadefinedbutton.h</header>
319+
</customwidget>
312320
<customwidget>
313321
<class>QgsDoubleSpinBox</class>
314322
<extends>QDoubleSpinBox</extends>
@@ -321,17 +329,12 @@
321329
<container>1</container>
322330
</customwidget>
323331
<customwidget>
324-
<class>QgsPenStyleComboBox</class>
332+
<class>QgsPenJoinStyleComboBox</class>
325333
<extends>QComboBox</extends>
326334
<header>qgspenstylecombobox.h</header>
327335
</customwidget>
328336
<customwidget>
329-
<class>QgsDataDefinedButton</class>
330-
<extends>QToolButton</extends>
331-
<header>qgsdatadefinedbutton.h</header>
332-
</customwidget>
333-
<customwidget>
334-
<class>QgsPenJoinStyleComboBox</class>
337+
<class>QgsPenStyleComboBox</class>
335338
<extends>QComboBox</extends>
336339
<header>qgspenstylecombobox.h</header>
337340
</customwidget>

‎src/ui/symbollayer/widget_simplemarker.ui

+7-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>513</width>
9+
<width>517</width>
1010
<height>398</height>
1111
</rect>
1212
</property>
@@ -43,7 +43,7 @@
4343
<property name="value">
4444
<double>1.000000000000000</double>
4545
</property>
46-
<property name="showClearButton">
46+
<property name="showClearButton" stdset="0">
4747
<bool>false</bool>
4848
</property>
4949
</widget>
@@ -80,6 +80,9 @@
8080
<verstretch>0</verstretch>
8181
</sizepolicy>
8282
</property>
83+
<property name="specialValueText">
84+
<string>Hairline</string>
85+
</property>
8386
<property name="decimals">
8487
<number>6</number>
8588
</property>
@@ -89,8 +92,8 @@
8992
<property name="singleStep">
9093
<double>0.200000000000000</double>
9194
</property>
92-
<property name="showClearButton">
93-
<bool>false</bool>
95+
<property name="showClearButton" stdset="0">
96+
<bool>true</bool>
9497
</property>
9598
</widget>
9699
</item>

‎src/ui/symbollayer/widget_svgfill.ui

+16-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout_3">
17-
<property name="margin">
17+
<property name="leftMargin">
18+
<number>1</number>
19+
</property>
20+
<property name="topMargin">
21+
<number>1</number>
22+
</property>
23+
<property name="rightMargin">
24+
<number>1</number>
25+
</property>
26+
<property name="bottomMargin">
1827
<number>1</number>
1928
</property>
2029
<item row="1" column="0">
@@ -155,6 +164,9 @@
155164
<verstretch>0</verstretch>
156165
</sizepolicy>
157166
</property>
167+
<property name="specialValueText">
168+
<string>No outline</string>
169+
</property>
158170
<property name="decimals">
159171
<number>6</number>
160172
</property>
@@ -164,8 +176,8 @@
164176
<property name="singleStep">
165177
<double>0.200000000000000</double>
166178
</property>
167-
<property name="showClearButton">
168-
<bool>false</bool>
179+
<property name="showClearButton" stdset="0">
180+
<bool>true</bool>
169181
</property>
170182
</widget>
171183
</item>
@@ -200,7 +212,7 @@
200212
<property name="singleStep">
201213
<double>0.200000000000000</double>
202214
</property>
203-
<property name="showClearButton">
215+
<property name="showClearButton" stdset="0">
204216
<bool>false</bool>
205217
</property>
206218
</widget>

‎src/ui/symbollayer/widget_svgmarker.ui

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<verstretch>0</verstretch>
2727
</sizepolicy>
2828
</property>
29+
<property name="specialValueText">
30+
<string>No outline</string>
31+
</property>
2932
<property name="decimals">
3033
<number>6</number>
3134
</property>
@@ -38,7 +41,7 @@
3841
<property name="value">
3942
<double>0.200000000000000</double>
4043
</property>
41-
<property name="showClearButton">
44+
<property name="showClearButton" stdset="0">
4245
<bool>false</bool>
4346
</property>
4447
</widget>
@@ -334,7 +337,7 @@
334337
<property name="value">
335338
<double>1.000000000000000</double>
336339
</property>
337-
<property name="showClearButton">
340+
<property name="showClearButton" stdset="0">
338341
<bool>false</bool>
339342
</property>
340343
</widget>

0 commit comments

Comments
 (0)