Skip to content

Commit b42220d

Browse files
author
brushtyler
committed
replaced all QFormLayouts with QGridLayouts
git-svn-id: http://svn.osgeo.org/qgis/trunk@13703 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 23594d2 commit b42220d

17 files changed

+233
-223
lines changed

‎python/plugins/GdalTools/tools/dialogBase.ui

+4-7
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>179</height>
10+
<height>170</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -19,6 +19,9 @@
1919
<property name="sizeConstraint">
2020
<enum>QLayout::SetNoConstraint</enum>
2121
</property>
22+
<property name="margin">
23+
<number>0</number>
24+
</property>
2225
</layout>
2326
</item>
2427
<item>
@@ -30,12 +33,6 @@
3033
</item>
3134
<item>
3235
<widget class="QTextEdit" name="textEditCommand">
33-
<property name="sizePolicy">
34-
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
35-
<horstretch>0</horstretch>
36-
<verstretch>0</verstretch>
37-
</sizepolicy>
38-
</property>
3936
<property name="minimumSize">
4037
<size>
4138
<width>0</width>

‎python/plugins/GdalTools/tools/optionsTable.ui

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<height>0</height>
3535
</size>
3636
</property>
37+
<attribute name="horizontalHeaderMinimumSectionSize">
38+
<number>30</number>
39+
</attribute>
40+
<attribute name="horizontalHeaderStretchLastSection">
41+
<bool>true</bool>
42+
</attribute>
3743
<column>
3844
<property name="text">
3945
<string>Name</string>

‎python/plugins/GdalTools/tools/widgetBuildVRT.ui

+9-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
14+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
@@ -21,13 +21,10 @@
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout">
2323
<item>
24-
<layout class="QFormLayout" name="formLayout">
24+
<layout class="QGridLayout" name="gridLayout">
2525
<property name="sizeConstraint">
2626
<enum>QLayout::SetNoConstraint</enum>
2727
</property>
28-
<property name="fieldGrowthPolicy">
29-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
30-
</property>
3128
<item row="0" column="0">
3229
<widget class="QLabel" name="label">
3330
<property name="text">
@@ -90,6 +87,13 @@
9087
</item>
9188
</layout>
9289
</item>
90+
<item row="2" column="0">
91+
<widget class="QCheckBox" name="resolutionCheck">
92+
<property name="text">
93+
<string>&amp;Resolution:</string>
94+
</property>
95+
</widget>
96+
</item>
9397
<item row="2" column="1">
9498
<widget class="QComboBox" name="resolutionComboBox">
9599
<property name="sizePolicy">
@@ -118,13 +122,6 @@
118122
</item>
119123
</widget>
120124
</item>
121-
<item row="2" column="0">
122-
<widget class="QCheckBox" name="resolutionCheck">
123-
<property name="text">
124-
<string>&amp;Resolution:</string>
125-
</property>
126-
</widget>
127-
</item>
128125
<item row="3" column="0">
129126
<widget class="QCheckBox" name="srcNoDataCheck">
130127
<property name="text">

‎python/plugins/GdalTools/tools/widgetClipper.ui

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
14+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
@@ -21,10 +21,7 @@
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout_4">
2323
<item>
24-
<layout class="QFormLayout" name="formLayout">
25-
<property name="fieldGrowthPolicy">
26-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
27-
</property>
24+
<layout class="QGridLayout" name="gridLayout">
2825
<item row="0" column="0">
2926
<widget class="QLabel" name="label_2">
3027
<property name="text">

‎python/plugins/GdalTools/tools/widgetContour.ui

