Skip to content

Commit a7e12c8

Browse files
elpasoelpaso
committed
[addlayerbutton] Fix height problems within the delimited text dialog
Also moved the status information under the button bas for consistency with other dialogs.
1 parent 01b4eeb commit a7e12c8

File tree

1 file changed

+108
-43
lines changed

1 file changed

+108
-43
lines changed

‎src/ui/qgsdelimitedtextsourceselectbase.ui

+108-43
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<x>0</x>
88
<y>0</y>
99
<width>730</width>
10-
<height>759</height>
10+
<height>643</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
14+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
@@ -32,9 +32,15 @@
3232
<property name="whatsThis">
3333
<string/>
3434
</property>
35-
<layout class="QVBoxLayout" name="verticalLayout_17" stretch="0,0,0,0,0">
35+
<layout class="QVBoxLayout" name="verticalLayout_17" stretch="0,0,0,0">
3636
<item>
3737
<widget class="QWidget" name="widget_3" native="true">
38+
<property name="sizePolicy">
39+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
40+
<horstretch>0</horstretch>
41+
<verstretch>0</verstretch>
42+
</sizepolicy>
43+
</property>
3844
<property name="acceptDrops">
3945
<bool>true</bool>
4046
</property>
@@ -132,6 +138,12 @@
132138
</item>
133139
<item>
134140
<widget class="QLineEdit" name="txtLayerName">
141+
<property name="sizePolicy">
142+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
143+
<horstretch>0</horstretch>
144+
<verstretch>0</verstretch>
145+
</sizepolicy>
146+
</property>
135147
<property name="toolTip">
136148
<string>Name to display in the map legend</string>
137149
</property>
@@ -140,6 +152,19 @@
140152
</property>
141153
</widget>
142154
</item>
155+
<item>
156+
<spacer name="horizontalSpacer_3">
157+
<property name="orientation">
158+
<enum>Qt::Horizontal</enum>
159+
</property>
160+
<property name="sizeHint" stdset="0">
161+
<size>
162+
<width>40</width>
163+
<height>20</height>
164+
</size>
165+
</property>
166+
</spacer>
167+
</item>
143168
<item>
144169
<widget class="QLabel" name="lblEncoding">
145170
<property name="text">
@@ -170,23 +195,41 @@
170195
</item>
171196
<item>
172197
<widget class="QScrollArea" name="scrollArea">
198+
<property name="sizePolicy">
199+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
200+
<horstretch>0</horstretch>
201+
<verstretch>0</verstretch>
202+
</sizepolicy>
203+
</property>
204+
<property name="maximumSize">
205+
<size>
206+
<width>16777215</width>
207+
<height>16777215</height>
208+
</size>
209+
</property>
173210
<property name="widgetResizable">
174211
<bool>true</bool>
175212
</property>
176213
<widget class="QWidget" name="scrollAreaWidgetContents">
177214
<property name="geometry">
178215
<rect>
179216
<x>0</x>
180-
<y>0</y>
217+
<y>-229</y>
181218
<width>696</width>
182-
<height>616</height>
219+
<height>742</height>
183220
</rect>
184221
</property>
222+
<property name="sizePolicy">
223+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
224+
<horstretch>0</horstretch>
225+
<verstretch>0</verstretch>
226+
</sizepolicy>
227+
</property>
185228
<layout class="QVBoxLayout" name="verticalLayout_4">
186229
<item>
187230
<widget class="QgsCollapsibleGroupBox" name="fileFormatGroupBox">
188231
<property name="sizePolicy">
189-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
232+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
190233
<horstretch>0</horstretch>
191234
<verstretch>0</verstretch>
192235
</sizepolicy>
@@ -668,7 +711,7 @@
668711
<item>
669712
<widget class="QgsCollapsibleGroupBox" name="recordOptionsGroupBox">
670713
<property name="sizePolicy">
671-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
714+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
672715
<horstretch>0</horstretch>
673716
<verstretch>0</verstretch>
674717
</sizepolicy>
@@ -772,7 +815,7 @@
772815
<item>
773816
<widget class="QgsCollapsibleGroupBox" name="fieldOptionsGroupBox">
774817
<property name="sizePolicy">
775-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
818+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
776819
<horstretch>0</horstretch>
777820
<verstretch>0</verstretch>
778821
</sizepolicy>
@@ -845,7 +888,7 @@
845888
<item>
846889
<widget class="QgsCollapsibleGroupBox" name="geometryDefinitionGroupBox">
847890
<property name="sizePolicy">
848-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
891+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
849892
<horstretch>0</horstretch>
850893
<verstretch>0</verstretch>
851894
</sizepolicy>
@@ -1160,7 +1203,7 @@
11601203
<item>
11611204
<widget class="QgsCollapsibleGroupBox" name="layeSettingsGroupBox">
11621205
<property name="sizePolicy">
1163-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
1206+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
11641207
<horstretch>0</horstretch>
11651208
<verstretch>0</verstretch>
11661209
</sizepolicy>
@@ -1230,55 +1273,77 @@
12301273
</layout>
12311274
</widget>
12321275
</item>
1276+
<item>
1277+
<widget class="QGroupBox" name="sampleDataGroupBox">
1278+
<property name="sizePolicy">
1279+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
1280+
<horstretch>0</horstretch>
1281+
<verstretch>0</verstretch>
1282+
</sizepolicy>
1283+
</property>
1284+
<property name="title">
1285+
<string>Sample data</string>
1286+
</property>
1287+
<property name="collapsed" stdset="0">
1288+
<bool>false</bool>
1289+
</property>
1290+
<layout class="QVBoxLayout" name="verticalLayout_15">
1291+
<item>
1292+
<widget class="QTableWidget" name="tblSample">
1293+
<property name="sizePolicy">
1294+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
1295+
<horstretch>0</horstretch>
1296+
<verstretch>0</verstretch>
1297+
</sizepolicy>
1298+
</property>
1299+
<property name="lineWidth">
1300+
<number>1</number>
1301+
</property>
1302+
</widget>
1303+
</item>
1304+
</layout>
1305+
</widget>
1306+
</item>
1307+
<item>
1308+
<spacer name="verticalSpacer">
1309+
<property name="orientation">
1310+
<enum>Qt::Vertical</enum>
1311+
</property>
1312+
<property name="sizeHint" stdset="0">
1313+
<size>
1314+
<width>20</width>
1315+
<height>40</height>
1316+
</size>
1317+
</property>
1318+
</spacer>
1319+
</item>
12331320
</layout>
12341321
</widget>
12351322
</widget>
12361323
</item>
12371324
<item>
1238-
<widget class="QgsCollapsibleGroupBox" name="sampleDataGroupBox">
1239-
<property name="sizePolicy">
1240-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
1241-
<horstretch>0</horstretch>
1242-
<verstretch>0</verstretch>
1243-
</sizepolicy>
1244-
</property>
1245-
<property name="title">
1246-
<string>Sample data</string>
1325+
<widget class="QDialogButtonBox" name="buttonBox">
1326+
<property name="orientation">
1327+
<enum>Qt::Horizontal</enum>
12471328
</property>
1248-
<property name="collapsed" stdset="0">
1249-
<bool>false</bool>
1329+
<property name="standardButtons">
1330+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
12501331
</property>
1251-
<layout class="QVBoxLayout" name="verticalLayout_15">
1252-
<item>
1253-
<widget class="QTableWidget" name="tblSample">
1254-
<property name="sizePolicy">
1255-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
1256-
<horstretch>0</horstretch>
1257-
<verstretch>0</verstretch>
1258-
</sizepolicy>
1259-
</property>
1260-
</widget>
1261-
</item>
1262-
</layout>
12631332
</widget>
12641333
</item>
12651334
<item>
12661335
<widget class="QLabel" name="lblStatus">
1336+
<property name="sizePolicy">
1337+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
1338+
<horstretch>0</horstretch>
1339+
<verstretch>0</verstretch>
1340+
</sizepolicy>
1341+
</property>
12671342
<property name="text">
12681343
<string>Sample data</string>
12691344
</property>
12701345
</widget>
12711346
</item>
1272-
<item>
1273-
<widget class="QDialogButtonBox" name="buttonBox">
1274-
<property name="orientation">
1275-
<enum>Qt::Horizontal</enum>
1276-
</property>
1277-
<property name="standardButtons">
1278-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
1279-
</property>
1280-
</widget>
1281-
</item>
12821347
</layout>
12831348
</widget>
12841349
<layoutdefault spacing="6" margin="11"/>

0 commit comments

Comments
 (0)