Change the semantics of 'none' and 'auto' viewers/editors: 'none' means now

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

diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h
index 370b6cb328b4d0896390d748b16a15e25e812db4..429d036e796c9bda8e74cbcdba8b2ef5f34322f3 100644 (file)
--- a/src/frontends/xforms/FormDocument.h
+++ b/src/frontends/xforms/FormDocument.h
@@ -6,26 +6,27 @@
  *
  * \author Jürgen Vigna
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORM_DOCUMENT_H
 #define FORM_DOCUMENT_H
 
-
-#include "FormBase.h"
+#include "FormDialogView.h"
+#include "BranchList.h"
 
 #include <boost/scoped_ptr.hpp>
 
 #include "lyx_forms.h"
 #include <vector>
 
-class ControlDocument;
-
 class BufferParams;
 
-class FormColorpicker;
+namespace lyx {
+namespace frontend {
 
+class ControlDocument;
+class FormColorpicker;
 struct FD_document;
 struct FD_document_paper;
 struct FD_document_class;
@@ -34,22 +35,13 @@ struct FD_document_options;
 struct FD_document_bullet;
 struct FD_document_branch;
 
-namespace {
-
-enum GuiColors {
-       GUI_COLOR_CHOICE   = FL_FREE_COL15
-};
-
-               
-}
-
-
 /** This class provides an XForms implementation of the FormDocument dialog.
  *  The table-layout-form here changes values for latex-tabulars
  */
-class FormDocument : public FormCB<ControlDocument, FormDB<FD_document> > {
+class FormDocument
+       : public FormController<ControlDocument, FormView<FD_document> > {
 public:
-       FormDocument();
+       FormDocument(Dialog &);
 private:
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xforms colours have been re-mapped). */
@@ -104,12 +96,15 @@ private:
        ///
        bool language_apply(BufferParams &);
        ///
-       bool options_apply(BufferParams &);
+       void options_apply(BufferParams &);
        ///
        void bullets_apply(BufferParams &);
        ///
        void branch_apply(BufferParams &);
 
+       void rebuild_all_branches_browser();
+       void rebuild_selected_branches_browser();
+
        /// Real GUI implementation.
        boost::scoped_ptr<FD_document_paper>    paper_;
        ///
@@ -123,7 +118,7 @@ private:
        ///
        boost::scoped_ptr<FD_document_branch>   branch_;
        ///
-       boost::scoped_ptr<FormColorpicker> picker_;     
+       boost::scoped_ptr<FormColorpicker> picker_;
        ///
        int ActCell;
        ///
@@ -135,9 +130,12 @@ private:
        ///
        FL_OBJECT * fbullet;
        ///
-       std::vector<string> lang_;
+       std::vector<std::string> lang_;
        /// Contains all legal branches for this doc
        BranchList branchlist_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif