fix completion painting for RTL (inline completion and completion list)

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

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 8ef56090ad73d93487ccc938b0368a7d2530ecac..732d25ff67290cd0abe38ca010355677b1b03033 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -22,7 +22,7 @@
 #include "GuiView.h"
 #include "Menus.h"
 #include "qt_helpers.h"
-#include "ToolbarBackend.h"
+#include "Toolbars.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -186,7 +186,7 @@ public:
        QString flavorFor(QString const & mime)
        {
                LYXERR(Debug::ACTION, "flavorFor " << mime);
-               if (mime == QLatin1String(pdfMimeType()))
+               if (mime == pdfMimeType())
                        return QLatin1String("com.adobe.pdf");
                return QString();
        }
@@ -195,12 +195,14 @@ public:
        {
                LYXERR(Debug::ACTION, "mimeFor " << flav);
                if (flav == QLatin1String("com.adobe.pdf"))
-                       return QLatin1String(pdfMimeType());
+                       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)
        {
@@ -356,6 +358,10 @@ struct GuiApplication::Private
        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.
@@ -511,7 +517,7 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
        }
 
        if (!enable)
-               flag.enabled(false);
+               flag.setEnabled(false);
 
        return true;
 }
@@ -706,6 +712,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_;
@@ -847,17 +865,8 @@ bool GuiApplication::event(QEvent * e)
        case QEvent::FileOpen: {
                // Open a file; this happens only on Mac OS X for now
                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())));
-
+               lyx::dispatch(FuncRequest(LFUN_FILE_OPEN,
+                       qstring_to_ucs4(foe->file())));
                e->accept();
                return true;
        }
@@ -1107,11 +1116,11 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
                        break;
 
                case ui_toolbarset:
-                       toolbarbackend.readToolbars(lex);
+                       d->toolbars_.readToolbars(lex);
                        break;
 
                case ui_toolbars:
-                       toolbarbackend.readToolbarSettings(lex);
+                       d->toolbars_.readToolbarSettings(lex);
                        break;
 
                default: