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

diff --git a/src/frontends/qt4/Dialog.h b/src/frontends/qt4/Dialog.h
index 987211d91f..57e63c1022 100644
--- a/src/frontends/qt4/Dialog.h
+++ b/src/frontends/qt4/Dialog.h
@@ -12,11 +12,14 @@
 #ifndef DIALOG_H
 #define DIALOG_H
 
-#include "lfuns.h"
+#include "FuncCode.h"
 
-#include <string>
+#include "insets/InsetCode.h"
+
+#include "support/strfwd.h"
+
+#include <QString>
 
-class QString;
 class QWidget;
 
 namespace lyx {
@@ -24,6 +27,7 @@ namespace lyx {
 class Buffer;
 class BufferView;
 class FuncRequest;
+class Inset;
 
 namespace frontend {
 
@@ -50,7 +54,8 @@ public:
 	/// \param lv is the access point for the dialog to the LyX kernel.
 	/// \param name is the identifier given to the dialog by its parent
 	/// container.
-	Dialog(GuiView & lv, std::string const & name);
+	/// \param title is the window title used for decoration.
+	Dialog(GuiView & lv, QString const & name, QString const & title);
 
 	virtual ~Dialog();
 
@@ -85,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.
@@ -114,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;
 
@@ -129,10 +144,7 @@ public:
 	//@}
 
 	/// Dialog identifier.
-	/// FIXME for Andre': Now that Dialog is entirely within qt4/
-	/// We can use QString instead in order to avoid <string> inclusion
-	/// or we can pimpl name_.
-	std::string const & name() const;
+	QString name() const { return name_; }
 
 	//@{
 	/** Enable the controller to initialise its data structures.
@@ -166,7 +178,7 @@ public:
 	 * It should be used in dispatchParams(), too for consistency reasons.
 	 *  \returns the lfun that is sent for applying the data.
 	 */
-	virtual kb_action getLfun() const { return LFUN_INSET_APPLY; }
+	virtual FuncCode getLfun() const { return LFUN_INSET_APPLY; }
 
 	/** Check whether we may apply our data.
 	 *
@@ -186,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.
@@ -219,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;
 
@@ -229,7 +235,7 @@ public:
 	//@{
 	bool isBufferAvailable() const;
 	bool isBufferReadonly() const;
-	std::string const bufferFilepath() const;
+	QString bufferFilepath() const;
 	//@}
 
 	/// The type of the current buffer.
@@ -240,24 +246,24 @@ 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;
 	//@}
 
 protected:
+	///
+	void setTitle(QString const & title) { title_ = title; }
+	///
 	virtual void apply();
 
 private:
 	/** The Dialog's name is the means by which a dialog identifies
 	 *  itself to the LyXView.
 	 */
-	std::string const name_;
+	QString const name_;
+	///
+	QString title_;
 	///
 	GuiView * lyxview_;