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 405d8db83d37aea80aa169295e4ea3949f9be9b5..d26ca470f44d1f8c04946c23b88902c45283597a 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -16,9 +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 {
@@ -27,13 +31,19 @@ enum FontState {
        ///
        IGNORE,
        ///
-       EMPH_TOGGLE,
+       UNDERBAR,
+       ///
+       STRIKEOUT,
+       ///
+       XOUT,
        ///
-       UNDERBAR_TOGGLE,
+       UULINE,
        ///
-       NOUN_TOGGLE,
+       UWAVE,
        ///
-       INHERIT
+       INHERIT,
+       ///
+       NONE
 };
 
 typedef std::pair<QString, FontFamily> FamilyPair;
@@ -42,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
 {
@@ -53,70 +63,48 @@ public:
 
 protected Q_SLOTS:
        void change_adaptor();
+       void on_emphCB_clicked();
+       void on_nounCB_clicked();
+       void on_nospellcheckCB_clicked();
 
 private:
-       /// Apply changes
+       /// \name Dialog inherited methods
+       //@{
        void applyView();
-       /// update
        void updateContents();
-
-       QList<FamilyPair> family;
-       QList<SeriesPair> series;
-       QList<ShapePair>  shape;
-       QList<SizePair>   size;
-       QList<BarPair>    bar;
-       QList<ColorPair>  color;
-       QList<LanguagePair> language;
-
-       ///
        bool initialiseParams(std::string const & data);
-       ///
        void clearParams() {}
-       ///
        void dispatchParams();
-       ///
        bool isBufferDependent() const { return true; }
-       ///
-       kb_action getLfun() const { return LFUN_FONT_FREE_UPDATE; }
+       FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
+       void saveSession(QSettings & settings) const;
+       void restoreSession();
+       //@}
 
        ///
-       void setFamily(FontFamily);
-       ///
-       void setSeries(FontSeries);
-       ///
-       void setShape(FontShape);
+       void paramsToDialog(Font const & font);
        ///
-       void setSize(FontSize);
+       void setBar(FontInfo & fi, FontState val);
        ///
-       void setBar(FontState);
-       ///
-       void setColor(ColorCode);
-       ///
-       void setLanguage(QString const &);
+       void setStrike(FontInfo & fi, FontState val);
 
-       ///
-       FontFamily getFamily() const;
-       ///
-       FontSeries getSeries() const;
-       ///
-       FontShape getShape() const;
-       ///
-       FontSize getSize() const;
-       ///
-       FontState getBar() const;
-       ///
-       ColorCode getColor() const;
-       ///
-       QString getLanguage() const;
+       QList<FamilyPair> family;
+       QList<SeriesPair> series;
+       QList<ShapePair>  shape;
+       QList<SizePair>   size;
+       QList<BarPair>    bar;
+       QList<BarPair>    strike;
+       QList<ColorCode> color;
+       QList<LanguagePair> language;
 
-private:
        ///
        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