Skip to content

Commit 0f0c981

Browse files
dakcartodakcarto
committedFeb 19, 2013
Update composer ui files
- Add section headers (should be moved to app stylesheet, and custom label or container class made) - Enable map grid group box (was disabled) - Reformat all form layouts to look like rest of app (more grid layout-like, with labels left-aligned and growing entry fields) - Re-layout map extents group box - Expand more group boxes by default (increases discovery)
·
ltr-3_40archive/master_2
1 parent 77afb16 commit 0f0c981

11 files changed

+632
-478
lines changed
 

‎src/ui/qgscomposerarrowwidgetbase.ui

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,36 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>469</width>
10-
<height>689</height>
9+
<width>334</width>
10+
<height>632</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QHBoxLayout" name="horizontalLayout_5">
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<property name="spacing">
18+
<number>0</number>
19+
</property>
1720
<property name="margin">
1821
<number>0</number>
1922
</property>
23+
<item>
24+
<widget class="QLabel" name="label_3">
25+
<property name="sizePolicy">
26+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
27+
<horstretch>0</horstretch>
28+
<verstretch>0</verstretch>
29+
</sizepolicy>
30+
</property>
31+
<property name="styleSheet">
32+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
33+
</property>
34+
<property name="text">
35+
<string>Arrow</string>
36+
</property>
37+
</widget>
38+
</item>
2039
<item>
2140
<widget class="QScrollArea" name="scrollArea">
2241
<property name="widgetResizable">
@@ -27,19 +46,13 @@
2746
<rect>
2847
<x>0</x>
2948
<y>0</y>
30-
<width>467</width>
31-
<height>687</height>
49+
<width>332</width>
50+
<height>610</height>
3251
</rect>
3352
</property>
3453
<layout class="QVBoxLayout" name="mainLayout">
3554
<item>
3655
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
37-
<property name="sizePolicy">
38-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
39-
<horstretch>0</horstretch>
40-
<verstretch>0</verstretch>
41-
</sizepolicy>
42-
</property>
4356
<property name="title">
4457
<string>Main properties</string>
4558
</property>
@@ -53,6 +66,9 @@
5366
<property name="fieldGrowthPolicy">
5467
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
5568
</property>
69+
<property name="labelAlignment">
70+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
71+
</property>
5672
<item row="1" column="0">
5773
<widget class="QLabel" name="label">
5874
<property name="text">
@@ -89,6 +105,12 @@
89105
</item>
90106
<item row="0" column="0" colspan="2">
91107
<widget class="QPushButton" name="mArrowColorButton">
108+
<property name="sizePolicy">
109+
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
110+
<horstretch>0</horstretch>
111+
<verstretch>0</verstretch>
112+
</sizepolicy>
113+
</property>
92114
<property name="text">
93115
<string>Arrow color...</string>
94116
</property>
@@ -99,25 +121,22 @@
99121
</item>
100122
<item>
101123
<widget class="QgsCollapsibleGroupBoxBasic" name="mArrowMarkersGroupBox">
102-
<property name="sizePolicy">
103-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
104-
<horstretch>0</horstretch>
105-
<verstretch>0</verstretch>
106-
</sizepolicy>
107-
</property>
108124
<property name="title">
109125
<string>Arrow markers</string>
110126
</property>
111127
<property name="syncGroup" stdset="0">
112128
<string notr="true">composeritem</string>
113129
</property>
114130
<property name="collapsed" stdset="0">
115-
<bool>true</bool>
131+
<bool>false</bool>
116132
</property>
117133
<layout class="QFormLayout" name="formLayout">
118134
<property name="fieldGrowthPolicy">
119135
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
120136
</property>
137+
<property name="labelAlignment">
138+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
139+
</property>
121140
<item row="0" column="0" colspan="2">
122141
<layout class="QHBoxLayout" name="horizontalLayout_3">
123142
<item>

‎src/ui/qgscomposerhtmlwidgetbase.ui

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,30 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QGridLayout" name="gridLayout_2">
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<property name="spacing">
18+
<number>0</number>
19+
</property>
1720
<property name="margin">
1821
<number>0</number>
1922
</property>
20-
<item row="0" column="0">
23+
<item>
24+
<widget class="QLabel" name="label">
25+
<property name="sizePolicy">
26+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
27+
<horstretch>0</horstretch>
28+
<verstretch>0</verstretch>
29+
</sizepolicy>
30+
</property>
31+
<property name="styleSheet">
32+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
33+
</property>
34+
<property name="text">
35+
<string>HTML frame</string>
36+
</property>
37+
</widget>
38+
</item>
39+
<item>
2140
<widget class="QScrollArea" name="scrollArea">
2241
<property name="widgetResizable">
2342
<bool>true</bool>
@@ -28,18 +47,12 @@
2847
<x>0</x>
2948
<y>0</y>
3049
<width>407</width>
31-
<height>368</height>
50+
<height>348</height>
3251
</rect>
3352
</property>
3453
<layout class="QVBoxLayout" name="mainLayout">
3554
<item>
3655
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
37-
<property name="sizePolicy">
38-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
39-
<horstretch>0</horstretch>
40-
<verstretch>0</verstretch>
41-
</sizepolicy>
42-
</property>
4356
<property name="title">
4457
<string>Main properties</string>
4558
</property>
@@ -50,16 +63,19 @@
5063
<bool>false</bool>
5164
</property>
5265
<layout class="QFormLayout" name="formLayout">
53-
<item row="2" column="0">
54-
<widget class="QLabel" name="mResizeModeLabel">
66+
<property name="fieldGrowthPolicy">
67+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
68+
</property>
69+
<property name="labelAlignment">
70+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
71+
</property>
72+
<item row="0" column="0">
73+
<widget class="QLabel" name="mUrlLabel">
5574
<property name="text">
56-
<string>Resize mode</string>
75+
<string>URL</string>
5776
</property>
5877
</widget>
5978
</item>
60-
<item row="2" column="1">
61-
<widget class="QComboBox" name="mResizeModeComboBox"/>
62-
</item>
6379
<item row="0" column="1">
6480
<layout class="QHBoxLayout" name="horizontalLayout">
6581
<item>
@@ -74,13 +90,16 @@
7490
</item>
7591
</layout>
7692
</item>
77-
<item row="0" column="0">
78-
<widget class="QLabel" name="mUrlLabel">
93+
<item row="2" column="0">
94+
<widget class="QLabel" name="mResizeModeLabel">
7995
<property name="text">
80-
<string>URL</string>
96+
<string>Resize mode</string>
8197
</property>
8298
</widget>
8399
</item>
100+
<item row="2" column="1">
101+
<widget class="QComboBox" name="mResizeModeComboBox"/>
102+
</item>
84103
</layout>
85104
</widget>
86105
</item>

‎src/ui/qgscomposeritemwidgetbase.ui

