* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index ae85894e5f0b416fea138e062809703080e4afa6..061060a8c30dba2c7110976352352f1148c04f89 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -62,9 +62,9 @@ public:
 
        ~GuiView();
 
-       /// LyXView inherited methods.
-       ///@{
-       int id() const { return id_; };
+       /// \name LyXView inherited methods.
+       //@{
+       int id() const { return id_; }
        void setBusy(bool);
        BufferView * currentBufferView();
        BufferView const * currentBufferView() const;
@@ -72,14 +72,21 @@ public:
        BufferView const * documentBufferView() const;
        void newDocument(std::string const & filename,
                bool fromTemplate);
+
+       /// could be called from any thread
        void message(docstring const &);
+       /// must be called from GUI thread
+       void updateMessage(QString const & str);
+
        bool getStatus(FuncRequest const & cmd, FuncStatus & flag);
-       bool dispatch(FuncRequest const & cmd);
+       void dispatch(FuncRequest const & cmd, DispatchResult & dr);
        void restartCursor();
        void updateCompletion(Cursor & cur, bool start, bool keep);
        void setFocus();
-       ///@}
+       //@}
 
+       ///
+       void focusInEvent(QFocusEvent * e);
        /// set a buffer to the current workarea.
        void setBuffer(Buffer * b); ///< \c Buffer to set.
 
@@ -105,18 +112,20 @@ public:
        bool hideWorkArea(GuiWorkArea * wa);
        /// closes the workarea
        bool closeWorkArea(GuiWorkArea * wa);
+       /// closes the buffer
+       bool closeBuffer(Buffer & buf);
        ///
        void openDocument(std::string const & filename);
        ///
        void importDocument(std::string const &);
 
-       /// GuiBufferDelegate.
-       ///@{
+       /// \name GuiBufferDelegate.
+       //@{
        void resetAutosaveTimers();
        void errors(std::string const &, bool from_master = false);
        void structureChanged();
        void updateTocItem(std::string const &, DocIterator const &);
-       ///@}
+       //@}
 
        ///
        TocModels & tocModels();
@@ -124,6 +133,9 @@ public:
        /// called on timeout
        void autoSave();
 
+       /// check for external change of any opened buffer, mainly for svn usage
+       void checkExternallyModifiedBuffers();
+
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
         */
@@ -153,6 +165,7 @@ public:
 
 Q_SIGNALS:
        void closing(int);
+       void triggerShowDialog(QString const & qname, QString const & qdata, Inset * inset);
 
 public Q_SLOTS:
        /// idle timeout.
@@ -175,6 +188,13 @@ private Q_SLOTS:
        void normalSizedIcons();
        void bigSizedIcons();
 
+       /// For completion of autosave or exporrt threads.
+       void threadFinished();
+
+       /// must be called in GUI thread
+       void doShowDialog(QString const & qname, QString const & qdata,
+       Inset * inset);
+
 private:
        /// Open given child document in current buffer directory.
        void openChildDocument(std::string const & filename);
@@ -235,7 +255,8 @@ public:
         */
        void updateDialogs();
 
-       /** \param name == "bibtex", "citation" etc; an identifier used to
+       /** Show dialog could be called from arbitrary threads.
+           \param name == "bibtex", "citation" etc; an identifier used to
            launch a particular dialog.
            \param data is a string representation of the Inset contents.
            It is often little more than the output from Inset::write.