Skip to content

Commit

Permalink
fix #2237, #2238
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12393 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 10, 2009
1 parent 2bd8a4b commit e8994c4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions src/app/attributetable/qgsattributetabledialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
mDock = new QgsAttributeTableDock( tr( "Attribute table - %1" ).arg( mLayer->name() ), QgisApp::instance() );
mDock->setAllowedAreas( Qt::BottomDockWidgetArea | Qt::TopDockWidgetArea );
mDock->setWidget( this );
connect( this, SIGNAL( destroyed() ), mDock, SLOT( close() ) );
QgisApp::instance()->addDockWidget( Qt::BottomDockWidgetArea, mDock );
}

Expand Down Expand Up @@ -505,6 +506,10 @@ void QgsAttributeTableDialog::updateSelectionFromLayer()
{
QgsDebugMsg( "updateFromLayer" );
mSelectedFeatures = mLayer->selectedFeaturesIds();

if ( cbxShowSelectedOnly->isChecked() )
mFilterModel->invalidate();

updateSelection();
}

Expand Down
6 changes: 4 additions & 2 deletions src/app/qgsidentifyresults.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ void QgsIdentifyResults::close()

saveWindowLocation();
done( 0 );
if ( mDock )
mDock->close();
}

// Save the current window size/position before closing
Expand Down Expand Up @@ -622,8 +624,8 @@ void QgsIdentifyResults::disconnectLayer( QObject *layer )
{
disconnect( vlayer, SIGNAL( layerDeleted() ), this, SLOT( layerDestroyed() ) );
disconnect( vlayer, SIGNAL( featureDeleted( int ) ), this, SLOT( featureDeleted( int ) ) );
disconnect( vlayer, SIGNAL( editingStarted() ), this, SLOT( changeEditAction() ) );
disconnect( vlayer, SIGNAL( editingStopped() ), this, SLOT( changeEditAction() ) );
disconnect( vlayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) );
disconnect( vlayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
}
else
{
Expand Down

0 comments on commit e8994c4

Please sign in to comment.