Lines changed: 88 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,26 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>393</width>
10-
<height>729</height>
9+
<width>376</width>
10+
<height>689</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Global Options</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout_2">
17-
<property name="spacing">
18-
<number>7</number>
19-
</property>
2017
<property name="margin">
2118
<number>0</number>
2219
</property>
2320
<item>
24-
<widget class="QgsCollapsibleGroupBoxBasic" name="mGeneralOptionsGroupBox">
25-
<property name="sizePolicy">
26-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
27-
<horstretch>0</horstretch>
28-
<verstretch>0</verstretch>
29-
</sizepolicy>
21+
<widget class="Line" name="line">
22+
<property name="orientation">
23+
<enum>Qt::Horizontal</enum>
3024
</property>
25+
</widget>
26+
</item>
27+
<item>
28+
<widget class="QgsCollapsibleGroupBoxBasic" name="mGeneralOptionsGroupBox">
3129
<property name="title">
3230
<string>Position and size</string>
3331
</property>
@@ -39,59 +37,12 @@
3937
</property>
4038
<layout class="QVBoxLayout" name="verticalLayout">
4139
<item>
42-
<layout class="QHBoxLayout" name="horizontalLayout_6">
43-
<item>
44-
<layout class="QFormLayout" name="formLayout">
45-
<property name="fieldGrowthPolicy">
46-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
47-
</property>
48-
<item row="0" column="0">
49-
<widget class="QLabel" name="mXLabel">
50-
<property name="text">
51-
<string>X</string>
52-
</property>
53-
</widget>
54-
</item>
55-
<item row="0" column="1">
56-
<widget class="QLineEdit" name="mXLineEdit"/>
57-
</item>
58-
<item row="1" column="0">
59-
<widget class="QLabel" name="mYLabel">
60-
<property name="text">
61-
<string>Y</string>
62-
</property>
63-
</widget>
64-
</item>
65-
<item row="1" column="1">
66-
<widget class="QLineEdit" name="mYLineEdit"/>
67-
</item>
68-
<item row="2" column="0">
69-
<widget class="QLabel" name="mWidthLabel">
70-
<property name="text">
71-
<string>Width</string>
72-
</property>
73-
</widget>
74-
</item>
75-
<item row="2" column="1">
76-
<widget class="QLineEdit" name="mWidthLineEdit"/>
77-
</item>
78-
<item row="3" column="0">
79-
<widget class="QLabel" name="mHeightLabel">
80-
<property name="text">
81-
<string>Height</string>
82-
</property>
83-
</widget>
84-
</item>
85-
<item row="3" column="1">
86-
<widget class="QLineEdit" name="mHeightLineEdit"/>
87-
</item>
88-
</layout>
89-
</item>
90-
<item>
40+
<layout class="QGridLayout" name="gridLayout_2">
41+
<property name="verticalSpacing">
42+
<number>0</number>
43+
</property>
44+
<item row="1" column="1">
9145
<widget class="QGroupBox" name="mReferencePointGroupBox">
92-
<property name="title">
93-
<string>Reference point</string>
94-
</property>
9546
<layout class="QVBoxLayout" name="verticalLayout_5">
9647
<item>
9748
<layout class="QGridLayout" name="gridLayout">
@@ -217,19 +168,67 @@
217168
</layout>
218169
</widget>
219170
</item>
171+
<item row="0" column="1">
172+
<widget class="QLabel" name="label_2">
173+
<property name="text">
174+
<string>Reference point</string>
175+
</property>
176+
</widget>
177+
</item>
178+
<item row="0" column="0" rowspan="2">
179+
<layout class="QFormLayout" name="formLayout">
180+
<property name="fieldGrowthPolicy">
181+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
182+
</property>
183+
<item row="0" column="0">
184+
<widget class="QLabel" name="mXLabel">
185+
<property name="text">
186+
<string>X</string>
187+
</property>
188+
</widget>
189+
</item>
190+
<item row="0" column="1">
191+
<widget class="QLineEdit" name="mXLineEdit"/>
192+
</item>
193+
<item row="1" column="0">
194+
<widget class="QLabel" name="mYLabel">
195+
<property name="text">
196+
<string>Y</string>
197+
</property>
198+
</widget>
199+
</item>
200+
<item row="1" column="1">
201+
<widget class="QLineEdit" name="mYLineEdit"/>
202+
</item>
203+
<item row="2" column="0">
204+
<widget class="QLabel" name="mWidthLabel">
205+
<property name="text">
206+
<string>Width</string>
207+
</property>
208+
</widget>
209+
</item>
210+
<item row="2" column="1">
211+
<widget class="QLineEdit" name="mWidthLineEdit"/>
212+
</item>
213+
<item row="3" column="0">
214+
<widget class="QLabel" name="mHeightLabel">
215+
<property name="text">
216+
<string>Height</string>
217+
</property>
218+
</widget>
219+
</item>
220+
<item row="3" column="1">
221+
<widget class="QLineEdit" name="mHeightLineEdit"/>
222+
</item>
223+
</layout>
224+
</item>
220225
</layout>
221226
</item>
222227
</layout>
223228
</widget>
224229
</item>
225230
<item>
226231
<widget class="QgsCollapsibleGroupBoxBasic" name="mFrameGroupBox">
227-
<property name="sizePolicy">
228-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
229-
<horstretch>0</horstretch>
230-
<verstretch>0</verstretch>
231-
</sizepolicy>
232-
</property>
233232
<property name="title">
234233
<string>Frame</string>
235234
</property>
@@ -251,8 +250,11 @@
251250
</widget>
252251
</item>
253252
<item>
254-
<layout class="QHBoxLayout" name="horizontalLayout">
255-
<item>
253+
<layout class="QFormLayout" name="formLayout_3">
254+
<property name="fieldGrowthPolicy">
255+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
256+
</property>
257+
<item row="0" column="0">
256258
<widget class="QLabel" name="mOutlineWidthLabel">
257259
<property name="text">
258260
<string>Thickness</string>
@@ -265,7 +267,7 @@
265267
</property>
266268
</widget>
267269
</item>
268-
<item>
270+
<item row="0" column="1">
269271
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
270272
</item>
271273
</layout>
@@ -275,12 +277,6 @@
275277
</item>
276278
<item>
277279
<widget class="QgsCollapsibleGroupBoxBasic" name="mBackgroundGroupBox">
278-
<property name="sizePolicy">
279-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
280-
<horstretch>0</horstretch>
281-
<verstretch>0</verstretch>
282-
</sizepolicy>
283-
</property>
284280
<property name="title">
285281
<string>Background</string>
286282
</property>
@@ -346,12 +342,6 @@
346342
</item>
347343
<item>
348344
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
349-
<property name="sizePolicy">
350-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
351-
<horstretch>0</horstretch>
352-
<verstretch>0</verstretch>
353-
</sizepolicy>
354-
</property>
355345
<property name="title">
356346
<string>Item ID</string>
357347
</property>
@@ -362,6 +352,12 @@
362352
<bool>true</bool>
363353
</property>
364354
<layout class="QFormLayout" name="formLayout_2">
355+
<property name="fieldGrowthPolicy">
356+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
357+
</property>
358+
<property name="labelAlignment">
359+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
360+
</property>
365361
<item row="0" column="0">
366362
<widget class="QLabel" name="mIdLabel">
367363
<property name="text">
@@ -410,12 +406,12 @@
410406
<slot>setValue(int)</slot>
411407
<hints>
412408
<hint type="sourcelabel">
413-
<x>137</x>
414-
<y>98</y>
409+
<x>255</x>
410+
<y>387</y>
415411
</hint>
416412
<hint type="destinationlabel">
417-
<x>197</x>
418-
<y>106</y>
413+
<x>364</x>
414+
<y>389</y>
419415
</hint>
420416
</hints>
421417
</connection>
@@ -426,12 +422,12 @@
426422
<slot>setValue(int)</slot>
427423
<hints>
428424
<hint type="sourcelabel">
429-
<x>196</x>
430-
<y>92</y>
425+
<x>364</x>
426+
<y>389</y>
431427
</hint>
432428
<hint type="destinationlabel">
433-
<x>153</x>
434-
<y>100</y>
429+
<x>271</x>
430+
<y>387</y>
435431
</hint>
436432
</hints>
437433
</connection>

‎src/ui/qgscomposerlabelwidgetbase.ui

