X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fcontrollers%2FControlCharacter.h;h=454ff33680e06a1d39e7cb6e470863eea6548de7;hb=120c89f24fae05379fbdc8539d3cfae574c2aecd;hp=b593c83c52643b6445e3f7aff5d3afcebdccb357;hpb=9705be9f1b8441175048b4e2065795051adafdc6;p=lyx.git

diff --git a/src/frontends/controllers/ControlCharacter.h b/src/frontends/controllers/ControlCharacter.h
index b593c83c52..454ff33680 100644
--- a/src/frontends/controllers/ControlCharacter.h
+++ b/src/frontends/controllers/ControlCharacter.h
@@ -1,56 +1,27 @@
+// -*- C++ -*-
 /**
  * \file ControlCharacter.h
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef CONTROLCHARACTER_H
 #define CONTROLCHARACTER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-#include "ControlDialogs.h"
-#include "lyxfont.h"
-#include "LColor.h"
+#include "ControlDialog_impl.h"
+#include "character.h"
+
+#include <boost/scoped_ptr.hpp>
 
 /** A controller for Character dialogs.
  */
-class ControlCharacter : public ControlDialog<ControlConnectBD>
-{
+class ControlCharacter : public ControlDialogBD {
 public:
-	///
-	enum FONT_STATE {
-		///
-		IGNORE,
-		///
-		EMPH_TOGGLE,
-		///
-		UNDERBAR_TOGGLE,
-		///
-		NOUN_TOGGLE,
-		///
-		LATEX_TOGGLE,
-		///
-		INHERIT
-	};
-	
-	///
-	typedef std::pair<string, LyXFont::FONT_FAMILY> FamilyPair;
-	///
-	typedef std::pair<string, LyXFont::FONT_SERIES> SeriesPair;
-	///
-	typedef std::pair<string, LyXFont::FONT_SHAPE>  ShapePair;
-	///
-	typedef std::pair<string, LyXFont::FONT_SIZE>   SizePair;
-	///
-	typedef std::pair<string, FONT_STATE> BarPair;
-	///
-	typedef std::pair<string, LColor::color> ColorPair;
-
 	///
 	ControlCharacter(LyXView &, Dialogs &);
 
@@ -63,7 +34,7 @@ public:
 	///
 	void setSize(LyXFont::FONT_SIZE);
 	///
-	void setBar(FONT_STATE);
+	void setBar(frnt::FONT_STATE);
 	///
 	void setColor(LColor::color);
 	///
@@ -71,33 +42,33 @@ public:
 	///
 	void setToggleAll(bool);
 
-private:
+	///
+	LyXFont::FONT_FAMILY getFamily() const;
+	///
+	LyXFont::FONT_SERIES getSeries() const;
+	///
+	LyXFont::FONT_SHAPE getShape() const;
+	///
+	LyXFont::FONT_SIZE getSize() const;
+	///
+	frnt::FONT_STATE getBar() const;
+	///
+	LColor::color getColor() const;
+	///
+	string getLanguage() const;
+	///
+	bool getToggleAll() const;
+
 	/// Get changed parameters and Dispatch them to the kernel.
 	virtual void apply();
+private:
 	/// set the params before show or update.
 	virtual void setParams();
-	/// clean-up on hide.
-	virtual void clearParams();
 
 	///
-	LyXFont * font_;
+	boost::scoped_ptr<LyXFont> font_;
 	///
 	bool toggleall_;
 };
 
-/// Helper functions
-std::vector<ControlCharacter::FamilyPair> const getFamilyData();
-///
-std::vector<ControlCharacter::SeriesPair> const getSeriesData();
-///
-std::vector<ControlCharacter::ShapePair>  const getShapeData();
-///
-std::vector<ControlCharacter::SizePair>   const getSizeData();
-///
-std::vector<ControlCharacter::BarPair>    const getBarData();
-///
-std::vector<ControlCharacter::ColorPair>  const getColorData();
-///
-std::vector<string> const getLanguageData();
-
 #endif // CONTROLCHARACTER_H