Fix reloading of local layout file (bug #11120)

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

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 998fcc255b5d785e796c98ceb72ef55047eb6d29..3ca4641ce0178cf4dd04a28662b6d963ca037d5b 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -20,12 +20,12 @@
 #include "support/strfwd.h"
 
 #include <QMainWindow>
+#include <QMenu>
 
 class QCloseEvent;
 class QDragEnterEvent;
 class QDropEvent;
 class QLabel;
-class QMenu;
 class QShowEvent;
 
 
@@ -116,7 +116,7 @@ public:
        /// \return true if the \c FuncRequest has been dispatched.
        void dispatch(FuncRequest const & cmd, DispatchResult & dr);
 
-       void restartCursor();
+       void restartCaret();
        /// Update the completion popup and the inline completion state.
        /// If \c start is true, then a new completion might be started.
        /// If \c keep is true, an active completion will be kept active
@@ -166,6 +166,9 @@ public:
        /// \name GuiBufferDelegate.
        //@{
        void resetAutosaveTimers();
+       // shows an error list (possibly master's)
+       // even if from_master is false, might show master's error list.
+       // this function should only be called if there was an error (#11106).
        void errors(std::string const &, bool from_master = false);
        void structureChanged();
        void updateTocItem(std::string const &, DocIterator const &);
@@ -226,6 +229,8 @@ public Q_SLOTS:
        void clearMessage();
        ///
        void updateWindowTitle(GuiWorkArea * wa);
+       ///
+       void disableShellEscape();
 
 private Q_SLOTS:
        ///
@@ -461,11 +466,16 @@ private:
        /// Request to give focus to minibuffer
        bool minibuffer_focus_;
 
+       /// Statusbar widget that shows shell-escape status
+       QLabel * shell_escape_;
        /// Statusbar widget that shows read-only status
        QLabel * read_only_;
        /// Statusbar widget that shows version control status
        QLabel * version_control_;
 
+       /// The rate from which the actual zoom value is calculated
+       /// from the default zoom pref
+       double zoom_ratio_ = 1.0;
        /// Minimum zoom percentage
        static int const zoom_min_ = 10;
 
@@ -476,6 +486,17 @@ private:
        bool devel_mode_;
 };
 
+
+class SEMenu : public QMenu
+{
+       Q_OBJECT
+public:
+       explicit SEMenu(QWidget * parent);
+
+public Q_SLOTS:
+       void showMenu(QPoint const &) { exec(QCursor::pos()); }
+};
+
 } // namespace frontend
 } // namespace lyx