]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiApplication.cpp
On Linux show in crash message box the backtrace
[lyx.git] / src / frontends / qt4 / GuiApplication.cpp
index 94581a3795dffebe86b98ee6a25d77a2c4637bd2..f6c8433141131732be85ac94fa9ab5dc642c366c 100644 (file)
 #include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 #include "support/Systemcall.h"
+#include "support/TempFile.h"
 
 #ifdef Q_WS_MACX
+#include "support/AppleScript.h"
 #include "support/linkback/LinkBackProxy.h"
 #endif
 
@@ -92,7 +94,6 @@
 #include <QLocale>
 #include <QLibraryInfo>
 #include <QList>
-#include <QMacPasteboardMime>
 #include <QMenuBar>
 #include <QMimeData>
 #include <QObject>
 #include <QTextCodec>
 #include <QTimer>
 #include <QTranslator>
-#if QT_VERSION >= 0x040400
 #include <QThreadPool>
-#endif
 #include <QWidget>
 
 #ifdef Q_WS_X11
 #include <objidl.h>
 #endif // Q_WS_WIN
 
+#ifdef Q_WS_MACX
+#include <QMacPasteboardMime>
+#endif // Q_WS_MACX
+
 #include "support/bind.h"
 #include <boost/crc.hpp>
 
@@ -173,6 +176,25 @@ frontend::Application * createApplication(int & argc, char * argv[])
        return guiApp;
 }
 
