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 307d00380b9d0fd5b2e17d25e8488a0896cf9883..d26ca470f44d1f8c04946c23b88902c45283597a 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -20,6 +20,9 @@
 
 #include <utility>
 
+#ifdef IGNORE
+#undef IGNORE
+#endif
 
 namespace lyx {
 namespace frontend {
@@ -28,13 +31,19 @@ enum FontState {
        ///
        IGNORE,
        ///
-       EMPH_TOGGLE,
+       UNDERBAR,
        ///
-       UNDERBAR_TOGGLE,
+       STRIKEOUT,
        ///
-       NOUN_TOGGLE,
+       XOUT,
        ///
-       INHERIT
+       UULINE,
+       ///
+       UWAVE,
+       ///
+       INHERIT,
+       ///
+       NONE
 };
 
 typedef std::pair<QString, FontFamily> FamilyPair;
@@ -43,7 +52,6 @@ typedef std::pair<QString, FontSeries> SeriesPair;
 typedef std::pair<QString, FontShape>  ShapePair;
 typedef std::pair<QString, FontSize>   SizePair;
 typedef std::pair<QString, FontState>  BarPair;
-typedef std::pair<QString, ColorCode>  ColorPair;
 typedef std::pair<QString, QString>    LanguagePair;
 
 class GuiCharacter : public GuiDialog, public Ui::CharacterUi
@@ -55,9 +63,12 @@ public:
 
 protected Q_SLOTS:
        void change_adaptor();
+       void on_emphCB_clicked();
+       void on_nounCB_clicked();
+       void on_nospellcheckCB_clicked();
 
 private:
-       /// Dialog inherited methods
+       /// \name Dialog inherited methods
        //@{
        void applyView();
        void updateContents();
@@ -65,28 +76,35 @@ private:
        void clearParams() {}
        void dispatchParams();
        bool isBufferDependent() const { return true; }
-       FuncCode getLfun() const { return LFUN_FONT_FREE_UPDATE; }
+       FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
+       void saveSession(QSettings & settings) const;
+       void restoreSession();
        //@}
 
        ///
        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<ColorPair>  color;
+       QList<BarPair>    strike;
+       QList<ColorCode> color;
        QList<LanguagePair> language;
 
-       ///
        ///
        Font font_;
        ///
-       bool toggleall_;
-       /// If true the language should be reset.
-       /// If false the language of font_ is used.
-       bool reset_lang_;
+       bool emph_;
+       ///
+       bool noun_;
+       ///
+       bool nospellcheck_;
 };
 
 } // namespace frontend