From: Enrico Forestieri <forenr@lyx.org>
Date: Sun, 13 Sep 2009 18:09:40 +0000 (+0000)
Subject: Fix display of toolbar icons after r31255.
X-Git-Tag: 2.0.0~5499
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b43aa05ff1ad20e79347920856188a25080747bb;p=features.git

Fix display of toolbar icons after r31255.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31387 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 13dbd9ca80..6c1de5387e 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -175,7 +175,12 @@ MenuButton::MenuButton(GuiToolbar * bar, ToolbarItem const & item, bool const st
 	setToolTip(label);
 	setStatusTip(label);
 	setText(label);
-	setIcon(QIcon(getPixmap("images/math/", toqstr(tbitem_.name_), "png")));
+	QString const name = toqstr(tbitem_.name_);
+	FileName fname = libFileSearch("images/math/", name, "png");
+	if (fname.exists())
+	    setIcon(QIcon(getPixmap("images/math/", name, "png")));
+	else
+	    setIcon(QIcon(getPixmap("images/", name, "png")));
 	if (sticky)
 		connect(this, SIGNAL(triggered(QAction *)),
 			this, SLOT(actionTriggered(QAction *)));