From cc822dd8df7f2edfe746370f9eb9d45edd920ba1 Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 11 Jan 2018 22:43:08 +0100 Subject: [PATCH] card filter: add clear button and placeholder text (#3003) --- cockatrice/src/filterbuilder.cpp | 4 ++++ cockatrice/src/tab_deck_editor.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/filterbuilder.cpp b/cockatrice/src/filterbuilder.cpp index d9b281c4..32c1cf09 100644 --- a/cockatrice/src/filterbuilder.cpp +++ b/cockatrice/src/filterbuilder.cpp @@ -32,6 +32,10 @@ FilterBuilder::FilterBuilder(QWidget *parent) edit = new QLineEdit; edit->setObjectName("edit"); + edit->setPlaceholderText(tr("Type your filter here")); +#if QT_VERSION >= 0x050200 + edit->setClearButtonEnabled(true); +#endif edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); QGridLayout *layout = new QGridLayout; diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index 49e519e2..cc91a720 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -312,18 +312,18 @@ void TabDeckEditor::createCentralFrame() { searchEdit = new SearchLineEdit; searchEdit->setObjectName("searchEdit"); + searchEdit->setPlaceholderText(tr("Search by card name")); #if QT_VERSION >= 0x050200 searchEdit->setClearButtonEnabled(true); #endif #if QT_VERSION >= 0x050300 searchEdit->addAction(QPixmap("theme:icons/search"), QLineEdit::LeadingPosition); #endif + searchEdit->installEventFilter(&searchKeySignals); setFocusProxy(searchEdit); setFocusPolicy(Qt::ClickFocus); - searchEdit->installEventFilter(&searchKeySignals); - searchEdit->setPlaceholderText(tr("Search by card name")); searchKeySignals.setObjectName("searchKeySignals"); connect(searchEdit, SIGNAL(textChanged(const QString &)), this, SLOT(updateSearch(const QString &))); connect(&searchKeySignals, SIGNAL(onEnter()), this, SLOT(actAddCard()));