Skip to content

Commit 7ff4888

Browse files
nyalldawsonnyalldawson
committed
[composer] Neaten up some item widget panels
1 parent 39b3e5f commit 7ff4888

7 files changed

+202
-92
lines changed

‎src/ui/qgsatlascompositionwidgetbase.ui

100644100755
+33-15
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>
@@ -32,15 +41,24 @@
3241
<enum>QFrame::StyledPanel</enum>
3342
</property>
3443
<layout class="QGridLayout" name="gridLayout">
44+
<property name="leftMargin">
45+
<number>0</number>
46+
</property>
47+
<property name="topMargin">
48+
<number>0</number>
49+
</property>
50+
<property name="rightMargin">
51+
<number>0</number>
52+
</property>
53+
<property name="bottomMargin">
54+
<number>0</number>
55+
</property>
3556
<property name="horizontalSpacing">
3657
<number>0</number>
3758
</property>
3859
<property name="verticalSpacing">
3960
<number>3</number>
4061
</property>
41-
<property name="margin">
42-
<number>0</number>
43-
</property>
4462
<item row="0" column="1">
4563
<widget class="QCheckBox" name="mUseAtlasCheckBox">
4664
<property name="text">
@@ -91,7 +109,7 @@
91109
<x>0</x>
92110
<y>0</y>
93111
<width>431</width>
94-
<height>567</height>
112+
<height>569</height>
95113
</rect>
96114
</property>
97115
<layout class="QVBoxLayout" name="mainLayout">
@@ -130,16 +148,6 @@
130148
</property>
131149
</widget>
132150
</item>
133-
<item row="0" column="2">
134-
<widget class="QgsMapLayerComboBox" name="mAtlasCoverageLayerComboBox">
135-
<property name="sizePolicy">
136-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
137-
<horstretch>0</horstretch>
138-
<verstretch>0</verstretch>
139-
</sizepolicy>
140-
</property>
141-
</widget>
142-
</item>
143151
<item row="0" column="1">
144152
<spacer name="horizontalSpacer_3">
145153
<property name="orientation">
@@ -177,6 +185,16 @@
177185
</property>
178186
</widget>
179187
</item>
188+
<item row="0" column="2" colspan="2">
189+
<widget class="QgsMapLayerComboBox" name="mAtlasCoverageLayerComboBox">
190+
<property name="sizePolicy">
191+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
192+
<horstretch>0</horstretch>
193+
<verstretch>0</verstretch>
194+
</sizepolicy>
195+
</property>
196+
</widget>
197+
</item>
180198
</layout>
181199
</widget>
182200
</item>

‎src/ui/qgscomposerhtmlwidgetbase.ui

100644100755
+20-4
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>407</width>
50-
<height>360</height>
59+
<height>364</height>
5160
</rect>
5261
</property>
5362
<layout class="QVBoxLayout" name="mainLayout">
@@ -105,7 +114,14 @@
105114
</widget>
106115
</item>
107116
<item row="2" column="1">
108-
<widget class="QComboBox" name="mResizeModeComboBox"/>
117+
<widget class="QComboBox" name="mResizeModeComboBox">
118+
<property name="sizePolicy">
119+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
120+
<horstretch>0</horstretch>
121+
<verstretch>0</verstretch>
122+
</sizepolicy>
123+
</property>
124+
</widget>
109125
</item>
110126
<item row="3" column="0" colspan="2">
111127
<widget class="QPushButton" name="mAddFramePushButton">
@@ -168,7 +184,7 @@
168184
<customwidget>
169185
<class>QgsCollapsibleGroupBoxBasic</class>
170186
<extends>QGroupBox</extends>
171-
<header location="global">qgscollapsiblegroupbox.h</header>
187+
<header>qgscollapsiblegroupbox.h</header>
172188
<container>1</container>
173189
</customwidget>
174190
</customwidgets>

‎src/ui/qgscomposeritemwidgetbase.ui

