]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiApplication.cpp
If we are in a closeEvent, we don't want to close all buffers, because these may...
[lyx.git] / src / frontends / qt4 / GuiApplication.cpp
index 4757da895443c27ae141705500cf75145664e276..01672acfe60997153bc36583ece93c30d7c3dbcb 100644 (file)
@@ -15,6 +15,7 @@
 #include "GuiApplication.h"
 
 #include "ColorCache.h"
+#include "ColorSet.h"
 #include "GuiClipboard.h"
 #include "GuiImage.h"
 #include "GuiKeySymbol.h"
@@ -54,6 +55,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h" // sorted
+#include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
 
 #include "support/linkback/LinkBackProxy.h"
 #endif
 
+#include <queue>
+
+#include <QByteArray>
 #include <QClipboard>
+#include <QDateTime>
 #include <QDir>
 #include <QEventLoop>
 #include <QFileOpenEvent>
+#include <QFileInfo>
 #include <QHash>
 #include <QIcon>
+#include <QImageReader>
 #include <QLocale>
 #include <QLibraryInfo>
 #include <QList>
@@ -78,6 +86,7 @@
 #include <QPixmapCache>
 #include <QRegExp>
 #include <QSessionManager>
+#include <QSettings>
 #include <QSocketNotifier>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 
 #ifdef Q_WS_WIN
 #include <QWindowsMime>
-#if defined(Q_CYGWIN_WIN) || defined(Q_CC_MINGW)
+#ifdef Q_CC_GNU
 #include <wtypes.h>
 #endif
 #include <objidl.h>
 #endif // Q_WS_WIN
 
 #include <boost/bind.hpp>
+#include <boost/crc.hpp>
 
 #include <exception>
 #include <vector>
