Skip to content

Commit 0a26099

Browse files
nyalldawsonnyalldawson
committedOct 1, 2014
[composer] Item widget layout tweaks for windows
·
ltr-3_40archive/master_2
1 parent 5b7d39a commit 0a26099

10 files changed

+770
-616
lines changed
 

‎src/ui/qgscomposerarrowwidgetbase.ui

100644100755
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@
1717
<property name="spacing">
1818
<number>0</number>
1919
</property>
20-
<property name="margin">
20+
<property name="leftMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="topMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="rightMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="bottomMargin">
2130
<number>0</number>
2231
</property>
2332
<item>
@@ -47,7 +56,7 @@
4756
<x>0</x>
4857
<y>0</y>
4958
<width>332</width>
50-
<height>360</height>
59+
<height>364</height>
5160
</rect>
5261
</property>
5362
<layout class="QVBoxLayout" name="mainLayout">
@@ -84,10 +93,7 @@
8493
<property name="collapsed" stdset="0">
8594
<bool>false</bool>
8695
</property>
87-
<layout class="QFormLayout" name="formLayout">
88-
<property name="fieldGrowthPolicy">
89-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
90-
</property>
96+
<layout class="QGridLayout" name="gridLayout">
9197
<item row="0" column="0" colspan="2">
9298
<layout class="QHBoxLayout" name="horizontalLayout_3">
9399
<item>

‎src/ui/qgscomposerattributetablewidgetbase.ui

Lines changed: 175 additions & 121 deletions
Large diffs are not rendered by default.

‎src/ui/qgscomposerhtmlwidgetbase.ui

100644100755
Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@
1717
<property name="spacing">
1818
<number>0</number>
1919
</property>
20-
<property name="margin">
20+
<property name="leftMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="topMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="rightMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="bottomMargin">
2130
<number>0</number>
2231
</property>
2332
<item>
@@ -45,9 +54,9 @@
4554
<property name="geometry">
4655
<rect>
4756
<x>0</x>
48-
<y>-40</y>
49-
<width>391</width>
50-
<height>517</height>
57+
<y>-84</y>
58+
<width>390</width>
59+
<height>448</height>
5160
</rect>
5261
</property>
5362
<layout class="QVBoxLayout" name="mainLayout">
@@ -207,7 +216,7 @@
207216
<property name="syncGroup" stdset="0">
208217
<string notr="true">composeritem</string>
209218
</property>
210-
<layout class="QFormLayout" name="formLayout">
219+
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1">
211220
<item row="0" column="0">
212221
<widget class="QLabel" name="mLabelMaxDistance">
213222
<property name="text">
@@ -275,7 +284,7 @@
275284
<customwidget>
276285
<class>QgsCollapsibleGroupBoxBasic</class>
277286
<extends>QGroupBox</extends>
278-
<header>qgscollapsiblegroupbox.h</header>
287+
<header location="global">qgscollapsiblegroupbox.h</header>
279288
<container>1</container>
280289
</customwidget>
281290
<customwidget>

‎src/ui/qgscomposeritemwidgetbase.ui

Lines changed: 323 additions & 297 deletions
Large diffs are not rendered by default.

‎src/ui/qgscomposerlabelwidgetbase.ui

100644100755
Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -53,7 +62,7 @@
5362
<x>0</x>
5463
<y>0</y>
5564
<width>302</width>
56-
<height>682</height>
65+
<height>686</height>
5766
</rect>
5867
</property>
5968
<layout class="QVBoxLayout" name="mainLayout">
@@ -71,29 +80,29 @@
7180
<property name="collapsed" stdset="0">
7281
<bool>false</bool>
7382
</property>
74-
<layout class="QVBoxLayout" name="verticalLayout">
75-
<item>
83+
<layout class="QGridLayout" name="gridLayout_2">
84+
<item row="0" column="0">
7685
<widget class="QPlainTextEdit" name="mTextEdit">
7786
<property name="tabStopWidth">
7887
<number>10</number>
7988
</property>
8089
</widget>
8190
</item>
82-
<item>
91+
<item row="1" column="0">
8392
<widget class="QCheckBox" name="mHtmlCheckBox">
8493
<property name="text">
8594
<string>Render as HTML</string>
8695
</property>
8796
</widget>
8897
</item>
89-
<item>
98+
<item row="2" column="0">
9099
<widget class="QPushButton" name="mInsertExpressionButton">
91100
<property name="text">
92101
<string>Insert an expression...</string>
93102
</property>
94103
</widget>
95104
</item>
96-
<item>
105+
<item row="3" column="0">
97106
<widget class="QPushButton" name="mFontButton">
98107
<property name="sizePolicy">
99108
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -106,7 +115,7 @@
106115
</property>
107116
</widget>
108117
</item>
109-
<item>
118+
<item row="4" column="0">
110119
<layout class="QHBoxLayout" name="horizontalLayout">
111120
<item>
112121
<widget class="QLabel" name="label_2">
@@ -311,13 +320,7 @@
311320
<property name="collapsed" stdset="0">
312321
<bool>true</bool>
313322
</property>
314-
<layout class="QFormLayout" name="formLayout_2">
315-
<property name="fieldGrowthPolicy">
316-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
317-
</property>
318-
<property name="labelAlignment">
319-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
320-
</property>
323+
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1">
321324
<item row="0" column="0">
322325
<widget class="QLabel" name="mMarginLabel">
323326
<property name="text">

