Yet more dialog tweaking from Rob.

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

diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h
index a27d9f659cff84cfc232fedb190738fa7813c285..db3fd67dd531a8b2eb692cc654608f7c50ede16f 100644 (file)
--- a/src/frontends/xforms/FormDocument.h
+++ b/src/frontends/xforms/FormDocument.h
@@ -1,80 +1,46 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 2000-2001 The LyX Team.
+/**
+ * \file FormDocument.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_DOCUMENT_H
 #define FORM_DOCUMENT_H
 
-#include <vector>
-#include <boost/smart_ptr.hpp>
-
-#ifdef __GNUG_
+#ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormBaseDeprecated.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <vector>
+
 class Combox;
 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
-    @author Jürgen Vigna
  */
 class FormDocument : public FormBaseBD {
 public:
-       FormDocument(LyXView *, Dialogs *);
+       FormDocument(LyXView &, Dialogs &);
        ///
        static void ComboInputCB(int, void *, Combox *);
 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,
@@ -83,7 +49,7 @@ private:
        /// Build the dialog
        virtual void build();
        /// Filter the inputs
-       virtual bool input( FL_OBJECT *, long );
+       virtual bool input( FL_OBJECT *, long);
        /// Update the dialog.
        virtual void update();
        /// Apply from dialog
@@ -101,9 +67,9 @@ private:
        ///
        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);
        ///
@@ -112,6 +78,8 @@ private:
        void CheckChoiceClass(FL_OBJECT * ob, long);
        ///
        void UpdateLayoutDocument(BufferParams const & params);
+       ///
+       void UpdateClassParams(BufferParams const & params);
 
        ///
        void paper_update(BufferParams const &);
@@ -146,31 +114,18 @@ private:
        ///
        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_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;
        ///
@@ -187,6 +142,8 @@ private:
        boost::scoped_ptr<Combox> combo_doc_class;
        /// The ButtonController
        ButtonController<NoRepeatedApplyReadOnlyPolicy, xformsBC> bc_;
+       ///
+       std::vector<string> lang_;
 };