#include "GuiDialog.h"
#include "ui_CharacterUi.h"
-#include "qt_helpers.h" // for LanguagePair
#include "Font.h"
-#include <vector>
+#include <utility>
+#ifdef IGNORE
+#undef IGNORE
+#endif
namespace lyx {
-
namespace frontend {
enum FontState {
///
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, FontState> BarPair;
+typedef std::pair<QString, ColorCode> ColorPair;
+typedef std::pair<QString, QString> LanguagePair;
class GuiCharacter : public GuiDialog, public Ui::CharacterUi
{
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(FontFamily);
- ///
- void setSeries(FontSeries);
- ///
- void setShape(FontShape);
- ///
- void setSize(FontSize);
- ///
- void setBar(FontState);
- ///
- void setColor(ColorCode);
- ///
- void setLanguage(std::string const &);
+ void paramsToDialog(Font const & font);
- ///
- FontFamily getFamily() const;
- ///
- FontSeries getSeries() const;
- ///
- FontShape getShape() const;
- ///
- FontSize getSize() const;
- ///
- FontState getBar() const;
- ///
- ColorCode getColor() const;
- ///
- std::string getLanguage() const;
+ QList<FamilyPair> family;
+ QList<SeriesPair> series;
+ QList<ShapePair> shape;
+ QList<SizePair> size;
+ QList<BarPair> bar;
+ QList<ColorPair> color;
+ QList<LanguagePair> language;
-private:
+ ///
///
Font font_;
///