also handle UI when manually applying filter

3nids · 3nids · commit ffd3f882f7cb · 2014-08-12T10:01:41.000+02:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -397,13 +397,6 @@ void QgsAttributeTableDialog::filterExpressionBuilder()
 
   if ( dlg.exec() == QDialog::Accepted )
   {
-    mFilterQuery->setText( dlg.expressionText() );
-    mFilterButton->setDefaultAction( mActionAdvancedFilter );
-    mFilterButton->setPopupMode( QToolButton::MenuButtonPopup );
-    mCbxCaseSensitive->setVisible( false );
-    mFilterQuery->setVisible( true );
-    mApplyFilterButton->setVisible( true );
-    mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );
     setFilterExpression( dlg.expressionText() );
   }
 }
@@ -706,6 +699,14 @@ void QgsAttributeTableDialog::filterQueryAccepted()
 
 void QgsAttributeTableDialog::setFilterExpression( QString filterString )
 {
+  mFilterQuery->setText( filterString );
+  mFilterButton->setDefaultAction( mActionAdvancedFilter );
+  mFilterButton->setPopupMode( QToolButton::MenuButtonPopup );
+  mCbxCaseSensitive->setVisible( false );
+  mFilterQuery->setVisible( true );
+  mApplyFilterButton->setVisible( true );
+  mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );
+
   QgsFeatureIds filteredFeatures;
   QgsDistanceArea myDa;
 
