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

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index af26f40b1b..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"
@@ -34,6 +35,7 @@
 #include "ui_PDFSupportUi.h"
 #include "ui_ModulesUi.h"
 #include "ui_OutputUi.h"
+#include "ui_ListingsSettingsUi.h"
 
 #include <list>
 #include <map>
@@ -74,6 +76,7 @@ public:
 	void updateFontlist();
 	void updateDefaultFormat();
 	void updatePagestyle(std::string const &, std::string const &);
+	bool isChildIncluded(std::string const &);
 
 	void showPreamble();
 	///
@@ -82,17 +85,21 @@ public:
 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();
@@ -111,6 +118,7 @@ private:
 	QString validateListingsParameters();
 
 	UiWidget<Ui::TextLayoutUi> *textLayoutModule;
+	UiWidget<Ui::MasterChildUi> *masterChildModule;
 	UiWidget<Ui::FontUi> *fontModule;
 	UiWidget<Ui::PageLayoutUi> *pageLayoutModule;
 	UiWidget<Ui::MarginsUi> *marginsModule;
@@ -122,6 +130,7 @@ private:
 	UiWidget<Ui::PDFSupportUi> *pdfSupportModule;
 	UiWidget<Ui::ModulesUi> *modulesModule;
 	UiWidget<Ui::OutputUi> *outputModule;
+	UiWidget<Ui::ListingsSettingsUi> *listingsModule;
 	PreambleModule * preambleModule;
 	
 	GuiBranches * branchesModule;
@@ -145,6 +154,8 @@ private:
 	void updateAvailableModules();
 	///
 	void updateSelectedModules();
+	///
+	void updateIncludeonlys();
 	/// save as default template
 	void saveDocDefault();
 	/// reset to default params
@@ -212,6 +223,10 @@ 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();
@@ -221,6 +236,10 @@ private:
 	BufferParams bp_;
 	/// List of names of available modules
 	std::list<modInfoStruct> moduleNames_;
+	///
+	std::map<docstring, docstring> changedBranches_;
+	///
+	std::list<std::string> includeonlys_;
 };