Remove a redundant deletion of a QObject

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

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index c35aec3323f645ee309ea5def04c88103fc77a40..c055378429a28c03c8f255c437ba3a385a3c2980 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -41,6 +41,7 @@ namespace lyx {
 
 class BufferParams;
 class LayoutModuleList;
+class LyXModule;
 class TextClass;
 
 namespace frontend {
@@ -51,6 +52,7 @@ class GuiIndices;
 class ModuleSelectionManager;
 class PreambleModule;
 class LocalLayout;
+class FontModule;
 
 ///
 typedef void const * BufferId;
@@ -80,6 +82,9 @@ public:
        ///
        BufferParams const & params() const { return bp_; }
 
+public Q_SLOTS:
+       void onBufferViewChanged();//override
+
 private Q_SLOTS:
        void updateNumbering();
        void change_adaptor();
@@ -134,7 +139,7 @@ private:
 
        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;
@@ -216,6 +221,8 @@ private:
                std::string id;
                QString description;
        };
+       ///
+       static modInfoStruct modInfo(LyXModule const & mod);
        /// List of available modules
        std::list<modInfoStruct> const & getModuleInfo();
        /// Modules in use in current buffer
@@ -318,6 +325,7 @@ Q_SIGNALS:
 private:
        void validate();
        void convert();
+       void hideConvert();
 private Q_SLOTS:
        void textChanged();
        void validatePressed();
@@ -329,6 +337,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