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

Restore handle bad layers dialog original behavior

Browse Source
This commit is contained in:
Alessandro Pasotti 2018-11-03 08:55:02 +01:00
parent 8493636f18
commit d46d765d58
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/qgshandlebadlayers.cpp
View File

@ -26,6 +26,7 @@
#include "qgsproviderregistry.h"
#include "qgsmessagebar.h"
#include "qgssettings.h"
#include "qgslayertreeregistrybridge.h"
#include <QDomDocument>
#include <QDomElement>
@ -347,13 +348,17 @@ void QgsHandleBadLayers::editAuthCfg()
void QgsHandleBadLayers::apply()
{
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );
QList<QgsMapLayer *> toRemove;
for ( const auto &l : QgsProject::instance()->mapLayers( ) )
{
if ( ! l->isValid() )
toRemove << l;
}
QgsProject::instance()->removeMapLayers( toRemove );
for ( int i = 0; i < mLayerList->rowCount(); i++ )
{
int idx = mLayerList->item( i, 0 )->data( Qt::UserRole ).toInt();
@ -372,11 +377,15 @@ void QgsHandleBadLayers::apply()
item->setForeground( QBrush( Qt::red ) );
}
}
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );
if ( mLayerList->rowCount() == 0 )
accept();
}
void QgsHandleBadLayers::accept()
{
apply();
if ( mLayerList->rowCount() > 0 &&
QMessageBox::warning( this,
@ -395,6 +404,9 @@ void QgsHandleBadLayers::accept()
if ( ! l->isValid() )
toRemove << l;
}
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );
QgsProject::instance()->removeMapLayers( toRemove );
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );
mLayerList->clear();
QDialog::accept();

BIN
tests/testdata/projects/bad_layers_test.gpkg vendored
View File

Binary file not shown.