Lines changed: 29 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,28 @@
2020
<string>Label Options</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="_2">
23+
<property name="spacing">
24+
<number>0</number>
25+
</property>
2326
<property name="margin">
2427
<number>0</number>
2528
</property>
29+
<item>
30+
<widget class="QLabel" name="label">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="styleSheet">
38+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
39+
</property>
40+
<property name="text">
41+
<string>Label</string>
42+
</property>
43+
</widget>
44+
</item>
2645
<item>
2746
<widget class="QScrollArea" name="scrollArea">
2847
<property name="widgetResizable">
@@ -34,18 +53,12 @@
3453
<x>0</x>
3554
<y>0</y>
3655
<width>441</width>
37-
<height>710</height>
56+
<height>690</height>
3857
</rect>
3958
</property>
4059
<layout class="QVBoxLayout" name="mainLayout">
4160
<item>
4261
<widget class="QgsCollapsibleGroupBoxBasic" name="mTextGroupBox">
43-
<property name="sizePolicy">
44-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
45-
<horstretch>0</horstretch>
46-
<verstretch>1</verstretch>
47-
</sizepolicy>
48-
</property>
4962
<property name="title">
5063
<string>Main properties</string>
5164
</property>
@@ -113,14 +126,8 @@
113126
</item>
114127
<item>
115128
<widget class="QgsCollapsibleGroupBoxBasic" name="mAlignementGroup">
116-
<property name="sizePolicy">
117-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
118-
<horstretch>0</horstretch>
119-
<verstretch>0</verstretch>
120-
</sizepolicy>
121-
</property>
122129
<property name="title">
123-
<string>Alignement</string>
130+
<string>Alignment</string>
124131
</property>
125132
<property name="checkable">
126133
<bool>false</bool>
@@ -129,12 +136,15 @@
129136
<string notr="true">composeritem</string>
130137
</property>
131138
<property name="collapsed" stdset="0">
132-
<bool>true</bool>
139+
<bool>false</bool>
133140
</property>
134141
<layout class="QFormLayout" name="formLayout_4">
135142
<property name="fieldGrowthPolicy">
136143
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
137144
</property>
145+
<property name="labelAlignment">
146+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
147+
</property>
138148
<item row="0" column="0">
139149
<widget class="QLabel" name="mVerticalAlignementLabel">
140150
<property name="text">
@@ -144,19 +154,6 @@
144154
</item>
145155
<item row="0" column="1">
146156
<layout class="QHBoxLayout" name="horizontalLayout_6">
147-
<item>
148-
<spacer name="horizontalSpacer">
149-
<property name="orientation">
150-
<enum>Qt::Horizontal</enum>
151-
</property>
152-
<property name="sizeHint" stdset="0">
153-
<size>
154-
<width>40</width>
155-
<height>20</height>
156-
</size>
157-
</property>
158-
</spacer>
159-
</item>
160157
<item>
161158
<widget class="QRadioButton" name="mTopRadioButton">
162159
<property name="text">
@@ -202,19 +199,6 @@
202199
</item>
203200
<item row="1" column="1">
204201
<layout class="QHBoxLayout" name="horizontalLayout_5">
205-
<item>
206-
<spacer name="horizontalSpacer_2">
207-
<property name="orientation">
208-
<enum>Qt::Horizontal</enum>
209-
</property>
210-
<property name="sizeHint" stdset="0">
211-
<size>
212-
<width>40</width>
213-
<height>20</height>
214-
</size>
215-
</property>
216-
</spacer>
217-
</item>
218202
<item>
219203
<widget class="QRadioButton" name="mLeftRadioButton">
220204
<property name="text">
@@ -256,12 +240,6 @@
256240
</item>
257241
<item>
258242
<widget class="QgsCollapsibleGroupBoxBasic" name="mDisplayGroupBox">
259-
<property name="sizePolicy">
260-
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
261-
<horstretch>0</horstretch>
262-
<verstretch>0</verstretch>
263-
</sizepolicy>
264-
</property>
265243
<property name="title">
266244
<string>Display</string>
267245
</property>
@@ -272,12 +250,15 @@
272250
<string notr="true">composeritem</string>
273251
</property>
274252
<property name="collapsed" stdset="0">
275-
<bool>true</bool>
253+
<bool>false</bool>
276254
</property>
277255
<layout class="QFormLayout" name="formLayout_2">
278256
<property name="fieldGrowthPolicy">
279257
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
280258
</property>
259+
<property name="labelAlignment">
260+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
261+
</property>
281262
<item row="0" column="0">
282263
<widget class="QLabel" name="mMarginLabel">
283264
<property name="text">

‎src/ui/qgscomposerlegendwidgetbase.ui

