[QGIS Commit] r12393 - in trunk/qgis/src/app: . attributetable

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-10 03:43:20 -0500 (Thu, 10 Dec 2009)
New Revision: 12393

Modified:
   trunk/qgis/src/app/attributetable/qgsattributetabledialog.cpp
   trunk/qgis/src/app/qgsidentifyresults.cpp
Log:
fix #2237, #2238

Modified: trunk/qgis/src/app/attributetable/qgsattributetabledialog.cpp
===================================================================
--- trunk/qgis/src/app/attributetable/qgsattributetabledialog.cpp	2009-12-10 07:59:34 UTC (rev 12392)
+++ trunk/qgis/src/app/attributetable/qgsattributetabledialog.cpp	2009-12-10 08:43:20 UTC (rev 12393)
@@ -78,6 +78,7 @@
     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 @@
 {
   QgsDebugMsg( "updateFromLayer" );
   mSelectedFeatures = mLayer->selectedFeaturesIds();
+
+  if ( cbxShowSelectedOnly->isChecked() )
+    mFilterModel->invalidate();
+
   updateSelection();
 }
 

Modified: trunk/qgis/src/app/qgsidentifyresults.cpp
===================================================================
--- trunk/qgis/src/app/qgsidentifyresults.cpp	2009-12-10 07:59:34 UTC (rev 12392)
+++ trunk/qgis/src/app/qgsidentifyresults.cpp	2009-12-10 08:43:20 UTC (rev 12393)
@@ -297,6 +297,8 @@
 
   saveWindowLocation();
   done( 0 );
+  if ( mDock )
+    mDock->close();
 }
 
 // Save the current window size/position before closing
@@ -622,8 +624,8 @@
   {
     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
   {