X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormDocument.h;h=429d036e796c9bda8e74cbcdba8b2ef5f34322f3;hb=d5443737342903de489d527802cd2cdd38987d74;hp=f7834a1e9511097e91c8f543aae8dacf67eacb31;hpb=784af7b916d986949397e86eec51c0982321f65c;p=lyx.git

diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h
index f7834a1e95..429d036e79 100644
--- a/src/frontends/xforms/FormDocument.h
+++ b/src/frontends/xforms/FormDocument.h
@@ -6,42 +6,42 @@
  *
  * \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
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBase.h"
+#include "FormDialogView.h"
+#include "BranchList.h"
 
 #include <boost/scoped_ptr.hpp>
 
+#include "lyx_forms.h"
 #include <vector>
 
-class ControlDocument;
-
-class Combox;
 class BufferParams;
 
+namespace lyx {
+namespace frontend {
+
+class ControlDocument;
+class FormColorpicker;
 struct FD_document;
 struct FD_document_paper;
 struct FD_document_class;
 struct FD_document_language;
 struct FD_document_options;
 struct FD_document_bullet;
+struct FD_document_branch;
 
 /** 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 FormCB<ControlDocument, FormDB<FD_document> > {
+class FormDocument
+	: public FormController<ControlDocument, FormView<FD_document> > {
 public:
-	FormDocument();
-	///
-	static void ComboInputCB(int, void *, Combox *);
+	FormDocument(Dialog &);
 private:
 	/** Redraw the form (on receipt of a Signal indicating, for example,
 	    that the xforms colours have been re-mapped). */
@@ -55,6 +55,8 @@ private:
 	/// Apply from dialog
 	virtual void apply();
 
+	///
+	void branch_input(FL_OBJECT *);
 	///
 	void ChoiceBulletSize(FL_OBJECT * ob, long);
 	///
@@ -84,6 +86,8 @@ private:
 	void options_update(BufferParams const &);
 	///
 	void bullets_update(BufferParams const &);
+	///
+	void branch_update(BufferParams const &);
 
 	///
 	void paper_apply(BufferParams &);
@@ -92,9 +96,14 @@ 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_;
@@ -107,6 +116,10 @@ private:
 	///
 	boost::scoped_ptr<FD_document_bullet>   bullets_;
 	///
+	boost::scoped_ptr<FD_document_branch>   branch_;
+	///
+	boost::scoped_ptr<FormColorpicker> picker_;
+	///
 	int ActCell;
 	///
 	int Confirmed;
@@ -117,11 +130,12 @@ private:
 	///
 	FL_OBJECT * fbullet;
 	///
-	boost::scoped_ptr<Combox> combo_language;
-	///
-	boost::scoped_ptr<Combox> combo_doc_class;
-	///
-	std::vector<string> lang_;
+	std::vector<std::string> lang_;
+	/// Contains all legal branches for this doc
+	BranchList branchlist_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif