[widget editor] enable returnPressed signal for the search widget

slarosa · slarosa · commit 9acfe52f828e · 2015-09-16T17:37:38.000+02:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -469,6 +469,7 @@ void QgsAttributeTableDialog::filterColumnChanged( QObject* filterAction )
   }
   else
   {
+    connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged() ), SLOT( filterQueryAccepted() ) );
     mApplyFilterButton->setVisible( true );
   }
 
@@ -504,6 +505,10 @@ void QgsAttributeTableDialog::filterShowAll()
   mFilterButton->setDefaultAction( mActionShowAllFilter );
   mFilterButton->setPopupMode( QToolButton::InstantPopup );
   mFilterQuery->setVisible( false );
+  if ( mCurrentSearchWidgetWrapper != 0 )
+  {
+    mCurrentSearchWidgetWrapper->widget()->setVisible( false );
+  }
   mApplyFilterButton->setVisible( false );
   mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowAll );
 }
diff --git a/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h b/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h
@@ -70,6 +70,7 @@ class GUI_EXPORT QgsSearchWidgetWrapper : public QgsWidgetWrapper
   signals:
 
     void expressionChanged( QString exp );
+    void expressionChanged();
 
   protected slots:
 
diff --git a/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp
@@ -96,6 +96,7 @@ void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* widget )
   mContainer->layout()->addWidget( mLineEdit );
   mContainer->layout()->addWidget( mCheckbox );
   connect( mLineEdit, SIGNAL( textChanged( QString ) ), this, SLOT( setExpression( QString ) ) );
+  connect( mLineEdit, SIGNAL( returnPressed() ), this, SLOT( filterChanged() ) );
   connect( mCheckbox, SIGNAL( stateChanged( int ) ), this, SLOT( setCaseString( int ) ) );
   mCheckbox->setChecked( Qt::Unchecked );
   mCaseString = "ILIKE";
@@ -105,3 +106,8 @@ bool QgsDefaultSearchWidgetWrapper::valid()
 {
   return true;
 }
+
+void QgsDefaultSearchWidgetWrapper::filterChanged()
+{
+  emit expressionChanged();
+}
diff --git a/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h b/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h
@@ -36,11 +36,13 @@ class GUI_EXPORT QgsDefaultSearchWidgetWrapper : public QgsSearchWidgetWrapper
   public:
     QString expression() override;
     bool applyDirectly() override;
+
   protected slots:
     void setExpression( QString exp ) override;
 
   private slots:
     void setCaseString( int );
+    void filterChanged();
 
   protected:
     QWidget* createWidget( QWidget* parent ) override;

Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,7 @@ void QgsAttributeTableDialog::filterColumnChanged( QObject* filterAction )`
`469`	`469`	`}`
`470`	`470`	`else`
`471`	`471`	`{`
	`472`	`+ connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged() ), SLOT( filterQueryAccepted() ) );`
`472`	`473`	`mApplyFilterButton->setVisible( true );`
`473`	`474`	`}`
`474`	`475`
`@@ -504,6 +505,10 @@ void QgsAttributeTableDialog::filterShowAll()`
`504`	`505`	`mFilterButton->setDefaultAction( mActionShowAllFilter );`
`505`	`506`	`mFilterButton->setPopupMode( QToolButton::InstantPopup );`
`506`	`507`	`mFilterQuery->setVisible( false );`
	`508`	`+ if ( mCurrentSearchWidgetWrapper != 0 )`
	`509`	`+ {`
	`510`	`+ mCurrentSearchWidgetWrapper->widget()->setVisible( false );`
	`511`	`+ }`
`507`	`512`	`mApplyFilterButton->setVisible( false );`
`508`	`513`	`mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowAll );`
`509`	`514`	`}`