]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiApplication.cpp
First step towards fixing bug 4588: move the ui file reading and the ToolbarBackend...
[lyx.git] / src / frontends / qt4 / GuiApplication.cpp
index 8dfc564621793b355e4c81215a0a761e06340c9f..80f4fe44836f0a23884d8a60b4edf7ef01fc07f5 100644 (file)
 
 #include "GuiApplication.h"
 
-#include "qt_helpers.h"
+#include "ColorCache.h"
+#include "GuiClipboard.h"
 #include "GuiImage.h"
 #include "GuiKeySymbol.h"
+#include "GuiSelection.h"
 #include "GuiView.h"
+#include "Menus.h"
+#include "qt_helpers.h"
+#include "ToolbarBackend.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferView.h"
+#include "Color.h"
 #include "Font.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "Language.h"
+#include "Lexer.h"
 #include "LyX.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Session.h"
 #include "version.h"
 
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/FileName.h"
+#include "support/foreach.h"
 #include "support/ForkedCalls.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
 
-#include <QApplication>
+#ifdef Q_WS_MACX
+#include "support/linkback/LinkBackProxy.h"
+#endif
+
 #include <QClipboard>
 #include <QEventLoop>
 #include <QFileOpenEvent>
+#include <QHash>
 #include <QLocale>
 #include <QLibraryInfo>
+#include <QMacPasteboardMime>
 #include <QMenuBar>
+#include <QMimeData>
 #include <QPixmapCache>
 #include <QRegExp>
 #include <QSessionManager>
 #include <QSocketNotifier>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
 #include <QTextCodec>
 #include <QTimer>
 #include <QTranslator>
 #undef None
 #endif
 
+#ifdef Q_WS_WIN
+#include <QList>
+#include <QWindowsMime>
+#if defined(Q_CYGWIN_WIN) || defined(Q_CC_MINGW)
+#include <wtypes.h>
+#endif
+#include <objidl.h>
+#endif // Q_WS_WIN
+
 #include <boost/bind.hpp>
 
 #include <exception>
 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";
+
 namespace lyx {
 
 frontend::Application * createApplication(int & argc, char * argv[])
@@ -144,17 +177,235 @@ public:
        }
 };
 
+#ifdef Q_WS_MACX
+// QMacPasteboardMimeGraphics can only be compiled on Mac.
+
+class QMacPasteboardMimeGraphics : public QMacPasteboardMime
+{
+public:
+       QMacPasteboardMimeGraphics()
+               : QMacPasteboardMime(MIME_QT_CONVERTOR|MIME_ALL)
+       {}
+
+       QString convertorName() { return "Graphics"; }
+
+       QString flavorFor(QString const & mime)
+       {
+               LYXERR(Debug::ACTION, "flavorFor " << mime);
+               if (mime == QLatin1String(pdf_mime_type))
+                       return QLatin1String("com.adobe.pdf");
+               return QString();
+       }
+
+       QString mimeFor(QString flav)
+       {
+               LYXERR(Debug::ACTION, "mimeFor " << flav);
+               if (flav == QLatin1String("com.adobe.pdf"))
+                       return QLatin1String(pdf_mime_type);
+               return QString();
+       }
+
+       bool canConvert(QString const & mime, QString flav)
+       { return mimeFor(flav) == mime; }
+
+       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> ret;
+               ret.append(data.toByteArray());
+               return ret;
+       }
+};
+#endif
+
 ///////////////////////////////////////////////////////////////
 // You can find more platform specific stuff
 // at the end of this file...
 ///////////////////////////////////////////////////////////////
 
