Skip to content

Commit 88bc74f

Browse files
author
timlinux
committed
Dont use form layout use grid layout (for #2121)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12210 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 35f60ae commit 88bc74f

File tree

2 files changed

+151
-163
lines changed

2 files changed

+151
-163
lines changed

‎src/ui/qgscontinuouscolordialogbase.ui

+115-123
Original file line numberDiff line numberDiff line change
@@ -13,133 +13,47 @@
1313
<property name="windowTitle">
1414
<string>Continuous color</string>
1515
</property>
16-
<layout class="QGridLayout" name="gridLayout_2">
17-
<item row="0" column="1">
18-
<layout class="QGridLayout" name="gridLayout">
19-
<item row="0" column="0">
20-
<layout class="QFormLayout" name="formLayout">
21-
<item row="0" column="0">
22-
<widget class="QLabel" name="classvarlabel">
23-
<property name="minimumSize">
24-
<size>
25-
<width>0</width>
26-
<height>20</height>
27-
</size>
28-
</property>
29-
<property name="text">
30-
<string>Classification field</string>
31-
</property>
32-
<property name="buddy">
33-
<cstring>classificationComboBox</cstring>
34-
</property>
35-
</widget>
36-
</item>
37-
<item row="0" column="1">
38-
<widget class="QComboBox" name="classificationComboBox">
39-
<property name="minimumSize">
40-
<size>
41-
<width>0</width>
42-
<height>20</height>
43-
</size>
44-
</property>
45-
</widget>
46-
</item>
47-
<item row="1" column="0">
48-
<widget class="QLabel" name="mincolorlabel">
49-
<property name="minimumSize">
50-
<size>
51-
<width>0</width>
52-
<height>20</height>
53-
</size>
54-
</property>
55-
<property name="text">
56-
<string>Minimum value</string>
57-
</property>
58-
<property name="buddy">
59-
<cstring>btnMinValue</cstring>
60-
</property>
61-
</widget>
62-
</item>
63-
<item row="2" column="0">
64-
<widget class="QLabel" name="maxcolorlabel">
65-
<property name="minimumSize">
66-
<size>
67-
<width>0</width>
68-
<height>20</height>
69-
</size>
70-
</property>
71-
<property name="text">
72-
<string>Maximum value</string>
73-
</property>
74-
<property name="buddy">
75-
<cstring>btnMaxValue</cstring>
76-
</property>
77-
</widget>
78-
</item>
79-
<item row="1" column="1">
80-
<widget class="QgsColorButton" name="btnMinValue">
81-
<property name="minimumSize">
82-
<size>
83-
<width>100</width>
84-
<height>0</height>
85-
</size>
86-
</property>
87-
</widget>
88-
</item>
89-
<item row="2" column="1">
90-
<widget class="QgsColorButton" name="btnMaxValue">
91-
<property name="minimumSize">
92-
<size>
93-
<width>100</width>
94-
<height>0</height>
95-
</size>
96-
</property>
97-
</widget>
98-
</item>
99-
<item row="3" column="0">
100-
<widget class="QLabel" name="outlinewidthlabel">
101-
<property name="minimumSize">
102-
<size>
103-
<width>0</width>
104-
<height>20</height>
105-
</size>
106-
</property>
107-
<property name="text">
108-
<string>Outline width</string>
109-
</property>
110-
<property name="buddy">
111-
<cstring>outlinewidthspinbox</cstring>
112-
</property>
113-
</widget>
114-
</item>
115-
<item row="3" column="1">
116-
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
117-
</item>
118-
</layout>
119-
</item>
120-
<item row="1" column="0">
121-
<widget class="QCheckBox" name="cb_polygonOutline">
122-
<property name="text">
123-
<string>Draw polygon outline</string>
124-
</property>
125-
</widget>
126-
</item>
127-
</layout>
128-
</item>
129-
<item row="1" column="1">
130-
<spacer name="verticalSpacer">
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="0" column="0">
18+
<spacer name="horizontalSpacer_2">
13119
<property name="orientation">
132-
<enum>Qt::Vertical</enum>
20+
<enum>Qt::Horizontal</enum>
13321
</property>
13422
<property name="sizeHint" stdset="0">
13523
<size>
136-
<width>20</width>
137-
<height>40</height>
24+
<width>40</width>
25+
<height>20</height>
13826
</size>
13927
</property>
14028
</spacer>
14129
</item>
30+
<item row="0" column="1">
31+
<widget class="QLabel" name="classvarlabel">
32+
<property name="minimumSize">
33+
<size>
34+
<width>0</width>
35+
<height>20</height>
36+
</size>
37+
</property>
38+
<property name="text">
39+
<string>Classification field</string>
40+
</property>
41+
<property name="buddy">
42+
<cstring>classificationComboBox</cstring>
43+
</property>
44+
</widget>
45+
</item>
14246
<item row="0" column="2">
47+
<widget class="QComboBox" name="classificationComboBox">
48+
<property name="minimumSize">
49+
<size>
50+
<width>0</width>
51+
<height>20</height>
52+
</size>
53+
</property>
54+
</widget>
55+
</item>
56+
<item row="0" column="3">
14357
<spacer name="horizontalSpacer">
14458
<property name="orientation">
14559
<enum>Qt::Horizontal</enum>
@@ -152,15 +66,93 @@
15266
</property>
15367
</spacer>
15468
</item>
155-
<item row="0" column="0">
156-
<spacer name="horizontalSpacer_2">
69+
<item row="1" column="1">
70+
<widget class="QLabel" name="mincolorlabel">
71+
<property name="minimumSize">
72+
<size>
73+
<width>0</width>
74+
<height>20</height>
75+
</size>
76+
</property>
77+
<property name="text">
78+
<string>Minimum value</string>
79+
</property>
80+
<property name="buddy">
81+
<cstring>btnMinValue</cstring>
82+
</property>
83+
</widget>
84+
</item>
85+
<item row="1" column="2">
86+
<widget class="QgsColorButton" name="btnMinValue">
87+
<property name="minimumSize">
88+
<size>
89+
<width>100</width>
90+
<height>0</height>
91+
</size>
92+
</property>
93+
</widget>
94+
</item>
95+
<item row="2" column="1">
96+
<widget class="QLabel" name="maxcolorlabel">
97+
<property name="minimumSize">
98+
<size>
99+
<width>0</width>
100+
<height>20</height>
101+
</size>
102+
</property>
103+
<property name="text">
104+
<string>Maximum value</string>
105+
</property>
106+
<property name="buddy">
107+
<cstring>btnMaxValue</cstring>
108+
</property>
109+
</widget>
110+
</item>
111+
<item row="2" column="2">
112+
<widget class="QgsColorButton" name="btnMaxValue">
113+
<property name="minimumSize">
114+
<size>
115+
<width>100</width>
116+
<height>0</height>
117+
</size>
118+
</property>
119+
</widget>
120+
</item>
121+
<item row="3" column="1">
122+
<widget class="QLabel" name="outlinewidthlabel">
123+
<property name="minimumSize">
124+
<size>
125+
<width>0</width>
126+
<height>20</height>
127+
</size>
128+
</property>
129+
<property name="text">
130+
<string>Outline width</string>
131+
</property>
132+
<property name="buddy">
133+
<cstring>outlinewidthspinbox</cstring>
134+
</property>
135+
</widget>
136+
</item>
137+
<item row="3" column="2">
138+
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
139+
</item>
140+
<item row="4" column="1" colspan="2">
141+
<widget class="QCheckBox" name="cb_polygonOutline">
142+
<property name="text">
143+
<string>Draw polygon outline</string>
144+
</property>
145+
</widget>
146+
</item>
147+
<item row="5" column="1" colspan="2">
148+
<spacer name="verticalSpacer">
157149
<property name="orientation">
158-
<enum>Qt::Horizontal</enum>
150+
<enum>Qt::Vertical</enum>
159151
</property>
160152
<property name="sizeHint" stdset="0">
161153
<size>
162-
<width>40</width>
163-
<height>20</height>
154+
<width>20</width>
155+
<height>40</height>
164156
</size>
165157
</property>
166158
</spacer>

‎src/ui/qgsludialogbase.ui

+36-40
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>227</width>
10-
<height>117</height>
10+
<height>122</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -16,57 +16,53 @@
1616
<property name="modal">
1717
<bool>true</bool>
1818
</property>
19-
<layout class="QVBoxLayout" name="verticalLayout">
20-
<item>
21-
<layout class="QFormLayout" name="formLayout">
22-
<item row="0" column="0">
23-
<widget class="QLabel" name="mLowerLabel">
24-
<property name="text">
25-
<string>Lower value</string>
26-
</property>
27-
<property name="buddy">
28-
<cstring>mLowerEdit</cstring>
29-
</property>
30-
</widget>
31-
</item>
32-
<item row="0" column="1">
33-
<widget class="QLineEdit" name="mLowerEdit"/>
34-
</item>
35-
<item row="1" column="0">
36-
<widget class="QLabel" name="mUpperLabel">
37-
<property name="text">
38-
<string>Upper value</string>
39-
</property>
40-
<property name="buddy">
41-
<cstring>mUpperEdit</cstring>
42-
</property>
43-
</widget>
44-
</item>
45-
<item row="1" column="1">
46-
<widget class="QLineEdit" name="mUpperEdit"/>
47-
</item>
48-
</layout>
19+
<layout class="QGridLayout" name="gridLayout">
20+
<item row="0" column="0">
21+
<widget class="QLabel" name="mLowerLabel">
22+
<property name="text">
23+
<string>Lower value</string>
24+
</property>
25+
<property name="buddy">
26+
<cstring>mLowerEdit</cstring>
27+
</property>
28+
</widget>
4929
</item>
50-
<item>
30+
<item row="0" column="1">
31+
<widget class="QLineEdit" name="mLowerEdit"/>
32+
</item>
33+
<item row="1" column="0">
34+
<widget class="QLabel" name="mUpperLabel">
35+
<property name="text">
36+
<string>Upper value</string>
37+
</property>
38+
<property name="buddy">
39+
<cstring>mUpperEdit</cstring>
40+
</property>
41+
</widget>
42+
</item>
43+
<item row="1" column="1">
44+
<widget class="QLineEdit" name="mUpperEdit"/>
45+
</item>
46+
<item row="3" column="0" colspan="2">
47+
<widget class="QDialogButtonBox" name="buttonBox">
48+
<property name="standardButtons">
49+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
50+
</property>
51+
</widget>
52+
</item>
53+
<item row="2" column="0">
5154
<spacer name="verticalSpacer">
5255
<property name="orientation">
5356
<enum>Qt::Vertical</enum>
5457
</property>
5558
<property name="sizeHint" stdset="0">
5659
<size>
5760
<width>20</width>
58-
<height>10</height>
61+
<height>40</height>
5962
</size>
6063
</property>
6164
</spacer>
6265
</item>
63-
<item>
64-
<widget class="QDialogButtonBox" name="buttonBox">
65-
<property name="standardButtons">
66-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
67-
</property>
68-
</widget>
69-
</item>
7066
</layout>
7167
</widget>
7268
<layoutdefault spacing="6" margin="11"/>

0 commit comments

Comments
 (0)