Fix the tab ordering of GuiDocument components.

[lyx.git] / src / frontends / qt4 / GuiToolbar.cpp

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 05e97e912a103cad8f4ac6b4d1b3a6d3eb577d81..5a0edfa335419e3fe1557a0411f677517c498614 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -174,11 +174,15 @@ MenuButton::MenuButton(GuiToolbar * bar, ToolbarItem const & item, bool const st
        setStatusTip(label);
        setText(label);
        QString const name = toqstr(tbitem_.name_);
-       FileName const fname = libFileSearch("images/math/", name, "png");
-       if (fname.exists())
-           setIcon(QIcon(getPixmap("images/math/", name, "png")));
-       else
-           setIcon(QIcon(getPixmap("images/", name, "png")));
+       QString imagedir = "images/math/";
+       FileName const fname = imageLibFileSearch(imagedir, name, "png");
+       if (fname.exists()) {
+               setIcon(QIcon(getPixmap(imagedir, name, "png")));
+       } else {
+               imagedir = "images/";
+               imageLibFileSearch(imagedir, name, "png");
+               setIcon(QIcon(getPixmap(imagedir, name, "png")));
+       }
        if (sticky)
                connect(this, SIGNAL(triggered(QAction *)),
                        this, SLOT(actionTriggered(QAction *)));
@@ -326,7 +330,16 @@ void GuiToolbar::saveSession() const
 void GuiToolbar::restoreSession()
 {
        QSettings settings;
-       setVisibility(settings.value(sessionKey() + "/visibility").toInt());
+       int const error_val = -1;
+       int visibility =
+               settings.value(sessionKey() + "/visibility", error_val).toInt();
+       if (visibility == error_val || visibility == 0) {
+               // This should not happen, but in case we use the defaults
+               LYXERR0("Session settings could not be found! Defaults are used instead.");
+               visibility = 
+                       guiApp->toolbars().defaultVisibility(fromqstr(objectName()));
+       }
+       setVisibility(visibility);
 }