Skip to content

Commit b855ad1

Browse files
nyalldawsonnyalldawson
authoredOct 19, 2017
Merge pull request #5366 from DelazJ/effectsalign
Vertically align color widget in Effect properties dialog
·
ltr-3_40final-3_0_0
2 parents 8ca4a1a + b6ed28b commit b855ad1

File tree

6 files changed

+85
-97
lines changed

6 files changed

+85
-97
lines changed
 

‎src/ui/effects/widget_blur.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<property name="sizeHint" stdset="0">
106106
<size>
107107
<width>20</width>
108-
<height>189</height>
108+
<height>0</height>
109109
</size>
110110
</property>
111111
</spacer>

‎src/ui/effects/widget_coloreffects.ui

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -223,25 +223,6 @@
223223
</property>
224224
</widget>
225225
</item>
226-
<item row="4" column="1">
227-
<widget class="QgsColorButton" name="mColorizeColorButton">
228-
<property name="minimumSize">
229-
<size>
230-
<width>100</width>
231-
<height>0</height>
232-
</size>
233-
</property>
234-
<property name="maximumSize">
235-
<size>
236-
<width>100</width>
237-
<height>16777215</height>
238-
</size>
239-
</property>
240-
<property name="text">
241-
<string/>
242-
</property>
243-
</widget>
244-
</item>
245226
<item row="5" column="0">
246227
<widget class="QLabel" name="labelGrayscale">
247228
<property name="text">
@@ -259,6 +240,25 @@
259240
</property>
260241
</widget>
261242
</item>
243+
<item row="4" column="1" colspan="2">
244+
<widget class="QgsColorButton" name="mColorizeColorButton">
245+
<property name="sizePolicy">
246+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
247+
<horstretch>0</horstretch>
248+
<verstretch>0</verstretch>
249+
</sizepolicy>
250+
</property>
251+
<property name="minimumSize">
252+
<size>
253+
<width>100</width>
254+
<height>0</height>
255+
</size>
256+
</property>
257+
<property name="text">
258+
<string/>
259+
</property>
260+
</widget>
261+
</item>
262262
</layout>
263263
</widget>
264264
</item>
@@ -272,7 +272,7 @@
272272
<property name="sizeHint" stdset="0">
273273
<size>
274274
<width>20</width>
275-
<height>40</height>
275+
<height>0</height>
276276
</size>
277277
</property>
278278
</spacer>

‎src/ui/effects/widget_drawsource.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<property name="sizeHint" stdset="0">
7979
<size>
8080
<width>20</width>
81-
<height>189</height>
81+
<height>0</height>
8282
</size>
8383
</property>
8484
</spacer>

‎src/ui/effects/widget_glow.ui

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,6 @@
4545
</property>
4646
</widget>
4747
</item>
48-
<item row="3" column="1">
49-
<widget class="QgsColorButton" name="mColorBtn">
50-
<property name="sizePolicy">
51-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
52-
<horstretch>0</horstretch>
53-
<verstretch>0</verstretch>
54-
</sizepolicy>
55-
</property>
56-
<property name="minimumSize">
57-
<size>
58-
<width>120</width>
59-
<height>0</height>
60-
</size>
61-
</property>
62-
<property name="maximumSize">
63-
<size>
64-
<width>120</width>
65-
<height>16777215</height>
66-
</size>
67-
</property>
68-
</widget>
69-
</item>
7048
<item row="1" column="0">
7149
<widget class="QLabel" name="label_27">
7250
<property name="text">
@@ -176,6 +154,22 @@
176154
</property>
177155
</widget>
178156
</item>
157+
<item row="3" column="1" colspan="2">
158+
<widget class="QgsColorButton" name="mColorBtn">
159+
<property name="sizePolicy">
160+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
161+
<horstretch>0</horstretch>
162+
<verstretch>0</verstretch>
163+
</sizepolicy>
164+
</property>
165+
<property name="minimumSize">
166+
<size>
167+
<width>120</width>
168+
<height>0</height>
169+
</size>
170+
</property>
171+
</widget>
172+
</item>
179173
</layout>
180174
</widget>
181175
</item>
@@ -189,7 +183,7 @@
189183
<property name="sizeHint" stdset="0">
190184
<size>
191185
<width>20</width>
192-
<height>40</height>
186+
<height>0</height>
193187
</size>
194188
</property>
195189
</spacer>
@@ -203,11 +197,6 @@
203197
<header>qgscolorbutton.h</header>
204198
<container>1</container>
205199
</customwidget>
206-
<customwidget>
207-
<class>QgsDoubleSpinBox</class>
208-
<extends>QDoubleSpinBox</extends>
209-
<header>qgsdoublespinbox.h</header>
210-
</customwidget>
211200
<customwidget>
212201
<class>QgsSpinBox</class>
213202
<extends>QSpinBox</extends>
@@ -223,6 +212,17 @@
223212
<extends>QComboBox</extends>
224213
<header>qgseffectdrawmodecombobox.h</header>
225214
</customwidget>
215+
<customwidget>
216+
<class>QgsOpacityWidget</class>
217+
<extends>QWidget</extends>
218+
<header>qgsopacitywidget.h</header>
219+
<container>1</container>
220+
</customwidget>
221+
<customwidget>
222+
<class>QgsDoubleSpinBox</class>
223+
<extends>QDoubleSpinBox</extends>
224+
<header>qgsdoublespinbox.h</header>
225+
</customwidget>
226226
<customwidget>
227227
<class>QgsUnitSelectionWidget</class>
228228
<extends>QWidget</extends>
@@ -235,12 +235,6 @@
235235
<header>qgscolorrampbutton.h</header>
236236
<container>1</container>
237237
</customwidget>
238-
<customwidget>
239-
<class>QgsOpacityWidget</class>
240-
<extends>QWidget</extends>
241-
<header>qgsopacitywidget.h</header>
242-
<container>1</container>
243-
</customwidget>
244238
</customwidgets>
245239
<tabstops>
246240
<tabstop>mSpreadSpnBx</tabstop>

