]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiApplication.cpp
Kornel's gcc compile fix.
[lyx.git] / src / frontends / qt4 / GuiApplication.cpp
index dd071e9773c778a84cc6393076d5bd6aacb494ad..266ae8886748414e18b86a9ff59d495c82e7947d 100644 (file)
@@ -15,6 +15,7 @@
 #include "GuiApplication.h"
 
 #include "ColorCache.h"
+#include "ColorSet.h"
 #include "GuiClipboard.h"
 #include "GuiImage.h"
 #include "GuiKeySymbol.h"
@@ -22,6 +23,7 @@
 #include "GuiView.h"
 #include "Menus.h"
 #include "qt_helpers.h"
+#include "Toolbars.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 #include "Font.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "Intl.h"
+#include "KeyMap.h"
 #include "Language.h"
+#include "LaTeXFeatures.h"
+#include "Lexer.h"
 #include "LyX.h"
+#include "LyXAction.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
+#include "Server.h"
 #include "Session.h"
+#include "SpellChecker.h"
 #include "version.h"
 
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/foreach.h"
 #include "support/ForkedCalls.h"
 #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/Path.h"
+#include "support/Systemcall.h"
 
 #ifdef Q_WS_MACX
 #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>
 #include <QMacPasteboardMime>
 #include <QMenuBar>
 #include <QMimeData>
+#include <QObject>
+#include <QPixmap>
 #include <QPixmapCache>
 #include <QRegExp>
 #include <QSessionManager>
+#include <QSettings>
 #include <QSocketNotifier>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #endif
 
 #ifdef Q_WS_WIN
-#include <QVector>
 #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 <map>
+#include <sstream>
+#include <vector>
 
 using namespace std;
 using namespace lyx::support;
 
-// FIXME: These strings are also used in GuiClipboard.cpp.
-static char const * const lyx_mime_type = "application/x-lyx";
-static char const * const pdf_mime_type = "application/pdf";
-static char const * const emf_mime_type = "image/x-emf";
-static char const * const wmf_mime_type = "image/x-wmf";
+
+static void initializeResources()
+{
+       static bool initialized = false;
+       if (!initialized) {
+               Q_INIT_RESOURCE(Resources); 
+               initialized = true;
+       }
+}
+
 
 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
