Skip to content

Commit 497d4a8

Browse files
committed
Shows a warning and abort deletion if the layer is in the current project
1 parent cc14619 commit 497d4a8

File tree

2 files changed

+66
-32
lines changed

2 files changed

+66
-32
lines changed

src/providers/ogr/qgsgeopackagedataitems.cpp

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ QgsGeoPackageRasterLayerItem::QgsGeoPackageRasterLayerItem( QgsDataItem *parent,
356356
}
357357

358358

359-
360359
#ifdef HAVE_GUI
361360
QList<QAction *> QgsGeoPackageVectorLayerItem::actions()
362361
{
@@ -370,22 +369,39 @@ QList<QAction *> QgsGeoPackageVectorLayerItem::actions()
370369

371370
void QgsGeoPackageVectorLayerItem::deleteLayer()
372371
{
373-
if ( QMessageBox::question( nullptr, QObject::tr( "Delete Layer" ),
374-
QObject::tr( "Are you sure you want to delete layer '%1' from GeoPackage?" ).arg( mName ),
375-
QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
376-
return;
377-
378-
QString errCause;
379-
bool res = ::deleteLayer( mUri, errCause );
380-
if ( !res )
372+
// Check if the layer is in the registry
373+
const QgsMapLayer *projectLayer = nullptr;
374+
Q_FOREACH ( const QgsMapLayer *layer, QgsProject::instance()->mapLayers() )
375+
{
376+
if ( layer->publicSource() == mUri )
377+
{
378+
projectLayer = layer;
379+
}
380+
}
381+
if ( ! projectLayer )
381382
{
382-
QMessageBox::warning( nullptr, tr( "Delete Layer" ), errCause );
383+
if ( QMessageBox::question( nullptr, QObject::tr( "Delete Layer" ),
384+
QObject::tr( "Are you sure you want to delete layer '%1' from GeoPackage?" ).arg( mName ),
385+
QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
386+
return;
387+
388+
QString errCause;
389+
bool res = ::deleteLayer( mUri, errCause );
390+
if ( !res )
391+
{
392+
QMessageBox::warning( nullptr, tr( "Delete Layer" ), errCause );
393+
}
394+
else
395+
{
396+
QMessageBox::information( nullptr, tr( "Delete Layer" ), tr( "Layer deleted successfully." ) );
397+
if ( mParent )
398+
mParent->refresh();
399+
}
383400
}
384401
else
385402
{
386-
QMessageBox::information( nullptr, tr( "Delete Layer" ), tr( "Layer deleted successfully." ) );
387-
if ( mParent )
388-
mParent->refresh();
403+
QMessageBox::warning( nullptr, QObject::tr( "Delete Layer" ), QObject::tr( "The layer '%1' cannot be deleted because it is in the current project as '%2',"
404+
" remove it from the project and retry." ).arg( mName, projectLayer->name() ) );
389405
}
390406
}
391407
#endif

src/providers/ogr/qgsogrdataitems.cpp

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "qgslogger.h"
1919
#include "qgsmessagelog.h"
2020
#include "qgssettings.h"
21+
#include "qgsproject.h"
2122

2223
#include <QFileInfo>
2324
#include <QTextStream>
@@ -131,31 +132,48 @@ void QgsOgrLayerItem::deleteLayer()
131132
{
132133
// Messages are different for files and tables
133134
QString title = mIsSubLayer ? QObject::tr( "Delete Layer" ) : QObject::tr( "Delete File" );
134-
QString confirmMessage;
135-
if ( mIsSubLayer )
135+
// Check if the layer is in the registry
136+
const QgsMapLayer *projectLayer = nullptr;
137+
Q_FOREACH ( const QgsMapLayer *layer, QgsProject::instance()->mapLayers() )
136138
{
137-
confirmMessage = QObject::tr( "Are you sure you want to delete layer '%1' from datasource?" ).arg( mName );
138-
}
139-
else
140-
{
141-
confirmMessage = QObject::tr( "Are you sure you want to delete file '%1'?" ).arg( mUri );
139+
if ( layer->publicSource() == mUri )
140+
{
141+
projectLayer = layer;
142+
}
142143
}
143-
if ( QMessageBox::question( nullptr, title,
144-
confirmMessage,
145-
QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
146-
return;
147-
148-
QString errCause;
149-
bool res = ::deleteLayer( mUri, errCause );
150-
if ( !res )
144+
if ( ! projectLayer )
151145
{
152-
QMessageBox::warning( nullptr, title, errCause );
146+
QString confirmMessage;
147+
if ( mIsSubLayer )
148+
{
149+
confirmMessage = QObject::tr( "Are you sure you want to delete layer '%1' from datasource?" ).arg( mName );
150+
}
151+
else
152+
{
153+
confirmMessage = QObject::tr( "Are you sure you want to delete file '%1'?" ).arg( mUri );
154+
}
155+
if ( QMessageBox::question( nullptr, title,
156+
confirmMessage,
157+
QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
158+
return;
159+
160+
QString errCause;
161+
bool res = ::deleteLayer( mUri, errCause );
162+
if ( !res )
163+
{
164+
QMessageBox::warning( nullptr, title, errCause );
165+
}
166+
else
167+
{
168+
QMessageBox::information( nullptr, title, mIsSubLayer ? tr( "Layer deleted successfully." ) : tr( "File deleted successfully." ) );
169+
if ( mParent )
170+
mParent->refresh();
171+
}
153172
}
154173
else
155174
{
156-
QMessageBox::information( nullptr, title, mIsSubLayer ? tr( "Layer deleted successfully." ) : tr( "File deleted successfully." ) );
157-
if ( mParent )
158-
mParent->refresh();
175+
QMessageBox::warning( nullptr, title, QObject::tr( "The layer '%1' cannot be deleted because it is in the current project as '%2',"
176+
" remove it from the project and retry." ).arg( mName, projectLayer->name() ) );
159177
}
160178
}
161179
#endif

0 commit comments

Comments
 (0)