mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

When closing the filter window also clear the filter

Browse source 
The tooltip already pretended that that's what it did...

Also make the tooltip wording consistent.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-11-13 13:45:32 -08:00
parent ac9ead4571
commit 2cd31a30f2
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/filtermodels.h
View file

@ -104,4 +104,4 @@ private:
bool justCleared;
};
#endif
#endif

10
qt-ui/simplewidgets.cpp
View file

@ -577,7 +577,7 @@ MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
// Buttons to Clear/Minimize/Close
QToolBar *tb = new QToolBar();
QToolButton *clearBtn = new QToolButton();
clearBtn->setToolTip(tr("Clear the filters"));
clearBtn->setToolTip(tr("Reset the filters"));
clearBtn->setIcon(QIcon(":/trash"));
clearBtn->setAutoRaise(true);
QToolButton *closeBtn = new QToolButton();
@ -594,7 +594,7 @@ MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
tb->addWidget(minimize);
tb->addWidget(closeBtn);
connect(closeBtn, SIGNAL(clicked(bool)), this, SLOT(hide()));
connect(closeBtn, SIGNAL(clicked(bool)), this, SLOT(closeFilter()));
connect(clearBtn, SIGNAL(clicked(bool)), MultiFilterSortModel::instance(), SLOT(clearFilter()));
l->addWidget(tb);
l->addWidget(tagFilter);
@ -610,3 +610,9 @@ MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
setMinimumHeight(expandedWidget->height() + 5);
}
void MultiFilter::closeFilter()
{
MultiFilterSortModel::instance()->clearFilter();
hide();
}

3
qt-ui/simplewidgets.h
View file

@ -132,6 +132,9 @@ private:
class MultiFilter : public QScrollArea {
Q_OBJECT
public
slots:
void closeFilter();
public:
MultiFilter(QWidget *parent);
QWidget *expandedWidget;