+//
+////////////////////////////////////////////////////////////////////////
+
+namespace {
+
+struct PngMap {
+       QString key;
+       QString value;
+};
+
+
+bool operator<(PngMap const & lhs, PngMap const & rhs)
+{
+       return lhs.key < rhs.key;
+}
+
+
+class CompareKey {
+public:
+       CompareKey(QString const & name) : name_(name) {}
+       bool operator()(PngMap const & other) const { return other.key == name_; }
+private:
+       QString const name_;
+};
+
+
+// this must be sorted alphabetically
+// Upper case comes before lower case
+PngMap sorted_png_map[] = {
+       { "Bumpeq", "bumpeq2" },
+       { "Cap", "cap2" },
+       { "Cup", "cup2" },
+       { "Delta", "delta2" },
+       { "Downarrow", "downarrow2" },
+       { "Gamma", "gamma2" },
+       { "Lambda", "lambda2" },
+       { "Leftarrow", "leftarrow2" },
+       { "Leftrightarrow", "leftrightarrow2" },
+       { "Longleftarrow", "longleftarrow2" },
+       { "Longleftrightarrow", "longleftrightarrow2" },
+       { "Longrightarrow", "longrightarrow2" },
+       { "Omega", "omega2" },
+       { "Phi", "phi2" },
+       { "Pi", "pi2" },
+       { "Psi", "psi2" },
+       { "Rightarrow", "rightarrow2" },
+       { "Sigma", "sigma2" },
+       { "Subset", "subset2" },
+       { "Supset", "supset2" },
+       { "Theta", "theta2" },
+       { "Uparrow", "uparrow2" },
+       { "Updownarrow", "updownarrow2" },
+       { "Upsilon", "upsilon2" },
+       { "Vdash", "vdash3" },
+       { "Vert", "vert2" },
+       { "Xi", "xi2" },
+       { "nLeftarrow", "nleftarrow2" },
+       { "nLeftrightarrow", "nleftrightarrow2" },
+       { "nRightarrow", "nrightarrow2" },
+       { "nVDash", "nvdash3" },
+       { "nvDash", "nvdash2" },
+       { "textrm \\AA", "textrm_AA"},
+       { "textrm \\O", "textrm_O"},
+       { "vDash", "vdash2" }
+};
+
+size_t const nr_sorted_png_map = sizeof(sorted_png_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), /**/);
+
+       PngMap const * const it = find_if(begin, end, CompareKey(name));
+
+       QString png_name;
+       if (it != end) {
+               png_name = it->value;
+       } else {
+               png_name = name;
+               png_name.replace('_', "underscore");
+               png_name.replace(' ', '_');
+
+               // This way we can have "math-delim { }" on the toolbar.
+               png_name.replace('(', "lparen");
+               png_name.replace(')', "rparen");
+               png_name.replace('[', "lbracket");
+               png_name.replace(']', "rbracket");
+               png_name.replace('{', "lbrace");
+               png_name.replace('}', "rbrace");
+               png_name.replace('|', "bars");
+               png_name.replace(',', "thinspace");
+               png_name.replace(':', "mediumspace");
+               png_name.replace(';', "thickspace");
+               png_name.replace('!', "negthinspace");
+       }
+
+       LYXERR(Debug::GUI, "findPng(" << name << ")\n"
+               << "Looking for math PNG called \"" << png_name << '"');
+       return png_name;
+}
+
+} // namespace anon
+
+
+QString iconName(FuncRequest const & f, bool unknown)
+{
+       initializeResources();
+       QString name1;
+       QString name2;
+       QString path;
+       switch (f.action) {
+       case LFUN_MATH_INSERT:
+               if (!f.argument().empty()) {
+                       path = "math/";
+                       name1 = findPng(toqstr(f.argument()).mid(1));
+               }
+               break;
+       case LFUN_MATH_DELIM:
+       case LFUN_MATH_BIGDELIM:
+               path = "math/";
+               name1 = findPng(toqstr(f.argument()));
+               break;
+       case LFUN_CALL:
+               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;
+
+               if (!f.argument().empty()) {
+                       name1 = name2 + ' ' + toqstr(f.argument());
+                       name1.replace(' ', '_');
+                       name1.replace('\\', "backslash");
+               }
+       }
+
+       FileName fname = libFileSearch("images/" + path, name1, "png");
+       if (fname.exists())
+               return toqstr(fname.absFilename());
+
+       fname = libFileSearch("images/" + path, name2, "png");
+       if (fname.exists())
+               return toqstr(fname.absFilename());
+
+       path = ":/images/" + path;
+       QDir res(path);
+       if (!res.exists()) {
+               LYXERR0("Directory " << path << " not found in resource!"); 
+               return QString();
+       }
+       name1 += ".png";
+       if (res.exists(name1))
+               return path + name1;
+
+       name2 += ".png";
+       if (res.exists(name2))
+               return path + name2;
+
+       LYXERR(Debug::GUI, "Cannot find icon with filename "
+                          << "\"" << name1 << "\""
+                          << " or filename "
+                          << "\"" << name2 << "\"" 
+                          << " for command \""
+                          << lyxaction.getActionName(f.action)
+                          << '(' << to_utf8(f.argument()) << ")\"");
+
+       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)
+{
+       QString icon = iconName(f, unknown);
+       if (icon.isEmpty())
+               return QIcon();
+
+       //LYXERR(Debug::GUI, "Found icon: " << icon);
+       QPixmap pm;
+       if (!pm.load(icon)) {
+               LYXERR0("Cannot load icon " << icon << " please verify resource system!");
+               return QIcon();
+       }
+
+       return QIcon(pm);
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+// LyX server support code.
+//
+////////////////////////////////////////////////////////////////////////
+
 class SocketNotifier : public QSocketNotifier
 {
 public:
@@ -130,7 +440,10 @@ public:
 
 
 ////////////////////////////////////////////////////////////////////////
+//
 // Mac specific stuff goes here...
+//
+////////////////////////////////////////////////////////////////////////
 
 class MenuTranslator : public QTranslator
 {
@@ -166,7 +479,7 @@ public:
                        QKeyEvent * ke = static_cast<QKeyEvent*>(e);
                        KeySymbol sym;
                        setKeySymbol(&sym, ke);
-                       theLyXFunc().processKeySym(sym, q_key_state(ke->modifiers()));
+                       guiApp->processKeySym(sym, q_key_state(ke->modifiers()));
                        e->accept();
                        return true;
                }
@@ -189,7 +502,7 @@ public:
        QString flavorFor(QString const & mime)
        {
                LYXERR(Debug::ACTION, "flavorFor " << mime);
-               if (mime == QLatin1String(pdf_mime_type))
+               if (mime == pdfMimeType())
                        return QLatin1String("com.adobe.pdf");
                return QString();
        }
@@ -198,21 +511,25 @@ public:
        {
                LYXERR(Debug::ACTION, "mimeFor " << flav);
                if (flav == QLatin1String("com.adobe.pdf"))
-                       return QLatin1String(pdf_mime_type);
+                       return pdfMimeType();
                return QString();
        }
 
        bool canConvert(QString const & mime, QString flav)
-       { return mimeFor(flav) == mime; }
+       {
+               return mimeFor(flav) == mime;
+       }
 
-       QVariant convertToMime(QString const & mime, QList<QByteArray> data, QString flav)
+       QVariant convertToMime(QString const & /*mime*/, QList<QByteArray> data,
+               QString /*flav*/)
        {
                if(data.count() > 1)
                        qWarning("QMacPasteboardMimeGraphics: Cannot handle multiple member data");
                return data.first();
        }
 
-       QList<QByteArray> convertFromMime(QString const & mime, QVariant data, QString flav)
+       QList<QByteArray> convertFromMime(QString const & /*mime*/,
+               QVariant data, QString /*flav*/)
        {
                QList<QByteArray> ret;
                ret.append(data.toByteArray());
@@ -222,8 +539,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...
+//
 ///////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
@@ -235,10 +553,10 @@ public:
 static FORMATETC cfFromMime(QString const & mimetype)
 {
        FORMATETC formatetc;
-       if (mimetype == emf_mime_type) {
+       if (mimetype == emfMimeType()) {
                formatetc.cfFormat = CF_ENHMETAFILE;
                formatetc.tymed = TYMED_ENHMF;
-       } else if (mimetype == wmf_mime_type) {
+       } else if (mimetype == wmfMimeType()) {
                formatetc.cfFormat = CF_METAFILEPICT;
                formatetc.tymed = TYMED_MFPICT;
        }
@@ -262,7 +580,7 @@ public:
        bool canConvertToMime(QString const & mimetype,
                IDataObject * pDataObj) const
        {
-               if (mimetype != emf_mime_type && mimetype != wmf_mime_type)
+               if (mimetype != emfMimeType() && mimetype != wmfMimeType())
                        return false;
                FORMATETC formatetc = cfFromMime(mimetype);
                return pDataObj->QueryGetData(&formatetc) == S_OK;
@@ -305,11 +623,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;
        }
 
@@ -317,9 +636,9 @@ public:
        {
                switch (formatetc.cfFormat) {
                case CF_ENHMETAFILE:
-                       return emf_mime_type
+                       return emfMimeType()
                case CF_METAFILEPICT:
-                       return wmf_mime_type;
+                       return wmfMimeType();
                }
                return QString();
        }
@@ -333,13 +652,20 @@ public:
 
 struct GuiApplication::Private
 {
-       Private(): language_model_(0), global_menubar_(0)
+       Private(): language_model_(0), meta_fake_bit(NoModifier),
+               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
+               initKeySequences(&theTopLevelKeymap());
+       }
+
+       void initKeySequences(KeyMap * kb)
+       {
+               keyseq = KeySequence(kb, kb);
+               cancel_meta_seq = KeySequence(kb, kb);
        }
 
        ///
@@ -355,23 +681,35 @@ struct GuiApplication::Private
        ///
        QTranslator qt_trans_;
        ///
-       std::map<int, SocketNotifier *> socket_notifiers_;
+       QHash<int, SocketNotifier *> socket_notifiers_;
        ///
        Menus menus_;
+       ///
+       /// The global instance
+       Toolbars toolbars_;
+
        /// this timer is used for any regular events one wants to
        /// perform. at present it is used to check if forked processes
        /// are done.
        QTimer general_timer_;
 
+       /// delayed FuncRequests
+       std::queue<FuncRequest> func_request_queue_;
+
+       ///
+       KeySequence keyseq;
+       ///
+       KeySequence cancel_meta_seq;
+       ///
+       KeyModifier meta_fake_bit;
+
        /// Multiple views container.
        /**
        * Warning: This must not be a smart pointer as the destruction of the
        * object is handled by Qt when the view is closed
        * \sa Qt::WA_DeleteOnClose attribute.
        */
-       std::map<int, GuiView *> views_;
-       ///
-       std::vector<int> view_ids_;
+       QHash<int, GuiView *> views_;
 
        /// Only used on mac.
        GlobalMenuBar * global_menubar_;
@@ -383,10 +721,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
 };
 
@@ -403,12 +738,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.
@@ -421,6 +760,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
@@ -431,38 +775,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;
@@ -490,6 +804,40 @@ 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));
+}
+
+
+LyXView * GuiApplication::currentWindow() 
+{
+#ifdef Q_WS_MACX
+       /* In LyX/Mac, when a dialog is open, the menus of the
+          application can still be accessed without giving focus to
+          the main window. In this case, we want to disable the menu
+          entries that are buffer or view-related.
+       */
+       if (current_view_ && activeWindow() != current_view_)
+               return 0;
+#endif
+       return current_view_;
+}
+
+
 bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
 {
        bool enable = true;
@@ -497,16 +845,24 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
        switch(cmd.action) {
 
        case LFUN_WINDOW_CLOSE:
-               enable = d->view_ids_.size() > 0;
+               enable = d->views_.size() > 0;
                break;
 
        case LFUN_BUFFER_NEW:
        case LFUN_BUFFER_NEW_TEMPLATE:
        case LFUN_FILE_OPEN:
+       case LFUN_HELP_OPEN:
        case LFUN_SCREEN_FONT_UPDATE:
        case LFUN_SET_COLOR:
        case LFUN_WINDOW_NEW:
        case LFUN_LYX_QUIT:
+       case LFUN_LYXRC_APPLY:
+       case LFUN_COMMAND_PREFIX:
+       case LFUN_CANCEL:
+       case LFUN_META_PREFIX:
+       case LFUN_RECONFIGURE:
+       case LFUN_SERVER_GET_FILENAME:
+       case LFUN_SERVER_NOTIFY:
                enable = true;
                break;
 
@@ -515,15 +871,52 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
        }
 
        if (!enable)
-               flag.enabled(false);
+               flag.setEnabled(false);
 
        return true;
 }
 
-       
-bool GuiApplication::dispatch(FuncRequest const & cmd)
+
+// This function runs "configure" and then rereads lyx.defaults to
+// reconfigure the automatic settings.
+static void reconfigure(LyXView * lv, string const & option)
 {
-       switch(cmd.action) {
+       // emit message signal.
+       if (lv)
+               lv->message(_("Running configure..."));
+
+       // Run configure in user lyx directory
+       PathChanger p(package().user_support());
+       string configure_command = package().configure_command();
+       configure_command += option;
+       Systemcall one;
+       int ret = one.startscript(Systemcall::Wait, configure_command);
+       p.pop();
+       // emit message signal.
+       if (lv)
+               lv->message(_("Reloading configuration..."));
+       lyxrc.read(libFileSearch(QString(), "lyxrc.defaults"));
+       // Re-read packages.lst
+       LaTeXFeatures::getAvailable();
+
+       if (ret)
+               Alert::information(_("System reconfiguration failed"),
+                          _("The system reconfiguration has failed.\n"
+                                 "Default textclass is used but LyX may "
+                                 "not be able to work properly.\n"
+                                 "Please reconfigure again if needed."));
+       else
+
+               Alert::information(_("System reconfigured"),
+                          _("The system has been reconfigured.\n"
+                            "You need to restart LyX to make use of any\n"
+                            "updated document class specifications."));
+}
+
+
+void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
+{
+       switch (cmd.action) {
 
        case LFUN_WINDOW_NEW:
                createView(toqstr(cmd.argument()));
@@ -531,8 +924,11 @@ 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);
+               // clear the last opened list, because
+               // maybe this will end the session
+               theSession().lastOpened().clear();
                current_view_->close();
                break;
 
@@ -563,38 +959,75 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
        }
 
        case LFUN_BUFFER_NEW:
-               if (viewCount() == 0
-                   || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
+               if (d->views_.empty()
+                   || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
                        createView(QString(), false); // keep hidden
                        current_view_->newDocument(to_utf8(cmd.argument()), false);
                        current_view_->show();
                        setActiveWindow(current_view_);
-               } else
+               } else {
                        current_view_->newDocument(to_utf8(cmd.argument()), false);
+               }
                break;
 
        case LFUN_BUFFER_NEW_TEMPLATE:
-               if (viewCount() == 0 
-                   || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
+               if (d->views_.empty()
+                   || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
                        createView();
                        current_view_->newDocument(to_utf8(cmd.argument()), true);
-                       if (!current_view_->buffer())
+                       if (!current_view_->documentBufferView())
                                current_view_->close();
-               } else
+               } else {
                        current_view_->newDocument(to_utf8(cmd.argument()), true);
+               }
                break;
 
        case LFUN_FILE_OPEN:
-               if (viewCount() == 0
-                   || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
-                       createView();
-                       current_view_->openDocument(to_utf8(cmd.argument()));
-                       if (!current_view_->buffer())
+               // FIXME: create a new method shared with LFUN_HELP_OPEN.
+               if (d->views_.empty()
+                   || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
+                       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_->documentBufferView())
                                current_view_->close();
                } else
                        current_view_->openDocument(to_utf8(cmd.argument()));
                break;
 
+       case LFUN_HELP_OPEN: {
+               // FIXME: create a new method shared with LFUN_FILE_OPEN.
+               if (current_view_ == 0)
+                       createView();
+               string const arg = to_utf8(cmd.argument());
+               if (arg.empty()) {
+                       current_view_->message(_("Missing argument"));
+                       break;
+               }
+               FileName fname = i18nLibFileSearch("doc", arg, "lyx");
+               if (fname.empty()) 
+                       fname = i18nLibFileSearch("examples", arg, "lyx");
+
+               if (fname.empty()) {
+                       lyxerr << "LyX: unable to find documentation file `"
+                               << arg << "'. Bad installation?" << endl;
+                       break;
+               }
+               current_view_->message(bformat(_("Opening help file %1$s..."),
+                       makeDisplayPath(fname.absFilename())));
+               Buffer * buf = current_view_->loadDocument(fname, false);
+               if (buf) {
+                       current_view_->setBuffer(buf);
+                       buf->updateLabels();
+                       buf->errors("Parse");
+               }
+               break;
+       }
+
        case LFUN_SET_COLOR: {
                string lyx_name;
                string const x11_name = split(to_utf8(cmd.argument()), lyx_name, ' ');
@@ -627,36 +1060,252 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
                break;
        }
 
+       case LFUN_LYXRC_APPLY: {
+               // reset active key sequences, since the bindings
+               // are updated (bug 6064)
+               d->keyseq.reset();
+               LyXRC const lyxrc_orig = lyxrc;
+
+               istringstream ss(to_utf8(cmd.argument()));
+               bool const success = lyxrc.read(ss) == 0;
+
+               if (!success) {
+                       lyxerr << "Warning in LFUN_LYXRC_APPLY!\n"
+                               << "Unable to read lyxrc data"
+                               << endl;
+                       break;
+               }
+
+               actOnUpdatedPrefs(lyxrc_orig, lyxrc);
+               setSpellChecker();
+               resetGui();
+
+               break;
+       }
+
+       case LFUN_COMMAND_PREFIX:
+               lyx::dispatch(FuncRequest(LFUN_MESSAGE, d->keyseq.printOptions(true)));
+               break;
+
+       case LFUN_CANCEL: {
+               d->keyseq.reset();
+               d->meta_fake_bit = NoModifier;
+               GuiView * gv = currentView();
+               if (gv && gv->currentBufferView())
+                       // cancel any selection
+                       lyx::dispatch(FuncRequest(LFUN_MARK_OFF));
+               dr.setMessage(from_ascii(N_("Cancel")));
+               break;
+       }
+       case LFUN_META_PREFIX:
+               d->meta_fake_bit = AltModifier;
+               dr.setMessage(d->keyseq.print(KeySequence::ForGui));
+               break;
+
+       // --- Menus -----------------------------------------------
+       case LFUN_RECONFIGURE:
+               // argument is any additional parameter to the configure.py command
+               reconfigure(currentView(), to_utf8(cmd.argument()));
+               break;
+
+       // --- lyxserver commands ----------------------------
+       case LFUN_SERVER_GET_FILENAME: {
+               GuiView * lv = currentView();
+               LASSERT(lv && lv->documentBufferView(), return);
+               docstring const fname = from_utf8(
+                       lv->documentBufferView()->buffer().absFileName());
+               dr.setMessage(fname);
+               LYXERR(Debug::INFO, "FNAME[" << fname << ']');
+               break;
+       }
+       case LFUN_SERVER_NOTIFY: {
+               docstring const dispatch_buffer = d->keyseq.print(KeySequence::Portable);
+               dr.setMessage(dispatch_buffer);
+               theServer().notifyClient(to_utf8(dispatch_buffer));
+               break;
+       }
        default:
                // Notify the caller that the action has not been dispatched.
-               return false;
+               dr.dispatched(false);
+               return;
        }
 
        // The action has been dispatched.
-       return true;
+       dr.dispatched(true);
+}
+
+
+docstring GuiApplication::viewStatusMessage()
+{
+       // When meta-fake key is pressed, show the key sequence so far + "M-".
+       if (d->meta_fake_bit != NoModifier)
+               return d->keyseq.print(KeySequence::ForGui) + "M-";
+
+       // Else, when a non-complete key sequence is pressed,
+       // show the available options.
+       if (d->keyseq.length() > 0 && !d->keyseq.deleted())
+               return d->keyseq.printOptions(true);
+
+       return docstring();
+}
+
+
+void GuiApplication::handleKeyFunc(FuncCode action)
+{
+       char_type c = 0;
+
+       if (d->keyseq.length())
+               c = 0;
+       GuiView * gv = currentView();
+       LASSERT(gv && gv->currentBufferView(), return);
+       BufferView * bv = gv->currentBufferView();
+       bv->getIntl().getTransManager().deadkey(
+               c, get_accent(action).accent, bv->cursor().innerText(),
+               bv->cursor());
+       // Need to clear, in case the minibuffer calls these
+       // actions
+       d->keyseq.clear();
+       // copied verbatim from do_accent_char
+       bv->cursor().resetAnchor();
+       bv->processUpdateFlags(Update::FitCursor);
+}
+
+
+void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state)
+{
+       LYXERR(Debug::KEY, "KeySym is " << keysym.getSymbolName());
+
+       GuiView * lv = currentView();
+
+       // Do nothing if we have nothing (JMarc)
+       if (!keysym.isOK()) {
+               LYXERR(Debug::KEY, "Empty kbd action (probably composing)");
+               lv->restartCursor();
+               return;
+       }
+
+       if (keysym.isModifier()) {
+               LYXERR(Debug::KEY, "isModifier true");
+               if (lv)
+                       lv->restartCursor();
+               return;
+       }
+
+       char_type encoded_last_key = keysym.getUCSEncoded();
+
+       // Do a one-deep top-level lookup for
+       // cancel and meta-fake keys. RVDK_PATCH_5
+       d->cancel_meta_seq.reset();
+
+       FuncRequest func = d->cancel_meta_seq.addkey(keysym, state);
+       LYXERR(Debug::KEY, "action first set to [" << func.action << ']');
+
+       // When not cancel or meta-fake, do the normal lookup.
+       // Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
+       // Mostly, meta_fake_bit = NoModifier. RVDK_PATCH_5.
+       if ((func.action != LFUN_CANCEL) && (func.action != LFUN_META_PREFIX)) {
+               // remove Caps Lock and Mod2 as a modifiers
+               func = d->keyseq.addkey(keysym, (state | d->meta_fake_bit));
+               LYXERR(Debug::KEY, "action now set to [" << func.action << ']');
+       }
+
+       // Dont remove this unless you know what you are doing.
+       d->meta_fake_bit = NoModifier;
+
+       // Can this happen now ?
+       if (func.action == LFUN_NOACTION)
+               func = FuncRequest(LFUN_COMMAND_PREFIX);
+
+       LYXERR(Debug::KEY, " Key [action=" << func.action << "]["
+               << d->keyseq.print(KeySequence::Portable) << ']');
+
+       // already here we know if it any point in going further
+       // why not return already here if action == -1 and
+       // num_bytes == 0? (Lgb)
+
+       if (d->keyseq.length() > 1)
+               lv->message(d->keyseq.print(KeySequence::ForGui));
+
+
+       // Maybe user can only reach the key via holding down shift.
+       // Let's see. But only if shift is the only modifier
+       if (func.action == LFUN_UNKNOWN_ACTION && state == ShiftModifier) {
+               LYXERR(Debug::KEY, "Trying without shift");
+               func = d->keyseq.addkey(keysym, NoModifier);
+               LYXERR(Debug::KEY, "Action now " << func.action);
+       }
+
+       if (func.action == LFUN_UNKNOWN_ACTION) {
+               // Hmm, we didn't match any of the keysequences. See
+               // if it's normal insertable text not already covered
+               // by a binding
+               if (keysym.isText() && d->keyseq.length() == 1) {
+                       LYXERR(Debug::KEY, "isText() is true, inserting.");
+                       func = FuncRequest(LFUN_SELF_INSERT,
+                                          FuncRequest::KEYBOARD);
+               } else {
+                       LYXERR(Debug::KEY, "Unknown, !isText() - giving up");
+                       lv->message(_("Unknown function."));
+                       lv->restartCursor();
+                       return;
+               }
+       }
+
+       if (func.action == LFUN_SELF_INSERT) {
+               if (encoded_last_key != 0) {
+                       docstring const arg(1, encoded_last_key);
+                       lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, arg,
+                                            FuncRequest::KEYBOARD));
+                       LYXERR(Debug::KEY, "SelfInsert arg[`" << to_utf8(arg) << "']");
+               }
+       } else {
+               lyx::dispatch(func);
+               if (!lv)
+                       return;
+       }
+}
+
+
+void GuiApplication::dispatchDelayed(FuncRequest const & func)
+{
+       d->func_request_queue_.push(func);
+       QTimer::singleShot(0, this, SLOT(processFuncRequestQueue()));
 }
 
 
 void GuiApplication::resetGui()
 {
-       map<int, GuiView *>::iterator it;
-       for (it = d->views_.begin(); it != d->views_.end(); ++it)
-               it->second->resetDialogs();
+       // 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) {
+               GuiView * gv = *it;
+               setCurrentView(gv);
+               gv->setLayoutDirection(layoutDirection());
+               gv->resetDialogs();
+       }
 