‎src/ui/qgscomposermapwidgetbase.ui

100644100755
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -54,9 +63,9 @@
5463
<property name="geometry">
5564
<rect>
5665
<x>0</x>
57-
<y>0</y>
58-
<width>444</width>
59-
<height>2238</height>
66+
<y>-805</y>
67+
<width>438</width>
68+
<height>1872</height>
6069
</rect>
6170
</property>
6271
<property name="sizePolicy">
@@ -534,7 +543,7 @@
534543
<property name="collapsed" stdset="0">
535544
<bool>false</bool>
536545
</property>
537-
<layout class="QFormLayout" name="formLayout_4">
546+
<layout class="QGridLayout" name="gridLayout_6" columnstretch="0,1">
538547
<item row="0" column="0">
539548
<widget class="QLabel" name="mGridTypeLabel_2">
540549
<property name="accessibleName">
@@ -591,7 +600,7 @@
591600
</item>
592601
</widget>
593602
</item>
594-
<item row="4" column="0">
603+
<item row="3" column="0">
595604
<widget class="QLabel" name="mIntervalXLabel_2">
596605
<property name="text">
597606
<string>Interval</string>
@@ -601,7 +610,7 @@
601610
</property>
602611
</widget>
603612
</item>
604-
<item row="4" column="1">
613+
<item row="3" column="1">
605614
<layout class="QVBoxLayout" name="verticalLayout_9">
606615
<item>
607616
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
@@ -631,7 +640,7 @@
631640
</item>
632641
</layout>
633642
</item>
634-
<item row="6" column="0">
643+
<item row="4" column="0">
635644
<widget class="QLabel" name="mOffsetXLabel_2">
636645
<property name="text">
637646
<string>Offset</string>
@@ -641,7 +650,7 @@
641650
</property>
642651
</widget>
643652
</item>
644-
<item row="6" column="1">
653+
<item row="4" column="1">
645654
<layout class="QVBoxLayout" name="verticalLayout_10">
646655
<item>
647656
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
@@ -671,7 +680,7 @@
671680
</item>
672681
</layout>
673682
</item>
674-
<item row="8" column="0">
683+
<item row="5" column="0">
675684
<widget class="QLabel" name="mCrossWidthLabel">
676685
<property name="text">
677686
<string>Cross width</string>
@@ -681,7 +690,7 @@
681690
</property>
682691
</widget>
683692
</item>
684-
<item row="8" column="1">
693+
<item row="5" column="1">
685694
<widget class="QDoubleSpinBox" name="mCrossWidthSpinBox">
686695
<property name="suffix">
687696
<string> mm</string>
@@ -691,7 +700,7 @@
691700
</property>
692701
</widget>
693702
</item>
694-
<item row="9" column="0">
703+
<item row="6" column="0">
695704
<widget class="QLabel" name="mLineStyleLabel">
696705
<property name="text">
697706
<string>Line style</string>
@@ -701,24 +710,41 @@
701710
</property>
702711
</widget>
703712
</item>
704-
<item row="9" column="1">
713+
<item row="6" column="1">
705714
<widget class="QPushButton" name="mGridLineStyleButton">
706715
<property name="text">
707716
<string>change...</string>
708717
</property>
709718
</widget>
710719
</item>
711-
<item row="11" column="0">
720+
<item row="7" column="0">
721+
<widget class="QLabel" name="mMarkerStyleLabel">
722+
<property name="text">
723+
<string>Marker style</string>
724+
</property>
725+
<property name="wordWrap">
726+
<bool>false</bool>
727+
</property>
728+
</widget>
729+
</item>
730+
<item row="7" column="1">
731+
<widget class="QPushButton" name="mGridMarkerStyleButton">
732+
<property name="text">
733+
<string>change...</string>
734+
</property>
735+
</widget>
736+
</item>
737+
<item row="8" column="0">
712738
<widget class="QLabel" name="mGridBlendLabel">
713739
<property name="text">
714740
<string>Blend mode</string>
715741
</property>
716742
</widget>
717743
</item>
718-
<item row="11" column="1">
744+
<item row="8" column="1">
719745
<widget class="QgsBlendModeComboBox" name="mGridBlendComboBox"/>
720746
</item>
721-
<item row="14" column="0" colspan="2">
747+
<item row="9" column="0" colspan="2">
722748
<widget class="QgsCollapsibleGroupBoxBasic" name="mGridFrameGroupBox">
723749
<property name="title">
724750
<string>Grid frame</string>
@@ -901,7 +927,7 @@
901927
</layout>
902928
</widget>
903929
</item>
904-
<item row="17" column="0" colspan="2">
930+
<item row="10" column="0" colspan="2">
905931
<widget class="QgsCollapsibleGroupBoxBasic" name="mDrawAnnotationGroupBox">
906932
<property name="enabled">
907933
<bool>true</bool>
@@ -921,7 +947,7 @@
921947
<property name="collapsed" stdset="0">
922948
<bool>false</bool>
923949
</property>
924-
<layout class="QFormLayout" name="formLayout_2">
950+
<layout class="QGridLayout" name="gridLayout_7" columnstretch="0,1">
925951
<property name="leftMargin">
926952
<number>6</number>
927953
</property>
@@ -1093,23 +1119,6 @@
10931119
</layout>
10941120
</widget>
10951121
</item>
1096-
<item row="10" column="0">
1097-
<widget class="QLabel" name="mMarkerStyleLabel">
1098-
<property name="text">
1099-
<string>Marker style</string>
1100-
</property>
1101-
<property name="wordWrap">
1102-
<bool>false</bool>
1103-
</property>
1104-
</widget>
1105-
</item>
1106-
<item row="10" column="1">
1107-
<widget class="QPushButton" name="mGridMarkerStyleButton">
1108-
<property name="text">
1109-
<string>change...</string>
1110-
</property>
1111-
</widget>
1112-
</item>
11131122
</layout>
11141123
</widget>
11151124
</item>
@@ -1221,7 +1230,7 @@
12211230
<property name="collapsed" stdset="0">
12221231
<bool>false</bool>
12231232
</property>
1224-
<layout class="QFormLayout" name="formLayout_3">
1233+
<layout class="QGridLayout" name="gridLayout_8" columnstretch="0,1">
12251234
<item row="0" column="0">
12261235
<widget class="QLabel" name="mOverviewFrameMapLabel">
12271236
<property name="text">
@@ -1256,14 +1265,14 @@
12561265
<item row="2" column="1">
12571266
<widget class="QgsBlendModeComboBox" name="mOverviewBlendModeComboBox"/>
12581267
</item>
1259-
<item row="3" column="0">
1268+
<item row="3" column="0" colspan="2">
12601269
<widget class="QCheckBox" name="mOverviewInvertCheckbox">
12611270
<property name="text">
12621271
<string>Invert overview</string>
12631272
</property>
12641273
</widget>
12651274
</item>
1266-
<item row="4" column="0">
1275+
<item row="4" column="0" colspan="2">
12671276
<widget class="QCheckBox" name="mOverviewCenterCheckbox">
12681277
<property name="text">
12691278
<string>Center on overview</string>

