X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FDialog.h;h=57e63c1022bd1588f935bfd4b47af6cd88ebe076;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=1bd75673c54af9c076edf8a516b393216793c48f;hpb=ca336815773375d01290686217f381a605d7d205;p=lyx.git

diff --git a/src/frontends/qt4/Dialog.h b/src/frontends/qt4/Dialog.h
index 1bd75673c5..57e63c1022 100644
--- a/src/frontends/qt4/Dialog.h
+++ b/src/frontends/qt4/Dialog.h
@@ -14,6 +14,8 @@
 
 #include "FuncCode.h"
 
+#include "insets/InsetCode.h"
+
 #include "support/strfwd.h"
 
 #include <QString>
@@ -25,6 +27,7 @@ namespace lyx {
 class Buffer;
 class BufferView;
 class FuncRequest;
+class Inset;
 
 namespace frontend {
 
@@ -87,9 +90,11 @@ public:
 	/// \param data is a string encoding of the data to be displayed.
 	/// It is passed to the Controller to be translated into a useable form.
 	virtual void showData(std::string const & data);
-	virtual void updateData(std::string const & data);
 	//@}
 
+	/// \return inset at current cursor location.
+	Inset const * inset(InsetCode code) const;
+
 	/** Check whether we may apply our data.
 	 *
 	 *  The buttons are disabled if not and (re-)enabled if yes.
@@ -116,9 +121,17 @@ public:
 	/// Hide the dialog from sight
 	void hideView();
 
-	/// Create the dialog if necessary, update it and display it.
+	/// Prepare dialog and display it.
 	void showView();
 
+	/// Prepare dialog before view.
+	void prepareView();
+
+	/// Decide wether the dialog should grab thekeyboard focus when shown.
+	/// This method defaults to true, override if a different behaviour
+	/// is wanted.
+	virtual bool wantInitialFocus() const { return true; }
+
 	/// Update the display of the dialog whilst it is still visible.
 	virtual void updateView() = 0;
 
@@ -185,11 +198,6 @@ public:
 	 */
 	virtual bool disconnectOnApply() const { return false; }
 
-	/** \return true if Dialog::View::show() should not display the dialog
-	 *   after running update. Currently, only ControlSpellchecker
-	 *   makes use of that.
-	*/
-	virtual bool exitEarly() const { return false; }
 	//@}
 
 	/** \c Kernel part: a wrapper making the LyX kernel available to the dialog.
@@ -218,7 +226,6 @@ public:
 	 *  stored by the dialog are not applied to the inset currently
 	 *  connected to the dialog. Instead, they will be used to generate
 	 *  a new inset at the cursor position.
-	 *  \param name is used to identify the dialog to the kernel.
 	 */
 	void disconnect() const;
 
@@ -239,13 +246,8 @@ public:
 	 *  We should aim to reduce/remove these from the interface.
 	 */
 	//@{
-	GuiView & lyxview() { return *lyxview_; }
 	GuiView const & lyxview() const { return *lyxview_; }
-
-	Buffer & buffer();
 	Buffer const & buffer() const;
-
-	BufferView * bufferview();
 	BufferView const * bufferview() const;
 	//@}