-       dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
+       lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
 }
 
 
-static void updateIds(map<int, GuiView *> const & stdmap, vector<int> & ids)
+void GuiApplication::createView(int view_id)
 {
-       ids.clear();
-       map<int, GuiView *>::const_iterator it;
-       for (it = stdmap.begin(); it != stdmap.end(); ++it)
-               ids.push_back(it->first);
+       createView(QString(), true, view_id);
 }
 
 
-void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
+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.
@@ -664,19 +1313,14 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
                d->global_menubar_->releaseKeyboard();
 
        // create new view
-       updateIds(d->views_, d->view_ids_);
-       int id = 0;
+       int id = view_id;
        while (d->views_.find(id) != d->views_.end())
                id++;
-       GuiView * view = new GuiView(id);
-       
-       // copy the icon size from old view
-       if (viewCount() > 0)
-               view->setIconSize(current_view_->iconSize());
 
+       LYXERR(Debug::GUI, "About to create new window with ID " << id);
+       GuiView * view = new GuiView(id);
        // register view
        d->views_[id] = view;
-       updateIds(d->views_, d->view_ids_);
 
        if (autoShow) {
                view->show();
@@ -697,7 +1341,6 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
 #endif
        }
        view->setFocus();
-       setCurrentView(view);
 }
 
 
