QDialogButtonBox for the remaining dialogs.

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

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 8328211eb1fff473837d0dfffac6aff9af3144e4..d26ca470f44d1f8c04946c23b88902c45283597a 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -31,21 +31,19 @@ enum FontState {
        ///
        IGNORE,
        ///
-       EMPH_TOGGLE,
+       UNDERBAR,
        ///
-       UNDERBAR_TOGGLE,
+       STRIKEOUT,
        ///
-       NOUN_TOGGLE,
+       XOUT,
        ///
-       STRIKEOUT_TOGGLE,
+       UULINE,
        ///
-       XOUT_TOGGLE,
+       UWAVE,
        ///
-       UULINE_TOGGLE,
+       INHERIT,
        ///
-       UWAVE_TOGGLE,
-       ///
-       INHERIT
+       NONE
 };
 
 typedef std::pair<QString, FontFamily> FamilyPair;
@@ -65,6 +63,9 @@ public:
 
 protected Q_SLOTS:
        void change_adaptor();
+       void on_emphCB_clicked();
+       void on_nounCB_clicked();
+       void on_nospellcheckCB_clicked();
 
 private:
        /// \name Dialog inherited methods
@@ -82,20 +83,28 @@ private:
 
        ///
        void paramsToDialog(Font const & font);
+       ///
+       void setBar(FontInfo & fi, FontState val);
+       ///
+       void setStrike(FontInfo & fi, FontState val);
 
        QList<FamilyPair> family;
        QList<SeriesPair> series;
        QList<ShapePair>  shape;
        QList<SizePair>   size;
        QList<BarPair>    bar;
+       QList<BarPair>    strike;
        QList<ColorCode> color;
        QList<LanguagePair> language;
 
-       ///
        ///
        Font font_;
        ///
-       bool toggleall_;
+       bool emph_;
+       ///
+       bool noun_;
+       ///
+       bool nospellcheck_;
 };
 
 } // namespace frontend