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">

0 commit comments

Comments
 (0)
Please sign in to comment.