From 5e5f95b75a199490302153411cded2765c230938 Mon Sep 17 00:00:00 2001 From: Sebastian Dietrich Date: Tue, 19 Jan 2016 01:06:30 +0100 Subject: [PATCH 1/2] Hide excepted layers even if all types of layers are allowed. --- src/gui/qgsmaplayerproxymodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/qgsmaplayerproxymodel.cpp b/src/gui/qgsmaplayerproxymodel.cpp index 3a972a2ba4fc..01e2903dde81 100644 --- a/src/gui/qgsmaplayerproxymodel.cpp +++ b/src/gui/qgsmaplayerproxymodel.cpp @@ -46,7 +46,7 @@ void QgsMapLayerProxyModel::setExceptedLayerList( const QList& exc bool QgsMapLayerProxyModel::filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const { - if ( mFilters.testFlag( All ) ) + if ( mFilters.testFlag( All ) && mExceptList.isEmpty() ) return true; QModelIndex index = sourceModel()->index( source_row, 0, source_parent ); From 01603d728ca9788facd6b78cb36ad20b767f85c6 Mon Sep 17 00:00:00 2001 From: Sebastian Dietrich Date: Tue, 19 Jan 2016 22:06:05 +0100 Subject: [PATCH 2/2] QgsJoinDialog offers only vector-layer for joining. --- src/app/qgsjoindialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/qgsjoindialog.cpp b/src/app/qgsjoindialog.cpp index 103ffafb44d2..4059f46676eb 100644 --- a/src/app/qgsjoindialog.cpp +++ b/src/app/qgsjoindialog.cpp @@ -40,6 +40,7 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QList already mTargetFieldComboBox->setLayer( mLayer ); + mJoinLayerComboBox->setFilters( QgsMapLayerProxyModel::VectorLayer ); mJoinLayerComboBox->setExceptedLayerList( alreadyJoinedLayers ); connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), mJoinFieldComboBox, SLOT( setLayer( QgsMapLayer* ) ) ); connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), this, SLOT( joinedLayerChanged( QgsMapLayer* ) ) );