@@ -719,6 +1362,18 @@ FontLoader & GuiApplication::fontLoader()
 }
 
 
+Toolbars const & GuiApplication::toolbars() const 
+{
+       return d->toolbars_;
+}
+
+
+Toolbars & GuiApplication::toolbars()
+{
+       return d->toolbars_; 
+}
+
+
 Menus const & GuiApplication::menus() const 
 {
        return d->menus_;
@@ -731,17 +1386,12 @@ Menus & GuiApplication::menus()
 }
 
 
-size_t GuiApplication::viewCount() const
+QList<int> GuiApplication::viewIds() const
 {
-       return d->view_ids_.size();
+       return d->views_.keys();
 }
 
 
-vector<int> const & GuiApplication::viewIds()
-{
-       return d->view_ids_;
-}
-
 ColorCache & GuiApplication::colorCache()
 {
        return d->color_cache_;
@@ -750,7 +1400,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();
 }
 
@@ -761,16 +1415,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()
 {
-       // 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);
+       setGuiLanguage();
+
+       // Read menus
+       if (!readUIFile(toqstr(lyxrc.ui_file)))
+               // Gives some error box here.
+               return;
+
+#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_)
@@ -802,13 +1515,33 @@ 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));
+       for (size_t i = 0; i < lastopened.size(); ++i) {
+               FileName const & file_name = lastopened[i].file_name;
+               if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
+                         && current_view_->documentBufferView() != 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].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();
@@ -858,19 +1591,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);
-
-               if (!current_view_ || !current_view_->view())
-                       // The application is not properly initialized yet.
-                       // So we acknowledge the event and delay the file opening
-                       // until LyX is ready.
-                       // FIXME UNICODE: FileName accept an utf8 encoded string.
-                       LyX::ref().addFileToLoad(fromqstr(foe->file()));
-               else
-                       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;
        }