+////////////////////////////////////////////////////////////////////////
+// Windows specific stuff goes here...
+
+#ifdef Q_WS_WIN
+// QWindowsMimeMetafile can only be compiled on Windows.
+
+static FORMATETC cfFromMime(QString const & mimetype)
+{
+       FORMATETC formatetc;
+       if (mimetype == emf_mime_type) {
+               formatetc.cfFormat = CF_ENHMETAFILE;
+               formatetc.tymed = TYMED_ENHMF;
+       } else if (mimetype == wmf_mime_type) {
+               formatetc.cfFormat = CF_METAFILEPICT;
+               formatetc.tymed = TYMED_MFPICT;
+       }
+       formatetc.ptd = 0;
+       formatetc.dwAspect = DVASPECT_CONTENT;
+       formatetc.lindex = -1;
+       return formatetc;
+}
+
+
+class QWindowsMimeMetafile : public QWindowsMime {
+public:
+       QWindowsMimeMetafile() {}
+
+       bool canConvertFromMime(FORMATETC const & formatetc,
+               QMimeData const * mimedata) const
+       {
+               return false;
+       }
+
+       bool canConvertToMime(QString const & mimetype,
+               IDataObject * pDataObj) const
+       {
+               if (mimetype != emf_mime_type && mimetype != wmf_mime_type)
+                       return false;
+               FORMATETC formatetc = cfFromMime(mimetype);
+               return pDataObj->QueryGetData(&formatetc) == S_OK;
+       }
+
+       bool convertFromMime(FORMATETC const & formatetc,
+               const QMimeData * mimedata, STGMEDIUM * pmedium) const
+       {
+               return false;
+       }
+
+       QVariant convertToMime(QString const & mimetype, IDataObject * pDataObj,
+               QVariant::Type preferredType) const
+       {
+               QByteArray data;
+               if (!canConvertToMime(mimetype, pDataObj))
+                       return data;
+
+               FORMATETC formatetc = cfFromMime(mimetype);
+               STGMEDIUM s;
+               if (pDataObj->GetData(&formatetc, &s) != S_OK)
+                       return data;
+
+               int dataSize;
+               if (s.tymed == TYMED_ENHMF) {
+                       dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, 0, 0);
+                       data.resize(dataSize);
+                       dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, dataSize,
+                               (LPBYTE)data.data());
+               } else if (s.tymed == TYMED_MFPICT) {
+                       dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, 0, 0);
+                       data.resize(dataSize);
+                       dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, dataSize,
+                               (LPBYTE)data.data());
+               }
+               data.detach();
+               ReleaseStgMedium(&s);
+
+               return data;
+       }
+
+
+       QVector<FORMATETC> formatsForMime(QString const & mimeType,
+               QMimeData const * mimeData) const
+       {
+               QVector<FORMATETC> formats;
+               formats += cfFromMime(mimeType);
+               return formats;
+       }
+
+       QString mimeForFormat(FORMATETC const & formatetc) const
+       {
+               switch (formatetc.cfFormat) {
+               case CF_ENHMETAFILE:
+                       return emf_mime_type; 
+               case CF_METAFILEPICT:
+                       return wmf_mime_type;
+               }
+               return QString();
+       }
+};
+
+#endif // Q_WS_WIN
+
+////////////////////////////////////////////////////////////////////////
+// GuiApplication::Private definition and implementation.
+////////////////////////////////////////////////////////////////////////
+
+struct GuiApplication::Private
+{
+       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
+       }
+
+       ///
+       QSortFilterProxyModel * language_model_;
+       ///
+       GuiClipboard clipboard_;
+       ///
+       GuiSelection selection_;
+       ///
+       FontLoader font_loader_;
+       ///
+       ColorCache color_cache_;
+       ///
+       QTranslator qt_trans_;
+       ///
+       QHash<int, SocketNotifier *> socket_notifiers_;
+       ///
+       Menus menus_;
+       /// 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_;
+
+       /// 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.
+       */
+       QHash<int, GuiView *> views_;
+
+       /// Only used on mac.
+       GlobalMenuBar * global_menubar_;
+
+#ifdef Q_WS_MACX
+       /// Linkback mime handler for MacOSX.
+       QMacPasteboardMimeGraphics mac_pasteboard_mime_;
+#endif
+
+#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_;
+#endif
+};
+
 
 GuiApplication * guiApp;
 
+GuiApplication::~GuiApplication()
+{
+#ifdef Q_WS_MACX
+       closeAllLinkBackLinks();
+#endif
+       delete d;
+}
+
 
 GuiApplication::GuiApplication(int & argc, char ** argv)
