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

Allow appending layers to existing spatialite in its create layer dialog

Browse Source
This commit is contained in:
Mathieu Pellerin 2017-12-08 13:02:38 +07:00 committed by GitHub
parent 11c1f3a718
commit 1ea83e227f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/qgsnewspatialitelayerdialog.cpp
View File

@ -126,7 +126,7 @@ void QgsNewSpatialiteLayerDialog::toolButtonNewDatabase_clicked()
{
QString fileName = QFileDialog::getSaveFileName( this, tr( "New SpatiaLite Database File" ),
QDir::homePath(),
tr( "SpatiaLite" ) + " (*.sqlite *.db *.sqlite3 *.db3 *.s3db)" );
tr( "SpatiaLite" ) + " (*.sqlite *.db *.sqlite3 *.db3 *.s3db)", nullptr, QFileDialog::DontConfirmOverwrite );
if ( fileName.isEmpty() )
return;
@ -138,6 +138,7 @@ void QgsNewSpatialiteLayerDialog::toolButtonNewDatabase_clicked()
mDatabaseComboBox->insertItem( 0, fileName );
mDatabaseComboBox->setCurrentIndex( 0 );
createDb();
}
@ -149,8 +150,7 @@ QString QgsNewSpatialiteLayerDialog::selectedType() const
void QgsNewSpatialiteLayerDialog::checkOk()
{
bool created = !leLayerName->text().isEmpty() &&
( checkBoxPrimaryKey->isChecked() || mAttributeView->topLevelItemCount() > 0 ) &&
createDb();
( checkBoxPrimaryKey->isChecked() || mAttributeView->topLevelItemCount() > 0 );
mOkButton->setEnabled( created );
}
@ -251,6 +251,28 @@ bool QgsNewSpatialiteLayerDialog::createDb()
return false;
QFile newDb( dbPath );
if ( newDb.exists() )
{
QMessageBox msgBox;
msgBox.setIcon( QMessageBox::Question );
msgBox.setWindowTitle( tr( "The File Already Exists." ) );
msgBox.setText( tr( "Do you want to overwrite the existing file with a new database or add a new layer to it?" ) );
QPushButton *overwriteButton = msgBox.addButton( tr( "Overwrite" ), QMessageBox::ActionRole );
QPushButton *addNewLayerButton = msgBox.addButton( tr( "Add new layer" ), QMessageBox::ActionRole );
msgBox.setStandardButtons( QMessageBox::Cancel );
msgBox.setDefaultButton( addNewLayerButton );
int ret = msgBox.exec();
if ( ret == QMessageBox::Cancel )
{
return false;
}
if ( msgBox.clickedButton() == overwriteButton )
{
newDb.remove();
}
}
if ( !newDb.exists() )
{
QString errCause;