X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDialog.h;h=2359d740122f260fad455380a79d27bb112613a4;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=dbc32e1a27ef80b3da1dd291cabbcda81a63103a;hpb=c9ea6e6eef090b863fb54445010f24443b15eb23;p=lyx.git

diff --git a/src/frontends/qt4/GuiDialog.h b/src/frontends/qt4/GuiDialog.h
index dbc32e1a27..2359d74012 100644
--- a/src/frontends/qt4/GuiDialog.h
+++ b/src/frontends/qt4/GuiDialog.h
@@ -16,14 +16,17 @@
 #include "ButtonController.h"
 
 #include <QDialog>
-#include <QObject>
+
 
 namespace lyx {
 namespace frontend {
 
-/** \c Dialog collects the different parts of a Model-Controller-View
- *  split of a generic dialog together.
- */
+/// Base class for historical LyX dialogs.
+/** 
+  * \warning New dialogs should use the leaner classes \c DialogView or
+  * \c DockView depending on the intent. Eventally, old dialog should be
+  * converted to \c DialogView too.
+  */
 class GuiDialog : public QDialog, public Dialog
 {
 	Q_OBJECT
@@ -32,38 +35,35 @@ 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.
-	GuiDialog(LyXView & lv, std::string const & name);
-	//GuiDialog(GuiDialog &, docstring const &);
+	/// \param title is the window title used for decoration.
+	GuiDialog(GuiView & lv, QString const & name, QString const & title);
+
+	virtual QWidget * asQWidget() { return this; }
+	virtual QWidget const * asQWidget() const { return this; }
 
 public Q_SLOTS:
-	// dialog closed from WM
-	void slotWMHide();
+	/** \name Buttons
+	 *  These methods are publicly accessible because they are invoked
+	 *  by the View when the user presses... guess what ;-)
+	 */
 	// Restore button clicked
 	void slotRestore();
 	// OK button clicked
 	void slotOK();
 	// Apply button clicked
 	void slotApply();
-	// Close button clicked
+	// AutoApply checkbox clicked
+	void slotAutoApply();
+	// Close button clicked or closed from WindowManager
 	void slotClose();
+	///
+	void closeEvent(QCloseEvent * e);
 
 public:
-	/** \name Buttons
-	 *  These methods are publicly accessible because they are invoked
-	 *  by the View when the user presses... guess what ;-)
-	 */
-	//@{
-	void ApplyButton();
-	void OKButton();
-	void CancelButton();
-	void RestoreButton();
-	//@}
-
 	/** Check whether we may apply our data.
 	 *
 	 *  The buttons are disabled if not and (re-)enabled if yes.
 	 */
-	void checkStatus();
 	void setButtonsValid(bool valid);
 
 	/** \name Dialog Components
@@ -74,41 +74,39 @@ public:
 	ButtonController & bc() { return bc_; }
 	//@}
 
-	void preShow();
-	void postShow();
-	void preUpdate();
-	void postUpdate();
-
-	///
-	bool readOnly() const;
-
 	/// the dialog has changed contents
 	virtual void changed();
 
+	virtual void enableView(bool enable);
+
 	/// default: do nothing
 	virtual void applyView() {}
 	/// default: do nothing
-	virtual void update_contents() {}
+	virtual void updateContents() {}
 
-protected:
-	/// Hide the dialog.
-	virtual void hideView();
-	/// Create the dialog if necessary, update it and display it.
-	virtual void showView();
-	///
-	virtual bool isVisibleView() const;
+public:
 	/// is the dialog currently valid ?
-	virtual bool isValid();
+	virtual bool isValid() { return true; }
 
-private:
-	/// update the dialog
+public:
+
+	/** When applying, it's useful to know whether the dialog is about
+	 *  to close or not (no point refreshing the display for example).
+	 */
+	bool isClosing() const { return is_closing_; }
+
+	/// Update the display of the dialog whilst it is still visible.
 	virtual void updateView();
 
+private:
 	ButtonController bc_;
 	/// are we updating ?
 	bool updating_;
+
+	bool is_closing_;
 };
 
+
 } // namespace frontend
 } // namespace lyx