Lines changed: 104 additions & 88 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>407</width>
10-
<height>839</height>
9+
<width>393</width>
10+
<height>995</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -17,16 +17,35 @@
1717
</sizepolicy>
1818
</property>
1919
<property name="windowTitle">
20-
<string>Barscale Options</string>
20+
<string>Legend Options</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout">
23+
<property name="spacing">
24+
<number>0</number>
25+
</property>
2326
<property name="margin">
2427
<number>0</number>
2528
</property>
29+
<item>
30+
<widget class="QLabel" name="label_11">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="styleSheet">
38+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
39+
</property>
40+
<property name="text">
41+
<string>Legend</string>
42+
</property>
43+
</widget>
44+
</item>
2645
<item>
2746
<widget class="QScrollArea" name="scrollArea">
2847
<property name="frameShape">
29-
<enum>QFrame::NoFrame</enum>
48+
<enum>QFrame::StyledPanel</enum>
3049
</property>
3150
<property name="widgetResizable">
3251
<bool>true</bool>
@@ -35,20 +54,14 @@
3554
<property name="geometry">
3655
<rect>
3756
<x>0</x>
38-
<y>-101</y>
39-
<width>386</width>
40-
<height>940</height>
57+
<y>0</y>
58+
<width>376</width>
59+
<height>990</height>
4160
</rect>
4261
</property>
4362
<layout class="QVBoxLayout" name="mainLayout">
4463
<item>
4564
<widget class="QgsCollapsibleGroupBoxBasic" name="mMainPropertiesColGroupBox">
46-
<property name="sizePolicy">
47-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
48-
<horstretch>0</horstretch>
49-
<verstretch>0</verstretch>
50-
</sizepolicy>
51-
</property>
5265
<property name="title">
5366
<string>Main properties</string>
5467
</property>
@@ -59,6 +72,12 @@
5972
<bool>false</bool>
6073
</property>
6174
<layout class="QFormLayout" name="formLayout">
75+
<property name="fieldGrowthPolicy">
76+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
77+
</property>
78+
<property name="labelAlignment">
79+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
80+
</property>
6281
<item row="0" column="0">
6382
<widget class="QLabel" name="mTitleLabel">
6483
<property name="text">
@@ -334,13 +353,69 @@
334353
</widget>
335354
</item>
336355
<item>
337-
<widget class="QgsCollapsibleGroupBoxBasic" name="mColumnsColGroupBox">
356+
<widget class="QgsCollapsibleGroupBoxBasic" name="mFontsColGroupBox">
338357
<property name="sizePolicy">
339358
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
340359
<horstretch>0</horstretch>
341360
<verstretch>0</verstretch>
342361
</sizepolicy>
343362
</property>
363+
<property name="title">
364+
<string>Fonts</string>
365+
</property>
366+
<property name="syncGroup" stdset="0">
367+
<string notr="true">composeritem</string>
368+
</property>
369+
<property name="collapsed" stdset="0">
370+
<bool>false</bool>
371+
</property>
372+
<layout class="QGridLayout" name="gridLayout_4">
373+
<item row="0" column="0">
374+
<widget class="QPushButton" name="mTitleFontButton">
375+
<property name="sizePolicy">
376+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
377+
<horstretch>0</horstretch>
378+
<verstretch>0</verstretch>
379+
</sizepolicy>
380+
</property>
381+
<property name="text">
382+
<string>Title Font...</string>
383+
</property>
384+
</widget>
385+
</item>
386+
<item row="0" column="1">
387+
<widget class="QPushButton" name="mGroupFontButton">
388+
<property name="text">
389+
<string>Group Font...</string>
390+
</property>
391+
</widget>
392+
</item>
393+
<item row="1" column="0">
394+
<widget class="QPushButton" name="mLayerFontButton">
395+
<property name="text">
396+
<string>Layer Font...</string>
397+
</property>
398+
</widget>
399+
</item>
400+
<item row="1" column="1">
401+
<widget class="QPushButton" name="mItemFontButton">
402+
<property name="text">
403+
<string>Item Font...</string>
404+
</property>
405+
</widget>
406+
</item>
407+
<item row="2" column="0" colspan="2">
408+
<widget class="QPushButton" name="mFontColorPushButton">
409+
<property name="text">
410+
<string>Font color...</string>
411+
</property>
412+
</widget>
413+
</item>
414+
</layout>
415+
</widget>
416+
</item>
417+
<item>
418+
<widget class="QgsCollapsibleGroupBoxBasic" name="mColumnsColGroupBox">
344419
<property name="title">
345420
<string>Columns</string>
346421
</property>
@@ -351,6 +426,12 @@
351426
<bool>true</bool>
352427
</property>
353428
<layout class="QFormLayout" name="formLayout_2">
429+
<property name="fieldGrowthPolicy">
430+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
431+
</property>
432+
<property name="labelAlignment">
433+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
434+
</property>
354435
<item row="1" column="0">
355436
<widget class="QLabel" name="label_2">
356437
<property name="text">
@@ -410,12 +491,6 @@
410491
</item>
411492
<item>
412493
<widget class="QgsCollapsibleGroupBoxBasic" name="mSymbolsColGroupBox">
413-
<property name="sizePolicy">
414-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
415-
<horstretch>0</horstretch>
416-
<verstretch>0</verstretch>
417-
</sizepolicy>
418-
</property>
419494
<property name="title">
420495
<string>Symbol</string>
421496
</property>
@@ -429,6 +504,9 @@
429504
<property name="fieldGrowthPolicy">
430505
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
431506
</property>
507+
<property name="labelAlignment">
508+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
509+
</property>
432510
<item row="0" column="0">
433511
<widget class="QLabel" name="label_3">
434512
<property name="text">
@@ -468,12 +546,6 @@
468546
</item>
469547
<item>
470548
<widget class="QgsCollapsibleGroupBoxBasic" name="mSpacingColGroupBox">
471-
<property name="sizePolicy">
472-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
473-
<horstretch>0</horstretch>
474-
<verstretch>0</verstretch>
475-
</sizepolicy>
476-
</property>
477549
<property name="title">
478550
<string>Spacing</string>
479551
</property>
@@ -484,6 +556,12 @@
484556
<bool>true</bool>
485557
</property>
486558
<layout class="QFormLayout" name="formLayout_4">
559+
<property name="fieldGrowthPolicy">
560+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
561+
</property>
562+
<property name="labelAlignment">
563+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
564+
</property>
487565
<item row="0" column="0">
488566
<widget class="QLabel" name="label_5">
489567
<property name="text">
@@ -572,68 +650,6 @@
572650
</layout>
573651
</widget>
574652
</item>
575-
<item>
576-
<widget class="QgsCollapsibleGroupBoxBasic" name="mFontsColGroupBox">
577-
<property name="sizePolicy">
578-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
579-
<horstretch>0</horstretch>
580-
<verstretch>0</verstretch>
581-
</sizepolicy>
582-
</property>
583-
<property name="title">
584-
<string>Fonts</string>
585-
</property>
586-
<property name="syncGroup" stdset="0">
587-
<string notr="true">composeritem</string>
588-
</property>
589-
<property name="collapsed" stdset="0">
590-
<bool>true</bool>
591-
</property>
592-
<layout class="QGridLayout" name="gridLayout_4">
593-
<item row="0" column="0">
594-
<widget class="QPushButton" name="mTitleFontButton">
595-
<property name="sizePolicy">
596-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
597-
<horstretch>0</horstretch>
598-
<verstretch>0</verstretch>
599-
</sizepolicy>
600-
</property>
601-
<property name="text">
602-
<string>Title Font...</string>
603-
</property>
604-
</widget>
605-
</item>
606-
<item row="0" column="1">
607-
<widget class="QPushButton" name="mGroupFontButton">
608-
<property name="text">
609-
<string>Group Font...</string>
610-
</property>
611-
</widget>
612-
</item>
613-
<item row="1" column="0">
614-
<widget class="QPushButton" name="mLayerFontButton">
615-
<property name="text">
616-
<string>Layer Font...</string>
617-
</property>
618-
</widget>
619-
</item>
620-
<item row="1" column="1">
621-
<widget class="QPushButton" name="mItemFontButton">
622-
<property name="text">
623-
<string>Item Font...</string>
624-
</property>
625-
</widget>
626-
</item>
627-
<item row="2" column="0" colspan="2">
628-
<widget class="QPushButton" name="mFontColorPushButton">
629-
<property name="text">
630-
<string>Font color...</string>
631-
</property>
632-
</widget>
633-
</item>
634-
</layout>
635-
</widget>
636-
</item>
637653
</layout>
638654
</widget>
639655
</widget>

‎src/ui/qgscomposermapwidgetbase.ui

