Amend f441590c

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

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 09fa73101570ae23e5e704f1102bfdd97e430f56..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;
@@ -75,6 +74,7 @@ public:
        void updateFontsize(std::string const &, std::string const &);
        void updateFontlist();
        void updateDefaultFormat();
+       void updateEngineType(std::string const &, CiteEngineType const &);
        void updatePagestyle(std::string const &, std::string const &);
        bool isChildIncluded(std::string const &);
 
@@ -97,6 +97,8 @@ private Q_SLOTS:
        void romanChanged(int);
        void sansChanged(int);
        void ttChanged(int);
+       void fontOsfToggled(bool state);
+       void fontScToggled(bool state);
        void setIndent(int);
        void enableIndent(bool);
        void setSkip(int);
@@ -104,8 +106,12 @@ private Q_SLOTS:
        void browseLayout();
        void browseMaster();
        void classChanged();
+       void classChanged_adaptor();
        void languagePackageChanged(int);
+       void biblioChanged();
        void bibtexChanged(int);
+       void setAuthorYear(bool);
+       void setNumerical(bool);
        void updateModuleInfo();
        void modulesChanged();
        void changeBackgroundColor();
@@ -116,15 +122,20 @@ private Q_SLOTS:
        void deleteNoteFontColor();
        void changeBoxBackgroundColor();
        void deleteBoxBackgroundColor();
+       void languageChanged(int);
        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;
@@ -170,14 +181,10 @@ private:
        ///
        void setLayoutComboByIDString(std::string const & idString);
 
-       /// available classes
-       GuiIdListModel classes_model_;
        /// available modules
        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();
@@ -223,14 +230,18 @@ private:
        void setLanguage() const;
        ///
        void saveAsDefault() const;
-       ///
-       bool isFontAvailable(std::string const & font) const;
        /// does this font provide Old Style figures?
-       bool providesOSF(std::string const & font) const;
+       bool providesOSF(QString const & font) const;
        /// does this font provide true Small Caps?
-       bool providesSC(std::string const & font) const;
+       bool providesSC(QString const & font) const;
+       /** does this font provide OSF and Small Caps only via 
+        * a single, undifferentiated expert option?
+        */
+       bool hasMonolithicExpertSet(QString const & font) const;
        /// does this font provide size adjustment?
-       bool providesScale(std::string const & font) const;
+       bool providesScale(QString const & font) const;
+       /// does this font provide an alternative without math?
+       bool providesNoMath(QString const & font) const;
        ///
        void executeBranchRenaming() const;
        ///
@@ -241,6 +252,20 @@ private:
        ///
        void updateUnknownBranches();
        ///
+       void updateTexFonts();
+       ///
+       void updateMathFonts(QString const & rm);
+       ///
+       void updateFontOptions();
+       ///
+       bool ot1() const;
+       ///
+       bool completeFontset() const;
+       ///
+       bool noMathFont() const;
+       ///
+       void allPackages(int);
+       ///
        BufferParams bp_;
        /// List of names of available modules
        std::list<modInfoStruct> moduleNames_;
@@ -248,6 +273,10 @@ private:
        std::map<docstring, docstring> changedBranches_;
        ///
        std::list<std::string> includeonlys_;
+       ///
+       bool biblioChanged_;
+       /// Track if a non-module document param changed
+       bool nonModuleChanged_;
 };
 
 
@@ -281,7 +310,7 @@ public:
        LocalLayout();
        void update(BufferParams const & params, BufferId id);
        void apply(BufferParams & params);
-       bool isValid() const { return is_valid_; }
+       bool isValid() const { return validated_; }
 
 Q_SIGNALS:
        /// signal that something's changed in the Widget.
@@ -297,7 +326,26 @@ private Q_SLOTS:
 
 private:
        BufferId current_id_;
-       bool is_valid_;
+       bool validated_;
+};
+
+
+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;
 };