+67-58
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,22 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>522</width>
10-
<height>174</height>
9+
<width>520</width>
10+
<height>172</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
14+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
1818
</property>
1919
<property name="windowTitle">
2020
<string>Contour</string>
2121
</property>
22-
<layout class="QVBoxLayout" name="verticalLayout_2">
22+
<layout class="QVBoxLayout" name="verticalLayout_3">
2323
<item>
24-
<layout class="QFormLayout" name="formLayout">
25-
<property name="fieldGrowthPolicy">
26-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
27-
</property>
24+
<layout class="QGridLayout" name="gridLayout">
2825
<item row="0" column="0">
2926
<widget class="QLabel" name="label">
3027
<property name="text">
@@ -93,56 +90,6 @@
9390
</item>
9491
</layout>
9592
</item>
96-
<item row="3" column="0">
97-
<layout class="QVBoxLayout" name="verticalLayout">
98-
<item>
99-
<widget class="QCheckBox" name="attributeCheck">
100-
<property name="text">
101-
<string>&amp;Attribute name:</string>
102-
</property>
103-
</widget>
104-
</item>
105-
<item>
106-
<layout class="QHBoxLayout" name="horizontalLayout">
107-
<item>
108-
<spacer name="horizontalSpacer">
109-
<property name="orientation">
110-
<enum>Qt::Horizontal</enum>
111-
</property>
112-
<property name="sizeType">
113-
<enum>QSizePolicy::Fixed</enum>
114-
</property>
115-
<property name="sizeHint" stdset="0">
116-
<size>
117-
<width>10</width>
118-
<height>10</height>
119-
</size>
120-
</property>
121-
</spacer>
122-
</item>
123-
<item>
124-
<widget class="QLabel" name="label_5">
125-
<property name="font">
126-
<font>
127-
<pointsize>8</pointsize>
128-
</font>
129-
</property>
130-
<property name="text">
131-
<string>If not provided, no elevation attribute is attached.</string>
132-
</property>
133-
</widget>
134-
</item>
135-
</layout>
136-
</item>
137-
</layout>
138-
</item>
139-
<item row="3" column="1">
140-
<widget class="QLineEdit" name="attributeEdit">
141-
<property name="text">
142-
<string>ELEV</string>
143-
</property>
144-
</widget>
145-
</item>
14693
<item row="2" column="0">
14794
<widget class="QLabel" name="label_3">
14895
<property name="text">
@@ -166,6 +113,68 @@
166113
</property>
167114
</widget>
168115
</item>
116+
<item row="3" column="0">
117+
<layout class="QVBoxLayout" name="verticalLayout">
118+
<property name="sizeConstraint">
119+
<enum>QLayout::SetFixedSize</enum>
120+
</property>
121+
<item>
122+
<widget class="QCheckBox" name="attributeCheck">
123+
<property name="text">
124+
<string>&amp;Attribute name:</string>
125+
</property>
126+
</widget>
127+
</item>
128+
<item>
129+
<widget class="QLabel" name="label_5">
130+
<property name="sizePolicy">
131+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
132+
<horstretch>0</horstretch>
133+
<verstretch>0</verstretch>
134+
</sizepolicy>
135+
</property>
136+
<property name="font">
137+
<font>
138+
<pointsize>8</pointsize>
139+
</font>
140+
</property>
141+
<property name="text">
142+
<string>If not provided, no elevation attribute is attached.</string>
143+
</property>
144+
<property name="indent">
145+
<number>16</number>
146+
</property>
147+
</widget>
148+
</item>
149+
</layout>
150+
</item>
151+
<item row="3" column="1">
152+
<layout class="QVBoxLayout" name="verticalLayout_2">
153+
<item>
154+
<widget class="QLineEdit" name="attributeEdit">
155+
<property name="text">
156+
<string>ELEV</string>
157+
</property>
158+
</widget>
159+
</item>
160+
<item>
161+
<spacer name="verticalSpacer">
162+
<property name="orientation">
163+
<enum>Qt::Vertical</enum>
164+
</property>
165+
<property name="sizeType">
166+
<enum>QSizePolicy::Minimum</enum>
167+
</property>
168+
<property name="sizeHint" stdset="0">
169+
<size>
170+
<width>20</width>
171+
<height>0</height>
172+
</size>
173+
</property>
174+
</spacer>
175+
</item>
176+
</layout>
177+
</item>
169178
</layout>
170179
</item>
171180
</layout>

‎python/plugins/GdalTools/tools/widgetConvert.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
14+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
@@ -28,7 +28,7 @@
2828
</widget>
2929
</item>
3030
<item>
31-
<layout class="QFormLayout" name="formLayout">
31+
<layout class="QGridLayout" name="gridLayout">
3232
<item row="0" column="0">
3333
<widget class="QLabel" name="label">
3434
<property name="text">

0 commit comments

Comments
 (0)