Lines changed: 96 additions & 68 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>450</width>
10-
<height>910</height>
9+
<width>457</width>
10+
<height>1086</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -20,23 +20,51 @@
2020
<string>Map options</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout_2">
23+
<property name="spacing">
24+
<number>0</number>
25+
</property>
2326
<property name="margin">
2427
<number>0</number>
2528
</property>
29+
<item>
30+
<widget class="QLabel" name="label_3">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="styleSheet">
38+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
39+
</property>
40+
<property name="text">
41+
<string>Map</string>
42+
</property>
43+
</widget>
44+
</item>
2645
<item>
2746
<widget class="QScrollArea" name="scrollArea">
47+
<property name="frameShape">
48+
<enum>QFrame::StyledPanel</enum>
49+
</property>
2850
<property name="widgetResizable">
2951
<bool>true</bool>
3052
</property>
3153
<widget class="QWidget" name="scrollAreaWidgetContents">
3254
<property name="geometry">
3355
<rect>
3456
<x>0</x>
35-
<y>-93</y>
36-
<width>427</width>
37-
<height>1023</height>
57+
<y>0</y>
58+
<width>455</width>
59+
<height>1051</height>
3860
</rect>
3961
</property>
62+
<property name="sizePolicy">
63+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
64+
<horstretch>0</horstretch>
65+
<verstretch>0</verstretch>
66+
</sizepolicy>
67+
</property>
4068
<layout class="QVBoxLayout" name="mainLayout">
4169
<item>
4270
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
@@ -59,6 +87,9 @@
5987
<property name="fieldGrowthPolicy">
6088
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
6189
</property>
90+
<property name="labelAlignment">
91+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
92+
</property>
6293
<item row="0" column="0" colspan="2">
6394
<layout class="QHBoxLayout" name="horizontalLayout_2">
6495
<item>
@@ -82,18 +113,9 @@
82113
</item>
83114
<item row="1" column="0">
84115
<widget class="QLabel" name="label_2">
85-
<property name="sizePolicy">
86-
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
87-
<horstretch>0</horstretch>
88-
<verstretch>0</verstretch>
89-
</sizepolicy>
90-
</property>
91116
<property name="text">
92117
<string>Scale</string>
93118
</property>
94-
<property name="wordWrap">
95-
<bool>true</bool>
96-
</property>
97119
<property name="buddy">
98120
<cstring>mScaleLineEdit</cstring>
99121
</property>
@@ -111,9 +133,6 @@
111133
<property name="text">
112134
<string>Rotation</string>
113135
</property>
114-
<property name="wordWrap">
115-
<bool>true</bool>
116-
</property>
117136
</widget>
118137
</item>
119138
<item row="2" column="1">
@@ -174,84 +193,78 @@
174193
<string notr="true">composeritem</string>
175194
</property>
176195
<property name="collapsed" stdset="0">
177-
<bool>true</bool>
196+
<bool>false</bool>
178197
</property>
179-
<layout class="QFormLayout" name="formLayout_2">
180-
<item row="0" column="0">
181-
<widget class="QLabel" name="mXMinLabel">
182-
<property name="enabled">
183-
<bool>true</bool>
184-
</property>
198+
<layout class="QGridLayout" name="gridLayout">
199+
<item row="0" column="2">
200+
<widget class="QLabel" name="mYMinLabel">
185201
<property name="text">
186-
<string>X min</string>
202+
<string>Y min</string>
187203
</property>
188204
<property name="wordWrap">
189-
<bool>true</bool>
205+
<bool>false</bool>
190206
</property>
191207
<property name="buddy">
192-
<cstring>mXMinLineEdit</cstring>
208+
<cstring>mYMinLineEdit</cstring>
193209
</property>
194210
</widget>
195211
</item>
196212
<item row="0" column="1">
197213
<widget class="QLineEdit" name="mXMinLineEdit"/>
198214
</item>
199-
<item row="1" column="0">
200-
<widget class="QLabel" name="mXMaxLabel">
215+
<item row="0" column="3">
216+
<widget class="QLineEdit" name="mYMinLineEdit"/>
217+
</item>
218+
<item row="1" column="2">
219+
<widget class="QLabel" name="mYMaxLabel">
201220
<property name="text">
202-
<string>X max</string>
221+
<string>Y max</string>
203222
</property>
204223
<property name="wordWrap">
205-
<bool>true</bool>
224+
<bool>false</bool>
206225
</property>
207226
<property name="buddy">
208-
<cstring>mXMaxLineEdit</cstring>
227+
<cstring>mYMaxLineEdit</cstring>
209228
</property>
210229
</widget>
211230
</item>
212-
<item row="1" column="1">
213-
<widget class="QLineEdit" name="mXMaxLineEdit"/>
214-
</item>
215-
<item row="2" column="0">
216-
<widget class="QLabel" name="mYMinLabel">
231+
<item row="0" column="0">
232+
<widget class="QLabel" name="mXMinLabel">
233+
<property name="enabled">
234+
<bool>true</bool>
235+
</property>
217236
<property name="text">
218-
<string>Y min</string>
237+
<string>X min</string>
219238
</property>
220239
<property name="wordWrap">
221-
<bool>true</bool>
240+
<bool>false</bool>
222241
</property>
223242
<property name="buddy">
224-
<cstring>mYMinLineEdit</cstring>
243+
<cstring>mXMinLineEdit</cstring>
225244
</property>
226245
</widget>
227246
</item>
228-
<item row="2" column="1">
229-
<widget class="QLineEdit" name="mYMinLineEdit"/>
230-
</item>
231-
<item row="3" column="0">
232-
<widget class="QLabel" name="mYMaxLabel">
247+
<item row="1" column="0">
248+
<widget class="QLabel" name="mXMaxLabel">
233249
<property name="text">
234-
<string>Y max</string>
250+
<string>X max</string>
235251
</property>
236252
<property name="wordWrap">
237-
<bool>true</bool>
253+
<bool>false</bool>
238254
</property>
239255
<property name="buddy">
240-
<cstring>mYMaxLineEdit</cstring>
256+
<cstring>mXMaxLineEdit</cstring>
241257
</property>
242258
</widget>
243259
</item>
244-
<item row="3" column="1">
260+
<item row="1" column="1">
261+
<widget class="QLineEdit" name="mXMaxLineEdit"/>
262+
</item>
263+
<item row="1" column="3">
245264
<widget class="QLineEdit" name="mYMaxLineEdit"/>
246265
</item>
247-
<item row="4" column="0" colspan="2">
266+
<item row="2" column="0" colspan="4">
248267
<widget class="QPushButton" name="mSetToMapCanvasExtentButton">
249-
<property name="sizePolicy">
250-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
251-
<horstretch>0</horstretch>
252-
<verstretch>0</verstretch>
253-
</sizepolicy>
254-
</property>
255268
<property name="text">
256269
<string>Set to map canvas extent</string>
257270
</property>
@@ -262,12 +275,6 @@
262275
</item>
263276
<item>
264277
<widget class="QgsCollapsibleGroupBoxBasic" name="mGridCheckBox">
265-
<property name="sizePolicy">
266-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
267-
<horstretch>0</horstretch>
268-
<verstretch>0</verstretch>
269-
</sizepolicy>
270-
</property>
271278
<property name="title">
272279
<string>Show grid</string>
273280
</property>
@@ -281,12 +288,15 @@
281288
<string notr="true">composeritem</string>
282289
</property>
283290
<property name="collapsed" stdset="0">
284-
<bool>true</bool>
291+
<bool>false</bool>
285292
</property>
286293
<layout class="QFormLayout">
287294
<property name="fieldGrowthPolicy">
288295
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
289296
</property>
297+
<property name="labelAlignment">
298+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
299+
</property>
290300
<item row="0" column="0">
291301
<widget class="QLabel" name="mGridTypeLabel">
292302
<property name="accessibleName">
@@ -296,7 +306,7 @@
296306
<string>Grid &amp;type</string>
297307
</property>
298308
<property name="wordWrap">
299-
<bool>true</bool>
309+
<bool>false</bool>
300310
</property>
301311
<property name="buddy">
302312
<cstring>mGridTypeComboBox</cstring>
@@ -312,7 +322,7 @@
312322
<string>Interval</string>
313323
</property>
314324
<property name="wordWrap">
315-
<bool>true</bool>
325+
<bool>false</bool>
316326
</property>
317327
<property name="buddy">
318328
<cstring>mIntervalXSpinBox</cstring>
@@ -355,7 +365,7 @@
355365
<string>Offset X</string>
356366
</property>
357367
<property name="wordWrap">
358-
<bool>true</bool>
368+
<bool>false</bool>
359369
</property>
360370
<property name="buddy">
361371
<cstring>mOffsetXSpinBox</cstring>
@@ -398,7 +408,7 @@
398408
<string>Cross width</string>
399409
</property>
400410
<property name="wordWrap">
401-
<bool>true</bool>
411+
<bool>false</bool>
402412
</property>
403413
<property name="buddy">
404414
<cstring>mCrossWidthSpinBox</cstring>
@@ -417,6 +427,9 @@
417427
<property name="text">
418428
<string>Frame style</string>
419429
</property>
430+
<property name="wordWrap">
431+
<bool>false</bool>
432+
</property>
420433
</widget>
421434
</item>
422435
<item row="4" column="1">
@@ -427,6 +440,9 @@
427440
<property name="text">
428441
<string>Frame width</string>
429442
</property>
443+
<property name="wordWrap">
444+
<bool>false</bool>
445+
</property>
430446
</widget>
431447
</item>
432448
<item row="5" column="1">
@@ -438,7 +454,7 @@
438454
<string>Line style</string>
439455
</property>
440456
<property name="wordWrap">
441-
<bool>true</bool>
457+
<bool>false</bool>
442458
</property>
443459
</widget>
444460
</item>
@@ -451,6 +467,9 @@
451467
</item>
452468
<item row="7" column="0" colspan="2">
453469
<widget class="QgsCollapsibleGroupBoxBasic" name="mDrawAnnotationCheckableGroupBox">
470+
<property name="enabled">
471+
<bool>true</bool>
472+
</property>
454473
<property name="title">
455474
<string>Draw coordinates</string>
456475
</property>
@@ -467,6 +486,9 @@
467486
<property name="fieldGrowthPolicy">
468487
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
469488
</property>
489+
<property name="labelAlignment">
490+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
491+
</property>
470492
<item row="0" column="0">
471493
<widget class="QLabel" name="mAnnotationFormatLabel">
472494
<property name="text">
@@ -639,6 +661,12 @@
639661
<bool>true</bool>
640662
</property>
641663
<layout class="QFormLayout" name="formLayout_3">
664+
<property name="fieldGrowthPolicy">
665+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
666+
</property>
667+
<property name="labelAlignment">
668+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
669+
</property>
642670
<item row="0" column="0">
643671
<widget class="QLabel" name="mOverviewFrameMapLabel">
644672
<property name="text">

‎src/ui/qgscomposerpicturewidgetbase.ui