+
+void setLocale()
+{
+       QLocale theLocale;
+       if (lyxrc.gui_language == "auto") {
+               theLocale = QLocale::system();
+       } else {
+               Language const * l = languages.getLanguage(lyxrc.gui_language);
+               string const code = l ? l->code() : string();
+               theLocale = QLocale(toqstr(code));
+       }
+       string const code = fromqstr(theLocale.name());
+       // Qt tries to outsmart us and transforms en_US to C.
+       Messages::guiLanguage((code == "C") ? "en_US" : code);
+       QLocale::setDefault(theLocale);
+       setlocale(LC_NUMERIC, "C");
+}
+
+
 namespace frontend {
 
 
@@ -235,53 +257,144 @@ private:
 
 // this must be sorted alphabetically
 // Upper case comes before lower case
+// Please don't change the formatting, this list is parsed by
+// development/tools/generate_symbols_images.py.
 PngMap sorted_png_map[] = {
+       { "Arrownot", "arrownot2"},
+       { "Arrowvert", "arrowvert2"},
+       { "Bowtie", "bowtie2" },
+       { "Box", "box2" },
        { "Bumpeq", "bumpeq2" },
+       { "CIRCLE", "circle3" },
        { "Cap", "cap2" },
+       { "CheckedBox", "checkedbox2" },
+       { "Circle", "circle2" },
+       { "Colonapprox", "colonapprox2" },
+       { "Coloneq", "coloneq2" },
+       { "Coloneqq", "coloneqq2" },
+       { "Colonsim", "colonsim2" },
        { "Cup", "cup2" },
+       { "DOWNarrow", "downarrow3" },
        { "Delta", "delta2" },
        { "Diamond", "diamond2" },
+       { "Doteq", "doteq2" },
        { "Downarrow", "downarrow2" },
+       { "Eqcolon", "eqcolon2" },
+       { "Eqqcolon", "eqqcolon2" },
        { "Gamma", "gamma2" },
+       { "Join", "join2" },
+       { "LEFTCIRCLE", "leftcircle3" },
+       { "LEFTarrow", "leftarrow3" },
+       { "LEFTcircle", "leftcircle4" },
+       { "LHD", "lhd2" },
        { "Lambda", "lambda2" },
+       { "Lbag", "lbag2"},
        { "Leftarrow", "leftarrow2" },
+       { "Leftcircle", "leftcircle2" },
        { "Leftrightarrow", "leftrightarrow2" },
+       { "Longarrownot", "longarrownot2"},
        { "Longleftarrow", "longleftarrow2" },
        { "Longleftrightarrow", "longleftrightarrow2" },
+       { "Longmapsfrom", "longmapsfrom2"},
+       { "Longmapsto", "longmapsto2"},
        { "Longrightarrow", "longrightarrow2" },
+       { "Mapsfrom", "mapsfrom2"},
+       { "Mapsfromchar", "mapsfromchar2"},
+       { "Mapsto", "mapsto2"},
+       { "Mapstochar", "mapstochar2"},
        { "Omega", "omega2" },
        { "Phi", "phi2" },
        { "Pi", "pi2" },
        { "Psi", "psi2" },
+       { "RHD", "rhd2" },
+       { "RIGHTCIRCLE", "rightcircle3" },
+       { "RIGHTarrow", "rightarrow3" },
+       { "RIGHTcircle", "rightcircle4" },
+       { "Rbag", "rbag2"},
        { "Rightarrow", "rightarrow2" },
+       { "Rightcircle", "rightcircle2" },
        { "Sigma", "sigma2" },
+       { "Square", "square2" },
        { "Subset", "subset2" },
        { "Supset", "supset2" },
        { "Theta", "theta2" },
+       { "Thorn", "thorn2" },
+       { "UParrow", "uparrow3" },
        { "Uparrow", "uparrow2" },
        { "Updownarrow", "updownarrow2" },
        { "Upsilon", "upsilon2" },
        { "Vdash", "vdash3" },
        { "Vert", "vert2" },
+       { "XBox", "xbox3" },
+       { "Xbox", "xbox2" },
        { "Xi", "xi2" },
        { "nLeftarrow", "nleftarrow2" },
        { "nLeftrightarrow", "nleftrightarrow2" },
        { "nRightarrow", "nrightarrow2" },
        { "nVDash", "nvdash3" },
+       { "nVdash", "nvdash4" },
        { "nvDash", "nvdash2" },
        { "textrm \\AA", "textrm_AA"},
        { "textrm \\O", "textrm_O"},
-       { "vDash", "vdash2" }
+       { "vDash", "vdash2" },
+       { "varDelta", "vardelta2" },
+       { "varGamma", "vargamma2" },
+       { "varLambda", "varlambda2" },
+       { "varOmega", "varomega2" },
+       { "varPhi", "varphi2" },
+       { "varPi", "varpi2" },
+       { "varPsi", "varpsi2" },
+       { "varSigma", "varsigma2" },
+       { "varTheta", "vartheta2" },
+       { "varUpsilon", "varupsilon2" },
+       { "varXi", "varxi2" }
 };
 
+
 size_t const nr_sorted_png_map = sizeof(sorted_png_map) / sizeof(PngMap);
 
+// This list specifies which system's theme icon is related to which lyx
+// command. It was based on:
+// http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+// this must be sorted alphabetically
+// Upper case comes before lower case
+PngMap sorted_theme_icon_map[] = {
+       { "bookmark-goto 0", "go-jump" },
+       { "buffer-new", "document-new" },
+       { "buffer-print", "document-print" },
+       { "buffer-write", "document-save" },
+       { "buffer-write-as", "document-save-as" },
+       { "buffer-zoom-in", "zoom-in" },
+       { "buffer-zoom-out", "zoom-out" },
+       { "copy", "edit-copy" },
+       { "cut", "edit-cut" },
+       { "depth-decrement", "format-indent-less" },
+       { "depth-increment", "format-indent-more" },
+       { "dialog-show print", "document-print" },
+       { "dialog-show spellchecker", "tools-check-spelling" },
+       { "dialog-show-new-inset graphics", "insert-image" },
+       { "dialog-toggle findreplaceadv", "edit-find-replace" },
+       { "file-open", "document-open" },
+       { "font-bold", "format-text-bold" },
+       { "font-ital", "format-text-italic" },
+       { "font-strikeout", "format-text-strikethrough" },
+       { "font-underline", "format-text-underline" },
+       { "lyx-quit", "application-exit" },
+       { "paste", "edit-paste" },
+       { "redo", "edit-redo" },
+       { "undo", "edit-undo" },
+       { "window-close", "window-close" },
+       { "window-new", "window-new" }
+};
+
+size_t const nr_sorted_theme_icon_map = sizeof(sorted_theme_icon_map) / sizeof(PngMap);
+
 
 QString findPng(QString const & name)
 {
        PngMap const * const begin = sorted_png_map;
        PngMap const * const end = begin + nr_sorted_png_map;
-       LASSERT(sorted(begin, end), /**/);
+       LATTEST(sorted(begin, end));
 
        PngMap const * const it = find_if(begin, end, CompareKey(name));
 
@@ -315,6 +428,20 @@ QString findPng(QString const & name)
 } // namespace anon
 
 
+QString themeIconName(QString const & action)
+{
+       PngMap const * const begin = sorted_theme_icon_map;
+       PngMap const * const end = begin + nr_sorted_theme_icon_map;
+       LASSERT(sorted(begin, end), /**/);
+
+       PngMap const * const it = find_if(begin, end, CompareKey(action));
+
+       if (it != end)
+               return it->value;
+       return QString();
+}
+
+
 QString iconName(FuncRequest const & f, bool unknown)
 {
        initializeResources();
@@ -371,14 +498,18 @@ QString iconName(FuncRequest const & f, bool unknown)
                }
        }
 
