Skip to content

Commit 2aa523d

Browse files
alexbruyalexbruy
committed
increase maximum value for outline width in symbols widgets (fix #14094)
1 parent 32423a3 commit 2aa523d

File tree

5 files changed

+45
-51
lines changed

5 files changed

+45
-51
lines changed

‎src/ui/symbollayer/widget_ellipse.ui

+9-9
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
<property name="singleStep">
223223
<double>0.200000000000000</double>
224224
</property>
225-
<property name="showClearButton" stdset="0">
225+
<property name="showClearButton">
226226
<bool>false</bool>
227227
</property>
228228
</widget>
@@ -260,12 +260,12 @@
260260
<number>6</number>
261261
</property>
262262
<property name="maximum">
263-
<double>999999999.000000000000000</double>
263+
<double>999999999.999999046325684</double>
264264
</property>
265265
<property name="singleStep">
266266
<double>0.200000000000000</double>
267267
</property>
268-
<property name="showClearButton" stdset="0">
268+
<property name="showClearButton">
269269
<bool>false</bool>
270270
</property>
271271
</widget>
@@ -437,7 +437,7 @@
437437
<property name="singleStep">
438438
<double>0.200000000000000</double>
439439
</property>
440-
<property name="showClearButton" stdset="0">
440+
<property name="showClearButton">
441441
<bool>false</bool>
442442
</property>
443443
</widget>
@@ -553,6 +553,11 @@
553553
<header>qgscolorbuttonv2.h</header>
554554
<container>1</container>
555555
</customwidget>
556+
<customwidget>
557+
<class>QgsDataDefinedButton</class>
558+
<extends>QToolButton</extends>
559+
<header>qgsdatadefinedbutton.h</header>
560+
</customwidget>
556561
<customwidget>
557562
<class>QgsDoubleSpinBox</class>
558563
<extends>QDoubleSpinBox</extends>
@@ -569,11 +574,6 @@
569574
<extends>QComboBox</extends>
570575
<header>qgspenstylecombobox.h</header>
571576
</customwidget>
572-
<customwidget>
573-
<class>QgsDataDefinedButton</class>
574-
<extends>QToolButton</extends>
575-
<header>qgsdatadefinedbutton.h</header>
576-
</customwidget>
577577
</customwidgets>
578578
<tabstops>
579579
<tabstop>btnChangeColorFill</tabstop>

‎src/ui/symbollayer/widget_simplefill.ui

+7-7
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@
223223
<number>6</number>
224224
</property>
225225
<property name="maximum">
226-
<double>100000.000000000000000</double>
226+
<double>999999999.999999046325684</double>
227227
</property>
228228
<property name="singleStep">
229229
<double>0.200000000000000</double>
230230
</property>
231-
<property name="showClearButton" stdset="0">
231+
<property name="showClearButton">
232232
<bool>false</bool>
233233
</property>
234234
</widget>
@@ -343,6 +343,11 @@
343343
<header>qgscolorbuttonv2.h</header>
344344
<container>1</container>
345345
</customwidget>
346+
<customwidget>
347+
<class>QgsDataDefinedButton</class>
348+
<extends>QToolButton</extends>
349+
<header>qgsdatadefinedbutton.h</header>
350+
</customwidget>
346351
<customwidget>
347352
<class>QgsDoubleSpinBox</class>
348353
<extends>QDoubleSpinBox</extends>
@@ -359,11 +364,6 @@
359364
<extends>QComboBox</extends>
360365
<header>qgspenstylecombobox.h</header>
361366
</customwidget>
362-
<customwidget>
363-
<class>QgsDataDefinedButton</class>
364-
<extends>QToolButton</extends>
365-
<header>qgsdatadefinedbutton.h</header>
366-
</customwidget>
367367
<customwidget>
368368
<class>QgsPenJoinStyleComboBox</class>
369369
<extends>QComboBox</extends>

‎src/ui/symbollayer/widget_simplemarker.ui

+10-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<property name="value">
4444
<double>1.000000000000000</double>
4545
</property>
46-
<property name="showClearButton" stdset="0">
46+
<property name="showClearButton">
4747
<bool>false</bool>
4848
</property>
4949
</widget>
@@ -83,10 +83,13 @@
8383
<property name="decimals">
8484
<number>6</number>
8585
</property>
86+
<property name="maximum">
87+
<double>999999999.999999046325684</double>
88+
</property>
8689
<property name="singleStep">
8790
<double>0.200000000000000</double>
8891
</property>
89-
<property name="showClearButton" stdset="0">
92+
<property name="showClearButton">
9093
<bool>false</bool>
9194
</property>
9295
</widget>
@@ -472,6 +475,11 @@
472475
<header>qgscolorbuttonv2.h</header>
473476
<container>1</container>
474477
</customwidget>
478+
<customwidget>
479+
<class>QgsDataDefinedButton</class>
480+
<extends>QToolButton</extends>
481+
<header>qgsdatadefinedbutton.h</header>
482+
</customwidget>
475483
<customwidget>
476484
<class>QgsDoubleSpinBox</class>
477485
<extends>QDoubleSpinBox</extends>
@@ -488,11 +496,6 @@
488496
<extends>QComboBox</extends>
489497
<header>qgspenstylecombobox.h</header>
490498
</customwidget>
491-
<customwidget>
492-
<class>QgsDataDefinedButton</class>
493-
<extends>QToolButton</extends>
494-
<header>qgsdatadefinedbutton.h</header>
495-
</customwidget>
496499
</customwidgets>
497500
<tabstops>
498501
<tabstop>btnChangeColorFill</tabstop>

‎src/ui/symbollayer/widget_svgfill.ui

+10-19
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,7 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout_3">
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">
17+
<property name="margin">
2718
<number>1</number>
2819
</property>
2920
<item row="1" column="0">
@@ -168,12 +159,12 @@
168159
<number>6</number>
169160
</property>
170161
<property name="maximum">
171-
<double>99999999.989999994635582</double>
162+
<double>999999999.999999046325684</double>
172163
</property>
173164
<property name="singleStep">
174165
<double>0.200000000000000</double>
175166
</property>
176-
<property name="showClearButton" stdset="0">
167+
<property name="showClearButton">
177168
<bool>false</bool>
178169
</property>
179170
</widget>
@@ -204,12 +195,12 @@
204195
<number>6</number>
205196
</property>
206197
<property name="maximum">
207-
<double>99999999.000000000000000</double>
198+
<double>999999999.999999046325684</double>
208199
</property>
209200
<property name="singleStep">
210201
<double>0.200000000000000</double>
211202
</property>
212-
<property name="showClearButton" stdset="0">
203+
<property name="showClearButton">
213204
<bool>false</bool>
214205
</property>
215206
</widget>
@@ -332,6 +323,11 @@
332323
<header>qgscolorbuttonv2.h</header>
333324
<container>1</container>
334325
</customwidget>
326+
<customwidget>
327+
<class>QgsDataDefinedButton</class>
328+
<extends>QToolButton</extends>
329+
<header>qgsdatadefinedbutton.h</header>
330+
</customwidget>
335331
<customwidget>
336332
<class>QgsDoubleSpinBox</class>
337333
<extends>QDoubleSpinBox</extends>
@@ -343,11 +339,6 @@
343339
<header>qgsunitselectionwidget.h</header>
344340
<container>1</container>
345341
</customwidget>
346-
<customwidget>
347-
<class>QgsDataDefinedButton</class>
348-
<extends>QToolButton</extends>
349-
<header>qgsdatadefinedbutton.h</header>
350-
</customwidget>
351342
</customwidgets>
352343
<tabstops>
353344
<tabstop>mTextureWidthSpinBox</tabstop>

‎src/ui/symbollayer/widget_svgmarker.ui

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>519</width>
10-
<height>364</height>
10+
<height>389</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -30,15 +30,15 @@
3030
<number>6</number>
3131
</property>
3232
<property name="maximum">
33-
<double>99999999.989999994635582</double>
33+
<double>999999999.999999046325684</double>
3434
</property>
3535
<property name="singleStep">
3636
<double>0.200000000000000</double>
3737
</property>
3838
<property name="value">
3939
<double>0.200000000000000</double>
4040
</property>
41-
<property name="showClearButton" stdset="0">
41+
<property name="showClearButton">
4242
<bool>false</bool>
4343
</property>
4444
</widget>
@@ -334,7 +334,7 @@
334334
<property name="value">
335335
<double>1.000000000000000</double>
336336
</property>
337-
<property name="showClearButton" stdset="0">
337+
<property name="showClearButton">
338338
<bool>false</bool>
339339
</property>
340340
</widget>
@@ -501,6 +501,11 @@
501501
<header>qgscolorbuttonv2.h</header>
502502
<container>1</container>
503503
</customwidget>
504+
<customwidget>
505+
<class>QgsDataDefinedButton</class>
506+
<extends>QToolButton</extends>
507+
<header>qgsdatadefinedbutton.h</header>
508+
</customwidget>
504509
<customwidget>
505510
<class>QgsDoubleSpinBox</class>
506511
<extends>QDoubleSpinBox</extends>
@@ -512,11 +517,6 @@
512517
<header>qgsunitselectionwidget.h</header>
513518
<container>1</container>
514519
</customwidget>
515-
<customwidget>
516-
<class>QgsDataDefinedButton</class>
517-
<extends>QToolButton</extends>
518-
<header>qgsdatadefinedbutton.h</header>
519-
</customwidget>
520520
</customwidgets>
521521
<tabstops>
522522
<tabstop>spinSize</tabstop>

0 commit comments

Comments
 (0)