Use QFontMetrics information for underlines (and friends) width and position

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

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 3be1401f30c8fb376baa6e4e2e3b6e07c4db23da..812c08405a53dbc5f711be3481daa36bb96c01de 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -16,11 +16,13 @@
 
 #include "GuiDialog.h"
 #include "ui_CharacterUi.h"
-#include "qt_helpers.h" // for LanguagePair
 #include "Font.h"
 
 #include <utility>
 
+#ifdef IGNORE
+#undef IGNORE
+#endif
 
 namespace lyx {
 namespace frontend {
@@ -35,6 +37,12 @@ enum FontState {
        ///
        NOUN_TOGGLE,
        ///
+       STRIKEOUT_TOGGLE,
+       ///
+       UULINE_TOGGLE,
+       ///
+       UWAVE_TOGGLE,
+       ///
        INHERIT
 };
 
@@ -44,7 +52,7 @@ 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
 {
@@ -57,7 +65,7 @@ protected Q_SLOTS:
        void change_adaptor();
 
 private:
-       /// Dialog inherited methods
+       /// \name Dialog inherited methods
        //@{
        void applyView();
        void updateContents();
@@ -65,7 +73,9 @@ 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() const;
+       void restoreSession();
        //@}
 
        ///
@@ -76,7 +86,7 @@ private:
        QList<ShapePair>  shape;
        QList<SizePair>   size;
        QList<BarPair>    bar;
-       QList<ColorPair>  color;
+       QList<ColorCode> color;
        QList<LanguagePair> language;
 
        ///
@@ -84,9 +94,6 @@ private:
        Font font_;
        ///
        bool toggleall_;
-       /// If true the language should be reset.
-       /// If false the language of font_ is used.
-       bool reset_lang_;
 };
 
 } // namespace frontend