‎src/ui/qgscomposerpicturewidgetbase.ui

100644100755
Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -52,8 +61,8 @@
5261
<rect>
5362
<x>0</x>
5463
<y>0</y>
55-
<width>314</width>
56-
<height>554</height>
64+
<width>330</width>
65+
<height>553</height>
5766
</rect>
5867
</property>
5968
<layout class="QVBoxLayout" name="mainLayout">
@@ -317,13 +326,7 @@
317326
<property name="collapsed" stdset="0">
318327
<bool>false</bool>
319328
</property>
320-
<layout class="QFormLayout" name="formLayout">
321-
<property name="fieldGrowthPolicy">
322-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
323-
</property>
324-
<property name="labelAlignment">
325-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
326-
</property>
329+
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
327330
<item row="1" column="0">
328331
<widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
329332
<property name="text">

‎src/ui/qgscomposerscalebarwidgetbase.ui

100644100755
Lines changed: 149 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
<property name="geometry">
5252
<rect>
5353
<x>0</x>
54-
<y>-461</y>
55-
<width>340</width>
56-
<height>867</height>
54+
<y>-124</y>
55+
<width>369</width>
56+
<height>817</height>
5757
</rect>
5858
</property>
5959
<layout class="QVBoxLayout" name="mainLayout">
@@ -68,13 +68,7 @@
6868
<property name="collapsed" stdset="0">
6969
<bool>false</bool>
7070
</property>
71-
<layout class="QFormLayout" name="formLayout">
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>
71+
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
7872
<item row="0" column="0">
7973
<widget class="QLabel" name="mMapLabel">
8074
<property name="sizePolicy">
@@ -134,16 +128,7 @@
134128
<property name="collapsed" stdset="0">
135129
<bool>false</bool>
136130
</property>
137-
<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>
144-
<item row="0" column="0" colspan="2">
145-
<widget class="QComboBox" name="mUnitsComboBox"/>
146-
</item>
131+
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
147132
<item row="1" column="0">
148133
<widget class="QLabel" name="mUnitLabelLabel">
149134
<property name="text">
@@ -166,7 +151,7 @@
166151
<string>Map units per bar unit</string>
167152
</property>
168153
<property name="wordWrap">
169-
<bool>true</bool>
154+
<bool>false</bool>
170155
</property>
171156
<property name="buddy">
172157
<cstring>mMapUnitsPerBarUnitSpinBox</cstring>
@@ -183,6 +168,9 @@
183168
</property>
184169
</widget>
185170
</item>
171+
<item row="0" column="0" colspan="2">
172+
<widget class="QComboBox" name="mUnitsComboBox"/>
173+
</item>
186174
</layout>
187175
</widget>
188176
</item>
@@ -197,13 +185,7 @@
197185
<property name="collapsed" stdset="0">
198186
<bool>false</bool>
199187
</property>
200-
<layout class="QFormLayout" name="formLayout_3">
201-
<property name="fieldGrowthPolicy">
202-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
203-
</property>
204-
<property name="labelAlignment">
205-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
206-
</property>
188+
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1">
207189
<item row="0" column="0">
208190
<widget class="QLabel" name="mSegmentLabel">
209191
<property name="text">
@@ -292,13 +274,7 @@
292274
<property name="collapsed" stdset="0">
293275
<bool>true</bool>
294276
</property>
295-
<layout class="QFormLayout" name="formLayout_4">
296-
<property name="fieldGrowthPolicy">
297-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
298-
</property>
299-
<property name="labelAlignment">
300-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
301-
</property>
277+
<layout class="QGridLayout" name="gridLayout_4" columnstretch="0,1">
302278
<item row="0" column="0">
303279
<widget class="QLabel" name="label_4">
304280
<property name="text">
@@ -409,7 +385,7 @@
409385
<property name="collapsed" stdset="0">
410386
<bool>true</bool>
411387
</property>
412-
<layout class="QFormLayout" name="formLayout_5">
388+
<layout class="QGridLayout" name="gridLayout_5" columnstretch="0,1">
413389
<item row="1" column="0">
414390
<widget class="QLabel" name="label_7">
415391
<property name="text">
@@ -418,23 +394,40 @@
418394
</widget>
419395
</item>
420396
<item row="1" column="1">
421-
<widget class="QgsColorButtonV2" name="mFontColorButton">
422-
<property name="minimumSize">
423-
<size>
424-
<width>120</width>
425-
<height>0</height>
426-
</size>
427-
</property>
428-
<property name="maximumSize">
429-
<size>
430-
<width>120</width>
431-
<height>16777215</height>
432-
</size>
433-
</property>
434-
<property name="text">
435-
<string/>
436-
</property>
437-
</widget>
397+
<layout class="QHBoxLayout" name="horizontalLayout_2">
398+
<item>
399+
<widget class="QgsColorButtonV2" name="mFontColorButton">
400+
<property name="minimumSize">
401+
<size>
402+
<width>120</width>
403+
<height>0</height>
404+
</size>
405+
</property>
406+
<property name="maximumSize">
407+
<size>
408+
<width>120</width>
409+
<height>16777215</height>
410+
</size>
411+
</property>
412+
<property name="text">
413+
<string/>
414+
</property>
415+
</widget>
416+
</item>
417+
<item>
418+
<spacer name="horizontalSpacer">
419+
<property name="orientation">
420+
<enum>Qt::Horizontal</enum>
421+
</property>
422+
<property name="sizeHint" stdset="0">
423+
<size>
424+
<width>40</width>
425+
<height>20</height>
426+
</size>
427+
</property>
428+
</spacer>
429+
</item>
430+
</layout>
438431
</item>
439432
<item row="2" column="0">
440433
<widget class="QLabel" name="label_9">
@@ -444,23 +437,40 @@
444437
</widget>
445438
</item>
446439
<item row="2" column="1">
447-
<widget class="QgsColorButtonV2" name="mFillColorButton">
448-
<property name="minimumSize">
449-
<size>
450-
<width>120</width>
451-
<height>0</height>
452-
</size>
453-
</property>
454-
<property name="maximumSize">
455-
<size>
456-
<width>120</width>
457-
<height>16777215</height>
458-
</size>
459-
</property>
460-
<property name="text">
461-
<string/>
462-
</property>
463-
</widget>
440+
<layout class="QHBoxLayout" name="horizontalLayout_3">
441+
<item>
442+
<widget class="QgsColorButtonV2" name="mFillColorButton">
443+
<property name="minimumSize">
444+
<size>
445+
<width>120</width>
446+
<height>0</height>
447+
</size>
448+
</property>
449+
<property name="maximumSize">
450+
<size>
451+
<width>120</width>
452+
<height>16777215</height>
453+
</size>
454+
</property>
455+
<property name="text">
456+
<string/>
457+
</property>
458+
</widget>
459+
</item>
460+
<item>
461+
<spacer name="horizontalSpacer_2">
462+
<property name="orientation">
463+
<enum>Qt::Horizontal</enum>
464+
</property>
465+
<property name="sizeHint" stdset="0">
466+
<size>
467+
<width>40</width>
468+
<height>20</height>
469+
</size>
470+
</property>
471+
</spacer>
472+
</item>
473+
</layout>
464474
</item>
465475
<item row="3" column="0">
466476
<widget class="QLabel" name="label_10">
@@ -470,23 +480,40 @@
470480
</widget>
471481
</item>
472482
<item row="3" column="1">
473-
<widget class="QgsColorButtonV2" name="mFillColor2Button">
474-
<property name="minimumSize">
475-
<size>
476-
<width>120</width>
477-
<height>0</height>
478-
</size>
479-
</property>
480-
<property name="maximumSize">
481-
<size>
482-
<width>120</width>
483-
<height>16777215</height>
484-
</size>
485-
</property>
486-
<property name="text">
487-
<string/>
488-
</property>
489-
</widget>
483+
<layout class="QHBoxLayout" name="horizontalLayout_4">
484+
<item>
485+
<widget class="QgsColorButtonV2" name="mFillColor2Button">
486+
<property name="minimumSize">
487+
<size>
488+
<width>120</width>
489+
<height>0</height>
490+
</size>
491+
</property>
492+
<property name="maximumSize">
493+
<size>
494+
<width>120</width>
495+
<height>16777215</height>
496+
</size>
497+
</property>
498+
<property name="text">
499+
<string/>
500+
</property>
501+
</widget>
502+
</item>
503+
<item>
504+
<spacer name="horizontalSpacer_3">
505+
<property name="orientation">
506+
<enum>Qt::Horizontal</enum>
507+
</property>
508+
<property name="sizeHint" stdset="0">
509+
<size>
510+
<width>40</width>
511+
<height>20</height>
512+
</size>
513+
</property>
514+
</spacer>
515+
</item>
516+
</layout>
490517
</item>
491518
<item row="4" column="0">
492519
<widget class="QLabel" name="label_11">
@@ -496,23 +523,40 @@
496523
</widget>
497524
</item>
498525
<item row="4" column="1">
499-
<widget class="QgsColorButtonV2" name="mStrokeColorButton">
500-
<property name="minimumSize">
501-
<size>
502-
<width>120</width>
503-
<height>0</height>
504-
</size>
505-
</property>
506-
<property name="maximumSize">
507-
<size>
508-
<width>120</width>
509-
<height>16777215</height>
510-
</size>
511-
</property>
512-
<property name="text">
513-
<string/>
514-
</property>
515-
</widget>
526+
<layout class="QHBoxLayout" name="horizontalLayout_5">
527+
<item>
528+
<widget class="QgsColorButtonV2" name="mStrokeColorButton">
529+
<property name="minimumSize">
530+
<size>
531+
<width>120</width>
532+
<height>0</height>
533+
</size>
534+
</property>
535+
<property name="maximumSize">
536+
<size>
537+
<width>120</width>
538+
<height>16777215</height>
539+
</size>
540+
</property>
541+
<property name="text">
542+
<string/>
543+
</property>
544+
</widget>
545+
</item>
546+
<item>
547+
<spacer name="horizontalSpacer_4">
548+
<property name="orientation">
549+
<enum>Qt::Horizontal</enum>
550+
</property>
551+
<property name="sizeHint" stdset="0">
552+
<size>
553+
<width>40</width>
554+
<height>20</height>
555+
</size>
556+
</property>
557+
</spacer>
558+
</item>
559+
</layout>
516560
</item>
517561
<item row="0" column="0" colspan="2">
518562
<widget class="QPushButton" name="mFontButton">
@@ -541,7 +585,7 @@
541585
<customwidget>
542586
<class>QgsCollapsibleGroupBoxBasic</class>
543587
<extends>QGroupBox</extends>
544-
<header location="global">qgscollapsiblegroupbox.h</header>
588+
<header>qgscollapsiblegroupbox.h</header>
545589
<container>1</container>
546590
</customwidget>
547591
<customwidget>