-       : QApplication(argc, argv), Application(), current_view_(0), global_menubar_(0)
+       : QApplication(argc, argv),     current_view_(0), d(new GuiApplication::Private)
 {
        QString app_name = "LyX";
        QCoreApplication::setOrganizationName(app_name);
@@ -168,7 +419,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        if (lyxrc.quit_on_last_window_closed)
                setQuitOnLastWindowClosed(false);
        */
-#ifdef Q_WS_MAC
+#ifdef Q_WS_MACX
        // 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);
@@ -189,21 +440,23 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        // 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 (qt_trans_.load(language_name,
+       if (d->qt_trans_.load(language_name,
                QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
        {
-               installTranslator(&qt_trans_);
+               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 "
-                       << fromqstr(language_name));
+                       << language_name);
        } else
                LYXERR(Debug::GUI, "Could not find  Qt translations for locale "
-                       << fromqstr(language_name));
+                       << language_name);
 
 #ifdef Q_WS_MACX
        // This allows to translate the strings that appear in the LyX menu.
-       addMenuTranslator();
+       /// 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()));
 
@@ -232,55 +485,47 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        if (lyxrc.typewriter_font_name.empty())
                lyxrc.typewriter_font_name = fromqstr(typewriterFontName());
 
-       general_timer_.setInterval(500);
-       connect(&general_timer_, SIGNAL(timeout()),
+       d->general_timer_.setInterval(500);
+       connect(&d->general_timer_, SIGNAL(timeout()),
                this, SLOT(handleRegularEvents()));
-       general_timer_.start();
-       
-#ifdef Q_WS_MACX
-       if (global_menubar_ == 0) {
-               // Create the global default menubar which is shown for the dialogs
-               // and if no GuiView is visible.
-               global_menubar_ = new GlobalMenuBar();
-       }
-#endif 
+       d->general_timer_.start();
 }
 
 
