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

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 5f0145c066..599807f0ae 100644
--- 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
  *
@@ -13,59 +14,90 @@
 #ifndef GUICHARACTER_H
 #define GUICHARACTER_H
 
-#include "GuiDialogView.h"
-#include "ControlCharacter.h"
+#include "GuiDialog.h"
 #include "ui_CharacterUi.h"
+#include "Font.h"
 
-#include <QDialog>
+#include <utility>
 
-#include <vector>
+#ifdef IGNORE
+#undef IGNORE
+#endif
 
 namespace lyx {
 namespace frontend {
 
-class GuiCharacter;
+enum FontState {
+	///
+	IGNORE,
+	///
+	EMPH_TOGGLE,
+	///
+	UNDERBAR_TOGGLE,
+	///
+	NOUN_TOGGLE,
+	///
+	STRIKEOUT_TOGGLE,
+	///
+	UULINE_TOGGLE,
+	///
+	UWAVE_TOGGLE,
+	///
+	INHERIT
+};
+
+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 GuiCharacterDialog : public QDialog, public Ui::CharacterUi {
+class GuiCharacter : public GuiDialog, public Ui::CharacterUi
+{
 	Q_OBJECT
+
 public:
-	GuiCharacterDialog(GuiCharacter * form);
-protected:
-	void closeEvent(QCloseEvent * e);
-private:
-	GuiCharacter * form_;
+	GuiCharacter(GuiView & lv);
+
 protected Q_SLOTS:
 	void change_adaptor();
-};
 
-
-class GuiCharacter : public GuiView<GuiCharacterDialog>
-{
-public:
-	friend class GuiCharacterDialog;
-
-	GuiCharacter(GuiDialog &);
-	/// parent controller
-	ControlCharacter & controller()
-	{ return static_cast<ControlCharacter &>(this->getController()); }
-	/// parent controller
-	ControlCharacter const & controller() const
-	{ return static_cast<ControlCharacter const &>(this->getController()); }
 private:
-	/// Apply changes
-	virtual void applyView();
-	/// update
-	virtual void update_contents();
-	/// build the dialog
-	virtual void build_dialog();
-
-	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;
+	/// \name Dialog inherited methods
+	//@{
+	void applyView();
+	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;
+	QList<ShapePair>  shape;
+	QList<SizePair>   size;
+	QList<BarPair>    bar;
+	QList<ColorPair>  color;
+	QList<LanguagePair> language;
+
+	///
+	///
+	Font font_;
+	///
+	bool toggleall_;
+	/// If true the language should be reset.
+	/// If false the language of font_ is used.
+	bool reset_lang_;
 };
 
 } // namespace frontend