[search widgets] when selecting _Please select_ find all features

qgis · Nov 13, 2015 · 31ac9be · 31ac9be
1 parent b2034f2
commit 31ac9be
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/gui/editorwidgets/core/qgssearchwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgssearchwidgetwrapper.cpp
@@ -33,3 +33,8 @@ void QgsSearchWidgetWrapper::setFeature( const QgsFeature& feature )
   Q_UNUSED( feature )
 }
 
+void QgsSearchWidgetWrapper::clearExpression()
+{
+  mExpression = QString( "TRUE" );
+}
+
diff --git a/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h b/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h
@@ -81,6 +81,9 @@ class GUI_EXPORT QgsSearchWidgetWrapper : public QgsWidgetWrapper
     void setFeature( const QgsFeature& feature ) override;
 
   protected:
+    //! clears the expression to search for all features
+    void clearExpression();
+
     QString mExpression;
     int mFieldIdx;
 

diff --git a/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
@@ -37,7 +37,14 @@ void QgsValueMapSearchWidgetWrapper::comboBoxIndexChanged( int idx )
 {
   if ( mComboBox )
   {
-    setExpression( mComboBox->itemData( idx ).toString() );
+    if ( idx == 0 )
+    {
+      clearExpression();
+    }
+    else
+    {
+      setExpression( mComboBox->itemData( idx ).toString() );
+    }
     emit expressionChanged( mExpression );
   }
 }

diff --git a/src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
@@ -97,8 +97,15 @@ bool QgsValueRelationSearchWidgetWrapper::valid()
 void QgsValueRelationSearchWidgetWrapper::valueChanged()
 {
   QVariant vl = value();
-  QSettings settings;
+  if ( !vl.isValid() )
-  setExpression( vl.isNull() ? settings.value( "qgis/nullValue", "NULL" ).toString() : vl.toString() );
+  {
+    clearExpression();
+  }
+  else
+  {
+    QSettings settings;
+    setExpression( vl.isNull() ? settings.value( "qgis/nullValue", "NULL" ).toString() : vl.toString() );
+  }
   emit expressionChanged( mExpression );
 }
 
@@ -149,7 +156,7 @@ void QgsValueRelationSearchWidgetWrapper::initWidget( QWidget* editor )
 
   if ( mComboBox )
   {
-    mComboBox->addItem( tr( "Please select" ), QVariant( layer()->fields().at( mFieldIdx ).type() ) );
+    mComboBox->addItem( tr( "Please select" ), QVariant() ); // creates an invalid to allow selecting all features
     if ( config( "AllowNull" ).toBool() )
     {
       mComboBox->addItem( tr( "(no selection)" ), QVariant( layer()->fields().at( mFieldIdx ).type() ) );