100644100755
+43-8
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,12 @@
261261
</item>
262262
<item row="0" column="1">
263263
<widget class="QDoubleSpinBox" name="mItemRotationSpinBox">
264+
<property name="sizePolicy">
265+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
266+
<horstretch>0</horstretch>
267+
<verstretch>0</verstretch>
268+
</sizepolicy>
269+
</property>
264270
<property name="suffix">
265271
<string> °</string>
266272
</property>
@@ -289,6 +295,12 @@
289295
<layout class="QFormLayout" name="formLayout_4">
290296
<item row="0" column="0" colspan="2">
291297
<widget class="QgsColorButton" name="mFrameColorButton">
298+
<property name="sizePolicy">
299+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
300+
<horstretch>0</horstretch>
301+
<verstretch>0</verstretch>
302+
</sizepolicy>
303+
</property>
292304
<property name="text">
293305
<string>Color...</string>
294306
</property>
@@ -308,7 +320,17 @@
308320
</widget>
309321
</item>
310322
<item row="1" column="1">
311-
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
323+
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
324+
<property name="sizePolicy">
325+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
326+
<horstretch>0</horstretch>
327+
<verstretch>0</verstretch>
328+
</sizepolicy>
329+
</property>
330+
<property name="suffix">
331+
<string> mm</string>
332+
</property>
333+
</widget>
312334
</item>
313335
<item row="2" column="0">
314336
<widget class="QLabel" name="label_8">
@@ -318,7 +340,14 @@
318340
</widget>
319341
</item>
320342
<item row="2" column="1">
321-
<widget class="QgsPenJoinStyleComboBox" name="mFrameJoinStyleCombo"/>
343+
<widget class="QgsPenJoinStyleComboBox" name="mFrameJoinStyleCombo">
344+
<property name="sizePolicy">
345+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
346+
<horstretch>0</horstretch>
347+
<verstretch>0</verstretch>
348+
</sizepolicy>
349+
</property>
350+
</widget>
322351
</item>
323352
</layout>
324353
</widget>
@@ -343,6 +372,12 @@
343372
<layout class="QHBoxLayout" name="horizontalLayout">
344373
<item>
345374
<widget class="QgsColorButton" name="mBackgroundColorButton">
375+
<property name="sizePolicy">
376+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
377+
<horstretch>0</horstretch>
378+
<verstretch>0</verstretch>
379+
</sizepolicy>
380+
</property>
346381
<property name="text">
347382
<string>Color...</string>
348383
</property>
@@ -460,6 +495,12 @@
460495
</layout>
461496
</widget>
462497
<customwidgets>
498+
<customwidget>
499+
<class>QgsCollapsibleGroupBoxBasic</class>
500+
<extends>QGroupBox</extends>
501+
<header>qgscollapsiblegroupbox.h</header>
502+
<container>1</container>
503+
</customwidget>
463504
<customwidget>
464505
<class>QgsColorButton</class>
465506
<extends>QPushButton</extends>
@@ -470,12 +511,6 @@
470511
<extends>QComboBox</extends>
471512
<header>qgsblendmodecombobox.h</header>
472513
</customwidget>
473-
<customwidget>
474-
<class>QgsCollapsibleGroupBoxBasic</class>
475-
<extends>QGroupBox</extends>
476-
<header location="global">qgscollapsiblegroupbox.h</header>
477-
<container>1</container>
478-
</customwidget>
479514
<customwidget>
480515
<class>QgsPenJoinStyleComboBox</class>
481516
<extends>QComboBox</extends>

‎src/ui/qgscomposerlegendwidgetbase.ui

