From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 18 Sep 2016 07:02:23 +0000 (+0200)
Subject: Connect filter reset button and remove unnecessary directives.
X-Git-Tag: 2.3.0alpha1~995
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f1ae30919f4925b91a069d12060aa7588c4586bf;p=features.git

Connect filter reset button and remove unnecessary directives.
---

diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index ecfe598c4c..aa98550734 100644
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -52,15 +52,11 @@ GuiRef::GuiRef(GuiView & lv)
 
 	// The filter bar
 	filter_ = new FancyLineEdit(this);
-#if QT_VERSION >= 0x040600
 	filter_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", "editclear", "svgz,png"));
 	filter_->setButtonVisible(FancyLineEdit::Right, true);
 	filter_->setButtonToolTip(FancyLineEdit::Right, qt_("Clear text"));
 	filter_->setAutoHideButton(FancyLineEdit::Right, true);
-#endif
-#if QT_VERSION >= 0x040700
 	filter_->setPlaceholderText(qt_("All available labels"));
-#endif
 	filter_->setToolTip(qt_("Enter string to filter the list of available labels"));
 
 	filterBarL->addWidget(filter_, 0);
@@ -87,6 +83,8 @@ GuiRef::GuiRef(GuiView & lv)
 		this, SLOT(changed_adaptor()));
 	connect(filter_, SIGNAL(textEdited(QString)),
 		this, SLOT(filterLabels()));
+	connect(filter_, SIGNAL(rightButtonClicked()),
+		this, SLOT(resetFilter()));
 	connect(csFindCB, SIGNAL(clicked()),
 		this, SLOT(filterLabels()));
 	connect(nameED, SIGNAL(textChanged(QString)),
@@ -541,6 +539,13 @@ void GuiRef::filterLabels()
 }
 
 
+void GuiRef::resetFilter()
+{
+	filter_->setText(QString());
+	filterLabels();
+}
+
+
 bool GuiRef::initialiseParams(std::string const & data)
 {
 	InsetCommand::string2params(data, params_);
diff --git a/src/frontends/qt4/GuiRef.h b/src/frontends/qt4/GuiRef.h
index 2873046352..4c7d48899e 100644
--- a/src/frontends/qt4/GuiRef.h
+++ b/src/frontends/qt4/GuiRef.h
@@ -40,6 +40,7 @@ private Q_SLOTS:
 	void changed_adaptor();
 	void gotoClicked();
 	void filterLabels();
+	void resetFilter();
 	void refHighlighted(QTreeWidgetItem *);
 	void selectionChanged();
 	void refTextChanged(QString const &);