-       QString imagedir = "images/" + path;
-       FileName fname = imageLibFileSearch(imagedir, name1, "png");
-       if (fname.exists())
-               return toqstr(fname.absFileName());
+       QStringList imagedirs;
+       imagedirs << "images/" << "images/ipa/";
+       for (int i = 0; i < imagedirs.size(); ++i) { 
+               QString imagedir = imagedirs.at(i) + path;
+               FileName fname = imageLibFileSearch(imagedir, name1, "png");
+               if (fname.exists())
+                       return toqstr(fname.absFileName());
 
-       fname = imageLibFileSearch(imagedir, name2, "png");
-       if (fname.exists())
-               return toqstr(fname.absFileName());
+               fname = imageLibFileSearch(imagedir, name2, "png");
+               if (fname.exists())
+                       return toqstr(fname.absFileName());
+       }
 
        path = ":/images/" + path;
        QDir res(path);
@@ -403,8 +534,8 @@ QString iconName(FuncRequest const & f, bool unknown)
                           << '(' << to_utf8(f.argument()) << ")\"");
 
        if (unknown) {
-               imagedir = "images/";
-               fname = imageLibFileSearch(imagedir, "unknown", "png");
+               QString imagedir = "images/";
+               FileName fname = imageLibFileSearch(imagedir, "unknown", "png");
                if (fname.exists())
                        return toqstr(fname.absFileName());
                return QString(":/images/unknown.png");
@@ -437,6 +568,17 @@ QPixmap getPixmap(QString const & path, QString const & name, QString const & ex
 
 QIcon getIcon(FuncRequest const & f, bool unknown)
 {
+#if (QT_VERSION >= 0x040600)
+       if (lyxrc.use_system_theme_icons) {
+               QString action = toqstr(lyxaction.getActionName(f.action()));
+               if (!f.argument().empty())
+                       action += " " + toqstr(f.argument());
+               QString const theme_icon = themeIconName(action);
+               if (QIcon::hasThemeIcon(theme_icon))
+                       return QIcon::fromTheme(theme_icon);
+       }
+#endif
+
        QString icon = iconName(f, unknown);
        if (icon.isEmpty())
                return QIcon();
@@ -487,7 +629,7 @@ public:
 
        QString translate(const char * /*context*/,
          const char * sourceText,
-         const char * /*comment*/ = 0)
+         const char * /*comment*/ = 0) const
        {
                string const s = sourceText;
                if (s == N_("About %1") || s == N_("Preferences")
@@ -684,29 +826,45 @@ public:
 class KeyChecker : public QObject {
 private:
        bool pressed_;
+       bool started_;
 public:
-       KeyChecker() {
-               pressed_ = false;
-       }
+       KeyChecker() : pressed_(false), started_(false) {}
+
        void start() {
                QCoreApplication::instance()->installEventFilter(this);
                pressed_ = false;
+               started_ = true;
        }
        void stop() {
                QCoreApplication::instance()->removeEventFilter(this);
+               started_ = false;
        }
        bool pressed() {
                QCoreApplication::processEvents();
                return pressed_;
        }
+       bool started() const {
+               return started_;
+       }
        bool eventFilter(QObject *obj, QEvent *event) {
                LYXERR(Debug::ACTION, "Event Type: " << event->type());
                switch (event->type()) {
                case QEvent::Show:
                case QEvent::Hide:
                case QEvent::Resize:
+               case QEvent::UpdateRequest:
+               case QEvent::CursorChange:
+               case QEvent::ActionChanged:
+               case QEvent::EnabledChange:
+               case QEvent::SockAct:
+               case QEvent::Timer:
+               case QEvent::Paint:
+               case QEvent::ToolTipChange:
+               case QEvent::LayoutRequest:
+               case QEvent::MetaCall:
                        return QObject::eventFilter(obj, event);
                default:
+                       // FIXME Blocking all these events is a bad idea.
                        QKeyEvent *keyEvent = dynamic_cast<QKeyEvent*>(event);
                        if (keyEvent && keyEvent->key() == Qt::Key_Escape)
                                pressed_ = true;
@@ -727,7 +885,7 @@ struct GuiApplication::Private
        {
        #ifdef Q_WS_WIN
                /// WMF Mime handler for Windows clipboard.
-               wmf_mime_ = new QWindowsMimeMetafile();
+               wmf_mime_ = new QWindowsMimeMetafile;
        #endif
                initKeySequences(&theTopLevelKeymap());
        }
@@ -819,6 +977,8 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        QCoreApplication::setOrganizationDomain("lyx.org");
        QCoreApplication::setApplicationName(lyx_package);
 
+       qsrand(QDateTime::currentDateTime().toTime_t());
+
        // Install translator for GUI elements.
        installTranslator(&d->qt_trans_);
 
@@ -837,6 +997,8 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        /// A translator suitable for the entries in the LyX menu.
        /// Only needed with Qt/Mac.
        installTranslator(new MenuTranslator(this));
+       ///
+    setupApplescript();
 #endif
 
 #ifdef Q_WS_X11
@@ -874,12 +1036,10 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
                this, SLOT(handleRegularEvents()));
        d->general_timer_.start();
 
-#if QT_VERSION >= 0x040400
        // maxThreadCount() defaults in general to 2 on single or dual-processor.
        // This is clearly not enough in a time where we use threads for
        // document preview and/or export. 20 should be OK.
        QThreadPool::globalInstance()->setMaxThreadCount(20);
-#endif
 }
 
 
@@ -1079,13 +1239,28 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
                break;
 
        case LFUN_BUFFER_FORALL: {
-               if (!currentView() || !currentView()->currentBufferView() || !&currentView()->currentBufferView()->buffer()) {
-                       flag.message(from_utf8(N_("Command not allowed without any visible document in the active window")));
+               if (theBufferList().empty()) {
+                       flag.message(from_utf8(N_("Command not allowed without a buffer open")));
+                       flag.setEnabled(false);
+                       break;
+               }
+
+               FuncRequest const cmdToPass = lyxaction.lookupFunc(cmd.getLongArg(0));
+               if (cmdToPass.action() == LFUN_UNKNOWN_ACTION) {
+                       flag.message(from_utf8(N_("the <LFUN-COMMAND> argument of buffer-forall is not valid")));
                        flag.setEnabled(false);
                }
                break;
        }
 
+       case LFUN_DIALOG_SHOW: {
+               string const name = cmd.getArg(0);
+               return name == "aboutlyx"
+                       || name == "prefs"
+                       || name == "texinfo"
+                       || name == "progress"
+                       || name == "compare";
+       }
 
        default:
                return false;
@@ -1201,7 +1376,7 @@ void GuiApplication::gotoBookmark(unsigned int idx, bool openFile,
                return;
        BookmarksSection::Bookmark const & bm =
                theSession().bookmarks().bookmark(idx);
-       LASSERT(!bm.filename.empty(), /**/);
+       LASSERT(!bm.filename.empty(), return);
        string const file = bm.filename.absFileName();
        // if the file is not opened, open it.
        if (!theBufferList().exists(bm.filename)) {
@@ -1271,7 +1446,7 @@ void GuiApplication::reconfigure(string const & option)
        string configure_command = package().configure_command();
        configure_command += option;
        Systemcall one;
-       int ret = one.startscript(Systemcall::Wait, configure_command);
+       int const ret = one.startscript(Systemcall::Wait, configure_command);
        p.pop();
        // emit message signal.
        if (current_view_)
@@ -1283,7 +1458,7 @@ void GuiApplication::reconfigure(string const & option)
        if (ret)
                Alert::information(_("System reconfiguration failed"),
                           _("The system reconfiguration has failed.\n"
-                                 "Default textclass is used but LyX may "
+                                 "Default textclass is used but LyX may\n"
                                  "not be able to work properly.\n"
                                  "Please reconfigure again if needed."));
        else
@@ -1417,8 +1592,12 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                validateCurrentView();
                // FIXME: create a new method shared with LFUN_HELP_OPEN.
                string const fname = to_utf8(cmd.argument());
-               if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
-                         && current_view_->documentBufferView() != 0)) {
+               bool const is_open = FileName::isAbsolute(fname)
+                       && theBufferList().getBuffer(FileName(fname));
+               if (d->views_.empty()
+                   || (!lyxrc.open_buffers_in_tabs
+                       && current_view_->documentBufferView() != 0
+                       && !is_open)) {
                        // We want the ui session to be saved per document and not per
                        // window number. The filename crc is a good enough identifier.
                        boost::crc_32_type crc;
@@ -1513,7 +1692,18 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                }
 
                actOnUpdatedPrefs(lyxrc_orig, lyxrc);
-               resetGui();
+
+               // If the request comes from the minibuffer, then we can't reset
+               // the GUI, since that would destory the minibuffer itself and
+               // cause a crash, since we are currently in one of the methods of 
+               // GuiCommandBuffer. See bug #8540. 
+               if (cmd.origin() != FuncRequest::COMMANDBUFFER)
+                       resetGui();
+               // else
+               //   FIXME Unfortunately, that leaves a bug here, since we cannot
+               //   reset the GUI in this case. If the changes to lyxrc affected the
+               //   UI, then, nothing would happen. This seems fairly unlikely, but 
+               //   it definitely is a bug.
 
                break;
        }
@@ -1603,59 +1793,73 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
        }
 
        case LFUN_BUFFER_FORALL: {
-               GuiView * gv = currentView();
-               Buffer * const buf = &gv->currentBufferView()->buffer();
-
-               bool processVisible = true;
-               bool processHidden = false;
-               docstring msg = _("Applied the following command to all visible buffers in the active window: ");
-               string commandToRun = argument;
-               if (cmd.getArg(0) == "both") {
-                       processHidden = true;
-                       msg = _("Applied the following command to all visible and hidden buffers in the active window: ");
-                       commandToRun = cmd.getLongArg(1);
-               } else if (cmd.getArg(0) == "visible") {
-                       commandToRun = cmd.getLongArg(1);
-               } else if (cmd.getArg(0) == "hidden") {
-                       processHidden = true;
-                       processVisible = false;
-                       commandToRun = cmd.getLongArg(1);
-                       msg = _("Applied the following command to all hidden buffers in the active window: ");
-               }
-               FuncRequest const funcToRun = lyxaction.lookupFunc(commandToRun);
-               dr.setMessage(bformat(_("%1$s%2$s"), msg, from_utf8(commandToRun)));
+               FuncRequest const funcToRun = lyxaction.lookupFunc(cmd.getLongArg(0));
 
+               map<Buffer *, GuiView *> views_lVisible;
+               map<GuiView *, Buffer *> activeBuffers;
+
+               QList<GuiView *> allViews = d->views_.values();
+
+               // this foreach does not modify any buffer. It just collects info on local visibility of buffers
+               // and on which buffer is active in each view.
                Buffer * const last = theBufferList().last();
+               foreach (GuiView * view, allViews) {
+                       // all of the buffers might be locally hidden. That is, there is no active buffer.
+                       if (!view || !view->currentBufferView() || !&view->currentBufferView()->buffer())
+                               activeBuffers[view] = 0;
+                       else
+                               activeBuffers[view] = &view->currentBufferView()->buffer();
+
+                       // find out if each is locally visible or locally hidden.
+                       // we don't use a for loop as the buffer list cycles.
+                       Buffer * b = theBufferList().first();
+                       while (true) {
+                               bool const locallyVisible = view && view->workArea(*b);
+                               if (locallyVisible) {
+                                       bool const exists_ = (views_lVisible.find(b) != views_lVisible.end());
+                                       // only need to overwrite/add if we don't already know a buffer is globally
+                                       // visible or we do know but we would prefer to dispatch LFUN from the
+                                       // current view because of cursor position issues.
+                                       if (!exists_ || (exists_ && views_lVisible[b] != current_view_))
+                                               views_lVisible[b] = view;
+                               }
+                               if (b == last)
+                                       break;
+                               b = theBufferList().next(b);
+                       }
+               }
+
+               GuiView * const homeView = currentView();
                Buffer * b = theBufferList().first();
                Buffer * nextBuf = 0;
-               // We cannot use a for loop as the buffer list cycles.
+               int numProcessed = 0;
                while (true) {
                        if (b != last)
-                               nextBuf = theBufferList().next(b); //get next now bc LFUN might close current 
-
-                       bool const hidden = !(gv && gv->workArea(*b));
-                       if (hidden) {
-                               if (processHidden) {
-                                       gv->setBuffer(b);
-                                       lyx::dispatch(funcToRun);
-                                       gv->currentWorkArea()->view().hideWorkArea(gv->currentWorkArea());
-                               }
-                       }
-
-                       else {
-                               if (processVisible) {
-                                       gv->setBuffer(b);
-                                       lyx::dispatch(funcToRun);
-                               }
+                               nextBuf = theBufferList().next(b); // get next now bc LFUN might close current.
+
+                       bool const visible = (views_lVisible.find(b) != views_lVisible.end());
+                       if (visible) {
+                               // first change to a view where b is locally visible, preferably current_view_.
+                               GuiView * const vLv = views_lVisible[b];
+                               vLv->setBuffer(b);
+                               lyx::dispatch(funcToRun);
+                               numProcessed++;
                        }
-
                        if (b == last)
                                break;
                        b = nextBuf;
                }
 
-               if (theBufferList().isLoaded(buf)) //the LFUN might have closed buf
-                       gv->setBuffer(buf);
+               // put things back to how they were (if possible).
+               foreach (GuiView * view, allViews) {
+                       Buffer * originalBuf = activeBuffers[view];
+                       // there might not have been an active buffer in this view or it might have been closed by the LFUN.
+                       if (theBufferList().isLoaded(originalBuf))
+                               view->setBuffer(originalBuf);
+               }
+               homeView->setFocus();
+
+               dr.setMessage(bformat(_("Applied \"%1$s\" to %2$d buffer(s)"), from_utf8(cmd.getLongArg(0)), numProcessed));
                break;
        }
 
@@ -1744,6 +1948,24 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                lyxerr.setLevel(Debug::value(to_utf8(cmd.argument())));
                break;
 
+       case LFUN_DIALOG_SHOW: {
+               string const name = cmd.getArg(0);
+
+               if ( name == "aboutlyx"
+                       || name == "prefs"
+                       || name == "texinfo"
+                       || name == "progress"
+                       || name == "compare")
+               {
+                       // work around: on Mac OS the application
+                       // is not terminated when closing the last view.
+                       // Create a new one to be able to dispatch the
+                       // LFUN_DIALOG_SHOW to this view.
+                       if (current_view_ == 0)
+                               createView();
+               }
+       }
+
        default:
                // The LFUN must be for one of GuiView, BufferView, Buffer or Cursor;
                // let's try that:
@@ -2062,14 +2284,10 @@ void GuiApplication::exit(int status)
 
 void GuiApplication::setGuiLanguage()
 {
-       QString const default_language = toqstr(getGuiMessages().language());
-       LYXERR(Debug::LOCALE, "Trying to set default locale to: " << default_language);
-       QLocale const default_locale(default_language);
-       QLocale::setDefault(default_locale);
-
+       setLocale();
+       QLocale theLocale;
        // install translation file for Qt built-in dialogs
-       QString const language_name = QString("qt_") + default_locale.name();
-
+       QString const language_name = QString("qt_") + theLocale.name();
        // language_name can be short (e.g. qt_zh) or long (e.g. qt_zh_CN).
        // Short-named translator can be loaded from a long name, but not the
        // opposite. Therefore, long name should be used without truncation.
@@ -2083,7 +2301,7 @@ void GuiApplication::setGuiLanguage()
                        << language_name);
        }
 
-       switch (default_locale.language()) {
+       switch (theLocale.language()) {
        case QLocale::Arabic :
        case QLocale::Hebrew :
        case QLocale::Persian :
@@ -2112,7 +2330,7 @@ void GuiApplication::execBatchCommands()
        // Create the global default menubar which is shown for the dialogs
        // and if no GuiView is visible.
        // This must be done after the session was recovered to know the "last files".
-       d->global_menubar_ = new GlobalMenuBar();
+       d->global_menubar_ = new GlobalMenuBar;
        d->menus_.fillMenuBar(d->global_menubar_, 0, true);
 #endif
 
@@ -2151,9 +2369,7 @@ QAbstractItemModel * GuiApplication::languageModel()
        }
        d->language_model_ = new QSortFilterProxyModel(this);
        d->language_model_->setSourceModel(lang_model);
-#if QT_VERSION >= 0x040300
        d->language_model_->setSortLocaleAware(true);
-#endif
        return d->language_model_;
 }
 
@@ -2395,7 +2611,7 @@ void GuiApplication::commitData(QSessionManager & sm)
 
 void GuiApplication::unregisterView(GuiView * gv)
 {
-       LASSERT(d->views_[gv->id()] == gv, /**/);
+       LAPPERR(d->views_[gv->id()] == gv);
        d->views_.remove(gv->id());
        if (current_view_ == gv)
                current_view_ = 0;
@@ -2411,7 +2627,7 @@ bool GuiApplication::closeAllViews()
        // are already entries in the lastOpened list.
        theSession().lastOpened().clear();
 
-       QList<GuiView *> views = d->views_.values();
+       QList<GuiView *> const views = d->views_.values();
        foreach (GuiView * view, views) {
                if (!view->closeScheduled())
                        return false;
@@ -2424,14 +2640,14 @@ bool GuiApplication::closeAllViews()
 
 GuiView & GuiApplication::view(int id) const
 {
-       LASSERT(d->views_.contains(id), /**/);
+       LAPPERR(d->views_.contains(id));
        return *d->views_.value(id);
 }
 
 
 void GuiApplication::hideDialogs(string const & name, Inset * inset) const
 {
-       QList<GuiView *> views = d->views_.values();
+       QList<GuiView *> const views = d->views_.values();
        foreach (GuiView * view, views)
                view->hideDialog(name, inset);
 }
@@ -2440,7 +2656,7 @@ void GuiApplication::hideDialogs(string const & name, Inset * inset) const
 Buffer const * GuiApplication::updateInset(Inset const * inset) const
 {
        Buffer const * buffer_ = 0;
-       QHash<int, GuiView *>::iterator end = d->views_.end();
+       QHash<int, GuiView *>::const_iterator end = d->views_.end();
        for (QHash<int, GuiView *>::iterator it = d->views_.begin(); it != end; ++it) {
                if (Buffer const * ptr = (*it)->updateInset(inset))
                        buffer_ = ptr;
@@ -2612,14 +2828,14 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
 
        if (retval == FormatMismatch) {
                LYXERR(Debug::FILES, "Converting ui file to format " << LFUN_FORMAT);
-               FileName const tempfile = FileName::tempName("convert_ui");
+               TempFile tmp("convertXXXXXX.ui");
+               FileName const tempfile = tmp.name();
                bool const success = prefs2prefs(ui_path, tempfile, true);
                if (!success) {
                        LYXERR0("Unable to convert " << ui_path.absFileName() <<
                                " to format " << LFUN_FORMAT << ".");
                } else {
                        retval = readUIFile(tempfile);
-                       tempfile.removeFile();
                }
        }
 
@@ -2679,6 +2895,11 @@ void GuiApplication::stopLongOperation() {
 }
 
 
+bool GuiApplication::longOperationStarted() {
+       return d->key_checker_.started();
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 //
 // X11 specific stuff goes here...
@@ -2734,7 +2955,7 @@ void hideDialogs(std::string const & name, Inset * inset)
 
 frontend::FontLoader & theFontLoader()
 {
-       LASSERT(frontend::guiApp, /**/);
+       LAPPERR(frontend::guiApp);
        return frontend::guiApp->fontLoader();
 }
 
@@ -2747,7 +2968,7 @@ frontend::FontMetrics const & theFontMetrics(Font const & f)
 
 frontend::FontMetrics const & theFontMetrics(FontInfo const & f)
 {
-       LASSERT(frontend::guiApp, /**/);
+       LAPPERR(frontend::guiApp);
        return frontend::guiApp->fontLoader().metrics(f);
 }
 
@@ -2760,14 +2981,14 @@ frontend::FontMetrics const & theFontMetrics(FontInfo const & f)
 
 frontend::Clipboard & theClipboard()
 {
-       LASSERT(frontend::guiApp, /**/);
+       LAPPERR(frontend::guiApp);
        return frontend::guiApp->clipboard();
 }
 
 
 frontend::Selection & theSelection()
 {
-       LASSERT(frontend::guiApp, /**/);
+       LAPPERR(frontend::guiApp);
        return frontend::guiApp->selection();
 }