Skip to content
Permalink
Browse files

fix #2237, #2238

git-svn-id: http://svn.osgeo.org/qgis/trunk@12393 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Dec 10, 2009
1 parent e4ee39f commit 8ee5c20190924ea68c55dda8ef67e4624da5e7ce
Showing with 9 additions and 2 deletions.
  1. +5 −0 src/app/attributetable/qgsattributetabledialog.cpp
  2. +4 −2 src/app/qgsidentifyresults.cpp
@@ -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 );
}

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

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

updateSelection();
}

@@ -297,6 +297,8 @@ void QgsIdentifyResults::close()

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

// Save the current window size/position before closing
@@ -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
{

0 comments on commit 8ee5c20

Please sign in to comment.
You can’t perform that action at this time.