Lines changed: 38 additions & 19 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>331</width>
10-
<height>614</height>
9+
<width>312</width>
10+
<height>572</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -20,9 +20,28 @@
2020
<string>Picture Options</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout_2">
23+
<property name="spacing">
24+
<number>0</number>
25+
</property>
2326
<property name="margin">
2427
<number>0</number>
2528
</property>
29+
<item>
30+
<widget class="QLabel" name="label_2">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="styleSheet">
38+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
39+
</property>
40+
<property name="text">
41+
<string>Picture</string>
42+
</property>
43+
</widget>
44+
</item>
2645
<item>
2746
<widget class="QScrollArea" name="scrollArea">
2847
<property name="widgetResizable">
@@ -33,19 +52,13 @@
3352
<rect>
3453
<x>0</x>
3554
<y>0</y>
36-
<width>329</width>
37-
<height>612</height>
55+
<width>310</width>
56+
<height>550</height>
3857
</rect>
3958
</property>
4059
<layout class="QVBoxLayout" name="mainLayout">
4160
<item>
4261
<widget class="QgsCollapsibleGroupBoxBasic" name="mPreviewGroupBox">
43-
<property name="sizePolicy">
44-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
45-
<horstretch>0</horstretch>
46-
<verstretch>0</verstretch>
47-
</sizepolicy>
48-
</property>
4962
<property name="title">
5063
<string>Main properties</string>
5164
</property>
@@ -56,6 +69,12 @@
5669
<bool>false</bool>
5770
</property>
5871
<layout class="QFormLayout" name="formLayout_2">
72+
<property name="fieldGrowthPolicy">
73+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
74+
</property>
75+
<property name="labelAlignment">
76+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
77+
</property>
5978
<item row="1" column="0">
6079
<widget class="QLabel" name="label">
6180
<property name="text">
@@ -97,6 +116,12 @@
97116
</item>
98117
<item>
99118
<widget class="QgsCollapsibleGroupBoxBasic" name="mSearchDirectoriesGroupBox">
119+
<property name="sizePolicy">
120+
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
121+
<horstretch>0</horstretch>
122+
<verstretch>0</verstretch>
123+
</sizepolicy>
124+
</property>
100125
<property name="title">
101126
<string>Search directories</string>
102127
</property>
@@ -167,27 +192,21 @@
167192
</item>
168193
<item>
169194
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
170-
<property name="sizePolicy">
171-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
172-
<horstretch>0</horstretch>
173-
<verstretch>0</verstretch>
174-
</sizepolicy>
175-
</property>
176195
<property name="title">
177196
<string>Rotation</string>
178197
</property>
179198
<property name="syncGroup" stdset="0">
180199
<string notr="true">composeritem</string>
181200
</property>
182201
<property name="collapsed" stdset="0">
183-
<bool>true</bool>
202+
<bool>false</bool>
184203
</property>
185204
<layout class="QFormLayout" name="formLayout">
186205
<property name="fieldGrowthPolicy">
187206
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
188207
</property>
189-
<property name="margin">
190-
<number>3</number>
208+
<property name="labelAlignment">
209+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
191210
</property>
192211
<item row="1" column="0">
193212
<widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">

‎src/ui/qgscomposerscalebarwidgetbase.ui

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,28 @@
2020
<string>Barscale Options</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout">
23+
<property name="spacing">
24+
<number>0</number>
25+
</property>
2326
<property name="margin">
2427
<number>0</number>
2528
</property>
29+
<item>
30+
<widget class="QLabel" name="label_5">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="styleSheet">
38+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
39+
</property>
40+
<property name="text">
41+
<string>Scalebar</string>
42+
</property>
43+
</widget>
44+
</item>
2645
<item>
2746
<widget class="QScrollArea" name="scrollArea">
2847
<property name="widgetResizable">
@@ -34,18 +53,12 @@
3453
<x>0</x>
3554
<y>0</y>
3655
<width>434</width>
37-
<height>759</height>
56+
<height>739</height>
3857
</rect>
3958
</property>
4059
<layout class="QVBoxLayout" name="mainLayout">
4160
<item>
4261
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
43-
<property name="sizePolicy">
44-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
45-
<horstretch>0</horstretch>
46-
<verstretch>0</verstretch>
47-
</sizepolicy>
48-
</property>
4962
<property name="title">
5063
<string>Main properties</string>
5164
</property>
@@ -59,6 +72,9 @@
5972
<property name="fieldGrowthPolicy">
6073
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
6174
</property>
75+
<property name="labelAlignment">
76+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
77+
</property>
6278
<item row="0" column="0">
6379
<widget class="QLabel" name="mMapLabel">
6480
<property name="sizePolicy">
@@ -109,22 +125,22 @@
109125
</item>
110126
<item>
111127
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_2">
112-
<property name="sizePolicy">
113-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
114-
<horstretch>0</horstretch>
115-
<verstretch>0</verstretch>
116-
</sizepolicy>
117-
</property>
118128
<property name="title">
119129
<string>Units</string>
120130
</property>
121131
<property name="syncGroup" stdset="0">
122132
<string notr="true">composeritem</string>
123133
</property>
124134
<property name="collapsed" stdset="0">
125-
<bool>true</bool>
135+
<bool>false</bool>
126136
</property>
127137
<layout class="QFormLayout" name="formLayout_2">
138+
<property name="fieldGrowthPolicy">
139+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
140+
</property>
141+
<property name="labelAlignment">
142+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
143+
</property>
128144
<item row="1" column="0">
129145
<widget class="QLabel" name="mUnitLabelLabel">
130146
<property name="text">
@@ -169,25 +185,22 @@
169185
</item>
170186
<item>
171187
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_3">
172-
<property name="sizePolicy">
173-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
174-
<horstretch>0</horstretch>
175-
<verstretch>0</verstretch>
176-
</sizepolicy>
177-
</property>
178188
<property name="title">
179189
<string>Segments</string>
180190
</property>
181191
<property name="syncGroup" stdset="0">
182192
<string notr="true">composeritem</string>
183193
</property>
184194
<property name="collapsed" stdset="0">
185-
<bool>true</bool>
195+
<bool>false</bool>
186196
</property>
187197
<layout class="QFormLayout" name="formLayout_3">
188198
<property name="fieldGrowthPolicy">
189199
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
190200
</property>
201+
<property name="labelAlignment">
202+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
203+
</property>
191204
<item row="0" column="0">
192205
<widget class="QLabel" name="mSegmentLabel">
193206
<property name="text">
@@ -267,25 +280,22 @@
267280
</item>
268281
<item>
269282
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_5">
270-
<property name="sizePolicy">
271-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
272-
<horstretch>0</horstretch>
273-
<verstretch>0</verstretch>
274-
</sizepolicy>
275-
</property>
276283
<property name="title">
277284
<string>Display</string>
278285
</property>
279286
<property name="syncGroup" stdset="0">
280287
<string notr="true">composeritem</string>
281288
</property>
282289
<property name="collapsed" stdset="0">
283-
<bool>true</bool>
290+
<bool>false</bool>
284291
</property>
285292
<layout class="QFormLayout" name="formLayout_4">
286293
<property name="fieldGrowthPolicy">
287294
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
288295
</property>
296+
<property name="labelAlignment">
297+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
298+
</property>
289299
<item row="0" column="0">
290300
<widget class="QLabel" name="label_4">
291301
<property name="text">
@@ -367,27 +377,18 @@
367377
</item>
368378
<item>
369379
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_4">
370-
<property name="sizePolicy">
371-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
372-
<horstretch>0</horstretch>
373-
<verstretch>0</verstretch>
374-
</sizepolicy>
375-
</property>
376380
<property name="title">
377381
<string>Fonts and colors</string>
378382
</property>
379383
<property name="syncGroup" stdset="0">
380384
<string notr="true">composeritem</string>
381385
</property>
382386
<property name="collapsed" stdset="0">
383-
<bool>true</bool>
387+
<bool>false</bool>
384388
</property>
385389
<layout class="QVBoxLayout" name="verticalLayout_2">
386390
<item>
387391
<layout class="QHBoxLayout" name="horizontalLayout2">
388-
<property name="margin">
389-
<number>0</number>
390-
</property>
391392
<item>
392393
<widget class="QPushButton" name="mFontButton">
393394
<property name="sizePolicy">
@@ -412,9 +413,6 @@
412413
</item>
413414
<item>
414415
<layout class="QHBoxLayout" name="horizontalLayout3">
415-
<property name="margin">
416-
<number>0</number>
417-
</property>
418416
<item>
419417
<widget class="QPushButton" name="mColorPushButton">
420418
<property name="text">