@@ -888,7 +1615,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_);
@@ -900,9 +1627,11 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
                        this->exit(1);
 
                case BufferException: {
-                       Buffer * buf = current_view_->buffer();
+                       if (!current_view_->documentBufferView())
+                               return false;
+                       Buffer * buf = &current_view_->documentBufferView()->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);
@@ -919,13 +1648,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;
@@ -970,8 +1699,7 @@ void GuiApplication::socketDataReceived(int fd)
 
 void GuiApplication::unregisterSocketCallback(int fd)
 {
-       d->socket_notifiers_[fd]->setEnabled(false);
-       d->socket_notifiers_.erase(fd);
+       d->socket_notifiers_.take(fd)->setEnabled(false);
 }
 
 
@@ -989,83 +1717,209 @@ void GuiApplication::commitData(QSessionManager & sm)
 }
 
 
-bool GuiApplication::unregisterView(int id)
+void GuiApplication::unregisterView(GuiView * gv)
 {
-       updateIds(d->views_, d->view_ids_);
-       LASSERT(d->views_.find(id) != d->views_.end(), /**/);
-       LASSERT(d->views_[id], /**/);
-
-       map<int, GuiView *>::iterator it;
-       for (it = d->views_.begin(); it != d->views_.end(); ++it) {
-               if (it->first == id) {
-                       d->views_.erase(id);
-                       break;
-               }
-       }
-       updateIds(d->views_, d->view_ids_);
-       return true;
+       LASSERT(d->views_[gv->id()] == gv, /**/);
+       d->views_.remove(gv->id());
+       if (current_view_ == gv)
+               current_view_ = 0;
 }
 
 
 bool GuiApplication::closeAllViews()
 {
-       updateIds(d->views_, d->view_ids_);
        if (d->views_.empty())
                return true;
 
-       map<int, GuiView*> const cmap = d->views_;
-       map<int, GuiView*>::const_iterator it;
-       for (it = cmap.begin(); it != cmap.end(); ++it) {
-               if (!it->second->close())
+       // 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())
                        return false;
        }
 
        d->views_.clear();
-       d->view_ids_.clear();
        return true;
 }
 
 
 GuiView & GuiApplication::view(int id) const
 {
-       LASSERT(d->views_.find(id) != d->views_.end(), /**/);
-       return *d->views_.find(id)->second;
+       LASSERT(d->views_.contains(id), /**/);
+       return *d->views_.value(id);
 }
 
 
 void GuiApplication::hideDialogs(string const & name, Inset * inset) const
 {
-       vector<int>::const_iterator it = d->view_ids_.begin();
-       vector<int>::const_iterator const end = d->view_ids_.end();
-       for (; it != end; ++it)
-               view(*it).hideDialog(name, inset);
+       QList<GuiView *> views = d->views_.values();
+       foreach (GuiView * view, views)
+               view->hideDialog(name, inset);
 }
 
 
 Buffer const * GuiApplication::updateInset(Inset const * inset) const
 {
        Buffer const * buffer_ = 0;
-       vector<int>::const_iterator it = d->view_ids_.begin();
-       vector<int>::const_iterator const end = d->view_ids_.end();
-       for (; it != end; ++it) {
-               Buffer const * ptr = view(*it).updateInset(inset);
-               if (ptr)
+       QHash<int, GuiView *>::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;
        }
        return buffer_;
 }
 
 
