Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 7101bfb5c3eb1c9279193bb71d7083b70cdbb760..40da643dffd3b7045eb7bf563154ddc14dfcf8b7 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -18,6 +18,8 @@
 #include "ui_CharacterUi.h"
 #include "Font.h"
 
+#include <QAction>
+
 #include <utility>
 
 #ifdef IGNORE
@@ -27,23 +29,23 @@
 namespace lyx {
 namespace frontend {
 
-enum FontState {
+enum FontDeco {
        ///
        IGNORE,
        ///
-       EMPH_TOGGLE,
+       UNDERBAR,
        ///
-       UNDERBAR_TOGGLE,
+       STRIKEOUT,
        ///
-       NOUN_TOGGLE,
+       XOUT,
        ///
-       STRIKEOUT_TOGGLE,
+       UULINE,
        ///
-       UULINE_TOGGLE,
+       UWAVE,
        ///
-       UWAVE_TOGGLE,
+       INHERIT,
        ///
-       INHERIT
+       NONE
 };
 
 typedef std::pair<QString, FontFamily> FamilyPair;
@@ -51,8 +53,7 @@ typedef std::pair<QString, FontFamily> FamilyPair;
 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, FontDeco>  BarPair;
 typedef std::pair<QString, QString>    LanguagePair;
 
 class GuiCharacter : public GuiDialog, public Ui::CharacterUi
@@ -64,9 +65,15 @@ public:
 
 protected Q_SLOTS:
        void change_adaptor();
+       void on_emphCB_clicked();
+       void on_nounCB_clicked();
+       void on_nospellcheckCB_clicked();
+       void resetToDefault();
+       void resetToNoChange();
+       void checkRestoreDefaults();
 
 private:
-       /// Dialog inherited methods
+       /// \name Dialog inherited methods
        //@{
        void applyView();
        void updateContents();
@@ -75,29 +82,39 @@ private:
        void dispatchParams();
        bool isBufferDependent() const { return true; }
        FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
-       void saveSession() const;
+       void saveSession(QSettings & settings) const;
        void restoreSession();
        //@}
 
        ///
        void paramsToDialog(Font const & font);
+       ///
+       void setBar(FontInfo & fi, FontDeco val);
+       ///
+       void setStrike(FontInfo & fi, FontDeco 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_;
+
+       ///
+       QAction * resetdefault_ = new QAction(this);
+       ///
+       QAction * resetnochange_ = new QAction(this);
 };
 
 } // namespace frontend