fix filtered features number over the window title

slarosa · m-kuhn · commit 7065762b5c97 · 2015-09-15T14:10:49.000+02:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -309,7 +309,7 @@ void QgsAttributeTableDialog::keyPressEvent( QKeyEvent* event )
 
 void QgsAttributeTableDialog::columnBoxInit()
 {
-  Q_FOREACH ( QAction* a, mFilterColumnsMenu->actions() )
+  Q_FOREACH( QAction* a, mFilterColumnsMenu->actions() )
   {
     mFilterColumnsMenu->removeAction( a );
     mFilterActionMapper->removeMappings( a );
@@ -329,7 +329,7 @@ void QgsAttributeTableDialog::columnBoxInit()
 
   QList<QgsField> fields = mLayer->fields().toList();
 
-  Q_FOREACH ( const QgsField field, fields )
+  Q_FOREACH( const QgsField field, fields )
   {
     int idx = mLayer->fieldNameIndex( field.name() );
     if ( idx < 0 )
@@ -506,7 +506,6 @@ void QgsAttributeTableDialog::filterShowAll()
   mFilterQuery->setVisible( false );
   mApplyFilterButton->setVisible( false );
   mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowAll );
-  updateTitle();
 }
 
 void QgsAttributeTableDialog::filterSelected()
@@ -746,7 +745,6 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )
   }
 
   setFilterExpression( str );
-  updateTitle();
 }
 
 void QgsAttributeTableDialog::filterQueryAccepted()
@@ -782,8 +780,6 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )
     }
   }
 
-  mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );
-
   QgsFeatureIds filteredFeatures;
   QgsDistanceArea myDa;
 
@@ -804,7 +800,7 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )
   << QgsExpressionContextUtils::projectScope()
   << QgsExpressionContextUtils::layerScope( mLayer );
 
-  if ( ! filterExpression.prepare( &context ) )
+  if ( !filterExpression.prepare( &context ) )
   {
     QgisApp::instance()->messageBar()->pushMessage( tr( "Evaluation error" ), filterExpression.evalErrorString(), QgsMessageBar::WARNING, QgisApp::instance()->messageTimeout() );
   }
@@ -846,4 +842,5 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )
     QgisApp::instance()->messageBar()->pushMessage( tr( "Error filtering" ), filterExpression.evalErrorString(), QgsMessageBar::WARNING, QgisApp::instance()->messageTimeout() );
     return;
   }
+  mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );
 }

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ void QgsAttributeTableDialog::keyPressEvent( QKeyEvent* event )`
`309`	`309`
`310`	`310`	`void QgsAttributeTableDialog::columnBoxInit()`
`311`	`311`	`{`
`312`		`- Q_FOREACH ( QAction* a, mFilterColumnsMenu->actions() )`
	`312`	`+ Q_FOREACH( QAction* a, mFilterColumnsMenu->actions() )`
`313`	`313`	`{`
`314`	`314`	`mFilterColumnsMenu->removeAction( a );`
`315`	`315`	`mFilterActionMapper->removeMappings( a );`
`@@ -329,7 +329,7 @@ void QgsAttributeTableDialog::columnBoxInit()`
`329`	`329`
`330`	`330`	`QList<QgsField> fields = mLayer->fields().toList();`
`331`	`331`
`332`		`- Q_FOREACH ( const QgsField field, fields )`
	`332`	`+ Q_FOREACH( const QgsField field, fields )`
`333`	`333`	`{`
`334`	`334`	`int idx = mLayer->fieldNameIndex( field.name() );`
`335`	`335`	`if ( idx < 0 )`
`@@ -506,7 +506,6 @@ void QgsAttributeTableDialog::filterShowAll()`
`506`	`506`	`mFilterQuery->setVisible( false );`
`507`	`507`	`mApplyFilterButton->setVisible( false );`
`508`	`508`	`mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowAll );`
`509`		`- updateTitle();`
`510`	`509`	`}`
`511`	`510`
`512`	`511`	`void QgsAttributeTableDialog::filterSelected()`
`@@ -746,7 +745,6 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )`
`746`	`745`	`}`
`747`	`746`
`748`	`747`	`setFilterExpression( str );`
`749`		`- updateTitle();`
`750`	`748`	`}`
`751`	`749`
`752`	`750`	`void QgsAttributeTableDialog::filterQueryAccepted()`
`@@ -782,8 +780,6 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )`
`782`	`780`	`}`
`783`	`781`	`}`
`784`	`782`
`785`		`- mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );`
`786`		`-`
`787`	`783`	`QgsFeatureIds filteredFeatures;`
`788`	`784`	`QgsDistanceArea myDa;`
`789`	`785`
`@@ -804,7 +800,7 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )`
`804`	`800`	`<< QgsExpressionContextUtils::projectScope()`
`805`	`801`	`<< QgsExpressionContextUtils::layerScope( mLayer );`
`806`	`802`
`807`		`- if ( ! filterExpression.prepare( &context ) )`
	`803`	`+ if ( !filterExpression.prepare( &context ) )`
`808`	`804`	`{`
`809`	`805`	`QgisApp::instance()->messageBar()->pushMessage( tr( "Evaluation error" ), filterExpression.evalErrorString(), QgsMessageBar::WARNING, QgisApp::instance()->messageTimeout() );`
`810`	`806`	`}`
`@@ -846,4 +842,5 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )`
`846`	`842`	`QgisApp::instance()->messageBar()->pushMessage( tr( "Error filtering" ), filterExpression.evalErrorString(), QgsMessageBar::WARNING, QgisApp::instance()->messageTimeout() );`
`847`	`843`	`return;`
`848`	`844`	`}`
	`845`	`+ mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );`
`849`	`846`	`}`