‎src/ui/qgscomposershapewidgetbase.ui

100644100755
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>285</width>
10-
<height>427</height>
10+
<height>148</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -56,7 +56,7 @@
5656
<x>0</x>
5757
<y>0</y>
5858
<width>283</width>
59-
<height>408</height>
59+
<height>129</height>
6060
</rect>
6161
</property>
6262
<layout class="QVBoxLayout" name="mainLayout">
@@ -71,10 +71,7 @@
7171
<property name="collapsed" stdset="0">
7272
<bool>false</bool>
7373
</property>
74-
<layout class="QFormLayout" name="formLayout">
75-
<property name="labelAlignment">
76-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
77-
</property>
74+
<layout class="QGridLayout" name="gridLayout">
7875
<item row="1" column="0">
7976
<widget class="QLabel" name="label_3">
8077
<property name="text">
@@ -134,7 +131,7 @@
134131
<customwidget>
135132
<class>QgsCollapsibleGroupBoxBasic</class>
136133
<extends>QGroupBox</extends>
137-
<header>qgscollapsiblegroupbox.h</header>
134+
<header location="global">qgscollapsiblegroupbox.h</header>
138135
<container>1</container>
139136
</customwidget>
140137
</customwidgets>

‎src/ui/qgscompositionwidgetbase.ui

100644100755
Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>294</width>
10-
<height>787</height>
10+
<height>506</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -49,7 +58,7 @@
4958
<x>0</x>
5059
<y>0</y>
5160
<width>292</width>
52-
<height>785</height>
61+
<height>504</height>
5362
</rect>
5463
</property>
5564
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -64,7 +73,7 @@
6473
<property name="collapsed" stdset="0">
6574
<bool>false</bool>
6675
</property>
67-
<layout class="QFormLayout" name="formLayout">
76+
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
6877
<item row="0" column="0">
6978
<widget class="QLabel" name="textLabel3">
7079
<property name="text">
@@ -360,13 +369,7 @@
360369
<property name="collapsed" stdset="0">
361370
<bool>true</bool>
362371
</property>
363-
<layout class="QFormLayout" name="formLayout_4">
364-
<property name="fieldGrowthPolicy">
365-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
366-
</property>
367-
<property name="labelAlignment">
368-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
369-
</property>
372+
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
370373
<item row="0" column="0">
371374
<widget class="QLabel" name="label_8">
372375
<property name="text">

0 commit comments

Comments
 (0)
Please sign in to comment.