Skip to content

Commit 054f64c

Browse files
dakcartodakcarto
committedApr 10, 2013
Update recent symbology widget update for cross-platform consistency
Also: - Keep color wells from over expanding - Group color wells together, where appropriate - Make SVG Groups view wider (was too thin)
·
ltr-3_40archive/master_2
1 parent 094a5d8 commit 054f64c

13 files changed

+611
-203
lines changed
 

‎src/ui/symbollayer/widget_ellipse.ui

Lines changed: 84 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>392</width>
9+
<width>404</width>
1010
<height>504</height>
1111
</rect>
1212
</property>
@@ -22,36 +22,99 @@
2222
<property name="fieldGrowthPolicy">
2323
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
2424
</property>
25+
<property name="labelAlignment">
26+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
27+
</property>
2528
<property name="horizontalSpacing">
2629
<number>28</number>
2730
</property>
28-
<item row="0" column="0">
29-
<widget class="QLabel" name="label">
30-
<property name="text">
31-
<string>Border color</string>
32-
</property>
33-
</widget>
34-
</item>
35-
<item row="0" column="1">
36-
<widget class="QgsColorButton" name="btnChangeColorBorder">
37-
<property name="text">
38-
<string/>
39-
</property>
40-
</widget>
41-
</item>
4231
<item row="1" column="0">
4332
<widget class="QLabel" name="label_2">
4433
<property name="text">
45-
<string>Fill color</string>
34+
<string>Colors</string>
4635
</property>
4736
</widget>
4837
</item>
4938
<item row="1" column="1">
50-
<widget class="QgsColorButton" name="btnChangeColorFill">
51-
<property name="text">
52-
<string/>
53-
</property>
54-
</widget>
39+
<layout class="QHBoxLayout" name="horizontalLayout_4">
40+
<item>
41+
<widget class="QLabel" name="label_3">
42+
<property name="sizePolicy">
43+
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
44+
<horstretch>0</horstretch>
45+
<verstretch>0</verstretch>
46+
</sizepolicy>
47+
</property>
48+
<property name="text">
49+
<string>Fill</string>
50+
</property>
51+
</widget>
52+
</item>
53+
<item>
54+
<widget class="QgsColorButton" name="btnChangeColorFill">
55+
<property name="minimumSize">
56+
<size>
57+
<width>100</width>
58+
<height>0</height>
59+
</size>
60+
</property>
61+
<property name="maximumSize">
62+
<size>
63+
<width>100</width>
64+
<height>16777215</height>
65+
</size>
66+
</property>
67+
<property name="text">
68+
<string/>
69+
</property>
70+
</widget>
71+
</item>
72+
<item>
73+
<widget class="QLabel" name="label">
74+
<property name="sizePolicy">
75+
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
76+
<horstretch>0</horstretch>
77+
<verstretch>0</verstretch>
78+
</sizepolicy>
79+
</property>
80+
<property name="text">
81+
<string>Border</string>
82+
</property>
83+
</widget>
84+
</item>
85+
<item>
86+
<widget class="QgsColorButton" name="btnChangeColorBorder">
87+
<property name="minimumSize">
88+
<size>
89+
<width>100</width>
90+
<height>0</height>
91+
</size>
92+
</property>
93+
<property name="maximumSize">
94+
<size>
95+
<width>100</width>
96+
<height>16777215</height>
97+
</size>
98+
</property>
99+
<property name="text">
100+
<string/>
101+
</property>
102+
</widget>
103+
</item>
104+
<item>
105+
<spacer name="horizontalSpacer">
106+
<property name="orientation">
107+
<enum>Qt::Horizontal</enum>
108+
</property>
109+
<property name="sizeHint" stdset="0">
110+
<size>
111+
<width>40</width>
112+
<height>20</height>
113+
</size>
114+
</property>
115+
</spacer>
116+
</item>
117+
</layout>
55118
</item>
56119
<item row="2" column="0">
57120
<widget class="QLabel" name="mSymbolWidthLabel">

‎src/ui/symbollayer/widget_fontmarker.ui

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<property name="fieldGrowthPolicy">
2626
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
2727
</property>
28+
<property name="labelAlignment">
29+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
30+
</property>
2831
<property name="horizontalSpacing">
2932
<number>28</number>
3033
</property>
@@ -53,6 +56,18 @@
5356
</item>
5457
<item row="1" column="1">
5558
<widget class="QgsColorButton" name="btnColor">
59+
<property name="minimumSize">
60+
<size>
61+
<width>100</width>
62+
<height>0</height>
63+
</size>
64+
</property>
65+
<property name="maximumSize">
66+
<size>
67+
<width>100</width>
68+
<height>16777215</height>
69+
</size>
70+
</property>
5671
<property name="text">
5772
<string/>
5873
</property>

‎src/ui/symbollayer/widget_linedecoration.ui

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<property name="fieldGrowthPolicy">
1818
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
1919
</property>
20+
<property name="labelAlignment">
21+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
22+
</property>
2023
<property name="horizontalSpacing">
2124
<number>28</number>
2225
</property>
@@ -38,6 +41,18 @@
3841
<verstretch>0</verstretch>
3942
</sizepolicy>
4043
</property>
44+
<property name="minimumSize">
45+
<size>
46+
<width>100</width>
47+
<height>0</height>
48+
</size>
49+
</property>
50+
<property name="maximumSize">
51+
<size>
52+
<width>100</width>
53+
<height>16777215</height>
54+
</size>
55+
</property>
4156
<property name="text">
4257
<string/>
4358
</property>

‎src/ui/symbollayer/widget_linepatternfill.ui

Lines changed: 16 additions & 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>328</width>
9+
<width>368</width>
1010
<height>293</height>
1111
</rect>
1212
</property>
@@ -17,6 +17,9 @@
1717
<property name="fieldGrowthPolicy">
1818
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
1919
</property>
20+
<property name="labelAlignment">
21+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
22+
</property>
2023
<property name="horizontalSpacing">
2124
<number>28</number>
2225
</property>
@@ -169,6 +172,18 @@
169172
</item>
170173
<item row="4" column="1">
171174
<widget class="QgsColorButton" name="mColorPushButton">
175+
<property name="minimumSize">
176+
<size>
177+
<width>100</width>
178+
<height>0</height>
179+
</size>
180+
</property>
181+
<property name="maximumSize">
182+
<size>
183+
<width>100</width>
184+
<height>16777215</height>
185+
</size>
186+
</property>
172187
<property name="text">
173188
<string/>
174189
</property>

‎src/ui/symbollayer/widget_markerline.ui

Lines changed: 12 additions & 3 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>308</width>
10-
<height>283</height>
9+
<width>368</width>
10+
<height>324</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -17,7 +17,16 @@
1717
<property name="fieldGrowthPolicy">
1818
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
1919
</property>
20-
<property name="margin">
20+
<property name="labelAlignment">
21+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
22+
</property>
23+
<property name="leftMargin">
24+
<number>1</number>
25+
</property>
26+
<property name="rightMargin">
27+
<number>1</number>
28+
</property>
29+
<property name="bottomMargin">
2130
<number>1</number>
2231
</property>
2332
<item row="0" column="0" colspan="2">

‎src/ui/symbollayer/widget_pointpatternfill.ui

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>365</width>
9+
<width>457</width>
1010
<height>271</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<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>
1723
<property name="horizontalSpacing">
1824
<number>28</number>
1925
</property>

0 commit comments

Comments
 (0)
Please sign in to comment.