Extend list of accessible menu info

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

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 410abe56c837570cdf0a686ad731ee31a2f63fa8..d4b1701758ae248bae8345d66164d0d7d1250441 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -664,38 +664,48 @@ public:
 };
 
 
-////////////////////////////////////////////////////////////////////////
-//
-// Mac specific stuff goes here...
-//
-////////////////////////////////////////////////////////////////////////
-
-class MenuTranslator : public QTranslator
+class GuiTranslator : public QTranslator
 {
 public:
-       MenuTranslator(QObject * parent)
+       GuiTranslator(QObject * parent = nullptr)
                : QTranslator(parent)
        {}
 
-#if QT_VERSION >= 0x050000
        virtual QString translate(const char * /* context */,
                const char *sourceText,
+#if QT_VERSION >= 0x050000
                const char * /* disambiguation */ = 0, int /* n */ = -1) const
 #else
-       QString translate(const char * /*context*/,
-         const char * sourceText,
-         const char * /*comment*/ = 0) const
+               const char * /*comment*/ = 0) const
 #endif
        {
-               string const s = sourceText;
-               if (s == N_("About %1") || s == N_("Preferences")
-                               || s == N_("Reconfigure") || s == N_("Quit %1"))
-                       return qt_(s);
-               else
-                       return QString();
+               // Here we declare the strings that need to be translated from Qt own GUI
+               // This is needed to include these strings to po files
+               _("About %1");
+               _("Preferences");
+               _("Reconfigure");
+               _("Quit %1");
+               _("&OK");
+               // Already in po: "Cancel", "&Cancel"
+               _("Apply"); // Already in po: "&Apply"
+               _("Reset"); // Already in po: "&Reset" "R&eset" "Rese&t"
+
+               docstring s = getGuiMessages().getIfFound(sourceText);
+               // This test should eventually be removed when translations are updated
+               if (s.empty())
+                       LYXERR(Debug::LOCALE, "Missing translation for `"
+                              << string(sourceText) << "'");
+               return toqstr(s);
        }
 };
 
+
+////////////////////////////////////////////////////////////////////////
+//
+// Mac specific stuff goes here...
+//
+////////////////////////////////////////////////////////////////////////
+
 #ifdef Q_OS_MAC
 // QMacPasteboardMimeGraphics can only be compiled on Mac.
 
@@ -944,8 +954,10 @@ struct GuiApplication::Private
        FontLoader font_loader_;
        ///
        ColorCache color_cache_;
-       ///
+       /// the built-in Qt translation mechanism
        QTranslator qt_trans_;
+       /// LyX gettext-based translation for Qt elements
+       GuiTranslator gui_trans_;
        ///
        QHash<int, SocketNotifier *> socket_notifiers_;
        ///
@@ -1025,7 +1037,9 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 
        qsrand(QDateTime::currentDateTime().toTime_t());
 
-       // Install translator for GUI elements.
+       // Install LyX translator for missing Qt translations
+       installTranslator(&d->gui_trans_);
+       // Install Qt native translator for GUI elements.
        installTranslator(&d->qt_trans_);
 
 #ifdef QPA_XCB
@@ -1044,10 +1058,6 @@ 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));
        ///
        setupApplescript();
 #endif
@@ -1401,15 +1411,17 @@ DispatchResult const & GuiApplication::dispatch(FuncRequest const & cmd)
                current_view_->currentBufferView()->cursor().saveBeforeDispatchPosXY();
                buffer = &current_view_->currentBufferView()->buffer();
        }
-       // This handles undo groups automagically
-       UndoGroupHelper ugh(buffer);
+
+       dr.screenUpdate(Update::FitCursor);
+       {
+               // This handles undo groups automagically
+               UndoGroupHelper ugh(buffer);
+               dispatch(cmd, dr);
+       }
 
        // redraw the screen at the end (first of the two drawing steps).
        // This is done unless explicitly requested otherwise
-       dr.screenUpdate(Update::FitCursor);
-       dispatch(cmd, dr);
        updateCurrentView(cmd, dr);
-
        d->dispatch_result_ = dr;
        return d->dispatch_result_;
 }
@@ -1790,6 +1802,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                //   UI, then, nothing would happen. This seems fairly unlikely, but
                //   it definitely is a bug.
 
+               dr.forceBufferUpdate();
                break;
        }
 
@@ -1854,8 +1867,11 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        dr.setMessage(bformat(_("Cannot iterate more than %1$d times"), max_iter));
                        dr.setError(true);
                } else {
-                       for (int i = 0; i < count; ++i)
-                               dispatch(lyxaction.lookupFunc(rest));
+                       for (int i = 0; i < count; ++i) {
+                               FuncRequest lfun = lyxaction.lookupFunc(rest);
+                               lfun.allowAsync(false);
+                               dispatch(lfun);
+                       }
                }
                break;
        }
@@ -1872,6 +1888,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        string first;
                        arg = split(arg, first, ';');
                        FuncRequest func(lyxaction.lookupFunc(first));
+                       func.allowAsync(false);
                        func.setOrigin(cmd.origin());
                        dispatch(func);
                }
@@ -1879,7 +1896,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
        }
 
        case LFUN_BUFFER_FORALL: {
-               FuncRequest const funcToRun = lyxaction.lookupFunc(cmd.getLongArg(0));
+               FuncRequest funcToRun = lyxaction.lookupFunc(cmd.getLongArg(0));
+               funcToRun.allowAsync(false);
 
                map<Buffer *, GuiView *> views_lVisible;
                map<GuiView *, Buffer *> activeBuffers;
@@ -2917,7 +2935,16 @@ Buffer const * GuiApplication::updateInset(Inset const * inset) const
 bool GuiApplication::searchMenu(FuncRequest const & func,
        docstring_list & names) const
 {
-       return d->menus_.searchMenu(func, names);
+       BufferView * bv = 0;
+       if (current_view_)
+               bv = current_view_->currentBufferView();
+       return d->menus_.searchMenu(func, names, bv);
+}
+
+
+bool GuiApplication::hasBufferView() const
+{
+       return (current_view_ && current_view_->currentBufferView());
 }