-void GuiApplication::readMenus(Lexer & lex)
+bool GuiApplication::searchMenu(FuncRequest const & func,
+       docstring_list & names) const
 {
-       menus().read(lex);
+       return d->menus_.searchMenu(func, names);
 }
 
 
-bool GuiApplication::searchMenu(FuncRequest const & func,
-       vector<docstring> & names) const
+bool GuiApplication::readUIFile(QString const & name, bool include)
 {
-       return menus().searchMenu(func, names);
+       LYXERR(Debug::INIT, "About to read " << name << "...");
+
+       FileName ui_path;
+       if (include) {
+               ui_path = libFileSearch("ui", name, "inc");
+               if (ui_path.empty())
+                       ui_path = libFileSearch("ui", changeExtension(name, "inc"));
+       } else {
+               ui_path = libFileSearch("ui", name, "ui");
+       }
+
+       if (ui_path.empty()) {
+               static const QString defaultUIFile = "default";
+               LYXERR(Debug::INIT, "Could not find " << name);
+               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);
+       }
+
+       // 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()) {
+               lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
+                      << endl;
+       }
+
+       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: {
+                       lex.next(true);
+                       QString const file = toqstr(lex.getString());
+                       if (!readUIFile(file, true))
+                               return false;
+                       break;
+               }
+               case ui_menuset:
+                       d->menus_.read(lex);
+                       break;
+
+               case ui_toolbarset:
+                       d->toolbars_.readToolbars(lex);
+                       break;
+
+               case ui_toolbars:
+                       d->toolbars_.readToolbarSettings(lex);
+                       toolbar_uifiles.push_back(uifile);
+                       break;
+
+               default:
+                       if (!rtrim(lex.getString()).empty())
+                               lex.printError("LyX::ReadUIFile: "
+                                              "Unknown menu tag: `$$Token'");
+                       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;
 }
 
 
@@ -1090,8 +1944,8 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
        case SelectionRequest: {
                if (xev->xselectionrequest.selection != XA_PRIMARY)
                        break;
-               LYXERR(Debug::GUI, "X requested selection.");
-               BufferView * bv = current_view_->view();
+               LYXERR(Debug::SELECTION, "X requested selection.");
+               BufferView * bv = current_view_->currentBufferView();
                if (bv) {
                        docstring const sel = bv->requestSelection();
                        if (!sel.empty())
@@ -1102,8 +1956,8 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
        case SelectionClear: {
                if (xev->xselectionclear.selection != XA_PRIMARY)
                        break;
-               LYXERR(Debug::GUI, "Lost selection.");
-               BufferView * bv = current_view_->view();
+               LYXERR(Debug::SELECTION, "Lost selection.");
+               BufferView * bv = current_view_->currentBufferView();
                if (bv)
                        bv->clearSelection();
                break;
@@ -1168,6 +2022,7 @@ frontend::Selection & theSelection()
        return frontend::guiApp->selection();
 }
 
+
 } // namespace lyx
 
-#include "GuiApplication_moc.cpp"
+#include "moc_GuiApplication.cpp"