Skip to content

Commit c4aa4d0

Browse files
DelazJnirvn
DelazJ
authored and
nirvn
committedJan 14, 2018
Avoid translated name for fields when creating a new gpkg layer (#6058)
·
ltr-3_40final-3_0_0
1 parent 31d8dea commit c4aa4d0

File tree

2 files changed

+45
-33
lines changed

2 files changed

+45
-33
lines changed
 

‎src/gui/qgsnewgeopackagelayerdialog.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "qgssettings.h"
3131
#include "qgshelp.h"
3232
#include "qgsogrutils.h"
33+
#include "qgsgui.h"
3334

3435
#include <QPushButton>
3536
#include <QLineEdit>
@@ -47,6 +48,8 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
4748
: QDialog( parent, fl )
4849
{
4950
setupUi( this );
51+
QgsGui::instance()->enableAutoGeometryRestore( this );
52+
5053
connect( mAddAttributeButton, &QToolButton::clicked, this, &QgsNewGeoPackageLayerDialog::mAddAttributeButton_clicked );
5154
connect( mRemoveAttributeButton, &QToolButton::clicked, this, &QgsNewGeoPackageLayerDialog::mRemoveAttributeButton_clicked );
5255
connect( mFieldTypeBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsNewGeoPackageLayerDialog::mFieldTypeBox_currentIndexChanged );
@@ -58,9 +61,6 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
5861
connect( buttonBox, &QDialogButtonBox::rejected, this, &QgsNewGeoPackageLayerDialog::buttonBox_rejected );
5962
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsNewGeoPackageLayerDialog::showHelp );
6063

61-
QgsSettings settings;
62-
restoreGeometry( settings.value( QStringLiteral( "Windows/NewGeoPackageLayer/geometry" ) ).toByteArray() );
63-
6464
mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionNewAttribute.svg" ) ) );
6565
mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionDeleteAttribute.svg" ) ) );
6666

@@ -84,6 +84,8 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
8484
mGeometryWithZCheckBox->setEnabled( false );
8585
mGeometryWithMCheckBox->setEnabled( false );
8686
mGeometryColumnEdit->setEnabled( false );
87+
mGeometryColumnEdit->setText( "geometry" );
88+
mFeatureIdColumnEdit->setText( "fid" );
8789
mCheckBoxCreateSpatialIndex->setEnabled( false );
8890
mCrsSelector->setEnabled( false );
8991

@@ -106,6 +108,7 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
106108

107109
mCheckBoxCreateSpatialIndex->setChecked( true );
108110

111+
QgsSettings settings;
109112
mDatabase->setStorageMode( QgsFileWidget::SaveFile );
110113
mDatabase->setFilter( tr( "GeoPackage" ) + " (*.gpkg)" );
111114
mDatabase->setDialogTitle( tr( "Select Existing or Create a New GeoPackage Database File..." ) );
@@ -127,8 +130,6 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
127130

128131
QgsNewGeoPackageLayerDialog::~QgsNewGeoPackageLayerDialog()
129132
{
130-
QgsSettings settings;
131-
settings.setValue( QStringLiteral( "Windows/NewGeoPackageLayer/geometry" ), saveGeometry() );
132133
}
133134

134135
void QgsNewGeoPackageLayerDialog::setCrs( const QgsCoordinateReferenceSystem &crs )

‎src/ui/qgsnewgeopackagelayerdialogbase.ui

+39-28
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@
6666
</rect>
6767
</property>
6868
<layout class="QGridLayout" name="gridLayout_51">
69-
<item row="0" column="0">
70-
<layout class="QHBoxLayout" name="horizontalLayout_6"/>
71-
</item>
72-
<item row="4" column="0">
69+
<item row="3" column="0">
7370
<widget class="QGroupBox" name="groupBox_3">
7471
<property name="title">
7572
<string>New field</string>
@@ -83,6 +80,12 @@
8380
</item>
8481
<item row="2" column="0">
8582
<widget class="QLabel" name="mFieldLengthLabel">
83+
<property name="sizePolicy">
84+
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
85+
<horstretch>0</horstretch>
86+
<verstretch>0</verstretch>
87+
</sizepolicy>
88+
</property>
8689
<property name="text">
8790
<string>Maximum length</string>
8891
</property>
@@ -144,9 +147,9 @@
144147
</layout>
145148
</widget>
146149
</item>
147-
<item row="1" column="0">
150+
<item row="0" column="0">
148151
<layout class="QGridLayout" name="gridLayout_2">
149-
<item row="1" column="2">
152+
<item row="0" column="1">
150153
<layout class="QHBoxLayout" name="horizontalLayout">
151154
<item>
152155
<widget class="QgsFileWidget" name="mDatabase">
@@ -163,7 +166,7 @@
163166
</item>
164167
</layout>
165168
</item>
166-
<item row="3" column="0">
169+
<item row="2" column="0">
167170
<widget class="QLabel" name="mGeometryTypeLabel">
168171
<property name="enabled">
169172
<bool>true</bool>
@@ -173,7 +176,7 @@
173176
</property>
174177
</widget>
175178
</item>
176-
<item row="2" column="2">
179+
<item row="1" column="1">
177180
<widget class="QLineEdit" name="mTableNameEdit">
178181
<property name="sizePolicy">
179182
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -186,7 +189,7 @@
186189
</property>
187190
</widget>
188191
</item>
189-
<item row="1" column="0">
192+
<item row="0" column="0">
190193
<widget class="QLabel" name="mDatabaseLabel">
191194
<property name="enabled">
192195
<bool>true</bool>
@@ -196,7 +199,7 @@
196199
</property>
197200
</widget>
198201
</item>
199-
<item row="2" column="0">
202+
<item row="1" column="0">
200203
<widget class="QLabel" name="mTableNameLabel">
201204
<property name="text">
202205
<string>Table name</string>
@@ -206,7 +209,7 @@
206209
</property>
207210
</widget>
208211
</item>
209-
<item row="3" column="2">
212+
<item row="2" column="1">
210213
<widget class="QComboBox" name="mGeometryTypeBox">
211214
<property name="enabled">
212215
<bool>true</bool>
@@ -222,7 +225,7 @@
222225
</property>
223226
</widget>
224227
</item>
225-
<item row="4" column="2">
228+
<item row="3" column="1">
226229
<layout class="QHBoxLayout" name="horizontalZMLayout">
227230
<item>
228231
<widget class="QCheckBox" name="mGeometryWithZCheckBox">
@@ -238,9 +241,22 @@
238241
</property>
239242
</widget>
240243
</item>
244+
<item>
245+
<spacer name="horizontalSpacer_3">
246+
<property name="orientation">
247+
<enum>Qt::Horizontal</enum>
248+
</property>
249+
<property name="sizeHint" stdset="0">
250+
<size>
251+
<width>0</width>
252+
<height>20</height>
253+
</size>
254+
</property>
255+
</spacer>
256+
</item>
241257
</layout>
242258
</item>
243-
<item row="5" column="2">
259+
<item row="4" column="1">
244260
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
245261
<property name="focusPolicy">
246262
<enum>Qt::StrongFocus</enum>
@@ -249,7 +265,7 @@
249265
</item>
250266
</layout>
251267
</item>
252-
<item row="5" column="0">
268+
<item row="4" column="0">
253269
<widget class="QGroupBox" name="groupBox_2">
254270
<property name="title">
255271
<string>Fields list</string>
@@ -328,7 +344,7 @@
328344
</layout>
329345
</widget>
330346
</item>
331-
<item row="6" column="0">
347+
<item row="5" column="0">
332348
<widget class="QgsCollapsibleGroupBox" name="groupBox" native="true">
333349
<property name="title" stdset="0">
334350
<string>Advanced options</string>
@@ -363,7 +379,7 @@
363379
<item row="2" column="0">
364380
<widget class="QLabel" name="mLayerDescriptionLabel">
365381
<property name="text">
366-
<string>Layer description</string>
382+
<string>Layer description</string>
367383
</property>
368384
<property name="buddy">
369385
<cstring>mLayerIdentifierEdit</cstring>
@@ -404,9 +420,6 @@
404420
<property name="toolTip">
405421
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Name of the feature id column&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
406422
</property>
407-
<property name="text">
408-
<string>fid</string>
409-
</property>
410423
</widget>
411424
</item>
412425
<item row="4" column="0">
@@ -430,9 +443,6 @@
430443
<property name="toolTip">
431444
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Name of the geometry column&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
432445
</property>
433-
<property name="text">
434-
<string>geometry</string>
435-
</property>
436446
</widget>
437447
</item>
438448
<item row="5" column="2">
@@ -477,21 +487,22 @@
477487
</customwidgets>
478488
<tabstops>
479489
<tabstop>scrollArea</tabstop>
480-
<tabstop>mDatabase</tabstop>
481490
<tabstop>mTableNameEdit</tabstop>
482-
<tabstop>mLayerIdentifierEdit</tabstop>
483-
<tabstop>mLayerDescriptionEdit</tabstop>
484-
<tabstop>mFeatureIdColumnEdit</tabstop>
485491
<tabstop>mGeometryTypeBox</tabstop>
486-
<tabstop>mGeometryColumnEdit</tabstop>
492+
<tabstop>mGeometryWithZCheckBox</tabstop>
493+
<tabstop>mGeometryWithMCheckBox</tabstop>
487494
<tabstop>mCrsSelector</tabstop>
488-
<tabstop>mCheckBoxCreateSpatialIndex</tabstop>
489495
<tabstop>mFieldNameEdit</tabstop>
490496
<tabstop>mFieldTypeBox</tabstop>
491497
<tabstop>mFieldLengthEdit</tabstop>
492498
<tabstop>mAddAttributeButton</tabstop>
493499
<tabstop>mAttributeView</tabstop>
494500
<tabstop>mRemoveAttributeButton</tabstop>
501+
<tabstop>mLayerIdentifierEdit</tabstop>
502+
<tabstop>mLayerDescriptionEdit</tabstop>
503+
<tabstop>mFeatureIdColumnEdit</tabstop>
504+
<tabstop>mGeometryColumnEdit</tabstop>
505+
<tabstop>mCheckBoxCreateSpatialIndex</tabstop>
495506
</tabstops>
496507
<resources>
497508
<include location="../../images/images.qrc"/>

0 commit comments

Comments
 (0)
Please sign in to comment.