Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index f2ba321c3d8cac51635f4af1d5f9780cd61ef459..a49a995210085e0a43c62b0d1c1b10ba000da58a 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -41,7 +41,7 @@
 #include "Intl.h"
 #include "KeyMap.h"
 #include "Language.h"
-#include "LaTeXFeatures.h"
+#include "LaTeXPackages.h"
 #include "Lexer.h"
 #include "LyX.h"
 #include "LyXAction.h"
@@ -367,11 +367,12 @@ QString iconName(FuncRequest const & f, bool unknown)
                }
        }
 
-       FileName fname = libFileSearch("images/" + path, name1, "png");
+       QString imagedir = "images/" + path;
+       FileName fname = imageLibFileSearch(imagedir, name1, "png");
        if (fname.exists())
                return toqstr(fname.absFileName());
 
-       fname = libFileSearch("images/" + path, name2, "png");
+       fname = imageLibFileSearch(imagedir, name2, "png");
        if (fname.exists())
                return toqstr(fname.absFileName());
 
@@ -398,7 +399,8 @@ QString iconName(FuncRequest const & f, bool unknown)
                           << '(' << to_utf8(f.argument()) << ")\"");
 
        if (unknown) {
-               fname = libFileSearch(QString("images/"), "unknown", "png");
+               imagedir = "images/";
+               fname = imageLibFileSearch(imagedir, "unknown", "png");
                if (fname.exists())
                        return toqstr(fname.absFileName());
                return QString(":/images/unknown.png");
@@ -410,7 +412,8 @@ QString iconName(FuncRequest const & f, bool unknown)
 QPixmap getPixmap(QString const & path, QString const & name, QString const & ext)
 {
        QPixmap pixmap;
-       FileName fname = libFileSearch(path, name, ext);
+       QString imagedir = path;
+       FileName fname = imageLibFileSearch(imagedir, name, ext);
        QString path1 = toqstr(fname.absFileName());
        QString path2 = ":/" + path + name + "." + ext;
 
@@ -1100,26 +1103,9 @@ void GuiApplication::dispatch(FuncRequest const & cmd)
 
        BufferView * bv = current_view_->currentBufferView();
        if (bv) {
-               Cursor & cursor = bv->cursor();
-               Buffer & buf = bv->buffer();
-
-               // FIXME
-               // This check out to be done somewhere else. It got moved here
-               // from TextMetrics.cpp, where it definitely didn't need to be.
-               // Actually, this test ought not to be done at all, since the
-               // whole InsetBibitem business is a mess. But that is a different
-               // story.
-               int moveCursor = 0;
-               if (cursor.inTexted()) {
-                       moveCursor = cursor.paragraph().checkBiblio(buf);
-                       if (moveCursor > 0)
-                               cursor.posForward();
-                       else if (moveCursor < 0 && cursor.pos() >= -moveCursor)
-                               cursor.posBackward();
-               }
-               if (moveCursor != 0 || dr.needBufferUpdate()) {
-                       cursor.clearBufferUpdate();
-                       buf.updateBuffer();
+               if (dr.needBufferUpdate()) {
+                       bv->cursor().clearBufferUpdate();
+                       bv->buffer().updateBuffer();
                }
                // BufferView::update() updates the ViewMetricsInfo and
                // also initializes the position cache for all insets in
@@ -1225,7 +1211,7 @@ void GuiApplication::reconfigure(string const & option)
                current_view_->message(_("Reloading configuration..."));
        lyxrc.read(libFileSearch(QString(), "lyxrc.defaults"), false);
        // Re-read packages.lst
-       LaTeXFeatures::getAvailable();
+       LaTeXPackages::getAvailable();
 
        if (ret)
                Alert::information(_("System reconfiguration failed"),
@@ -1453,7 +1439,6 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                }
 
                actOnUpdatedPrefs(lyxrc_orig, lyxrc);
-               setSpellChecker();
                resetGui();
 
                break;