@@ -124,13 +134,57 @@ namespace lyx {
 
 frontend::Application * createApplication(int & argc, char * argv[])
 {
+#ifndef Q_WS_X11
+       // prune -geometry argument(s) by shifting
+       // the following ones 2 places down.
+       for (int i = 0 ; i < argc ; ++i) {
+               if (strcmp(argv[i], "-geometry") == 0) {
+                       int const remove = (i+1) < argc ? 2 : 1;
+                       argc -= remove;
+                       for (int j = i; j < argc; ++j)
+                               argv[j] = argv[j + remove];
+                       --i;
+               }
+       }
+#endif
        return new frontend::GuiApplication(argc, argv);
 }
 
 namespace frontend {
 
+
+/// Return the list of loadable formats.
+vector<string> loadableImageFormats()
+{
+       vector<string> fmts;
+
+       QList<QByteArray> qt_formats = QImageReader::supportedImageFormats();
+
+       LYXERR(Debug::GRAPHICS,
+               "\nThe image loader can load the following directly:\n");
+
+       if (qt_formats.empty())
+               LYXERR(Debug::GRAPHICS, "\nQt4 Problem: No Format available!");
+
+       for (QList<QByteArray>::const_iterator it = qt_formats.begin(); it != qt_formats.end(); ++it) {
+
+               LYXERR(Debug::GRAPHICS, (const char *) *it << ", ");
+
+               string ext = ascii_lowercase((const char *) *it);
+               // special case
+               if (ext == "jpeg")
+                       ext = "jpg";
+               fmts.push_back(ext);
+       }
+
+       return fmts;
+}
+
+
 ////////////////////////////////////////////////////////////////////////
-// Icon loading support code.
+//
+// Icon loading support code
+//
 ////////////////////////////////////////////////////////////////////////
 
 namespace {
@@ -259,6 +313,14 @@ QString iconName(FuncRequest const & f, bool unknown)
                path = "commands/";
                name1 = toqstr(f.argument());
                break;
+       case LFUN_COMMAND_ALTERNATIVES: {
+               // use the first of the alternative commands
+               docstring firstcom;
+               docstring dummy = split(f.argument(), firstcom, ';');
+               name1 = toqstr(firstcom);
+               name1.replace(' ', '_');
+               break;
+       }
        default:
                name2 = toqstr(lyxaction.getActionName(f.action));
                name1 = name2;
@@ -266,6 +328,7 @@ QString iconName(FuncRequest const & f, bool unknown)
                if (!f.argument().empty()) {
                        name1 = name2 + ' ' + toqstr(f.argument());
                        name1.replace(' ', '_');
+                       name1.replace('\\', "backslash");
                }
        }
 
@@ -291,16 +354,44 @@ QString iconName(FuncRequest const & f, bool unknown)
        if (res.exists(name2))
                return path + name2;
 
-       LYXERR(Debug::GUI, "Cannot find icon for command \""
+       LYXERR(Debug::GUI, "Cannot find icon with filename "
+                          << "\"" << name1 << "\""
+                          << " or filename "
+                          << "\"" << name2 << "\"" 
+                          << " for command \""
                           << lyxaction.getActionName(f.action)
                           << '(' << to_utf8(f.argument()) << ")\"");
 
-       if (unknown)
+       if (unknown) {
+               fname = libFileSearch(QString("images/"), "unknown", "png");
+               if (fname.exists())
+                       return toqstr(fname.absFilename());
                return QString(":/images/unknown.png");
+       }
 
        return QString();
 }
 
+QPixmap getPixmap(QString const & path, QString const & name, QString const & ext)
+{
+       QPixmap pixmap;
+       FileName fname = libFileSearch(path, name, ext);
+       QString path1 = toqstr(fname.absFilename());
+       QString path2 = ":/" + path + name + "." + ext;
+
+       if (pixmap.load(path1)) {
+               return pixmap;
+       }
+       else if (pixmap.load(path2)) {
+               return pixmap;
+       }
+
+       LYXERR0("Cannot load pixmap \""
+               << path << name << '.' << ext
+               << "\", please verify resource system!");
+
+       return QPixmap();
+}
 
 QIcon getIcon(FuncRequest const & f, bool unknown)
 {
@@ -308,7 +399,7 @@ QIcon getIcon(FuncRequest const & f, bool unknown)
        if (icon.isEmpty())
                return QIcon();
 
-       LYXERR(Debug::GUI, "Found icon: " << icon);
+       //LYXERR(Debug::GUI, "Found icon: " << icon);
        QPixmap pm;
        if (!pm.load(icon)) {
                LYXERR0("Cannot load icon " << icon << " please verify resource system!");
@@ -320,8 +411,11 @@ QIcon getIcon(FuncRequest const & f, bool unknown)
 
 
 ////////////////////////////////////////////////////////////////////////
+//
 // LyX server support code.
+//
 ////////////////////////////////////////////////////////////////////////
+
 class SocketNotifier : public QSocketNotifier
 {
 public:
@@ -337,7 +431,9 @@ public:
 
 
 ////////////////////////////////////////////////////////////////////////
+//
 // Mac specific stuff goes here...
+//
 ////////////////////////////////////////////////////////////////////////
 
 class MenuTranslator : public QTranslator
@@ -434,8 +530,9 @@ public:
 #endif
 
 ///////////////////////////////////////////////////////////////
-// You can find more platform specific stuff
-// at the end of this file...
+//
+// You can find more platform specific stuff at the end of this file...
+//
 ///////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
@@ -517,11 +614,12 @@ public:
        }
 
 
-       QVector<FORMATETC> formatsForMime(QString const & mimeType,
-               QMimeData const * mimeData) const
+       QVector<FORMATETC> formatsForMime(QString const & mimetype,
+               QMimeData const * mimedata) const
        {
                QVector<FORMATETC> formats;
-               formats += cfFromMime(mimeType);
+               if (mimetype == emfMimeType() || mimetype == wmfMimeType())
+                       formats += cfFromMime(mimetype);
                return formats;
        }
 
@@ -545,14 +643,12 @@ public:
 
 struct GuiApplication::Private
 {
-       Private()
-               : language_model_(0), global_menubar_(0)
+       Private(): language_model_(0), global_menubar_(0) 
        {
-#ifdef Q_WS_MACX
-               // Create the global default menubar which is shown for the dialogs
-               // and if no GuiView is visible.
-               global_menubar_ = new GlobalMenuBar();
-#endif
+       #ifdef Q_WS_WIN
+               /// WMF Mime handler for Windows clipboard.
+               wmf_mime_ = new QWindowsMimeMetafile();
+       #endif
        }
 
        ///
@@ -580,6 +676,9 @@ struct GuiApplication::Private
        /// are done.
        QTimer general_timer_;
 
+       /// delayed FuncRequests
+       std::queue<FuncRequest> func_request_queue_;
+
        /// Multiple views container.
        /**
        * Warning: This must not be a smart pointer as the destruction of the
@@ -598,10 +697,7 @@ struct GuiApplication::Private
 
 #ifdef Q_WS_WIN
        /// WMF Mime handler for Windows clipboard.
-       // FIXME for Windows Vista and Qt4 (see http://bugzilla.lyx.org/show_bug.cgi?id=4846)
-       // But this makes LyX crash on exit when LyX is compiled in release mode and if there
-       // is something in the clipboard.
-       QWindowsMimeMetafile wmf_mime_;
+       QWindowsMimeMetafile * wmf_mime_;
 #endif
 };
 
@@ -618,12 +714,16 @@ GuiApplication::~GuiApplication()
 
 
 GuiApplication::GuiApplication(int & argc, char ** argv)
-       : QApplication(argc, argv),     current_view_(0), d(new GuiApplication::Private)
+       : QApplication(argc, argv), current_view_(0),
+         d(new GuiApplication::Private)
 {
        QString app_name = "LyX";
        QCoreApplication::setOrganizationName(app_name);
        QCoreApplication::setOrganizationDomain("lyx.org");
-       QCoreApplication::setApplicationName(app_name + "-" + lyx_version);
+       QCoreApplication::setApplicationName(lyx_package);
+
+       // Install translator for GUI elements.
+       installTranslator(&d->qt_trans_);
 
        // FIXME: quitOnLastWindowClosed is true by default. We should have a
        // lyxrc setting for this in order to let the application stay resident.
@@ -636,6 +736,11 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        // FIXME: Do we need a lyxrc setting for this on Mac? This behaviour
        // seems to be the default case for applications like LyX.
        setQuitOnLastWindowClosed(false);
+
+       // This allows to translate the strings that appear in the LyX menu.
+       /// A translator suitable for the entries in the LyX menu.
+       /// Only needed with Qt/Mac.
+       installTranslator(new MenuTranslator(this));
 #endif
        
 #ifdef Q_WS_X11
@@ -646,38 +751,8 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        QApplication::setDoubleClickInterval(300);
 #endif
 
-       // install translation file for Qt built-in dialogs
-       QString language_name = QString("qt_") + QLocale::system().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.
-       // c.f. http://doc.trolltech.com/4.1/qtranslator.html#load
-       if (d->qt_trans_.load(language_name,
-               QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-       {
-               installTranslator(&d->qt_trans_);
-               // even if the language calls for RtL, don't do that
-               setLayoutDirection(Qt::LeftToRight);
-               LYXERR(Debug::GUI, "Successfully installed Qt translations for locale "
-                       << language_name);
-       } else
-               LYXERR(Debug::GUI, "Could not find  Qt translations for locale "
-                       << language_name);
-
-#ifdef Q_WS_MACX
-       // This allows to translate the strings that appear in the LyX menu.
-       /// A translator suitable for the entries in the LyX menu.
-       /// Only needed with Qt/Mac.
-       installTranslator(new MenuTranslator(this));
-#endif
        connect(this, SIGNAL(lastWindowClosed()), this, SLOT(onLastWindowClosed()));
 
-       using namespace lyx::graphics;
-
-       Image::newImage = boost::bind(&GuiImage::newImage);
-       Image::loadableFormats = boost::bind(&GuiImage::loadableFormats);
-
        // needs to be done before reading lyxrc
        QWidget w;
        lyxrc.dpi = (w.logicalDpiX() + w.logicalDpiY()) / 2;
@@ -705,6 +780,19 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 }
 
 
+GuiApplication * theGuiApp()
+{
+       return dynamic_cast<GuiApplication *>(theApp());
+}
+
+
+void GuiApplication::clearSession()
+{
+       QSettings settings;
+       settings.clear();
+}
+
+
 docstring GuiApplication::iconName(FuncRequest const & f, bool unknown)
 {
        return qstring_to_ucs4(lyx::frontend::iconName(f, unknown));
@@ -753,7 +841,7 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
 
        case LFUN_WINDOW_CLOSE:
                // update bookmark pit of the current buffer before window close
-               for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
+               for (size_t i = 0; i < theSession().bookmarks().size(); ++i)
                        theLyXFunc().gotoBookmark(i+1, false, false);
                current_view_->close();
                break;
@@ -811,9 +899,14 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
        case LFUN_FILE_OPEN:
                if (d->views_.empty()
                    || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
-                       createView();
-                       current_view_->openDocument(to_utf8(cmd.argument()));
-                       if (!current_view_->buffer())
+                       string const fname = to_utf8(cmd.argument());
+                       // 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;
+                       crc = for_each(fname.begin(), fname.end(), crc);
+                       createView(crc.checksum());
+                       current_view_->openDocument(fname);
+                       if (current_view_ && !current_view_->buffer())
                                current_view_->close();
                } else
                        current_view_->openDocument(to_utf8(cmd.argument()));
@@ -861,17 +954,45 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
 }
 
 
+void GuiApplication::dispatchDelayed(FuncRequest const & func)
+{
+       d->func_request_queue_.push(func);
+       QTimer::singleShot(0, this, SLOT(processFuncRequestQueue()));
+}
+
+
 void GuiApplication::resetGui()
 {
+       // Set the language defined by the user.
+       setGuiLanguage();
+
+       // Read menus
+       if (!readUIFile(toqstr(lyxrc.ui_file)))
+               // Gives some error box here.
+               return;
+
+       if (d->global_menubar_)
+               d->menus_.fillMenuBar(d->global_menubar_, 0, false);
+
        QHash<int, GuiView *>::iterator it;
-       for (it = d->views_.begin(); it != d->views_.end(); ++it)
-               (*it)->resetDialogs();
+       for (it = d->views_.begin(); it != d->views_.end(); ++it) {
+               GuiView * gv = *it;
+               gv->setLayoutDirection(layoutDirection());
+               gv->resetDialogs();
+       }
 
        dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
 }
 
 
-void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
+void GuiApplication::createView(int view_id)
+{
+       createView(QString(), true, view_id);
+}
+
+
+void GuiApplication::createView(QString const & geometry_arg, bool autoShow,
+       int view_id)
 {
        // release the keyboard which might have been grabed by the global
        // menubar on Mac to catch shortcuts even without any GuiView.
@@ -879,15 +1000,13 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
                d->global_menubar_->releaseKeyboard();
 
        // create new view
-       int id = 0;
-       while (d->views_.find(id) != d->views_.end())
-               id++;
+       int id = view_id;
+       if (id == 0) {
+               while (d->views_.find(id) != d->views_.end())
+                       id++;
+       }
+       LYXERR(Debug::GUI, "About to create new window with ID " << id);
        GuiView * view = new GuiView(id);
-       
-       // copy the icon size from old view
-       if (current_view_)
-               view->setIconSize(current_view_->iconSize());
-
        // register view
        d->views_[id] = view;
 
@@ -910,7 +1029,6 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
 #endif
        }
        view->setFocus();
-       setCurrentView(view);
 }
 
 
@@ -970,7 +1088,11 @@ ColorCache & GuiApplication::colorCache()
 
 int GuiApplication::exec()
 {
-       QTimer::singleShot(1, this, SLOT(execBatchCommands()));
+       // asynchronously handle batch commands. This event will be in
+       // the event queue in front of other asynchronous events. Hence,
+       // we can assume in the latter that the gui is setup already.
+       QTimer::singleShot(0, this, SLOT(execBatchCommands()));
+
        return QApplication::exec();
 }
 
@@ -981,21 +1103,75 @@ void GuiApplication::exit(int status)
 }
 
 
+void GuiApplication::setGuiLanguage()
+{
+       // Set the language defined by the user.
+       setRcGuiLanguage();
+
+       QString const default_language = toqstr(Messages::defaultLanguage());
+       LYXERR(Debug::LOCALE, "Tring to set default locale to: " << default_language);
+       QLocale const default_locale(default_language);
+       QLocale::setDefault(default_locale);
+
+       // install translation file for Qt built-in dialogs
+       QString const language_name = QString("qt_") + default_locale.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.
+       // c.f. http://doc.trolltech.com/4.1/qtranslator.html#load
+       if (!d->qt_trans_.load(language_name,
+                       QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+               LYXERR(Debug::LOCALE, "Could not find  Qt translations for locale "
+                       << language_name);
+       } else {
+               LYXERR(Debug::LOCALE, "Successfully installed Qt translations for locale "
+                       << language_name);
+       }
+
+       switch (default_locale.language()) {
+       case QLocale::Arabic :
+       case QLocale::Hebrew :
+       case QLocale::Persian :
+       case QLocale::Urdu :
+        setLayoutDirection(Qt::RightToLeft);
+               break;
+       default:
+        setLayoutDirection(Qt::LeftToRight);
+       }
+}
+
+
+void GuiApplication::processFuncRequestQueue()
+{
+       while (!d->func_request_queue_.empty()) {
+               lyx::dispatch(d->func_request_queue_.back());
+               d->func_request_queue_.pop();
+       }
+}
+
+
 void GuiApplication::execBatchCommands()
 {
+       setGuiLanguage();
+
        // Read menus
        if (!readUIFile(toqstr(lyxrc.ui_file)))
                // Gives some error box here.
                return;
 
-       // init the global menubar on Mac. This must be done after the session
-       // was recovered to know the "last files".
-       if (d->global_menubar_)
-               d->menus_.fillMenuBar(d->global_menubar_, 0, true);
+#ifdef Q_WS_MACX
+       // 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->menus_.fillMenuBar(d->global_menubar_, 0, true);
+#endif
 
-       LyX::ref().execBatchCommands();
+       lyx::execBatchCommands();
 }
 
+
 QAbstractItemModel * GuiApplication::languageModel()
 {
        if (d->language_model_)
@@ -1027,13 +1203,35 @@ void GuiApplication::restoreGuiSession()
        if (!lyxrc.load_session)
                return;
 
-       Session & session = LyX::ref().session();
-       vector<FileName> const & lastopened = session.lastOpened().getfiles();
+       Session & session = theSession();
+       LastOpenedSection::LastOpened const & lastopened = 
+               session.lastOpened().getfiles();
+
+       FileName active_file;
        // do not add to the lastfile list since these files are restored from
        // last session, and should be already there (regular files), or should
        // not be added at all (help files).
-       for_each(lastopened.begin(), lastopened.end(),
-               bind(&GuiView::loadDocument, current_view_, _1, false));
+       // Note that we open them in reverse order. This is because we close
+       // buffers also in reverse order (aesthetically motivated).
+       for (size_t i = lastopened.size(); i > 0; --i) {
+               FileName const & file_name = lastopened[i - 1].file_name;
+               if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
+                         && current_view_->buffer() != 0)) {
+                       boost::crc_32_type crc;
+                       string const & fname = file_name.absFilename();
+                       crc = for_each(fname.begin(), fname.end(), crc);
+                       createView(crc.checksum());
+               }
+               current_view_->loadDocument(file_name, false);
+
+               if (lastopened[i - 1].active)
+                       active_file = file_name;
+       }
+
+       // Restore last active buffer
+       Buffer * buffer = theBufferList().getBuffer(active_file);
+       if (buffer)
+               current_view_->setBuffer(buffer);
 
        // clear this list to save a few bytes of RAM
        session.lastOpened().clear();
@@ -1083,10 +1281,13 @@ bool GuiApplication::event(QEvent * e)
 {
        switch(e->type()) {
        case QEvent::FileOpen: {
-               // Open a file; this happens only on Mac OS X for now
+               // Open a file; this happens only on Mac OS X for now.
+               //
+               // We do this asynchronously because on startup the batch
+               // commands are not executed here yet and the gui is not ready
+               // therefore.
                QFileOpenEvent * foe = static_cast<QFileOpenEvent *>(e);
-               lyx::dispatch(FuncRequest(LFUN_FILE_OPEN,
-                       qstring_to_ucs4(foe->file())));
+               dispatchDelayed(FuncRequest(LFUN_FILE_OPEN, qstring_to_ucs4(foe->file())));
                e->accept();
                return true;
        }
@@ -1104,7 +1305,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
        catch (ExceptionMessage const & e) {
                switch(e.type_) { 
                case ErrorException:
-                       LyX::cref().emergencyCleanup();
+                       emergencyCleanup();
                        setQuitOnLastWindowClosed(false);
                        closeAllViews();
                        Alert::error(e.title_, e.details_);
@@ -1118,7 +1319,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
                case BufferException: {
                        Buffer * buf = current_view_->buffer();
                        docstring details = e.details_ + '\n';
-                       details += theBufferList().emergencyWrite(buf);
+                       details += buf->emergencyWrite();
                        theBufferList().release(buf);
                        details += "\n" + _("The current document was closed.");
                        Alert::error(e.title_, details);
@@ -1135,13 +1336,13 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
                        "\n\nException: ");
                s += from_ascii(e.what());
                Alert::error(_("Software exception Detected"), s);
-               LyX::cref().exit(1);
+               lyx_exit(1);
        }
        catch (...) {
                docstring s = _("LyX has caught some really weird exception, it will "
                        "now attempt to save all unsaved documents and exit.");
                Alert::error(_("Software exception Detected"), s);
-               LyX::cref().exit(1);
+               lyx_exit(1);
        }
 
        return false;
@@ -1220,6 +1421,10 @@ bool GuiApplication::closeAllViews()
        if (d->views_.empty())
                return true;
 
+       // When a view/window was closed before without quitting LyX, there
+       // are already entries in the lastOpened list.
+       theSession().lastOpened().clear();
+
        QList<GuiView *> views = d->views_.values();
        foreach (GuiView * view, views) {
                if (!view->close())
@@ -1267,29 +1472,6 @@ bool GuiApplication::searchMenu(FuncRequest const & func,
 
 bool GuiApplication::readUIFile(QString const & name, bool include)
 {
-       enum {
-               ui_menuset = 1,
-               ui_toolbars,
-               ui_toolbarset,
-               ui_include,
-               ui_last
-       };
-
-       LexerKeyword uitags[] = {
-               { "include", ui_include },
-               { "menuset", ui_menuset },
-               { "toolbars", ui_toolbars },
-               { "toolbarset", ui_toolbarset }
-       };
-
-       // Ensure that a file is read only once (prevents include loops)
-       static QStringList uifiles;
-       if (uifiles.contains(name)) {
-               LYXERR(Debug::INIT, "UI file '" << name << "' has been read already. "
-                                   << "Is this an include loop?");
-               return false;
-       }
-
        LYXERR(Debug::INIT, "About to read " << name << "...");
 
        FileName ui_path;
@@ -1302,16 +1484,63 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
        }
 
        if (ui_path.empty()) {
+               static const QString defaultUIFile = "default";
                LYXERR(Debug::INIT, "Could not find " << name);
-               Alert::warning(_("Could not find UI defintion file"),
-                              bformat(_("Error while reading the configuration file\n%1$s.\n"
-                                  "Please check your installation."), qstring_to_ucs4(name)));
-               return false;
+               if (include) {
+                       Alert::warning(_("Could not find UI definition file"),
+                               bformat(_("Error while reading the included file\n%1$s\n"
+                                       "Please check your installation."), qstring_to_ucs4(name)));
+                       return false;
+               }
+               if (name == defaultUIFile) {
+                       LYXERR(Debug::INIT, "Could not find default UI file!!");
+                       Alert::warning(_("Could not find default UI file"),
+                               _("LyX could not find the default UI file!\n"
+                                 "Please check your installation."));
+                       return false;
+               }
+               Alert::warning(_("Could not find UI definition file"),
+               bformat(_("Error while reading the configuration file\n%1$s\n"
+                       "Falling back to default.\n"
+                       "Please look under Tools>Preferences>User Interface and\n"
+                       "check which User Interface file you are using."), qstring_to_ucs4(name)));
+               return readUIFile(defaultUIFile, false);
        }
 
-       uifiles.push_back(name);
+       // Ensure that a file is read only once (prevents include loops)
+       static QStringList uifiles;
+       QString const uifile = toqstr(ui_path.absFilename());
+       if (uifiles.contains(uifile)) {
+               if (!include) {
+                       // We are reading again the top uifile so reset the safeguard:
+                       uifiles.clear();
+                       d->menus_.reset();
+                       d->toolbars_.reset();
+               } else {
+                       LYXERR(Debug::INIT, "UI file '" << name << "' has been read already. "
+                               << "Is this an include loop?");
+                       return false;
+               }
+       }
+       uifiles.push_back(uifile);
 
        LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
+
+       enum {
+               ui_menuset = 1,
+               ui_toolbars,
+               ui_toolbarset,
+               ui_include,
+               ui_last
+       };
+
+       LexerKeyword uitags[] = {
+               { "include", ui_include },
+               { "menuset", ui_menuset },
+               { "toolbars", ui_toolbars },
+               { "toolbarset", ui_toolbarset }
+       };
+
        Lexer lex(uitags);
        lex.setFile(ui_path);
        if (!lex.isOK()) {
@@ -1322,6 +1551,9 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
        if (lyxerr.debugging(Debug::PARSER))
                lex.printTable(lyxerr);
 
+       // store which ui files define Toolbars
+       static QStringList toolbar_uifiles;
+
        while (lex.isOK()) {
                switch (lex.lex()) {
                case ui_include: {
@@ -1341,6 +1573,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
 
                case ui_toolbars:
                        d->toolbars_.readToolbarSettings(lex);
+                       toolbar_uifiles.push_back(uifile);
                        break;
 
                default:
@@ -1350,6 +1583,32 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
                        break;
                }
        }
+
+       if (include)
+               return true;
+
+       QSettings settings;
+       settings.beginGroup("ui_files");
+       bool touched = false;
+       for (int i = 0; i != uifiles.size(); ++i) {
+               QFileInfo fi(uifiles[i]);
+               QDateTime const date_value = fi.lastModified();
+               QString const name_key = QString::number(i);
+               // if an ui file which defines Toolbars has changed,
+               // we have to reset the settings
+               if (toolbar_uifiles.contains(uifiles[i])
+                && (!settings.contains(name_key)
+                || settings.value(name_key).toString() != uifiles[i]
+                || settings.value(name_key + "/date").toDateTime() != date_value)) {
+                       touched = true;
+                       settings.setValue(name_key, uifiles[i]);
+                       settings.setValue(name_key + "/date", date_value);
+               }
+       }
+       settings.endGroup();
+       if (touched)
+               settings.remove("views");
+
        return true;
 }
 
@@ -1375,7 +1634,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
        case SelectionRequest: {
                if (xev->xselectionrequest.selection != XA_PRIMARY)
                        break;
-               LYXERR(Debug::GUI, "X requested selection.");
+               LYXERR(Debug::SELECTION, "X requested selection.");
                BufferView * bv = current_view_->view();
                if (bv) {
                        docstring const sel = bv->requestSelection();
@@ -1387,7 +1646,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
        case SelectionClear: {
                if (xev->xselectionclear.selection != XA_PRIMARY)
                        break;
-               LYXERR(Debug::GUI, "Lost selection.");
+               LYXERR(Debug::SELECTION, "Lost selection.");
                BufferView * bv = current_view_->view();
                if (bv)
                        bv->clearSelection();
@@ -1453,6 +1712,7 @@ frontend::Selection & theSelection()
        return frontend::guiApp->selection();
 }
 
+
 } // namespace lyx
 
-#include "GuiApplication_moc.cpp"
+#include "moc_GuiApplication.cpp"