remove defaults stuff, let Qt handle no toolbar

[lyx.git] / src / frontends / xforms / FormDocument.h

diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h
index de97f08934ddf8ba147924eac7dffb4b111f7959..41d5686e2435145f1aa2b37181e4582279c14d2c 100644 (file)
--- a/src/frontends/xforms/FormDocument.h
+++ b/src/frontends/xforms/FormDocument.h
@@ -1,112 +1,68 @@
 // -*- C++ -*-
 /**
  * \file FormDocument.h
- * Copyright 2000-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Vigna, jug@sad.it
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef FORM_DOCUMENT_H
 #define FORM_DOCUMENT_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-#include "FormBaseDeprecated.h"
+#include "FormBase.h"
 
 #include <boost/scoped_ptr.hpp>
 
 #include <vector>
 
-class Combox;
+class ControlDocument;
+
 class BufferParams;
 
-struct FD_form_tabbed_document;
-struct FD_form_doc_paper;
-struct FD_form_doc_class;
-struct FD_form_doc_language;
-struct FD_form_doc_options;
-struct FD_form_doc_bullet;
+struct FD_document;
+struct FD_document_paper;
+struct FD_document_class;
+struct FD_document_language;
+struct FD_document_options;
+struct FD_document_bullet;
 
 /** This class provides an XForms implementation of the FormDocument dialog.
-    The table-layout-form here changes values for latex-tabulars
+ *  The table-layout-form here changes values for latex-tabulars
  */
-class FormDocument : public FormBaseBD {
+class FormDocument : public FormCB<ControlDocument, FormDB<FD_document> > {
 public:
-       FormDocument(LyXView *, Dialogs *);
-       ///
-       static void ComboInputCB(int, void *, Combox *);
+       FormDocument();
 private:
-       ///
-       enum State {
-               ///
-               INPUT,
-               ///
-               CHECKCHOICECLASS,
-               ///
-               CHOICEBULLETSIZE,
-               ///
-               INPUTBULLETLATEX,
-               ///
-               BULLETDEPTH1,
-               ///
-               BULLETDEPTH2,
-               ///
-               BULLETDEPTH3,
-               ///
-               BULLETDEPTH4,
-               ///
-               BULLETPANEL1,
-               ///
-               BULLETPANEL2,
-               ///
-               BULLETPANEL3,
-               ///
-               BULLETPANEL4,
-               ///
-               BULLETPANEL5,
-               ///
-               BULLETPANEL6,
-               ///
-               BULLETBMTABLE
-       };
-       /// 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 dialog
        virtual void build();
        /// Filter the inputs
-       virtual bool input( FL_OBJECT *, long);
+       virtual ButtonPolicy::SMInput input( FL_OBJECT *, long);
        /// Update the dialog.
        virtual void update();
        /// Apply from dialog
        virtual void apply();
-       /// Cancel from dialog
-       virtual void cancel();
-
-       ///
-       virtual FL_FORM * form() const;
 
-       ///
-       bool CheckDocumentInput(FL_OBJECT * ob, long);
        ///
        void ChoiceBulletSize(FL_OBJECT * ob, long);
        ///
        void InputBulletLaTeX(FL_OBJECT * ob, long);
        ///
-       void BulletDepth(FL_OBJECT * ob, State);
+       void BulletDepth(FL_OBJECT * ob);
        ///
-       void BulletPanel(FL_OBJECT * ob, State);
+       void BulletPanel(FL_OBJECT * ob);
        ///
        void BulletBMTable(FL_OBJECT * ob, long);
        ///
        void checkReadOnly();
        ///
-       void CheckChoiceClass(FL_OBJECT * ob, long);
+       void CheckChoiceClass();
        ///
        void UpdateLayoutDocument(BufferParams const & params);
        ///
@@ -134,42 +90,16 @@ private:
        ///
        void bullets_apply(BufferParams &);
 
-       ///
-       void paper_apply();
-       ///
-       bool class_apply();
-       ///
-       bool language_apply();
-       ///
-       bool options_apply();
-       ///
-       void bullets_apply();
-
-       /// Fdesign generated methods
-       FD_form_tabbed_document * build_tabbed_document();
-       ///
-       FD_form_doc_paper * build_doc_paper();
-       ///
-       FD_form_doc_class * build_doc_class();
-       ///
-       FD_form_doc_language * build_doc_language();
-       ///
-       FD_form_doc_options * build_doc_options();
-       ///
-       FD_form_doc_bullet * build_doc_bullet();
-
        /// Real GUI implementation.
-       boost::scoped_ptr<FD_form_tabbed_document> dialog_;
-       ///
-       boost::scoped_ptr<FD_form_doc_paper>       paper_;
+       boost::scoped_ptr<FD_document_paper>    paper_;
        ///
-       boost::scoped_ptr<FD_form_doc_class>       class_;
+       boost::scoped_ptr<FD_document_class>    class_;
        ///
-       boost::scoped_ptr<FD_form_doc_language>    language_;
+       boost::scoped_ptr<FD_document_language> language_;
        ///
-       boost::scoped_ptr<FD_form_doc_options>     options_;
+       boost::scoped_ptr<FD_document_options>  options_;
        ///
-       boost::scoped_ptr<FD_form_doc_bullet>      bullets_;
+       boost::scoped_ptr<FD_document_bullet>   bullets_;
        ///
        int ActCell;
        ///
@@ -181,20 +111,7 @@ private:
        ///
        FL_OBJECT * fbullet;
        ///
-       boost::scoped_ptr<Combox> combo_language;
-       ///
-       boost::scoped_ptr<Combox> combo_doc_class;
-       /// The ButtonController
-       ButtonController<NoRepeatedApplyReadOnlyPolicy, xformsBC> bc_;
-       ///
        std::vector<string> lang_;
 };
 
-
-inline
-xformsBC & FormDocument::bc()
-{
-       return bc_;
-}
-
 #endif