‎src/ui/qgscomposershapewidgetbase.ui

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,28 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17+
<property name="spacing">
18+
<number>0</number>
19+
</property>
1720
<property name="margin">
1821
<number>0</number>
1922
</property>
23+
<item>
24+
<widget class="QLabel" name="label_2">
25+
<property name="sizePolicy">
26+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
27+
<horstretch>0</horstretch>
28+
<verstretch>0</verstretch>
29+
</sizepolicy>
30+
</property>
31+
<property name="styleSheet">
32+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
33+
</property>
34+
<property name="text">
35+
<string>Shape</string>
36+
</property>
37+
</widget>
38+
</item>
2039
<item>
2140
<widget class="QScrollArea" name="scrollArea">
2241
<property name="widgetResizable">
@@ -28,18 +47,12 @@
2847
<x>0</x>
2948
<y>0</y>
3049
<width>283</width>
31-
<height>425</height>
50+
<height>405</height>
3251
</rect>
3352
</property>
3453
<layout class="QVBoxLayout" name="mainLayout">
3554
<item>
3655
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
37-
<property name="sizePolicy">
38-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
39-
<horstretch>0</horstretch>
40-
<verstretch>0</verstretch>
41-
</sizepolicy>
42-
</property>
4356
<property name="title">
4457
<string>Main properties</string>
4558
</property>
@@ -53,6 +66,9 @@
5366
<property name="fieldGrowthPolicy">
5467
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
5568
</property>
69+
<property name="labelAlignment">
70+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
71+
</property>
5672
<item row="0" column="0" colspan="2">
5773
<widget class="QComboBox" name="mShapeComboBox"/>
5874
</item>

‎src/ui/qgscomposertablewidgetbase.ui

Lines changed: 80 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,36 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>605</width>
10-
<height>631</height>
9+
<width>410</width>
10+
<height>595</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17+
<property name="spacing">
18+
<number>0</number>
19+
</property>
1720
<property name="margin">
1821
<number>0</number>
1922
</property>
23+
<item>
24+
<widget class="QLabel" name="label">
25+
<property name="sizePolicy">
26+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
27+
<horstretch>0</horstretch>
28+
<verstretch>0</verstretch>
29+
</sizepolicy>
30+
</property>
31+
<property name="styleSheet">
32+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
33+
</property>
34+
<property name="text">
35+
<string>Attribute table</string>
36+
</property>
37+
</widget>
38+
</item>
2039
<item>
2140
<widget class="QScrollArea" name="scrollArea">
2241
<property name="widgetResizable">
@@ -27,21 +46,15 @@
2746
<rect>
2847
<x>0</x>
2948
<y>0</y>
30-
<width>603</width>
31-
<height>629</height>
49+
<width>408</width>
50+
<height>573</height>
3251
</rect>
3352
</property>
3453
<layout class="QVBoxLayout" name="mainLayout">
3554
<item>
3655
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
37-
<property name="sizePolicy">
38-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
39-
<horstretch>0</horstretch>
40-
<verstretch>0</verstretch>
41-
</sizepolicy>
42-
</property>
4356
<property name="title">
44-
<string>Main attributes</string>
57+
<string>Main properties</string>
4558
</property>
4659
<property name="syncGroup" stdset="0">
4760
<string notr="true">composeritem</string>
@@ -50,83 +63,95 @@
5063
<bool>false</bool>
5164
</property>
5265
<layout class="QFormLayout" name="formLayout_2">
53-
<item row="1" column="0">
66+
<property name="fieldGrowthPolicy">
67+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
68+
</property>
69+
<property name="labelAlignment">
70+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
71+
</property>
72+
<item row="0" column="0">
5473
<widget class="QLabel" name="mLayerLabel">
5574
<property name="text">
5675
<string>Layer</string>
5776
</property>
77+
<property name="wordWrap">
78+
<bool>true</bool>
79+
</property>
5880
<property name="buddy">
5981
<cstring>mLayerComboBox</cstring>
6082
</property>
6183
</widget>
6284
</item>
63-
<item row="1" column="1">
85+
<item row="0" column="1">
6486
<widget class="QComboBox" name="mLayerComboBox"/>
6587
</item>
66-
<item row="2" column="0" colspan="2">
88+
<item row="1" column="1">
6789
<widget class="QPushButton" name="mAttributesPushButton">
6890
<property name="text">
6991
<string>Attributes...</string>
7092
</property>
7193
</widget>
7294
</item>
73-
<item row="5" column="0">
95+
<item row="2" column="1">
96+
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
97+
<property name="text">
98+
<string>Show only visible features</string>
99+
</property>
100+
</widget>
101+
</item>
102+
<item row="3" column="0">
74103
<widget class="QLabel" name="mComposerMapLabel">
75104
<property name="text">
76105
<string>Composer map</string>
77106
</property>
107+
<property name="wordWrap">
108+
<bool>true</bool>
109+
</property>
78110
<property name="buddy">
79111
<cstring>mComposerMapComboBox</cstring>
80112
</property>
81113
</widget>
82114
</item>
83-
<item row="5" column="1">
115+
<item row="3" column="1">
84116
<widget class="QComboBox" name="mComposerMapComboBox"/>
85117
</item>
86-
<item row="3" column="0" colspan="2">
87-
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
88-
<property name="text">
89-
<string>Show only visible features</string>
90-
</property>
91-
</widget>
92-
</item>
93-
<item row="6" column="0">
118+
<item row="4" column="0">
94119
<widget class="QLabel" name="mMaxNumFeaturesLabel">
95120
<property name="text">
96121
<string>Maximum rows</string>
97122
</property>
123+
<property name="wordWrap">
124+
<bool>true</bool>
125+
</property>
98126
<property name="buddy">
99127
<cstring>mMaximumColumnsSpinBox</cstring>
100128
</property>
101129
</widget>
102130
</item>
103-
<item row="6" column="1">
131+
<item row="4" column="1">
104132
<widget class="QSpinBox" name="mMaximumColumnsSpinBox"/>
105133
</item>
106-
<item row="7" column="0">
134+
<item row="5" column="0">
107135
<widget class="QLabel" name="mMarginLabel">
108136
<property name="text">
109137
<string>Margin</string>
110138
</property>
139+
<property name="wordWrap">
140+
<bool>true</bool>
141+
</property>
111142
<property name="buddy">
112143
<cstring>mMarginSpinBox</cstring>
113144
</property>
114145
</widget>
115146
</item>
116-
<item row="7" column="1">
147+
<item row="5" column="1">
117148
<widget class="QDoubleSpinBox" name="mMarginSpinBox"/>
118149
</item>
119150
</layout>
120151
</widget>
121152
</item>
122153
<item>
123154
<widget class="QgsCollapsibleGroupBoxBasic" name="mShowGridGroupCheckBox">
124-
<property name="sizePolicy">
125-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
126-
<horstretch>0</horstretch>
127-
<verstretch>0</verstretch>
128-
</sizepolicy>
129-
</property>
130155
<property name="title">
131156
<string>Show grid</string>
132157
</property>
@@ -137,17 +162,23 @@
137162
<string notr="true">composeritem</string>
138163
</property>
139164
<property name="collapsed" stdset="0">
140-
<bool>true</bool>
165+
<bool>false</bool>
141166
</property>
142167
<layout class="QFormLayout" name="formLayout_3">
143168
<property name="fieldGrowthPolicy">
144169
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
145170
</property>
171+
<property name="labelAlignment">
172+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
173+
</property>
146174
<item row="0" column="0">
147175
<widget class="QLabel" name="mGridStrokeWidthLabel">
148176
<property name="text">
149177
<string>Stroke width</string>
150178
</property>
179+
<property name="wordWrap">
180+
<bool>true</bool>
181+
</property>
151182
<property name="buddy">
152183
<cstring>mGridStrokeWidthSpinBox</cstring>
153184
</property>
@@ -161,6 +192,9 @@
161192
<property name="text">
162193
<string>Color</string>
163194
</property>
195+
<property name="wordWrap">
196+
<bool>true</bool>
197+
</property>
164198
<property name="buddy">
165199
<cstring>mGridColorButton</cstring>
166200
</property>
@@ -174,6 +208,12 @@
174208
<verstretch>0</verstretch>
175209
</sizepolicy>
176210
</property>
211+
<property name="maximumSize">
212+
<size>
213+
<width>100</width>
214+
<height>16777215</height>
215+
</size>
216+
</property>
177217
<property name="text">
178218
<string/>
179219
</property>
@@ -184,20 +224,14 @@
184224
</item>
185225
<item>
186226
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_3">
187-
<property name="sizePolicy">
188-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
189-
<horstretch>0</horstretch>
190-
<verstretch>0</verstretch>
191-
</sizepolicy>
192-
</property>
193227
<property name="title">
194228
<string>Fonts</string>
195229
</property>
196230
<property name="syncGroup" stdset="0">
197231
<string notr="true">composeritem</string>
198232
</property>
199233
<property name="collapsed" stdset="0">
200-
<bool>true</bool>
234+
<bool>false</bool>
201235
</property>
202236
<layout class="QHBoxLayout" name="horizontalLayout">
203237
<item>
@@ -224,17 +258,17 @@
224258
</layout>
225259
</widget>
226260
<customwidgets>
227-
<customwidget>
228-
<class>QgsColorButton</class>
229-
<extends>QToolButton</extends>
230-
<header>qgscolorbutton.h</header>
231-
</customwidget>
232261
<customwidget>
233262
<class>QgsCollapsibleGroupBoxBasic</class>
234263
<extends>QGroupBox</extends>
235264
<header location="global">qgscollapsiblegroupbox.h</header>
236265
<container>1</container>
237266
</customwidget>
267+
<customwidget>
268+
<class>QgsColorButton</class>
269+
<extends>QToolButton</extends>
270+
<header>qgscolorbutton.h</header>
271+
</customwidget>
238272
</customwidgets>
239273
<resources/>
240274
<connections/>

