X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormParagraph.h;h=d55ae062aec0ef6bd94500fa5945c46516e1428e;hb=d5443737342903de489d527802cd2cdd38987d74;hp=4970ca4b91caeacd32c2ec17d9599ea654e79e74;hpb=1a32c26a5ee4af362e249418dc6d441b7ab5d695;p=lyx.git

diff --git a/src/frontends/xforms/FormParagraph.h b/src/frontends/xforms/FormParagraph.h
index 4970ca4b91..d55ae062ae 100644
--- a/src/frontends/xforms/FormParagraph.h
+++ b/src/frontends/xforms/FormParagraph.h
@@ -1,94 +1,49 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright (C) 2000 The LyX Team.
+/**
+ * \file FormParagraph.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           @author Jürgen Vigna
+ * \author Jürgen Vigna
  *
- *======================================================*/
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef FORM_PARAGRAPH_H
 #define FORM_PARAGRAPH_H
 
-#include <boost/smart_ptr.hpp>
-#include "FormBaseDeprecated.h"
-#include "xformsBC.h"
-#if 1
-#include "lyxparagraph.h"
-#endif
+#include "FormDialogView.h"
+#include "RadioButtonGroup.h"
 
-#ifdef __GNUG_
-#pragma interface
-#endif
+namespace lyx {
+namespace frontend {
 
-struct FD_form_tabbed_paragraph;
-struct FD_form_paragraph_general;
-struct FD_form_paragraph_extra;
+class ControlParagraph;
+struct FD_paragraph;
 
-/** This class provides an XForms implementation of the FormParagraph Popup.
- *           @author Jürgen Vigna
+/** This class provides an XForms implementation of the FormParagraph dialog.
  */
-class FormParagraph : public FormBaseBD {
+class FormParagraph
+	: public FormController<ControlParagraph, FormView<FD_paragraph> > {
 public:
 	///
-	FormParagraph(LyXView *, Dialogs *);
+	FormParagraph(Dialog &);
 private:
-	/// Pointer to the actual instantiation of the ButtonController.
-	virtual xformsBC & bc();
-	/** Redraw the form (on receipt of a Signal indicating, for example,
-	    that the xforms colours have been re-mapped). */
-	virtual void redraw();
-	/// Build the popup
+	/// Build the dialog
 	virtual void build();
-	/// Apply from popup
+	/// Apply from dialog
 	virtual void apply();
-	/// Update the popup.
+	/// Update the dialog
 	virtual void update();
+
 	/// Filter the inputs on callback from xforms
-	virtual bool input(FL_OBJECT * ob, long);
+	virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-	///
-	virtual FL_FORM * form() const;
-	
-	///
-	void general_update();
-#ifndef NO_PEXTRA
-	///
-	void extra_update();
-#endif
-	///
-	void general_apply();
-#ifndef NO_PEXTRA
-	///
-	void extra_apply();
-#endif
-	/// Typedefinitions from the fdesign produced Header file
-	FD_form_tabbed_paragraph * build_tabbed_paragraph();
-	///
-	FD_form_paragraph_general * build_paragraph_general();
-//#ifndef NO_PEXTRA
-	///
-	FD_form_paragraph_extra * build_paragraph_extra();
-//#endif
-	/// Real GUI implementation.
-	boost::scoped_ptr<FD_form_tabbed_paragraph> dialog_;
-	///
-	boost::scoped_ptr<FD_form_paragraph_general> general_;
-#ifndef NO_PEXTRA
-	///
-	boost::scoped_ptr<FD_form_paragraph_extra> extra_;
-#endif
-	/// The ButtonController
-	ButtonController<NoRepeatedApplyReadOnlyPolicy, xformsBC> bc_;
+	/// alignment radio buttons
+	RadioButtonGroup alignment_;
 };
 
+} // namespace frontend
+} // namespace lyx
 
-inline
-xformsBC & FormParagraph::bc()
-{
-	return bc_;
-}
 #endif