do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 6283b6fc2cdaf6fe8bbcca9d154fccadb4f242fe..bf5d92fb90a1412d761b135838245740dd67a509 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -4,6 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
+ * \author Angus Leeming
  * \author Edwin Leuven
  * \author John Levon
  *
@@ -14,36 +15,48 @@
 #define GUICHARACTER_H
 
 #include "GuiDialog.h"
-#include "ControlCharacter.h"
 #include "ui_CharacterUi.h"
-#include "frontend_helpers.h" // for LanguagePair
+#include "qt_helpers.h" // for LanguagePair
+#include "Font.h"
 
 #include <vector>
 
+
 namespace lyx {
+
 namespace frontend {
 
-typedef std::pair<QString, Font::FONT_FAMILY> FamilyPair;
-typedef std::pair<QString, Font::FONT_SERIES> SeriesPair;
-typedef std::pair<QString, Font::FONT_SHAPE>  ShapePair;
-typedef std::pair<QString, Font::FONT_SIZE>   SizePair;
-typedef std::pair<QString, FONT_STATE> BarPair;
-typedef std::pair<QString, Color_color> ColorPair;
+enum FontState {
+       ///
+       IGNORE,
+       ///
+       EMPH_TOGGLE,
+       ///
+       UNDERBAR_TOGGLE,
+       ///
+       NOUN_TOGGLE,
+       ///
+       INHERIT
+};
 
-class GuiCharacterDialog : public GuiDialog, public Ui::CharacterUi
+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;
+
+class GuiCharacter : public GuiDialog, public Ui::CharacterUi
 {
        Q_OBJECT
 
 public:
-       GuiCharacterDialog(LyXView & lv);
+       GuiCharacter(GuiView & lv);
 
 protected Q_SLOTS:
        void change_adaptor();
 
 private:
-       void closeEvent(QCloseEvent * e);
-       /// parent controller
-       ControlCharacter & controller();
        /// Apply changes
        void applyView();
        /// update
@@ -56,6 +69,56 @@ private:
        std::vector<BarPair>    bar;
        std::vector<ColorPair>  color;
        std::vector<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; }
+
+       ///
+       void setFamily(FontFamily);
+       ///
+       void setSeries(FontSeries);
+       ///
+       void setShape(FontShape);
+       ///
+       void setSize(FontSize);
+       ///
+       void setBar(FontState);
+       ///
+       void setColor(ColorCode);
+       ///
+       void setLanguage(std::string const &);
+
+       ///
+       FontFamily getFamily() const;
+       ///
+       FontSeries getSeries() const;
+       ///
+       FontShape getShape() const;
+       ///
+       FontSize getSize() const;
+       ///
+       FontState getBar() const;
+       ///
+       ColorCode getColor() const;
+       ///
+       std::string getLanguage() const;
+
+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