‎src/ui/effects/widget_shadoweffect.ui

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,6 @@
7676
</property>
7777
</widget>
7878
</item>
79-
<item row="4" column="1">
80-
<widget class="QgsColorButton" name="mShadowColorBtn">
81-
<property name="sizePolicy">
82-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
83-
<horstretch>0</horstretch>
84-
<verstretch>0</verstretch>
85-
</sizepolicy>
86-
</property>
87-
<property name="minimumSize">
88-
<size>
89-
<width>120</width>
90-
<height>0</height>
91-
</size>
92-
</property>
93-
<property name="maximumSize">
94-
<size>
95-
<width>120</width>
96-
<height>16777215</height>
97-
</size>
98-
</property>
99-
</widget>
100-
</item>
10179
<item row="3" column="0">
10280
<widget class="QLabel" name="label_28">
10381
<property name="text">
@@ -210,6 +188,22 @@
210188
</property>
211189
</widget>
212190
</item>
191+
<item row="4" column="1" colspan="2">
192+
<widget class="QgsColorButton" name="mShadowColorBtn">
193+
<property name="sizePolicy">
194+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
195+
<horstretch>0</horstretch>
196+
<verstretch>0</verstretch>
197+
</sizepolicy>
198+
</property>
199+
<property name="minimumSize">
200+
<size>
201+
<width>120</width>
202+
<height>0</height>
203+
</size>
204+
</property>
205+
</widget>
206+
</item>
213207
</layout>
214208
</widget>
215209
</item>
@@ -223,7 +217,7 @@
223217
<property name="sizeHint" stdset="0">
224218
<size>
225219
<width>20</width>
226-
<height>40</height>
220+
<height>0</height>
227221
</size>
228222
</property>
229223
</spacer>
@@ -237,11 +231,6 @@
237231
<header>qgscolorbutton.h</header>
238232
<container>1</container>
239233
</customwidget>
240-
<customwidget>
241-
<class>QgsDoubleSpinBox</class>
242-
<extends>QDoubleSpinBox</extends>
243-
<header>qgsdoublespinbox.h</header>
244-
</customwidget>
245234
<customwidget>
246235
<class>QgsSpinBox</class>
247236
<extends>QSpinBox</extends>
@@ -253,10 +242,9 @@
253242
<header>qgsblendmodecombobox.h</header>
254243
</customwidget>
255244
<customwidget>
256-
<class>QgsUnitSelectionWidget</class>
257-
<extends>QWidget</extends>
258-
<header>qgsunitselectionwidget.h</header>
259-
<container>1</container>
245+
<class>QgsEffectDrawModeComboBox</class>
246+
<extends>QComboBox</extends>
247+
<header>qgseffectdrawmodecombobox.h</header>
260248
</customwidget>
261249
<customwidget>
262250
<class>QgsOpacityWidget</class>
@@ -265,9 +253,15 @@
265253
<container>1</container>
266254
</customwidget>
267255
<customwidget>
268-
<class>QgsEffectDrawModeComboBox</class>
269-
<extends>QComboBox</extends>
270-
<header>qgseffectdrawmodecombobox.h</header>
256+
<class>QgsDoubleSpinBox</class>
257+
<extends>QDoubleSpinBox</extends>
258+
<header>qgsdoublespinbox.h</header>
259+
</customwidget>
260+
<customwidget>
261+
<class>QgsUnitSelectionWidget</class>
262+
<extends>QWidget</extends>
263+
<header>qgsunitselectionwidget.h</header>
264+
<container>1</container>
271265
</customwidget>
272266
</customwidgets>
273267
<tabstops>

‎src/ui/effects/widget_transform.ui

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,24 +288,24 @@
288288
<property name="sizeHint" stdset="0">
289289
<size>
290290
<width>20</width>
291-
<height>189</height>
291+
<height>0</height>
292292
</size>
293293
</property>
294294
</spacer>
295295
</item>
296296
</layout>
297297
</widget>
298298
<customwidgets>
299-
<customwidget>
300-
<class>QgsDoubleSpinBox</class>
301-
<extends>QDoubleSpinBox</extends>
302-
<header>qgsdoublespinbox.h</header>
303-
</customwidget>
304299
<customwidget>
305300
<class>QgsEffectDrawModeComboBox</class>
306301
<extends>QComboBox</extends>
307302
<header>qgseffectdrawmodecombobox.h</header>
308303
</customwidget>
304+
<customwidget>
305+
<class>QgsDoubleSpinBox</class>
306+
<extends>QDoubleSpinBox</extends>
307+
<header>qgsdoublespinbox.h</header>
308+
</customwidget>
309309
<customwidget>
310310
<class>QgsUnitSelectionWidget</class>
311311
<extends>QWidget</extends>

0 commit comments

Comments
 (0)
Please sign in to comment.