Skip to content

Commit 9acfe52

Browse files
committedSep 16, 2015
[widget editor] enable returnPressed signal for the search widget
1 parent a62c6a9 commit 9acfe52

File tree

4 files changed

+14
-0
lines changed

4 files changed

+14
-0
lines changed
 

‎src/app/qgsattributetabledialog.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ void QgsAttributeTableDialog::filterColumnChanged( QObject* filterAction )
469469
}
470470
else
471471
{
472+
connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged() ), SLOT( filterQueryAccepted() ) );
472473
mApplyFilterButton->setVisible( true );
473474
}
474475

@@ -504,6 +505,10 @@ void QgsAttributeTableDialog::filterShowAll()
504505
mFilterButton->setDefaultAction( mActionShowAllFilter );
505506
mFilterButton->setPopupMode( QToolButton::InstantPopup );
506507
mFilterQuery->setVisible( false );
508+
if ( mCurrentSearchWidgetWrapper != 0 )
509+
{
510+
mCurrentSearchWidgetWrapper->widget()->setVisible( false );
511+
}
507512
mApplyFilterButton->setVisible( false );
508513
mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowAll );
509514
}

‎src/gui/editorwidgets/core/qgssearchwidgetwrapper.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class GUI_EXPORT QgsSearchWidgetWrapper : public QgsWidgetWrapper
7070
signals:
7171

7272
void expressionChanged( QString exp );
73+
void expressionChanged();
Code has comments. Press enter to view.
7374

7475
protected slots:
7576

‎src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* widget )
9696
mContainer->layout()->addWidget( mLineEdit );
9797
mContainer->layout()->addWidget( mCheckbox );
9898
connect( mLineEdit, SIGNAL( textChanged( QString ) ), this, SLOT( setExpression( QString ) ) );
99+
connect( mLineEdit, SIGNAL( returnPressed() ), this, SLOT( filterChanged() ) );
99100
connect( mCheckbox, SIGNAL( stateChanged( int ) ), this, SLOT( setCaseString( int ) ) );
100101
mCheckbox->setChecked( Qt::Unchecked );
101102
mCaseString = "ILIKE";
@@ -105,3 +106,8 @@ bool QgsDefaultSearchWidgetWrapper::valid()
105106
{
106107
return true;
107108
}
109+
110+
void QgsDefaultSearchWidgetWrapper::filterChanged()
111+
{
112+
emit expressionChanged();
113+
}

‎src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ class GUI_EXPORT QgsDefaultSearchWidgetWrapper : public QgsSearchWidgetWrapper
3636
public:
3737
QString expression() override;
3838
bool applyDirectly() override;
39+
3940
protected slots:
4041
void setExpression( QString exp ) override;
4142

4243
private slots:
4344
void setCaseString( int );
45+
void filterChanged();
4446

4547
protected:
4648
QWidget* createWidget( QWidget* parent ) override;

0 commit comments

Comments
 (0)
Please sign in to comment.