X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiView.h;h=061060a8c30dba2c7110976352352f1148c04f89;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=82018505054b20e28e747bd3a5056f5cf38fa8e8;hpb=66dc054c6f065b4ddec28a65983c89a367343eb8;p=lyx.git

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 8201850505..061060a8c3 100644
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -62,26 +62,39 @@ 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;
 	BufferView * documentBufferView();
 	BufferView const * documentBufferView() const;
-	void setBuffer(Buffer * b);
-	Buffer * loadDocument(support::FileName const &  name,
-		bool tolastfiles = true);
 	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.
+
+	/// load a document into the current workarea.
+	Buffer * loadDocument(
+		support::FileName const &  name, ///< File to load.
+		bool tolastfiles = true  ///< append to the "Open recent" menu?
+		);
 
 	/// add toolbar, if newline==true, add a toolbar break before the toolbar
 	GuiToolbar * makeToolbar(ToolbarInfo const & tbinfo, bool newline);
@@ -99,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();
@@ -118,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.
 	 */
@@ -147,6 +165,7 @@ public:
 
 Q_SIGNALS:
 	void closing(int);
+	void triggerShowDialog(QString const & qname, QString const & qdata, Inset * inset);
 
 public Q_SLOTS:
 	/// idle timeout.
@@ -169,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);
@@ -229,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.
@@ -324,9 +351,6 @@ private:
 	///
 	void gotoNextOrPreviousBuffer(NextOrPrevious np);
 
-	///
-	Inset * getOpenInset(std::string const & name) const;
-
 	/// Is the dialog currently visible?
 	bool isDialogVisible(std::string const & name) const;
 	///
@@ -337,6 +361,8 @@ private:
 	void reloadBuffer();
 	///
 	void dispatchVC(FuncRequest const & cmd);
+	///
+	void showMessage();
 
 	/// This view ID.
 	int id_;