X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt2%2FQDocumentDialog.h;h=bea8ef735bcc1e1dbf13ea08b3be8732b8a4306f;hb=7b214dd05e55597e49230da58f5525639c088d52;hp=ca7010733bf72fbadeeb9c543ad1cd95255151e6;hpb=bd4302e0687240e331a4336a740fa855ed395a41;p=lyx.git

diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h
index ca7010733b..bea8ef735b 100644
--- a/src/frontends/qt2/QDocumentDialog.h
+++ b/src/frontends/qt2/QDocumentDialog.h
@@ -6,30 +6,31 @@
  *
  * \author Edwin Leuven
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef QDOCUMENTDIALOG_H
 #define QDOCUMENTDIALOG_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "ui/QDocumentDialogBase.h"
-#include "LString.h"
 
-#include "ui/BulletsModuleBase.h"
 #include "BulletsModule.h"
 
-#include "ui/ClassModuleBase.h"
-#include "ui/PackagesModuleBase.h"
-#include "ui/PaperModuleBase.h"
+#include "ui/TextLayoutModuleBase.h"
+#include "ui/MathsModuleBase.h"
+#include "ui/LaTeXModuleBase.h"
+#include "ui/PageLayoutModuleBase.h"
 #include "ui/LanguageModuleBase.h"
 #include "ui/BiblioModuleBase.h"
 #include "ui/NumberingModuleBase.h"
 #include "ui/MarginsModuleBase.h"
 #include "ui/PreambleModuleBase.h"
+#include "ui/BranchesModuleBase.h"
+
+class FloatPlacement;
+
+namespace lyx {
+namespace frontend {
 
 class QDocument;
 
@@ -41,11 +42,15 @@ public:
 	QDocumentDialog(QDocument *);
 	~QDocumentDialog();
 
-	void updateFontsize(string const &, string const &);
-	void updatePagestyle(string const &, string const &);
+	void updateFontsize(std::string const &, std::string const &);
+	void updatePagestyle(std::string const &, std::string const &);
+	void updateBranchView();
+	void toggleBranch(QListViewItem * selItem);
+
+	void showPreamble();
 
 public slots:
-	void setTitle(int);
+	void updateNumbering();
 	void change_adaptor();
 	void saveDefaultClicked();
 	void useDefaultsClicked();
@@ -59,34 +64,33 @@ protected slots:
 	void enableSkip(bool);
 	void portraitChanged();
 	void classChanged();
+	void addBranchPressed();
+	void deleteBranchPressed();
+	void toggleBranchPressed();
+	void branchDoubleClicked(QListViewItem * selItem);
+	void toggleBranchColor();
 
 protected:
 	void closeEvent(QCloseEvent * e);
 
 private:
-	enum Module {
-		LAYOUT,
-		PAPER,
-		MARGINS,
-		LANGUAGE,
-		BULLETS,
-		NUMBERING,
-		BIBLIOGRAPHY,
-		PACKAGES,
-		PREAMBLE
-	};
-
-	ClassModuleBase * layoutModule;
-	PaperModuleBase * paperModule;
+	TextLayoutModuleBase * textLayoutModule;
+	PageLayoutModuleBase * pageLayoutModule;
 	MarginsModuleBase * marginsModule;
 	LanguageModuleBase * langModule;
 	BulletsModule * bulletsModule;
 	NumberingModuleBase * numberingModule;
 	BiblioModuleBase * biblioModule;
-	PackagesModuleBase * packagesModule;
+	MathsModuleBase * mathsModule;
+	LaTeXModuleBase * latexModule;
 	PreambleModuleBase * preambleModule;
+	FloatPlacement * floatModule;
+	BranchesModuleBase * branchesModule;
 
 	QDocument * form_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // DOCUMENTDIALOG_H