X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCharacter.h;h=599807f0ae8a6b1a386a09593256e3cb453a88dc;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=81b06ab9ab5dff255ede326aa48701abbdbca9c6;hpb=6f3cdf8da80a6b3889f2a3b8b53f44590152d600;p=lyx.git

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 81b06ab9ab..599807f0ae 100644
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -16,16 +16,15 @@
 
 #include "GuiDialog.h"
 #include "ui_CharacterUi.h"
-#include "frontend_helpers.h" // for LanguagePair
 #include "Font.h"
 
-#include <vector>
+#include <utility>
 
+#ifdef IGNORE
+#undef IGNORE
+#endif
 
 namespace lyx {
-
-class Color_color;
-
 namespace frontend {
 
 enum FontState {
@@ -38,86 +37,60 @@ enum FontState {
 	///
 	NOUN_TOGGLE,
 	///
+	STRIKEOUT_TOGGLE,
+	///
+	UULINE_TOGGLE,
+	///
+	UWAVE_TOGGLE,
+	///
 	INHERIT
 };
 
-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, FontState> BarPair;
-typedef std::pair<QString, Color_color> ColorPair;
+typedef std::pair<QString, FontFamily> FamilyPair;
+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, QString>    LanguagePair;
 
 class GuiCharacter : public GuiDialog, public Ui::CharacterUi
 {
 	Q_OBJECT
 
 public:
-	GuiCharacter(LyXView & lv);
+	GuiCharacter(GuiView & lv);
 
 protected Q_SLOTS:
 	void change_adaptor();
 
 private:
-	void closeEvent(QCloseEvent * e);
-	/// Apply changes
+	/// \name Dialog inherited methods
+	//@{
 	void applyView();
-	/// update
 	void updateContents();
-
-	std::vector<FamilyPair> family;
-	std::vector<SeriesPair> series;
-	std::vector<ShapePair>  shape;
-	std::vector<SizePair>   size;
-	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; }
+	FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
+	void saveSession() const;
+	void restoreSession();
+	//@}
 
 	///
-	void setFamily(Font::FONT_FAMILY);
-	///
-	void setSeries(Font::FONT_SERIES);
-	///
-	void setShape(Font::FONT_SHAPE);
-	///
-	void setSize(Font::FONT_SIZE);
-	///
-	void setBar(FontState);
-	///
-	void setColor(Color_color);
-	///
-	void setLanguage(std::string const &);
-	///
-	void setToggleAll(bool);
+	void paramsToDialog(Font const & font);
+
+	QList<FamilyPair> family;
+	QList<SeriesPair> series;
+	QList<ShapePair>  shape;
+	QList<SizePair>   size;
+	QList<BarPair>    bar;
+	QList<ColorPair>  color;
+	QList<LanguagePair> language;
 
 	///
-	Font::FONT_FAMILY getFamily() const;
-	///
-	Font::FONT_SERIES getSeries() const;
-	///
-	Font::FONT_SHAPE getShape() const;
-	///
-	Font::FONT_SIZE getSize() const;
-	///
-	FontState getBar() const;
-	///
-	Color_color getColor() const;
-	///
-	std::string getLanguage() const;
-	///
-	bool getToggleAll() const;
-private:
 	///
 	Font font_;
 	///