#include "GuiDialog.h"
#include "ui_CharacterUi.h"
-#include "qt_helpers.h" // for LanguagePair
#include "Font.h"
#include <utility>
+#ifdef IGNORE
+#undef IGNORE
+#endif
namespace lyx {
namespace frontend {
///
NOUN_TOGGLE,
///
+ STRIKEOUT_TOGGLE,
+ ///
+ UULINE_TOGGLE,
+ ///
+ UWAVE_TOGGLE,
+ ///
INHERIT
};
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
{
void change_adaptor();
private:
- /// Dialog inherited methods
+ /// \name Dialog inherited methods
//@{
void applyView();
void updateContents();
void clearParams() {}
void dispatchParams();
bool isBufferDependent() const { return true; }
- FuncCode getLfun() const { return LFUN_FONT_FREE_UPDATE; }
+ FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
+ void saveSession() const;
+ void restoreSession();
//@}
///
QList<ShapePair> shape;
QList<SizePair> size;
QList<BarPair> bar;
- QList<ColorPair> color;
+ QList<ColorCode> 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