Fix for #889 - show selection count in atribute table dialog

timlinux · timlinux · commit e24e567741ec · 2010-09-15T13:59:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14231 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/attributetable/qgsattributetabledialog.cpp b/src/app/attributetable/qgsattributetabledialog.cpp
@@ -81,7 +81,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
     QgisApp::instance()->addDockWidget( Qt::BottomDockWidgetArea, mDock );
   }
 
-  setWindowTitle( tr( "Attribute table - %1 (%n Feature(s))", "feature count", mModel->rowCount() ).arg( mLayer->name() ) );
+  setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").
+      arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));
 
   mRemoveSelectionButton->setIcon( getThemeIcon( "/mActionUnselectAttributes.png" ) );
   mSelectedToTopButton->setIcon( getThemeIcon( "/mActionSelectedToTop.png" ) );
@@ -304,6 +305,8 @@ void QgsAttributeTableDialog::updateSelection()
 
   mSelectionModel->select( selection, QItemSelectionModel::ClearAndSelect );// | QItemSelectionModel::Columns);
   mView->setSelectionModel( mSelectionModel );
+  setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").
+      arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));
 
   /*for (int i = 0; i < mModel->rowCount(); ++i)
   {
@@ -351,6 +354,8 @@ void QgsAttributeTableDialog::updateRowSelection( int index )
     }
 
     updateRowSelection( first, last, 3 );
+    setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").
+      arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));
     mView->setSelectionMode( QAbstractItemView::NoSelection );
     return;
   }
@@ -401,6 +406,8 @@ void QgsAttributeTableDialog::updateRowSelection( int index )
     }
   }
   mView->setSelectionMode( QAbstractItemView::NoSelection );
+  setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").
+      arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));
 }
 
 void QgsAttributeTableDialog::updateRowSelection( int first, int last, int clickType )

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid`
`81`	`81`	`QgisApp::instance()->addDockWidget( Qt::BottomDockWidgetArea, mDock );`
`82`	`82`	`}`
`83`	`83`
`84`		`- setWindowTitle( tr( "Attribute table - %1 (%n Feature(s))", "feature count", mModel->rowCount() ).arg( mLayer->name() ) );`
	`84`	`+ setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").`
	`85`	`+ arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));`
`85`	`86`
`86`	`87`	`mRemoveSelectionButton->setIcon( getThemeIcon( "/mActionUnselectAttributes.png" ) );`
`87`	`88`	`mSelectedToTopButton->setIcon( getThemeIcon( "/mActionSelectedToTop.png" ) );`
`@@ -304,6 +305,8 @@ void QgsAttributeTableDialog::updateSelection()`
`304`	`305`
`305`	`306`	`mSelectionModel->select( selection, QItemSelectionModel::ClearAndSelect );// \| QItemSelectionModel::Columns);`
`306`	`307`	`mView->setSelectionModel( mSelectionModel );`
	`308`	`+ setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").`
	`309`	`+ arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));`
`307`	`310`
`308`	`311`	`/*for (int i = 0; i < mModel->rowCount(); ++i)`
`309`	`312`	`{`
`@@ -351,6 +354,8 @@ void QgsAttributeTableDialog::updateRowSelection( int index )`
`351`	`354`	`}`
`352`	`355`
`353`	`356`	`updateRowSelection( first, last, 3 );`
	`357`	`+ setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").`
	`358`	`+ arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));`
`354`	`359`	`mView->setSelectionMode( QAbstractItemView::NoSelection );`
`355`	`360`	`return;`
`356`	`361`	`}`
`@@ -401,6 +406,8 @@ void QgsAttributeTableDialog::updateRowSelection( int index )`
`401`	`406`	`}`
`402`	`407`	`}`
`403`	`408`	`mView->setSelectionMode( QAbstractItemView::NoSelection );`
	`409`	`+ setWindowTitle( tr ("Attribute table - %3 :: %1 / %2 features(s) selected", "feature count").`
	`410`	`+ arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ));`
`404`	`411`	`}`
`405`	`412`
`406`	`413`	`void QgsAttributeTableDialog::updateRowSelection( int first, int last, int clickType )`