‎src/ui/qgscompositionwidgetbase.ui

Lines changed: 61 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,28 @@
2020
<string>Composition</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout">
23+
<property name="spacing">
24+
<number>0</number>
25+
</property>
2326
<property name="margin">
2427
<number>0</number>
2528
</property>
29+
<item>
30+
<widget class="QLabel" name="label_10">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="styleSheet">
38+
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
39+
</property>
40+
<property name="text">
41+
<string>Composition</string>
42+
</property>
43+
</widget>
44+
</item>
2645
<item>
2746
<widget class="QScrollArea" name="scrollArea">
2847
<property name="sizePolicy">
@@ -32,7 +51,7 @@
3251
</sizepolicy>
3352
</property>
3453
<property name="frameShape">
35-
<enum>QFrame::NoFrame</enum>
54+
<enum>QFrame::StyledPanel</enum>
3655
</property>
3756
<property name="frameShadow">
3857
<enum>QFrame::Plain</enum>
@@ -45,19 +64,13 @@
4564
<rect>
4665
<x>0</x>
4766
<y>0</y>
48-
<width>391</width>
49-
<height>787</height>
67+
<width>389</width>
68+
<height>765</height>
5069
</rect>
5170
</property>
5271
<layout class="QVBoxLayout" name="verticalLayout_2">
5372
<item>
5473
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
55-
<property name="sizePolicy">
56-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
57-
<horstretch>0</horstretch>
58-
<verstretch>0</verstretch>
59-
</sizepolicy>
60-
</property>
6174
<property name="title">
6275
<string>Paper and quality</string>
6376
</property>
@@ -71,6 +84,9 @@
7184
<property name="fieldGrowthPolicy">
7285
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
7386
</property>
87+
<property name="labelAlignment">
88+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
89+
</property>
7490
<item row="0" column="0">
7591
<widget class="QLabel" name="textLabel3">
7692
<property name="sizePolicy">
@@ -216,12 +232,6 @@
216232
</item>
217233
<item>
218234
<widget class="QgsCollapsibleGroupBoxBasic" name="mPrintAsRasterGroupCheckBox">
219-
<property name="sizePolicy">
220-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
221-
<horstretch>0</horstretch>
222-
<verstretch>0</verstretch>
223-
</sizepolicy>
224-
</property>
225235
<property name="title">
226236
<string>Print as raster</string>
227237
</property>
@@ -235,9 +245,15 @@
235245
<string notr="true">composeritem</string>
236246
</property>
237247
<property name="collapsed" stdset="0">
238-
<bool>true</bool>
248+
<bool>false</bool>
239249
</property>
240250
<layout class="QFormLayout" name="formLayout_4">
251+
<property name="fieldGrowthPolicy">
252+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
253+
</property>
254+
<property name="labelAlignment">
255+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
256+
</property>
241257
<item row="0" column="0">
242258
<widget class="QLabel" name="label_9">
243259
<property name="text">
@@ -269,12 +285,6 @@
269285
</item>
270286
<item>
271287
<widget class="QgsCollapsibleGroupBoxBasic" name="mSnapToGridGroupCheckBox">
272-
<property name="sizePolicy">
273-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
274-
<horstretch>0</horstretch>
275-
<verstretch>0</verstretch>
276-
</sizepolicy>
277-
</property>
278288
<property name="title">
279289
<string>Snap to grid</string>
280290
</property>
@@ -291,6 +301,12 @@
291301
<bool>true</bool>
292302
</property>
293303
<layout class="QFormLayout" name="formLayout_2">
304+
<property name="fieldGrowthPolicy">
305+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
306+
</property>
307+
<property name="labelAlignment">
308+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
309+
</property>
294310
<item row="0" column="1">
295311
<widget class="QDoubleSpinBox" name="mGridResolutionSpinBox">
296312
<property name="sizePolicy">
@@ -388,6 +404,18 @@
388404
<verstretch>0</verstretch>
389405
</sizepolicy>
390406
</property>
407+
<property name="minimumSize">
408+
<size>
409+
<width>100</width>
410+
<height>0</height>
411+
</size>
412+
</property>
413+
<property name="maximumSize">
414+
<size>
415+
<width>100</width>
416+
<height>16777215</height>
417+
</size>
418+
</property>
391419
<property name="text">
392420
<string/>
393421
</property>
@@ -438,12 +466,6 @@
438466
</item>
439467
<item>
440468
<widget class="QgsCollapsibleGroupBoxBasic" name="mAlignmentSnapGroupCheckBox">
441-
<property name="sizePolicy">
442-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
443-
<horstretch>0</horstretch>
444-
<verstretch>0</verstretch>
445-
</sizepolicy>
446-
</property>
447469
<property name="title">
448470
<string>Snap to alignements</string>
449471
</property>
@@ -457,6 +479,12 @@
457479
<bool>true</bool>
458480
</property>
459481
<layout class="QFormLayout" name="formLayout_3">
482+
<property name="fieldGrowthPolicy">
483+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
484+
</property>
485+
<property name="labelAlignment">
486+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
487+
</property>
460488
<item row="0" column="0">
461489
<widget class="QLabel" name="label_7">
462490
<property name="text">
@@ -498,17 +526,17 @@
498526
</widget>
499527
<layoutdefault spacing="6" margin="11"/>
500528
<customwidgets>
501-
<customwidget>
502-
<class>QgsColorButton</class>
503-
<extends>QToolButton</extends>
504-
<header>qgscolorbutton.h</header>
505-
</customwidget>
506529
<customwidget>
507530
<class>QgsCollapsibleGroupBoxBasic</class>
508531
<extends>QGroupBox</extends>
509532
<header location="global">qgscollapsiblegroupbox.h</header>
510533
<container>1</container>
511534
</customwidget>
535+
<customwidget>
536+
<class>QgsColorButton</class>
537+
<extends>QToolButton</extends>
538+
<header>qgscolorbutton.h</header>
539+
</customwidget>
512540
</customwidgets>
513541
<tabstops>
514542
<tabstop>scrollArea</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.