Works now for the default case

carolinux · carolinux · commit f1085b833e83 · 2015-05-22T13:19:35.000+02:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -715,8 +715,9 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )
 
     QSettings settings;
     QString nullValue = settings.value( "qgis/nullValue", "NULL" ).toString();
+    QString value = mCurrentSearchWidgetWrapper->value().toString();
 
-    if ( mFilterQuery->displayText() == nullValue )
+    if (  value == nullValue )
     {
       str = QString( "%1 IS NULL" ).arg( QgsExpression::quotedColumnRef( fieldName ) );
     }
@@ -726,9 +727,9 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )
             .arg( QgsExpression::quotedColumnRef( fieldName ) )
             .arg( numeric ? "=" : sensString )
             .arg( numeric
-                  ? mFilterQuery->displayText().replace( "'", "''" )
+                  ? value.replace( "'", "''" )
                   :
-                  "%" + mFilterQuery->displayText().replace( "'", "''" ) + "%" ); // escape quotes
+                  "%" + value.replace( "'", "''" ) + "%" ); // escape quotes
     }
   }
 
@@ -738,7 +739,8 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )
 
 void QgsAttributeTableDialog::filterQueryAccepted()
 {
-  if ( mFilterQuery->text().isEmpty() )
+  if ( (mFilterQuery->isVisible() && mFilterQuery->text().isEmpty()) ||
+          (mCurrentSearchWidgetWrapper->widget()->isVisible() && mCurrentSearchWidgetWrapper->value().toString().isEmpty() ))
   {
     filterShowAll();
     return;
@@ -753,6 +755,10 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )
   mFilterButton->setPopupMode( QToolButton::MenuButtonPopup );
   mCbxCaseSensitive->setVisible( false );
   mFilterQuery->setVisible( true );
+  if ( mCurrentSearchWidgetWrapper != 0 ) 
+  {
+    mCurrentSearchWidgetWrapper->widget()->setVisible( false );
+  }
   mApplyFilterButton->setVisible( true );
   mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );
 
diff --git a/src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.cpp
@@ -28,17 +28,18 @@ QgsDefaultSearchWidgetWrapper::QgsDefaultSearchWidgetWrapper( QgsVectorLayer* vl
 
 QVariant QgsDefaultSearchWidgetWrapper::value()
 {
-    return QString("foo");
+    return mLineEdit->text();
 }
 
 QWidget* QgsDefaultSearchWidgetWrapper::createWidget( QWidget* parent )
 {
     return new QgsFilterLineEdit( parent );
 }
 
-void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* editor )
+void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* widget )
 {
-    connect( mLineEdit, SIGNAL( textChanged( QString ) ), this, SLOT( valueChanged( QString ) ) );
+    mLineEdit = qobject_cast<QgsFilterLineEdit*>( widget );
+    connect( widget, SIGNAL( textChanged( QString ) ), this, SLOT( valueChanged( QString ) ) );
 }
 
 void QgsDefaultSearchWidgetWrapper::setValue( const QVariant& value )

Original file line number	Diff line number	Diff line change
`@@ -715,8 +715,9 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )`
`715`	`715`
`716`	`716`	`QSettings settings;`
`717`	`717`	`QString nullValue = settings.value( "qgis/nullValue", "NULL" ).toString();`
	`718`	`+ QString value = mCurrentSearchWidgetWrapper->value().toString();`
`718`	`719`
`719`		`- if ( mFilterQuery->displayText() == nullValue )`
	`720`	`+ if ( value == nullValue )`
`720`	`721`	`{`
`721`	`722`	`str = QString( "%1 IS NULL" ).arg( QgsExpression::quotedColumnRef( fieldName ) );`
`722`	`723`	`}`
`@@ -726,9 +727,9 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )`
`726`	`727`	`.arg( QgsExpression::quotedColumnRef( fieldName ) )`
`727`	`728`	`.arg( numeric ? "=" : sensString )`
`728`	`729`	`.arg( numeric`
`729`		`- ? mFilterQuery->displayText().replace( "'", "''" )`
	`730`	`+ ? value.replace( "'", "''" )`
`730`	`731`	`:`
`731`		`- "%" + mFilterQuery->displayText().replace( "'", "''" ) + "%" ); // escape quotes`
	`732`	`+ "%" + value.replace( "'", "''" ) + "%" ); // escape quotes`
`732`	`733`	`}`
`733`	`734`	`}`
`734`	`735`
`@@ -738,7 +739,8 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )`
`738`	`739`
`739`	`740`	`void QgsAttributeTableDialog::filterQueryAccepted()`
`740`	`741`	`{`
`741`		`- if ( mFilterQuery->text().isEmpty() )`
	`742`	`+ if ( (mFilterQuery->isVisible() && mFilterQuery->text().isEmpty()) \|\|`
	`743`	`+ (mCurrentSearchWidgetWrapper->widget()->isVisible() && mCurrentSearchWidgetWrapper->value().toString().isEmpty() ))`
`742`	`744`	`{`
`743`	`745`	`filterShowAll();`
`744`	`746`	`return;`
`@@ -753,6 +755,10 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )`
`753`	`755`	`mFilterButton->setPopupMode( QToolButton::MenuButtonPopup );`
`754`	`756`	`mCbxCaseSensitive->setVisible( false );`
`755`	`757`	`mFilterQuery->setVisible( true );`
	`758`	`+ if ( mCurrentSearchWidgetWrapper != 0 )`
	`759`	`+ {`
	`760`	`+ mCurrentSearchWidgetWrapper->widget()->setVisible( false );`
	`761`	`+ }`
`756`	`762`	`mApplyFilterButton->setVisible( true );`
`757`	`763`	`mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );`
`758`	`764`
Original file line number	Diff line number	Diff line change
`@@ -28,17 +28,18 @@ QgsDefaultSearchWidgetWrapper::QgsDefaultSearchWidgetWrapper( QgsVectorLayer* vl`
`28`	`28`
`29`	`29`	`QVariant QgsDefaultSearchWidgetWrapper::value()`
`30`	`30`	`{`
`31`		`- return QString("foo");`
	`31`	`+ return mLineEdit->text();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`QWidget* QgsDefaultSearchWidgetWrapper::createWidget( QWidget* parent )`
`35`	`35`	`{`
`36`	`36`	`return new QgsFilterLineEdit( parent );`
`37`	`37`	`}`
`38`	`38`
`39`		`-void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* editor )`
	`39`	`+void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* widget )`
`40`	`40`	`{`
`41`		`- connect( mLineEdit, SIGNAL( textChanged( QString ) ), this, SLOT( valueChanged( QString ) ) );`
	`41`	`+ mLineEdit = qobject_cast<QgsFilterLineEdit*>( widget );`
	`42`	`+ connect( widget, SIGNAL( textChanged( QString ) ), this, SLOT( valueChanged( QString ) ) );`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`void QgsDefaultSearchWidgetWrapper::setValue( const QVariant& value )`