#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 {
///
IGNORE,
///
- EMPH_TOGGLE,
+ UNDERBAR,
///
- UNDERBAR_TOGGLE,
+ STRIKEOUT,
///
- NOUN_TOGGLE,
+ XOUT,
///
- INHERIT
+ UULINE,
+ ///
+ UWAVE,
+ ///
+ INHERIT,
+ ///
+ NONE
};
typedef std::pair<QString, FontFamily> FamilyPair;
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
{
protected Q_SLOTS:
void change_adaptor();
+ void on_emphCB_clicked();
+ void on_nounCB_clicked();
private:
- /// Apply changes
+ /// \name Dialog inherited methods
+ //@{
void applyView();
- /// update
void updateContents();
-
- 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);
- ///
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(QSettings & settings) const;
+ void restoreSession();
+ //@}
///
- void setFamily(FontFamily);
- ///
- void setSeries(FontSeries);
- ///
- void setShape(FontShape);
+ void paramsToDialog(Font const & font);
///
- void setSize(FontSize);
+ void setBar(FontInfo & fi, FontState val);
///
- void setBar(FontState);
- ///
- void setColor(ColorCode);
- ///
- void setLanguage(QString const &);
+ void setStrike(FontInfo & fi, FontState val);
- ///
- FontFamily getFamily() const;
- ///
- FontSeries getSeries() const;
- ///
- FontShape getShape() const;
- ///
- FontSize getSize() const;
- ///
- FontState getBar() const;
- ///
- ColorCode getColor() const;
- ///
- QString getLanguage() const;
+ QList<FamilyPair> family;
+ QList<SeriesPair> series;
+ QList<ShapePair> shape;
+ QList<SizePair> size;
+ QList<BarPair> bar;
+ QList<BarPair> strike;
+ QList<ColorCode> color;
+ QList<LanguagePair> language;
-private:
///
Font font_;
///
- bool toggleall_;
- /// If true the language should be reset.
- /// If false the language of font_ is used.
- bool reset_lang_;
+ bool emph_;
+ ///
+ bool noun_;
};
} // namespace frontend