* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index f505ad27bb902115ebd31fb9cdd6b3c4e07d2d0f..599807f0ae8a6b1a386a09593256e3cb453a88dc 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
 };
 
@@ -45,6 +53,7 @@ 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,10 +66,21 @@ protected Q_SLOTS:
        void change_adaptor();
 
 private:
-       /// Apply changes
+       /// \name Dialog inherited methods
+       //@{
        void applyView();
-       /// update
        void updateContents();
+       bool initialiseParams(std::string const & data);
+       void clearParams() {}
+       void dispatchParams();
+       bool isBufferDependent() const { return true; }
+       FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
+       void saveSession() const;
+       void restoreSession();
+       //@}
+
+       ///
+       void paramsToDialog(Font const & font);
 
        QList<FamilyPair> family;
        QList<SeriesPair> series;
@@ -71,47 +91,6 @@ private:
        QList<LanguagePair> language;
 
        ///
-       bool initialiseParams(std::string const & data);
-       ///
-       void clearParams() {}
-       ///
-       void dispatchParams();
-       ///
-       bool isBufferDependent() const { return true; }
-       ///
-       FuncCode getLfun() const { return LFUN_FONT_FREE_UPDATE; }
-
-       ///
-       void setFamily(FontFamily);
-       ///
-       void setSeries(FontSeries);
-       ///
-       void setShape(FontShape);
-       ///
-       void setSize(FontSize);
-       ///
-       void setBar(FontState);
-       ///
-       void setColor(ColorCode);
-       ///
-       void setLanguage(QString const &);
-
-       ///
-       FontFamily getFamily() const;
-       ///
-       FontSeries getSeries() const;
-       ///
-       FontShape getShape() const;
-       ///
-       FontSize getSize() const;
-       ///
-       FontState getBar() const;
-       ///
-       ColorCode getColor() const;
-       ///
-       QString getLanguage() const;
-
-private:
        ///
        Font font_;
        ///