-GuiApplication::~GuiApplication()
+bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
 {
-       socket_notifiers_.clear();
-}
-
-
-FuncStatus GuiApplication::getStatus(FuncRequest const & cmd)
-{
-       FuncStatus flag;
        bool enable = true;
 
        switch(cmd.action) {
 
        case LFUN_WINDOW_CLOSE:
-               enable = 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_SCREEN_FONT_UPDATE:
+       case LFUN_SET_COLOR:
+       case LFUN_WINDOW_NEW:
+       case LFUN_LYX_QUIT:
+               enable = true;
                break;
 
        default:
-               if (!current_view_) {
-                       enable = false;
-                       break;
-               }
+               return false;
        }
 
        if (!enable)
                flag.enabled(false);
 
-       return flag;
+       return true;
 }
 
        
 bool GuiApplication::dispatch(FuncRequest const & cmd)
 {
-       switch(cmd.action) {
+       switch (cmd.action) {
 
        case LFUN_WINDOW_NEW:
                createView(toqstr(cmd.argument()));
@@ -304,7 +549,7 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
 
        case LFUN_SCREEN_FONT_UPDATE: {
                // handle the screen font changes.
-               font_loader_.update();
+               d->font_loader_.update();
                // Backup current_view_
                GuiView * view = current_view_;
                // Set current_view_ to zero to forbid GuiWorkArea::redraw()
@@ -320,29 +565,31 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
        }
 
        case LFUN_BUFFER_NEW:
-               if (viewCount() == 0
+               if (d->views_.empty()
                    || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 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 
+               if (d->views_.empty()
                    || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
                        createView();
                        current_view_->newDocument(to_utf8(cmd.argument()), true);
                        if (!current_view_->buffer())
                                current_view_->close();
-               } else
+               } else {
                        current_view_->newDocument(to_utf8(cmd.argument()), true);
+               }
                break;
 
        case LFUN_FILE_OPEN:
-               if (viewCount() == 0
+               if (d->views_.empty()
                    || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
                        createView();
                        current_view_->openDocument(to_utf8(cmd.argument()));
@@ -352,6 +599,38 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
                        current_view_->openDocument(to_utf8(cmd.argument()));
                break;
 
+       case LFUN_SET_COLOR: {
+               string lyx_name;
+               string const x11_name = split(to_utf8(cmd.argument()), lyx_name, ' ');
+               if (lyx_name.empty() || x11_name.empty()) {
+                       current_view_->message(
+                               _("Syntax: set-color <lyx_name> <x11_name>"));
+                       break;
+               }
+
+               string const graphicsbg = lcolor.getLyXName(Color_graphicsbg);
+               bool const graphicsbg_changed = lyx_name == graphicsbg
+                       && x11_name != graphicsbg;
+               if (graphicsbg_changed) {
+                       // FIXME: The graphics cache no longer has a changeDisplay method.
+#if 0
+                       graphics::GCache::get().changeDisplay(true);
+#endif
+               }
+
+               if (!lcolor.setColor(lyx_name, x11_name)) {
+                       current_view_->message(
+                                       bformat(_("Set-color \"%1$s\" failed "
+                                                              "- color is undefined or "
+                                                              "may not be redefined"),
+                                                                  from_utf8(lyx_name)));
+                       break;
+               }
+               // Make sure we don't keep old colors in cache.
+               d->color_cache_.clear();
+               break;
+       }
+
        default:
                // Notify the caller that the action has not been dispatched.
                return false;
@@ -364,44 +643,33 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
 
 void GuiApplication::resetGui()
 {
-       map<int, GuiView *>::iterator it;
-       for (it = views_.begin(); it != views_.end(); ++it)
-               it->second->resetDialogs();
+       QHash<int, GuiView *>::iterator it;
+       for (it = d->views_.begin(); it != d->views_.end(); ++it)
+               (*it)->resetDialogs();
 
        dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
 }
 
 
-static void updateIds(map<int, GuiView *> const & stdmap, vector<int> & ids)
-{
-       ids.clear();
-       map<int, GuiView *>::const_iterator it;
-       for (it = stdmap.begin(); it != stdmap.end(); ++it)
-               ids.push_back(it->first);
-}
-
-
 void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
 {
        // release the keyboard which might have been grabed by the global
        // menubar on Mac to catch shortcuts even without any GuiView.
-       if (global_menubar_)
-               global_menubar_->releaseKeyboard();
+       if (d->global_menubar_)
+               d->global_menubar_->releaseKeyboard();
 
        // create new view
-       updateIds(views_, view_ids_);
        int id = 0;
-       while (views_.find(id) != views_.end())
+       while (d->views_.find(id) != d->views_.end())
                id++;
        GuiView * view = new GuiView(id);
        
        // copy the icon size from old view
-       if (viewCount() > 0)
+       if (current_view_)
                view->setIconSize(current_view_->iconSize());
 
        // register view
-       views_[id] = view;
-       updateIds(views_, view_ids_);
+       d->views_[id] = view;
 
        if (autoShow) {
                view->show();
@@ -426,17 +694,45 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
 }
 
 
-
-
 Clipboard & GuiApplication::clipboard()
 {
-       return clipboard_;
+       return d->clipboard_;
 }
 
 
 Selection & GuiApplication::selection()
 {
-       return selection_;
+       return d->selection_;
+}
+
+
+FontLoader & GuiApplication::fontLoader() 
+{
+       return d->font_loader_;
+}
+
+
+Menus const & GuiApplication::menus() const 
+{
+       return d->menus_;
+}
+
+
+Menus & GuiApplication::menus()
+{
+       return d->menus_; 
+}
+
+
+QList<int> GuiApplication::viewIds() const
+{
+       return d->views_.keys();
+}
+
+
+ColorCache & GuiApplication::colorCache()
+{
+       return d->color_cache_;
 }
 
 
@@ -455,9 +751,44 @@ void GuiApplication::exit(int status)
 
 void GuiApplication::execBatchCommands()
 {
+       // Read menus
+       if (!readUIFile(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);
+
        LyX::ref().execBatchCommands();
 }
 
+QAbstractItemModel * GuiApplication::languageModel()
+{
+       if (d->language_model_)
+               return d->language_model_;
+
+       QStandardItemModel * lang_model = new QStandardItemModel(this);
+       lang_model->insertColumns(0, 1);
+       int current_row;
+       Languages::const_iterator it = languages.begin();
+       Languages::const_iterator end = languages.end();
+       for (; it != end; ++it) {
+               current_row = lang_model->rowCount();
+               lang_model->insertRows(current_row, 1);
+               QModelIndex item = lang_model->index(current_row, 0);
+               lang_model->setData(item, qt_(it->second.display()), Qt::DisplayRole);
+               lang_model->setData(item, toqstr(it->second.lang()), Qt::UserRole);
+       }
+       d->language_model_ = new QSortFilterProxyModel(this);
+       d->language_model_->setSourceModel(lang_model);
+#if QT_VERSION >= 0x040300
+       d->language_model_->setSortLocaleAware(true);
+#endif
+       return d->language_model_;
+}
+
 
 void GuiApplication::restoreGuiSession()
 {
@@ -573,7 +904,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
                case WarningException:
                        Alert::warning(e.title_, e.details_);
                        return false;
-               };
+               }
        }
        catch (exception const & e) {
                docstring s = _("LyX has caught an exception, it will now "
@@ -596,7 +927,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
 
 bool GuiApplication::getRgbColor(ColorCode col, RGBColor & rgbcol)
 {
-       QColor const & qcol = color_cache_.get(col);
+       QColor const & qcol = d->color_cache_.get(col);
        if (!qcol.isValid()) {
                rgbcol.r = 0;
                rgbcol.g = 0;
@@ -612,34 +943,27 @@ bool GuiApplication::getRgbColor(ColorCode col, RGBColor & rgbcol)
 
 string const GuiApplication::hexName(ColorCode col)
 {
-       return ltrim(fromqstr(color_cache_.get(col).name()), "#");
-}
-
-
-void GuiApplication::updateColor(ColorCode)
-{
-       // FIXME: Bleh, can't we just clear them all at once ?
-       color_cache_.clear();
+       return ltrim(fromqstr(d->color_cache_.get(col).name()), "#");
 }
 
 
 void GuiApplication::registerSocketCallback(int fd, SocketCallback func)
 {
        SocketNotifier * sn = new SocketNotifier(this, fd, func);
-       socket_notifiers_[fd] = sn;
+       d->socket_notifiers_[fd] = sn;
        connect(sn, SIGNAL(activated(int)), this, SLOT(socketDataReceived(int)));
 }
 
 
 void GuiApplication::socketDataReceived(int fd)
 {
-       socket_notifiers_[fd]->func_();
+       d->socket_notifiers_[fd]->func_();
 }
 
 
 void GuiApplication::unregisterSocketCallback(int fd)
 {
-       socket_notifiers_.erase(fd);
+       d->socket_notifiers_.take(fd)->setEnabled(false);
 }
 
 
@@ -657,73 +981,54 @@ void GuiApplication::commitData(QSessionManager & sm)
 }
 
 
-void GuiApplication::addMenuTranslator()
-{
-       installTranslator(new MenuTranslator(this));
-}
-
-
-bool GuiApplication::unregisterView(int id)
+void GuiApplication::unregisterView(GuiView * gv)
 {
-       updateIds(views_, view_ids_);
-       BOOST_ASSERT(views_.find(id) != views_.end());
-       BOOST_ASSERT(views_[id]);
-
-       map<int, GuiView *>::iterator it;
-       for (it = views_.begin(); it != views_.end(); ++it) {
-               if (it->first == id) {
-                       views_.erase(id);
-                       break;
-               }
+       LASSERT(d->views_[gv->id()] == gv, /**/);
+       d->views_.remove(gv->id());
+       if (current_view_ == gv) {
+               current_view_ = 0;
+               theLyXFunc().setLyXView(0);
        }
-       updateIds(views_, view_ids_);
-       return true;
 }
 
 
 bool GuiApplication::closeAllViews()
 {
-       updateIds(views_, view_ids_);
-       if (views_.empty())
+       if (d->views_.empty())
                return true;
 
-       map<int, GuiView*> const cmap = views_;
-       map<int, GuiView*>::const_iterator it;
-       for (it = cmap.begin(); it != cmap.end(); ++it) {
-               if (!it->second->close())
+       QList<GuiView *> views = d->views_.values();
+       foreach (GuiView * view, views) {
+               if (!view->close())
                        return false;
        }
 
-       views_.clear();
-       view_ids_.clear();
+       d->views_.clear();
        return true;
 }
 
 
 GuiView & GuiApplication::view(int id) const
 {
-       BOOST_ASSERT(views_.find(id) != views_.end());
-       return *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 = view_ids_.begin();
-       vector<int>::const_iterator const end = 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 = view_ids_.begin();
-       vector<int>::const_iterator const end = 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_;
@@ -743,21 +1048,111 @@ bool GuiApplication::searchMenu(FuncRequest const & func,
 }
 
 
-void GuiApplication::initGlobalMenu()
+bool GuiApplication::readUIFile(string const & name, bool include)
 {
-       if (global_menubar_)
-               menus().fillMenuBar(global_menubar_, 0, true);
+       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 list<string> uifiles;
+       list<string>::const_iterator it  = uifiles.begin();
+       list<string>::const_iterator end = uifiles.end();
+       it = find(it, end, name);
+       if (it != end) {
+               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;
+       if (include) {
+               ui_path = libFileSearch("ui", toqstr(name), "inc");
+               if (ui_path.empty())
+                       ui_path = libFileSearch("ui",
+                                               changeExtension(toqstr(name), "inc"));
+       }
+       else
+               ui_path = libFileSearch("ui", toqstr(name), "ui");
+
+       if (ui_path.empty()) {
+               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."), from_utf8(name)));
+               return false;
+       }
+
+       uifiles.push_back(name);
+
+       LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
+       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);
+
+       while (lex.isOK()) {
+               switch (lex.lex()) {
+               case ui_include: {
+                       lex.next(true);
+                       string const file = lex.getString();
+                       if (!readUIFile(file, true))
+                               return false;
+                       break;
+               }
+               case ui_menuset:
+                       readMenus(lex);
+                       break;
+
+               case ui_toolbarset:
+                       toolbarbackend.readToolbars(lex);
+                       break;
+
+               case ui_toolbars:
+                       toolbarbackend.readToolbarSettings(lex);
+                       break;
+
+               default:
+                       if (!rtrim(lex.getString()).empty())
+                               lex.printError("LyX::ReadUIFile: "
+                                              "Unknown menu tag: `$$Token'");
+                       break;
+               }
+       }
+       return true;
 }
 
 
 void GuiApplication::onLastWindowClosed()
 {
-       if (global_menubar_)
-               global_menubar_->grabKeyboard();
+       if (d->global_menubar_)
+               d->global_menubar_->grabKeyboard();
 }
 
+
 ////////////////////////////////////////////////////////////////////////
+//
 // X11 specific stuff goes here...
+
 #ifdef Q_WS_X11
 bool GuiApplication::x11EventFilter(XEvent * xev)
 {
@@ -773,7 +1168,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
                if (bv) {
                        docstring const sel = bv->requestSelection();
                        if (!sel.empty())
-                               selection_.put(sel);
+                               d->selection_.put(sel);
                }
                break;
        }
@@ -794,6 +1189,13 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
 } // namespace frontend
 
 
+void hideDialogs(std::string const & name, Inset * inset)
+{
+       if (theApp())
+               theApp()->hideDialogs(name, inset);
+}
+
+
 ////////////////////////////////////////////////////////////////////
 //
 // Font stuff
@@ -802,7 +1204,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
 
 frontend::FontLoader & theFontLoader()
 {
-       BOOST_ASSERT(frontend::guiApp);
+       LASSERT(frontend::guiApp, /**/);
        return frontend::guiApp->fontLoader();
 }
 
@@ -815,21 +1217,27 @@ frontend::FontMetrics const & theFontMetrics(Font const & f)
 
 frontend::FontMetrics const & theFontMetrics(FontInfo const & f)
 {
-       BOOST_ASSERT(frontend::guiApp);
+       LASSERT(frontend::guiApp, /**/);
        return frontend::guiApp->fontLoader().metrics(f);
 }
 
 
+////////////////////////////////////////////////////////////////////
+//
+// Misc stuff
+//
+////////////////////////////////////////////////////////////////////
+
 frontend::Clipboard & theClipboard()
 {
-       BOOST_ASSERT(frontend::guiApp);
+       LASSERT(frontend::guiApp, /**/);
        return frontend::guiApp->clipboard();
 }
 
 
 frontend::Selection & theSelection()
 {
-       BOOST_ASSERT(frontend::guiApp);
+       LASSERT(frontend::guiApp, /**/);
        return frontend::guiApp->selection();
 }