X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.h;h=920e95145d102319956b8c1ddc407bae1b3b3c5e;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=11e491b6bbe9d93da9170567c3e5674b6c0a4a67;hpb=a707ac75ac30114124d0f183ac73d89f427f1a7c;p=lyx.git

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 11e491b6bb..920e95145d 100644
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -23,6 +23,7 @@
 #include "ui_DocumentUi.h"
 #include "ui_FontUi.h"
 #include "ui_TextLayoutUi.h"
+#include "ui_MasterChildUi.h"
 #include "ui_MathsUi.h"
 #include "ui_LaTeXUi.h"
 #include "ui_PageLayoutUi.h"
@@ -32,6 +33,9 @@
 #include "ui_MarginsUi.h"
 #include "ui_PreambleUi.h"
 #include "ui_PDFSupportUi.h"
+#include "ui_ModulesUi.h"
+#include "ui_OutputUi.h"
+#include "ui_ListingsSettingsUi.h"
 
 #include <list>
 #include <map>
@@ -40,12 +44,14 @@ namespace lyx {
 
 class BufferParams;
 class FloatPlacement;
+class LayoutModuleList;
 class TextClass;
 
 namespace frontend {
 
 class GuiBranches;
-class GuiSelectionManager;
+class GuiIndices;
+class ModuleSelectionManager;
 class PreambleModule;
 
 ///
@@ -65,41 +71,54 @@ class GuiDocument : public GuiDialog, public Ui::DocumentUi
 public:
 	GuiDocument(GuiView & lv);
 
-	void paramsToDialog(BufferParams const & params);
-	void apply(BufferParams & params);
-
+	void paramsToDialog();
 	void updateFontsize(std::string const &, std::string const &);
+	void updateFontlist();
+	void updateDefaultFormat();
 	void updatePagestyle(std::string const &, std::string const &);
+	bool isChildIncluded(std::string const &);
 
 	void showPreamble();
+	///
+	BufferParams const & params() const { return bp_; }
 
 private Q_SLOTS:
 	void updateNumbering();
 	void change_adaptor();
+	void includeonlyClicked(QTreeWidgetItem * item, int);
 	void setListingsMessage();
 	void saveDefaultClicked();
 	void useDefaultsClicked();
 	void setLSpacing(int);
 	void setMargins(bool);
-	void setCustomPapersize(int);
+	void papersizeChanged(int);
 	void setColSep();
 	void setCustomMargins(bool);
+	void fontencChanged(int);
 	void romanChanged(int);
 	void sansChanged(int);
 	void ttChanged(int);
+	void setIndent(int);
+	void enableIndent(bool);
 	void setSkip(int);
 	void enableSkip(bool);
 	void portraitChanged();
 	void browseLayout();
 	void browseMaster();
 	void classChanged();
+	void bibtexChanged(int);
 	void updateModuleInfo();
-
+	void modulesChanged();
+	void changeBackgroundColor();
+	void deleteBackgroundColor();
+	void xetexChanged(bool);
+	void branchesRename(docstring const &, docstring const &);
 private:
 	/// validate listings parameters and return an error message, if any
 	QString validateListingsParameters();
 
 	UiWidget<Ui::TextLayoutUi> *textLayoutModule;
+	UiWidget<Ui::MasterChildUi> *masterChildModule;
 	UiWidget<Ui::FontUi> *fontModule;
 	UiWidget<Ui::PageLayoutUi> *pageLayoutModule;
 	UiWidget<Ui::MarginsUi> *marginsModule;
@@ -109,14 +128,18 @@ private:
 	UiWidget<Ui::MathsUi> *mathsModule;
 	UiWidget<Ui::LaTeXUi> *latexModule;
 	UiWidget<Ui::PDFSupportUi> *pdfSupportModule;
-	PreambleModule *preambleModule;
+	UiWidget<Ui::ModulesUi> *modulesModule;
+	UiWidget<Ui::OutputUi> *outputModule;
+	UiWidget<Ui::ListingsSettingsUi> *listingsModule;
+	PreambleModule * preambleModule;
 	
-	GuiBranches *branchesModule;
+	GuiBranches * branchesModule;
+	GuiIndices * indicesModule;
 
 	BulletsModule * bulletsModule;
 	FloatPlacement * floatModule;
 
-	GuiSelectionManager * selectionManager;
+	ModuleSelectionManager * selectionManager;
 
 	/// Available modules
 	GuiIdListModel * availableModel() { return &modules_av_model_; }
@@ -131,6 +154,8 @@ private:
 	void updateAvailableModules();
 	///
 	void updateSelectedModules();
+	///
+	void updateIncludeonlys();
 	/// save as default template
 	void saveDocDefault();
 	/// reset to default params
@@ -160,6 +185,8 @@ private:
 	///
 	void dispatchParams();
 	///
+	void modulesToParams(BufferParams &);
+	///
 	bool isBufferDependent() const { return true; }
 	/// always true since we don't manipulate document contents
 	bool canApply() const { return true; }
@@ -168,8 +195,6 @@ private:
 	///
 	BufferParams & params() { return bp_; }
 	///
-	BufferParams const & params() const { return bp_; }
-	///
 	BufferId id() const;
 	///
 	struct modInfoStruct {
@@ -182,6 +207,11 @@ private:
 	/// Modules in use in current buffer
 	std::list<modInfoStruct> const getSelectedModules();
 	///
+	std::list<modInfoStruct> const getProvidedModules();
+	///
+	std::list<modInfoStruct> const 
+			makeModuleInfo(LayoutModuleList const & mods);
+	///
 	void setLanguage() const;
 	///
 	void saveAsDefault() const;
@@ -193,13 +223,23 @@ private:
 	bool providesSC(std::string const & font) const;
 	/// does this font provide size adjustment?
 	bool providesScale(std::string const & font) const;
+	///
+	void executeBranchRenaming() const;
+	///
+	void setCustomPapersize(bool custom);
 private:
 	///
 	void loadModuleInfo();
 	///
+	void updateUnknownBranches();
+	///
 	BufferParams bp_;
 	/// List of names of available modules
 	std::list<modInfoStruct> moduleNames_;
+	///
+	std::map<docstring, docstring> changedBranches_;
+	///
+	std::list<std::string> includeonlys_;
 };