100644100755
+10-10
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
<property name="geometry">
6464
<rect>
6565
<x>0</x>
66-
<y>0</y>
67-
<width>375</width>
68-
<height>1320</height>
66+
<y>-169</y>
67+
<width>374</width>
68+
<height>1145</height>
6969
</rect>
7070
</property>
7171
<layout class="QVBoxLayout" name="mainLayout">
@@ -802,7 +802,7 @@
802802
<string>Space below title.</string>
803803
</property>
804804
<property name="suffix">
805-
<string>mm</string>
805+
<string> mm</string>
806806
</property>
807807
</widget>
808808
</item>
@@ -817,17 +817,17 @@
817817
</widget>
818818
<layoutdefault spacing="6" margin="11"/>
819819
<customwidgets>
820-
<customwidget>
821-
<class>QgsColorButton</class>
822-
<extends>QPushButton</extends>
823-
<header>qgscolorbutton.h</header>
824-
</customwidget>
825820
<customwidget>
826821
<class>QgsCollapsibleGroupBoxBasic</class>
827822
<extends>QGroupBox</extends>
828-
<header location="global">qgscollapsiblegroupbox.h</header>
823+
<header>qgscollapsiblegroupbox.h</header>
829824
<container>1</container>
830825
</customwidget>
826+
<customwidget>
827+
<class>QgsColorButton</class>
828+
<extends>QPushButton</extends>
829+
<header>qgscolorbutton.h</header>
830+
</customwidget>
831831
</customwidgets>
832832
<resources>
833833
<include location="../../images/images.qrc"/>

‎src/ui/qgscomposermapwidgetbase.ui

100644100755
+37-13
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>-299</y>
58-
<width>439</width>
59-
<height>1699</height>
66+
<y>-348</y>
67+
<width>438</width>
68+
<height>1415</height>
6069
</rect>
6170
</property>
6271
<property name="sizePolicy">
@@ -464,6 +473,9 @@
464473
</item>
465474
<item row="3" column="1">
466475
<widget class="QDoubleSpinBox" name="mCrossWidthSpinBox">
476+
<property name="suffix">
477+
<string> mm</string>
478+
</property>
467479
<property name="decimals">
468480
<number>5</number>
469481
</property>
@@ -550,7 +562,11 @@
550562
</widget>
551563
</item>
552564
<item row="1" column="1" colspan="2">
553-
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox"/>
565+
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox">
566+
<property name="suffix">
567+
<string> mm</string>
568+
</property>
569+
</widget>
554570
</item>
555571
<item row="2" column="0">
556572
<widget class="QLabel" name="mFramePenLabel">
@@ -560,7 +576,11 @@
560576
</widget>
561577
</item>
562578
<item row="2" column="1">
563-
<widget class="QDoubleSpinBox" name="mGridFramePenSizeSpinBox"/>
579+
<widget class="QDoubleSpinBox" name="mGridFramePenSizeSpinBox">
580+
<property name="suffix">
581+
<string> mm</string>
582+
</property>
583+
</widget>
564584
</item>
565585
<item row="2" column="2">
566586
<widget class="QgsColorButton" name="mGridFramePenColorButton">
@@ -740,7 +760,11 @@
740760
</widget>
741761
</item>
742762
<item row="11" column="1">
743-
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
763+
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox">
764+
<property name="suffix">
765+
<string> mm</string>
766+
</property>
767+
</widget>
744768
</item>
745769
<item row="12" column="0">
746770
<widget class="QLabel" name="mCoordinatePrecisionLabel">
@@ -848,6 +872,12 @@
848872
</widget>
849873
<layoutdefault spacing="6" margin="11"/>
850874
<customwidgets>
875+
<customwidget>
876+
<class>QgsCollapsibleGroupBoxBasic</class>
877+
<extends>QGroupBox</extends>
878+
<header>qgscollapsiblegroupbox.h</header>
879+
<container>1</container>
880+
</customwidget>
851881
<customwidget>
852882
<class>QgsColorButton</class>
853883
<extends>QPushButton</extends>
@@ -858,12 +888,6 @@
858888
<extends>QComboBox</extends>
859889
<header>qgsblendmodecombobox.h</header>
860890
</customwidget>
861-
<customwidget>
862-
<class>QgsCollapsibleGroupBoxBasic</class>
863-
<extends>QGroupBox</extends>
864-
<header location="global">qgscollapsiblegroupbox.h</header>
865-
<container>1</container>
866-
</customwidget>
867891
</customwidgets>
868892
<resources/>
869893
<connections/>

0 commit comments

Comments
 (0)