#include "GuiDialog.h"
#include "ui_CharacterUi.h"
-#include "frontend_helpers.h" // for LanguagePair
+#include "qt_helpers.h" // for LanguagePair
#include "Font.h"
-#include <vector>
-
namespace lyx {
-
-class Color_color;
-
namespace frontend {
enum FontState {
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;
-class GuiCharacter : public GuiDialog, public Ui::CharacterUi, public Controller
+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);
- /// parent controller
- Controller & controller() { return *this; }
/// Apply changes
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;
+ 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);
///
bool isBufferDependent() const { return true; }
///
- kb_action getLfun() const { return LFUN_FONT_FREE_UPDATE; }
+ FuncCode getLfun() const { return LFUN_FONT_FREE_UPDATE; }
///
- void setFamily(Font::FONT_FAMILY);
+ void setFamily(FontFamily);
///
- void setSeries(Font::FONT_SERIES);
+ void setSeries(FontSeries);
///
- void setShape(Font::FONT_SHAPE);
+ void setShape(FontShape);
///
- void setSize(Font::FONT_SIZE);
+ void setSize(FontSize);
///
void setBar(FontState);
///
- void setColor(Color_color);
+ void setColor(ColorCode);
///
- void setLanguage(std::string const &);
- ///
- void setToggleAll(bool);
+ void setLanguage(QString const &);
///
- Font::FONT_FAMILY getFamily() const;
+ FontFamily getFamily() const;
///
- Font::FONT_SERIES getSeries() const;
+ FontSeries getSeries() const;
///
- Font::FONT_SHAPE getShape() const;
+ FontShape getShape() const;
///
- Font::FONT_SIZE getSize() const;
+ FontSize getSize() const;
///
FontState getBar() const;
///
- Color_color getColor() const;
- ///
- std::string getLanguage() const;
+ ColorCode getColor() const;
///
- bool getToggleAll() const;
+ QString getLanguage() const;
+
private:
///
Font font_;