Skip to content

Commit 83dea92

Browse files
nyalldawsonnyalldawson
committedDec 9, 2017
Fix ui merge
·
ltr-3_40final-3_0_0
1 parent e6f6d49 commit 83dea92

File tree

1 file changed

+65
-24
lines changed

1 file changed

+65
-24
lines changed
 

‎src/ui/qgsnewvectorlayerdialogbase.ui

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>471</width>
10-
<height>604</height>
9+
<width>867</width>
10+
<height>993</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -103,7 +103,7 @@
103103
<string>Add to fields list</string>
104104
</property>
105105
<property name="icon">
106-
<iconset>
106+
<iconset resource="../../images/images.qrc">
107107
<normaloff>:/images/themes/default/mActionNewAttribute.svg</normaloff>:/images/themes/default/mActionNewAttribute.svg</iconset>
108108
</property>
109109
<property name="toolButtonStyle">
@@ -200,7 +200,7 @@
200200
<string>Remove field</string>
201201
</property>
202202
<property name="icon">
203-
<iconset>
203+
<iconset resource="../../images/images.qrc">
204204
<normaloff>:/images/themes/default/mActionDeleteAttribute.svg</normaloff>:/images/themes/default/mActionDeleteAttribute.svg</iconset>
205205
</property>
206206
<property name="toolButtonStyle">
@@ -271,24 +271,48 @@
271271
</property>
272272
</widget>
273273
</item>
274-
<item row="0" column="1">
275-
<widget class="QgsFileWidget" name="mFileName"/>
274+
<item row="4" column="1">
275+
<widget class="QCheckBox" name="mGeometryWithZCheckBox">
276+
<property name="text">
277+
<string>Include Z dimension</string>
278+
</property>
279+
</widget>
280+
</item>
281+
<item row="5" column="1" colspan="2">
282+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
283+
<property name="minimumSize">
284+
<size>
285+
<width>0</width>
286+
<height>20</height>
287+
</size>
288+
</property>
289+
<property name="focusPolicy">
290+
<enum>Qt::StrongFocus</enum>
291+
</property>
292+
</widget>
276293
</item>
277-
<item row="1" column="1">
294+
<item row="4" column="2">
295+
<widget class="QCheckBox" name="mGeometryWithMCheckBox">
296+
<property name="text">
297+
<string>Include M values</string>
298+
</property>
299+
</widget>
300+
</item>
301+
<item row="1" column="1" colspan="2">
278302
<widget class="QComboBox" name="mFileEncoding">
279303
<property name="enabled">
280304
<bool>true</bool>
281305
</property>
282306
</widget>
283307
</item>
284-
<item row="2" column="1">
308+
<item row="2" column="1" colspan="2">
285309
<widget class="QComboBox" name="mFileFormatComboBox">
286310
<property name="enabled">
287311
<bool>true</bool>
288312
</property>
289313
</widget>
290314
</item>
291-
<item row="3" column="1">
315+
<item row="3" column="1" colspan="2">
292316
<widget class="QComboBox" name="mGeometryTypeBox">
293317
<property name="sizePolicy">
294318
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -298,19 +322,8 @@
298322
</property>
299323
</widget>
300324
</item>
301-
<item row="4" column="1">
302-
<widget class="QCheckBox" name="mGeometryWithZCheckBox">
303-
<property name="text">
304-
<string>Include Z dimension</string>
305-
</property>
306-
</widget>
307-
</item>
308-
<item row="5" column="1" colspan="2">
309-
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
310-
<property name="focusPolicy">
311-
<enum>Qt::StrongFocus</enum>
312-
</property>
313-
</widget>
325+
<item row="0" column="1" colspan="2">
326+
<widget class="QgsFileWidget" name="mFileName" native="true"/>
314327
</item>
315328
</layout>
316329
</item>
@@ -332,11 +345,11 @@
332345
</customwidget>
333346
</customwidgets>
334347
<tabstops>
335-
<tabstop>mFileName</tabstop>
336348
<tabstop>mFileEncoding</tabstop>
337349
<tabstop>mFileFormatComboBox</tabstop>
338350
<tabstop>mGeometryTypeBox</tabstop>
339351
<tabstop>mGeometryWithZCheckBox</tabstop>
352+
<tabstop>mGeometryWithMCheckBox</tabstop>
340353
<tabstop>mCrsSelector</tabstop>
341354
<tabstop>mNameEdit</tabstop>
342355
<tabstop>mTypeBox</tabstop>
@@ -346,7 +359,35 @@
346359
<tabstop>mAttributeView</tabstop>
347360
<tabstop>mRemoveAttributeButton</tabstop>
348361
</tabstops>
349-
<resources/>
362+
<resources>
363+
<include location="../../images/images.qrc"/>
364+
<include location="../../images/images.qrc"/>
365+
<include location="../../images/images.qrc"/>
366+
<include location="../../images/images.qrc"/>
367+
<include location="../../images/images.qrc"/>
368+
<include location="../../images/images.qrc"/>
369+
<include location="../../images/images.qrc"/>
370+
<include location="../../images/images.qrc"/>
371+
<include location="../../images/images.qrc"/>
372+
<include location="../../images/images.qrc"/>
373+
<include location="../../images/images.qrc"/>
374+
<include location="../../images/images.qrc"/>
375+
<include location="../../images/images.qrc"/>
376+
<include location="../../images/images.qrc"/>
377+
<include location="../../images/images.qrc"/>
378+
<include location="../../images/images.qrc"/>
379+
<include location="../../images/images.qrc"/>
380+
<include location="../../images/images.qrc"/>
381+
<include location="../../images/images.qrc"/>
382+
<include location="../../images/images.qrc"/>
383+
<include location="../../images/images.qrc"/>
384+
<include location="../../images/images.qrc"/>
385+
<include location="../../images/images.qrc"/>
386+
<include location="../../images/images.qrc"/>
387+
<include location="../../images/images.qrc"/>
388+
<include location="../../images/images.qrc"/>
389+
<include location="../../images/images.qrc"/>
390+
</resources>
350391
<connections>
351392
<connection>
352393
<sender>buttonBox</sender>

0 commit comments

Comments
 (0)
Please sign in to comment.