Skip to content

Commit 1f59541

Browse files
nyalldawsonnyalldawson
committedMay 12, 2016
Fix flipped marker fill and outline color
·
ltr-3_40archive/master_2
1 parent 79b9794 commit 1f59541

File tree

1 file changed

+105
-105
lines changed

1 file changed

+105
-105
lines changed
 

‎src/ui/symbollayer/widget_simplemarker.ui

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -14,98 +14,6 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QFormLayout" name="formLayout">
17-
<item row="1" column="1">
18-
<layout class="QHBoxLayout" name="horizontalLayout">
19-
<property name="topMargin">
20-
<number>0</number>
21-
</property>
22-
<item>
23-
<widget class="QgsColorButtonV2" name="btnChangeColorBorder">
24-
<property name="minimumSize">
25-
<size>
26-
<width>120</width>
27-
<height>0</height>
28-
</size>
29-
</property>
30-
<property name="maximumSize">
31-
<size>
32-
<width>120</width>
33-
<height>16777215</height>
34-
</size>
35-
</property>
36-
<property name="text">
37-
<string/>
38-
</property>
39-
</widget>
40-
</item>
41-
<item>
42-
<widget class="QgsDataDefinedButton" name="mBorderColorDDBtn">
43-
<property name="text">
44-
<string>...</string>
45-
</property>
46-
</widget>
47-
</item>
48-
<item>
49-
<spacer name="horizontalSpacer">
50-
<property name="orientation">
51-
<enum>Qt::Horizontal</enum>
52-
</property>
53-
<property name="sizeHint" stdset="0">
54-
<size>
55-
<width>40</width>
56-
<height>20</height>
57-
</size>
58-
</property>
59-
</spacer>
60-
</item>
61-
</layout>
62-
</item>
63-
<item row="4" column="1">
64-
<layout class="QHBoxLayout" name="horizontalLayout_2">
65-
<property name="topMargin">
66-
<number>0</number>
67-
</property>
68-
<item>
69-
<widget class="QgsColorButtonV2" name="btnChangeColorFill">
70-
<property name="minimumSize">
71-
<size>
72-
<width>120</width>
73-
<height>0</height>
74-
</size>
75-
</property>
76-
<property name="maximumSize">
77-
<size>
78-
<width>120</width>
79-
<height>16777215</height>
80-
</size>
81-
</property>
82-
<property name="text">
83-
<string/>
84-
</property>
85-
</widget>
86-
</item>
87-
<item>
88-
<widget class="QgsDataDefinedButton" name="mFillColorDDBtn">
89-
<property name="text">
90-
<string>...</string>
91-
</property>
92-
</widget>
93-
</item>
94-
<item>
95-
<spacer name="horizontalSpacer_2">
96-
<property name="orientation">
97-
<enum>Qt::Horizontal</enum>
98-
</property>
99-
<property name="sizeHint" stdset="0">
100-
<size>
101-
<width>40</width>
102-
<height>20</height>
103-
</size>
104-
</property>
105-
</spacer>
106-
</item>
107-
</layout>
108-
</item>
10917
<item row="7" column="1">
11018
<layout class="QHBoxLayout" name="horizontalLayout_3">
11119
<item>
@@ -323,19 +231,6 @@
323231
</item>
324232
</layout>
325233
</item>
326-
<item row="1" column="0">
327-
<widget class="QLabel" name="label_2">
328-
<property name="sizePolicy">
329-
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
330-
<horstretch>0</horstretch>
331-
<verstretch>0</verstretch>
332-
</sizepolicy>
333-
</property>
334-
<property name="text">
335-
<string>Fill</string>
336-
</property>
337-
</widget>
338-
</item>
339234
<item row="4" column="0">
340235
<widget class="QLabel" name="label">
341236
<property name="sizePolicy">
@@ -530,6 +425,111 @@
530425
</item>
531426
</layout>
532427
</item>
428+
<item row="2" column="1">
429+
<layout class="QHBoxLayout" name="horizontalLayout_2">
430+
<property name="topMargin">
431+
<number>0</number>
432+
</property>
433+
<item>
434+
<widget class="QgsColorButtonV2" name="btnChangeColorFill">
435+
<property name="minimumSize">
436+
<size>
437+
<width>120</width>
438+
<height>0</height>
439+
</size>
440+
</property>
441+
<property name="maximumSize">
442+
<size>
443+
<width>120</width>
444+
<height>16777215</height>
445+
</size>
446+
</property>
447+
<property name="text">
448+
<string/>
449+
</property>
450+
</widget>
451+
</item>
452+
<item>
453+
<widget class="QgsDataDefinedButton" name="mFillColorDDBtn">
454+
<property name="text">
455+
<string>...</string>
456+
</property>
457+
</widget>
458+
</item>
459+
<item>
460+
<spacer name="horizontalSpacer_2">
461+
<property name="orientation">
462+
<enum>Qt::Horizontal</enum>
463+
</property>
464+
<property name="sizeHint" stdset="0">
465+
<size>
466+
<width>40</width>
467+
<height>20</height>
468+
</size>
469+
</property>
470+
</spacer>
471+
</item>
472+
</layout>
473+
</item>
474+
<item row="4" column="1">
475+
<layout class="QHBoxLayout" name="horizontalLayout">
476+
<property name="topMargin">
477+
<number>0</number>
478+
</property>
479+
<item>
480+
<widget class="QgsColorButtonV2" name="btnChangeColorBorder">
481+
<property name="minimumSize">
482+
<size>
483+
<width>120</width>
484+
<height>0</height>
485+
</size>
486+
</property>
487+
<property name="maximumSize">
488+
<size>
489+
<width>120</width>
490+
<height>16777215</height>
491+
</size>
492+
</property>
493+
<property name="text">
494+
<string/>
495+
</property>
496+
</widget>
497+
</item>
498+
<item>
499+
<widget class="QgsDataDefinedButton" name="mBorderColorDDBtn">
500+
<property name="text">
501+
<string>...</string>
502+
</property>
503+
</widget>
504+
</item>
505+
<item>
506+
<spacer name="horizontalSpacer">
507+
<property name="orientation">
508+
<enum>Qt::Horizontal</enum>
509+
</property>
510+
<property name="sizeHint" stdset="0">
511+
<size>
512+
<width>40</width>
513+
<height>20</height>
514+
</size>
515+
</property>
516+
</spacer>
517+
</item>
518+
</layout>
519+
</item>
520+
<item row="2" column="0">
521+
<widget class="QLabel" name="label_2">
522+
<property name="sizePolicy">
523+
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
524+
<horstretch>0</horstretch>
525+
<verstretch>0</verstretch>
526+
</sizepolicy>
527+
</property>
528+
<property name="text">
529+
<string>Fill</string>
530+
</property>
531+
</widget>
532+
</item>
533533
</layout>
534534
</widget>
535535
<customwidgets>

0 commit comments

Comments
 (0)
Please sign in to comment.