Amend f441590c

[lyx.git] / src / frontends / qt4 / GuiDocument.h

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 4c8d1cf8578ebe6af35267386af5f8ca2440884a..5bf1340fc935fc049b7af43c225ae59413b98bbc 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -13,8 +13,6 @@
 #ifndef GUIDOCUMENT_H
 #define GUIDOCUMENT_H
 
-#include <QDialog>
-
 #include "BufferParams.h"
 #include "BulletsModule.h"
 #include "GuiDialog.h"
@@ -53,6 +51,7 @@ class GuiIndices;
 class ModuleSelectionManager;
 class PreambleModule;
 class LocalLayout;
+class FontModule;
 
 ///
 typedef void const * BufferId;
@@ -107,6 +106,7 @@ private Q_SLOTS:
        void browseLayout();
        void browseMaster();
        void classChanged();
+       void classChanged_adaptor();
        void languagePackageChanged(int);
        void biblioChanged();
        void bibtexChanged(int);
@@ -126,13 +126,16 @@ private Q_SLOTS:
        void osFontsChanged(bool);
        void mathFontChanged(int);
        void branchesRename(docstring const &, docstring const &);
+       void allPackagesAuto();
+       void allPackagesAlways();
+       void allPackagesNot();
 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;
+       FontModule *fontModule;
        UiWidget<Ui::PageLayoutUi> *pageLayoutModule;
        UiWidget<Ui::MarginsUi> *marginsModule;
        UiWidget<Ui::LanguageUi> *langModule;
@@ -182,8 +185,6 @@ private:
        GuiIdListModel modules_av_model_;
        /// selected modules
        GuiIdListModel modules_sel_model_;
-       /// current buffer
-       BufferId current_id_;
 
        /// return false if validate_listings_params returns error
        bool isValid();
@@ -263,6 +264,8 @@ private:
        ///
        bool noMathFont() const;
        ///
+       void allPackages(int);
+       ///
        BufferParams bp_;
        /// List of names of available modules
        std::list<modInfoStruct> moduleNames_;
@@ -272,6 +275,8 @@ private:
        std::list<std::string> includeonlys_;
        ///
        bool biblioChanged_;
+       /// Track if a non-module document param changed
+       bool nonModuleChanged_;
 };
 
 
@@ -325,6 +330,25 @@ private:
 };
 
 
+class FontModule : public UiWidget<Ui::FontUi>
+{
+       Q_OBJECT
+public:
+       /// The roman font currently not selected by osFontsCB->isChecked()
+       QString font_roman;
+       /// The sans font currently not selected by osFontsCB->isChecked()
+       QString font_sans;
+       /// The typewriter font currently not selected by osFontsCB->isChecked()
+       QString font_typewriter;
+       /// The math font currently not selected by osFontsCB->isChecked()
+       QString font_math;
+       /// The sans font scale currently not selected by osFontsCB->isChecked()
+       int font_sf_scale;
+       /// The typewriter font scale currently not selected by osFontsCB->isChecked()
+       int font_tt_scale;
+};
+
+
 } // namespace frontend
 } // namespace lyx