Use the command-alternatives sequence as defined in menus.bind

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

diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index c6258eaeb692c60004950061733d9433f133fc4f..fafdd46eea25478b49b6fd8f598e9e3c7db0f601 100644 (file)
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -25,6 +25,7 @@
 class QAbstractItemModel;
 class QIcon;
 class QSessionManager;
+class QFont;
 
 namespace lyx {
 
@@ -62,7 +63,7 @@ public:
 
        /// \name Methods inherited from Application class
        //@{
-       void dispatch(FuncRequest const &);
+       DispatchResult const & dispatch(FuncRequest const &);
        void dispatch(FuncRequest const &, DispatchResult & dr);
        FuncStatus getStatus(FuncRequest const & cmd) const;
        void restoreGuiSession();
@@ -76,6 +77,7 @@ public:
        void unregisterSocketCallback(int fd);
        bool searchMenu(FuncRequest const & func, docstring_list & names) const;
        void handleKeyFunc(FuncCode action);
+       bool unhide(Buffer * buf); //override
        //@}
 
        ///
@@ -108,7 +110,8 @@ public:
 #ifdef Q_WS_X11
        bool x11EventFilter(XEvent * ev);
 #elif defined(QPA_XCB)
-       virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result);
+       virtual bool nativeEventFilter(const QByteArray & eventType, void * message,
+                                      long * result) Q_DECL_OVERRIDE;
 #endif
        //@}
 
@@ -144,6 +147,8 @@ public:
 
        /// return a suitable monospaced font name.
        QString const typewriterFontName();
+       QFont const typewriterSystemFont();
+
        ///
        void unregisterView(GuiView * gv);
        ///
@@ -161,6 +166,9 @@ public:
 #endif
        }
 
+       /// return true if the key is part of a shortcut
+       bool queryKeySym(KeySymbol const & key, KeyModifier state) const;
+       ///
        void processKeySym(KeySymbol const & key, KeyModifier state);
        /// return the status bar state string
        docstring viewStatusMessage();
@@ -247,7 +255,12 @@ extern GuiApplication * guiApp;
 QString iconName(FuncRequest const & f, bool unknown);
 
 /// \return the pixmap for the given path, name and extension.
+/// in case of errors a warning is produced and an empty pixmap is returned.
 QPixmap getPixmap(QString const & path, QString const & name, QString const & ext);
+/// Load the file at \param path and convert it to a pixmap.
+/// \return true on success otherwise invalidate the pixmap and return false.
+/// The caller is responsible for error reporting.
+bool getPixmap(QPixmap & pixmap, QString const & path);
 
 /// \return an icon for the given action.
 QIcon getIcon(FuncRequest const & f, bool unknown);