sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-10 00:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

change label of the file widget in the new GeoPackage dialog (fix #60990)

Browse Source
This commit is contained in:
Alexander Bruy 2025-05-18 16:38:05 +01:00 committed by Nyall Dawson
parent 247b5fae1a
commit 4eaed187be
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/qgsnewgeopackagelayerdialog.cpp
View File

@ -128,12 +128,12 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
mCheckBoxCreateSpatialIndex->setChecked( true ); mCheckBoxCreateSpatialIndex->setChecked( true );
const QgsSettings settings; const QgsSettings settings;
mDatabase->setStorageMode( QgsFileWidget::SaveFile ); mFileName->setStorageMode( QgsFileWidget::SaveFile );
mDatabase->setFilter( tr( "GeoPackage" ) + " (*.gpkg)" ); mFileName->setFilter( tr( "GeoPackage" ) + " (*.gpkg)" );
mDatabase->setDialogTitle( tr( "Select Existing or Create a New GeoPackage Database File…" ) ); mFileName->setDialogTitle( tr( "Select Existing or Create a New GeoPackage Database File…" ) );
mDatabase->setDefaultRoot( settings.value( QStringLiteral( "UI/lastVectorFileFilterDir" ), QDir::homePath() ).toString() ); mFileName->setDefaultRoot( settings.value( QStringLiteral( "UI/lastVectorFileFilterDir" ), QDir::homePath() ).toString() );
mDatabase->setConfirmOverwrite( false ); mFileName->setConfirmOverwrite( false );
connect( mDatabase, &QgsFileWidget::fileChanged, this, [=]( const QString &filePath ) { connect( mFileName, &QgsFileWidget::fileChanged, this, [=]( const QString &filePath ) {
QgsSettings settings; QgsSettings settings;
const QFileInfo tmplFileInfo( filePath ); const QFileInfo tmplFileInfo( filePath );
settings.setValue( QStringLiteral( "UI/lastVectorFileFilterDir" ), tmplFileInfo.absolutePath() ); settings.setValue( QStringLiteral( "UI/lastVectorFileFilterDir" ), tmplFileInfo.absolutePath() );
@ -152,7 +152,7 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
completer->setCompletionRole( static_cast<int>( QgsProviderConnectionModel::CustomRole::Uri ) ); completer->setCompletionRole( static_cast<int>( QgsProviderConnectionModel::CustomRole::Uri ) );
completer->setCompletionMode( QCompleter::PopupCompletion ); completer->setCompletionMode( QCompleter::PopupCompletion );
completer->setFilterMode( Qt::MatchContains ); completer->setFilterMode( Qt::MatchContains );
mDatabase->lineEdit()->setCompleter( completer ); mFileName->lineEdit()->setCompleter( completer );
} }
void QgsNewGeoPackageLayerDialog::setCrs( const QgsCoordinateReferenceSystem &crs ) void QgsNewGeoPackageLayerDialog::setCrs( const QgsCoordinateReferenceSystem &crs )
@ -162,7 +162,7 @@ void QgsNewGeoPackageLayerDialog::setCrs( const QgsCoordinateReferenceSystem &cr
void QgsNewGeoPackageLayerDialog::lockDatabasePath() void QgsNewGeoPackageLayerDialog::lockDatabasePath()
{ {
mDatabase->setReadOnly( true ); mFileName->setReadOnly( true );
} }
void QgsNewGeoPackageLayerDialog::mFieldTypeBox_currentIndexChanged( int ) void QgsNewGeoPackageLayerDialog::mFieldTypeBox_currentIndexChanged( int )
@ -208,7 +208,7 @@ void QgsNewGeoPackageLayerDialog::mLayerIdentifierEdit_textEdited( const QString
void QgsNewGeoPackageLayerDialog::checkOk() void QgsNewGeoPackageLayerDialog::checkOk()
{ {
const bool ok = !mDatabase->filePath().isEmpty() && !mTableNameEdit->text().isEmpty() && mGeometryTypeBox->currentIndex() != -1; const bool ok = !mFileName->filePath().isEmpty() && !mTableNameEdit->text().isEmpty() && mGeometryTypeBox->currentIndex() != -1;
mOkButton->setEnabled( ok ); mOkButton->setEnabled( ok );
} }
@ -318,7 +318,7 @@ bool QgsNewGeoPackageLayerDialog::apply()
} }
} }
QString fileName( mDatabase->filePath() ); QString fileName( mFileName->filePath() );
if ( !fileName.endsWith( QLatin1String( ".gpkg" ), Qt::CaseInsensitive ) ) if ( !fileName.endsWith( QLatin1String( ".gpkg" ), Qt::CaseInsensitive ) )
fileName += QLatin1String( ".gpkg" ); fileName += QLatin1String( ".gpkg" );

4
src/gui/qgsnewgeopackagelayerdialog.h
View File

@ -51,12 +51,12 @@ class GUI_EXPORT QgsNewGeoPackageLayerDialog : public QDialog, private Ui::QgsNe
/** /**
* Returns the database path * Returns the database path
*/ */
QString databasePath() const { return mDatabase->filePath(); } QString databasePath() const { return mFileName->filePath(); }
/** /**
* Sets the initial database \a path * Sets the initial database \a path
*/ */
void setDatabasePath( const QString &path ) { mDatabase->setFilePath( path ); } void setDatabasePath( const QString &path ) { mFileName->setFilePath( path ); }
/** /**
* Sets the database path widgets to a locked and read-only mode. * Sets the database path widgets to a locked and read-only mode.

7
src/ui/qgsnewgeopackagelayerdialogbase.ui
View File

@ -399,7 +399,7 @@
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QgsFileWidget" name="mDatabase" native="true"> <widget class="QgsFileWidget" name="mFileName" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -437,12 +437,12 @@
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="mDatabaseLabel"> <widget class="QLabel" name="mFileNameLabel">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Database</string> <string>File name</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -542,6 +542,7 @@
<class>QgsCollapsibleGroupBox</class> <class>QgsCollapsibleGroupBox</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>qgscollapsiblegroupbox.h</header> <header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

6
tests/src/python/test_qgsnewgeopackagelayerdialog.py
View File

@ -68,7 +68,7 @@ class TestPyQgsNewGeoPackageLayerDialog(QgisTestCase):
dialog = QgsNewGeoPackageLayerDialog() dialog = QgsNewGeoPackageLayerDialog()
dialog.setProperty("hideDialogs", True) dialog.setProperty("hideDialogs", True)
mDatabase = dialog.findChild(QgsFileWidget, "mDatabase") mFileName = dialog.findChild(QgsFileWidget, "mFileName")
buttonBox = dialog.findChild(QDialogButtonBox, "buttonBox") buttonBox = dialog.findChild(QDialogButtonBox, "buttonBox")
ok_button = buttonBox.button(QDialogButtonBox.StandardButton.Ok) ok_button = buttonBox.button(QDialogButtonBox.StandardButton.Ok)
mTableNameEdit = dialog.findChild(QLineEdit, "mTableNameEdit") mTableNameEdit = dialog.findChild(QLineEdit, "mTableNameEdit")
@ -91,7 +91,7 @@ class TestPyQgsNewGeoPackageLayerDialog(QgisTestCase):
self.assertFalse(ok_button.isEnabled()) self.assertFalse(ok_button.isEnabled())
dbname = os.path.join(self.basetestpath, "test.gpkg") dbname = os.path.join(self.basetestpath, "test.gpkg")
mDatabase.setFilePath(dbname) mFileName.setFilePath(dbname)
self.assertEqual(mTableNameEdit.text(), "test") self.assertEqual(mTableNameEdit.text(), "test")
self.assertEqual(mLayerIdentifierEdit.text(), "test") self.assertEqual(mLayerIdentifierEdit.text(), "test")
self.assertTrue(ok_button.isEnabled()) self.assertTrue(ok_button.isEnabled())
@ -253,7 +253,7 @@ class TestPyQgsNewGeoPackageLayerDialog(QgisTestCase):
self.assertEqual(description, "my_description") self.assertEqual(description, "my_description")
# Try invalid path # Try invalid path
mDatabase.setFilePath("/this/is/invalid/test.gpkg") mFileName.setFilePath("/this/is/invalid/test.gpkg")
self.accepted = False self.accepted = False
QTest.mouseClick(ok_button, Qt.MouseButton.LeftButton) QTest.mouseClick(ok_button, Qt.MouseButton.LeftButton)
self.assertFalse(self.accepted) self.assertFalse(self.accepted)