#include "GuiCharacter.h"
#include "qt_helpers.h"
-#include "Color.h"
#include "Font.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "FuncRequest.h"
#include "Language.h"
-#include "Color.h"
-#include <QCloseEvent>
-
-using std::vector;
-using std::string;
+using namespace std;
namespace lyx {
namespace frontend {
-static vector<ShapePair> const getShapeData()
+static QList<ShapePair> shapeData()
{
- vector<ShapePair> shape(6);
-
- ShapePair pr;
-
- pr.first = qt_("No change");
- pr.second = Font::IGNORE_SHAPE;
- shape[0] = pr;
-
- pr.first = qt_("Upright");
- pr.second = Font::UP_SHAPE;
- shape[1] = pr;
-
- pr.first = qt_("Italic");
- pr.second = Font::ITALIC_SHAPE;
- shape[2] = pr;
-
- pr.first = qt_("Slanted");
- pr.second = Font::SLANTED_SHAPE;
- shape[3] = pr;
-
- pr.first = qt_("Small Caps");
- pr.second = Font::SMALLCAPS_SHAPE;
- shape[4] = pr;
-
- pr.first = qt_("Reset");
- pr.second = Font::INHERIT_SHAPE;
- shape[5] = pr;
-
- return shape;
+ QList<ShapePair> shapes;
+ shapes << ShapePair(qt_("No change"), IGNORE_SHAPE);
+ shapes << ShapePair(qt_("Upright"), UP_SHAPE);
+ shapes << ShapePair(qt_("Italic"), ITALIC_SHAPE);
+ shapes << ShapePair(qt_("Slanted"), SLANTED_SHAPE);
+ shapes << ShapePair(qt_("Small Caps"), SMALLCAPS_SHAPE);
+ shapes << ShapePair(qt_("Reset"), INHERIT_SHAPE);
+ return shapes;
}
-static vector<SizePair> const getSizeData()
+static QList<SizePair> sizeData()
{
- vector<SizePair> size(14);
-
- SizePair pr;
-
- pr.first = qt_("No change");
- pr.second = Font::IGNORE_SIZE;
- size[0] = pr;
-
- pr.first = qt_("Tiny");
- pr.second = Font::SIZE_TINY;
- size[1] = pr;
-
- pr.first = qt_("Smallest");
- pr.second = Font::SIZE_SCRIPT;
- size[2] = pr;
-
- pr.first = qt_("Smaller");
- pr.second = Font::SIZE_FOOTNOTE;
- size[3] = pr;
-
- pr.first = qt_("Small");
- pr.second = Font::SIZE_SMALL;
- size[4] = pr;
-
- pr.first = qt_("Normal");
- pr.second = Font::SIZE_NORMAL;
- size[5] = pr;
-
- pr.first = qt_("Large");
- pr.second = Font::SIZE_LARGE;
- size[6] = pr;
-
- pr.first = qt_("Larger");
- pr.second = Font::SIZE_LARGER;
- size[7] = pr;
-
- pr.first = qt_("Largest");
- pr.second = Font::SIZE_LARGEST;
- size[8] = pr;
-
- pr.first = qt_("Huge");
- pr.second = Font::SIZE_HUGE;
- size[9] = pr;
-
- pr.first = qt_("Huger");
- pr.second = Font::SIZE_HUGER;
- size[10] = pr;
-
- pr.first = qt_("Increase");
- pr.second = Font::INCREASE_SIZE;
- size[11] = pr;
-
- pr.first = qt_("Decrease");
- pr.second = Font::DECREASE_SIZE;
- size[12] = pr;
-
- pr.first = qt_("Reset");
- pr.second = Font::INHERIT_SIZE;
- size[13] = pr;
-
- return size;
+ QList<SizePair> sizes;
+ sizes << SizePair(qt_("No change"), FONT_SIZE_IGNORE);
+ sizes << SizePair(qt_("Tiny"), FONT_SIZE_TINY);
+ sizes << SizePair(qt_("Smallest"), FONT_SIZE_SCRIPT);
+ sizes << SizePair(qt_("Smaller"), FONT_SIZE_FOOTNOTE);
+ sizes << SizePair(qt_("Small"), FONT_SIZE_SMALL);
+ sizes << SizePair(qt_("Normal"), FONT_SIZE_NORMAL);
+ sizes << SizePair(qt_("Large"), FONT_SIZE_LARGE);
+ sizes << SizePair(qt_("Larger"), FONT_SIZE_LARGER);
+ sizes << SizePair(qt_("Largest"), FONT_SIZE_LARGEST);
+ sizes << SizePair(qt_("Huge"), FONT_SIZE_HUGE);
+ sizes << SizePair(qt_("Huger"), FONT_SIZE_HUGER);
+ sizes << SizePair(qt_("Increase"), FONT_SIZE_INCREASE);
+ sizes << SizePair(qt_("Decrease"), FONT_SIZE_DECREASE);
+ sizes << SizePair(qt_("Reset"), FONT_SIZE_INHERIT);
+ return sizes;
}
-static vector<BarPair> const getBarData()
+static QList<BarPair> barData()
{
- vector<BarPair> bar(5);
-
- BarPair pr;
-
- pr.first = qt_("No change");
- pr.second = IGNORE;
- bar[0] = pr;
-
- pr.first = qt_("Emph");
- pr.second = EMPH_TOGGLE;
- bar[1] = pr;
-
- pr.first = qt_("Underbar");
- pr.second = UNDERBAR_TOGGLE;
- bar[2] = pr;
-
- pr.first = qt_("Noun");
- pr.second = NOUN_TOGGLE;
- bar[3] = pr;
-
- pr.first = qt_("Reset");
- pr.second = INHERIT;
- bar[4] = pr;
-
- return bar;
+ QList<BarPair> bars;
+ bars << BarPair(qt_("No change"), IGNORE);
+ bars << BarPair(qt_("Emph"), EMPH_TOGGLE);
+ bars << BarPair(qt_("Underbar"), UNDERBAR_TOGGLE);
+ bars << BarPair(qt_("Noun"), NOUN_TOGGLE);
+ bars << BarPair(qt_("Reset"), INHERIT);
+ return bars;
}
-static vector<ColorPair> const getColorData()
+static QList<ColorPair> colorData()
{
- vector<ColorPair> color(11);
-
- ColorPair pr;
-
- pr.first = qt_("No change");
- pr.second = Color::ignore;
- color[0] = pr;
-
- pr.first = qt_("No color");
- pr.second = Color::none;
- color[1] = pr;
-
- pr.first = qt_("Black");
- pr.second = Color::black;
- color[2] = pr;
-
- pr.first = qt_("White");
- pr.second = Color::white;
- color[3] = pr;
-
- pr.first = qt_("Red");
- pr.second = Color::red;
- color[4] = pr;
-
- pr.first = qt_("Green");
- pr.second = Color::green;
- color[5] = pr;
-
- pr.first = qt_("Blue");
- pr.second = Color::blue;
- color[6] = pr;
-
- pr.first = qt_("Cyan");
- pr.second = Color::cyan;
- color[7] = pr;
-
- pr.first = qt_("Magenta");
- pr.second = Color::magenta;
- color[8] = pr;
-
- pr.first = qt_("Yellow");
- pr.second = Color::yellow;
- color[9] = pr;
-
- pr.first = qt_("Reset");
- pr.second = Color::inherit;
- color[10] = pr;
-
- return color;
+ QList<ColorPair> colors;
+ colors << ColorPair(qt_("No change"), Color_ignore);
+ colors << ColorPair(qt_("No color"), Color_none);
+ colors << ColorPair(qt_("Black"), Color_black);
+ colors << ColorPair(qt_("White"), Color_white);
+ colors << ColorPair(qt_("Red"), Color_red);
+ colors << ColorPair(qt_("Green"), Color_green);
+ colors << ColorPair(qt_("Blue"), Color_blue);
+ colors << ColorPair(qt_("Cyan"), Color_cyan);
+ colors << ColorPair(qt_("Magenta"), Color_magenta);
+ colors << ColorPair(qt_("Yellow"), Color_yellow);
+ colors << ColorPair(qt_("Reset"), Color_inherit);
+ return colors;
}
-static vector<SeriesPair> const getSeriesData()
+static QList<SeriesPair> seriesData()
{
- vector<SeriesPair> series(4);
-
- SeriesPair pr;
-
- pr.first = qt_("No change");
- pr.second = Font::IGNORE_SERIES;
- series[0] = pr;
-
- pr.first = qt_("Medium");
- pr.second = Font::MEDIUM_SERIES;
- series[1] = pr;
-
- pr.first = qt_("Bold");
- pr.second = Font::BOLD_SERIES;
- series[2] = pr;
-
- pr.first = qt_("Reset");
- pr.second = Font::INHERIT_SERIES;
- series[3] = pr;
-
+ QList<SeriesPair> series;
+ series << SeriesPair(qt_("No change"), IGNORE_SERIES);
+ series << SeriesPair(qt_("Medium"), MEDIUM_SERIES);
+ series << SeriesPair(qt_("Bold"), BOLD_SERIES);
+ series << SeriesPair(qt_("Reset"), INHERIT_SERIES);
return series;
}
-static vector<FamilyPair> const getFamilyData()
+static QList<FamilyPair> familyData()
{
- vector<FamilyPair> family(5);
-
- FamilyPair pr;
-
- pr.first = qt_("No change");
- pr.second = Font::IGNORE_FAMILY;
- family[0] = pr;
-
- pr.first = qt_("Roman");
- pr.second = Font::ROMAN_FAMILY;
- family[1] = pr;
-
- pr.first = qt_("Sans Serif");
- pr.second = Font::SANS_FAMILY;
- family[2] = pr;
-
- pr.first = qt_("Typewriter");
- pr.second = Font::TYPEWRITER_FAMILY;
- family[3] = pr;
-
- pr.first = qt_("Reset");
- pr.second = Font::INHERIT_FAMILY;
- family[4] = pr;
-
- return family;
+ QList<FamilyPair> families;
+ families << FamilyPair(qt_("No change"), IGNORE_FAMILY);
+ families << FamilyPair(qt_("Roman"), ROMAN_FAMILY);
+ families << FamilyPair(qt_("Sans Serif"), SANS_FAMILY);
+ families << FamilyPair(qt_("Typewriter"), TYPEWRITER_FAMILY);
+ families << FamilyPair(qt_("Reset"), INHERIT_FAMILY);
+ return families;
}
-GuiCharacter::GuiCharacter(LyXView & lv)
- : GuiDialog(lv, "character"), font_(Font::ALL_IGNORE),
+GuiCharacter::GuiCharacter(GuiView & lv)
+ : GuiDialog(lv, "character", qt_("Text Style")), font_(ignore_font),
toggleall_(false), reset_lang_(false)
{
setupUi(this);
- setViewTitle(_("Text Style"));
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
connect(langCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(toggleallCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- family = getFamilyData();
- series = getSeriesData();
- shape = getShapeData();
- size = getSizeData();
- bar = getBarData();
- color = getColorData();
- language = getLanguageData(true);
+#ifdef Q_WS_MACX
+ // On Mac it's common to have tool windows which are always in the
+ // foreground and are hidden when the main window is not focused.
+ setWindowFlags(Qt::Tool);
+ autoapplyCB->setChecked(true);
+#endif
+
+ family = familyData();
+ series = seriesData();
+ shape = shapeData();
+ size = sizeData();
+ bar = barData();
+ color = colorData();
+ language = languageData(true);
- for (vector<FamilyPair>::const_iterator cit = family.begin();
+ for (QList<FamilyPair>::const_iterator cit = family.begin();
cit != family.end(); ++cit) {
familyCO->addItem(cit->first);
}
- for (vector<SeriesPair>::const_iterator cit = series.begin();
+ for (QList<SeriesPair>::const_iterator cit = series.begin();
cit != series.end(); ++cit) {
seriesCO->addItem(cit->first);
}
- for (vector<ShapePair>::const_iterator cit = shape.begin();
+ for (QList<ShapePair>::const_iterator cit = shape.begin();
cit != shape.end(); ++cit) {
shapeCO->addItem(cit->first);
}
- for (vector<SizePair>::const_iterator cit = size.begin();
+ for (QList<SizePair>::const_iterator cit = size.begin();
cit != size.end(); ++cit) {
sizeCO->addItem(cit->first);
}
- for (vector<BarPair>::const_iterator cit = bar.begin();
+ for (QList<BarPair>::const_iterator cit = bar.begin();
cit != bar.end(); ++cit) {
miscCO->addItem(cit->first);
}
- for (vector<ColorPair>::const_iterator cit = color.begin();
+ for (QList<ColorPair>::const_iterator cit = color.begin();
cit != color.end(); ++cit) {
colorCO->addItem(cit->first);
}
- for (vector<LanguagePair>::const_iterator cit = language.begin();
+ for (QList<LanguagePair>::const_iterator cit = language.begin();
cit != language.end(); ++cit) {
- langCO->addItem(toqstr(cit->first));
+ langCO->addItem(cit->first);
}
bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
}
-void GuiCharacter::closeEvent(QCloseEvent * e)
-{
- slotClose();
- GuiDialog::closeEvent(e);
-}
-
-
-template<class A, class B>
-static int findPos2nd(vector<std::pair<A, B> > const & vec, B const & val)
+template<class B>
+static int findPos2nd(QList<pair<QString, B> > const & vec, B const & val)
{
- typedef typename vector<std::pair<A, B> >::const_iterator
- const_iterator;
-
- for (const_iterator cit = vec.begin(); cit != vec.end(); ++cit)
- if (cit->second == val)
- return int(cit - vec.begin());
-
+ for (int i = 0; i != vec.size(); ++i)
+ if (vec[i].second == val)
+ return i;
return 0;
}
bool GuiCharacter::initialiseParams(string const &)
{
// so that the user can press Ok
- if (getFamily() != Font::IGNORE_FAMILY
- || getSeries() != Font::IGNORE_SERIES
- || getShape() != Font::IGNORE_SHAPE
- || getSize() != Font::IGNORE_SIZE
+ if (getFamily() != IGNORE_FAMILY
+ || getSeries() != IGNORE_SERIES
+ || getShape() != IGNORE_SHAPE
+ || getSize() != FONT_SIZE_IGNORE
|| getBar() != IGNORE
- || getColor() != Color::ignore
+ || getColor() != Color_ignore
|| font_.language() != ignore_language)
setButtonsValid(true);
}
-Font::FONT_FAMILY GuiCharacter::getFamily() const
+FontFamily GuiCharacter::getFamily() const
{
- return font_.family();
+ return font_.fontInfo().family();
}
-void GuiCharacter::setFamily(Font::FONT_FAMILY val)
+void GuiCharacter::setFamily(FontFamily val)
{
- font_.setFamily(val);
+ font_.fontInfo().setFamily(val);
}
-Font::FONT_SERIES GuiCharacter::getSeries() const
+FontSeries GuiCharacter::getSeries() const
{
- return font_.series();
+ return font_.fontInfo().series();
}
-void GuiCharacter::setSeries(Font::FONT_SERIES val)
+void GuiCharacter::setSeries(FontSeries val)
{
- font_.setSeries(val);
+ font_.fontInfo().setSeries(val);
}
-Font::FONT_SHAPE GuiCharacter::getShape() const
+FontShape GuiCharacter::getShape() const
{
- return font_.shape();
+ return font_.fontInfo().shape();
}
-void GuiCharacter::setShape(Font::FONT_SHAPE val)
+void GuiCharacter::setShape(FontShape val)
{
- font_.setShape(val);
+ font_.fontInfo().setShape(val);
}
-Font::FONT_SIZE GuiCharacter::getSize() const
+FontSize GuiCharacter::getSize() const
{
- return font_.size();
+ return font_.fontInfo().size();
}
-void GuiCharacter::setSize(Font::FONT_SIZE val)
+void GuiCharacter::setSize(FontSize val)
{
- font_.setSize(val);
+ font_.fontInfo().setSize(val);
}
FontState GuiCharacter::getBar() const
{
- if (font_.emph() == Font::TOGGLE)
+ if (font_.fontInfo().emph() == FONT_TOGGLE)
return EMPH_TOGGLE;
- if (font_.underbar() == Font::TOGGLE)
+ if (font_.fontInfo().underbar() == FONT_TOGGLE)
return UNDERBAR_TOGGLE;
- if (font_.noun() == Font::TOGGLE)
+ if (font_.fontInfo().noun() == FONT_TOGGLE)
return NOUN_TOGGLE;
- if (font_.emph() == Font::IGNORE
- && font_.underbar() == Font::IGNORE
- && font_.noun() == Font::IGNORE)
+ if (font_.fontInfo().emph() == FONT_IGNORE
+ && font_.fontInfo().underbar() == FONT_IGNORE
+ && font_.fontInfo().noun() == FONT_IGNORE)
return IGNORE;
return INHERIT;
{
switch (val) {
case IGNORE:
- font_.setEmph(Font::IGNORE);
- font_.setUnderbar(Font::IGNORE);
- font_.setNoun(Font::IGNORE);
+ font_.fontInfo().setEmph(FONT_IGNORE);
+ font_.fontInfo().setUnderbar(FONT_IGNORE);
+ font_.fontInfo().setNoun(FONT_IGNORE);
break;
case EMPH_TOGGLE:
- font_.setEmph(Font::TOGGLE);
+ font_.fontInfo().setEmph(FONT_TOGGLE);
break;
case UNDERBAR_TOGGLE:
- font_.setUnderbar(Font::TOGGLE);
+ font_.fontInfo().setUnderbar(FONT_TOGGLE);
break;
case NOUN_TOGGLE:
- font_.setNoun(Font::TOGGLE);
+ font_.fontInfo().setNoun(FONT_TOGGLE);
break;
case INHERIT:
- font_.setEmph(Font::INHERIT);
- font_.setUnderbar(Font::INHERIT);
- font_.setNoun(Font::INHERIT);
+ font_.fontInfo().setEmph(FONT_INHERIT);
+ font_.fontInfo().setUnderbar(FONT_INHERIT);
+ font_.fontInfo().setNoun(FONT_INHERIT);
break;
}
}
-Color_color GuiCharacter::getColor() const
+ColorCode GuiCharacter::getColor() const
{
- return font_.color();
+ return font_.fontInfo().color();
}
-void GuiCharacter::setColor(Color_color val)
+void GuiCharacter::setColor(ColorCode val)
{
switch (val) {
- case Color::ignore:
- case Color::none:
- case Color::black:
- case Color::white:
- case Color::red:
- case Color::green:
- case Color::blue:
- case Color::cyan:
- case Color::magenta:
- case Color::yellow:
- case Color::inherit:
- font_.setColor(val);
+ case Color_ignore:
+ case Color_none:
+ case Color_black:
+ case Color_white:
+ case Color_red:
+ case Color_green:
+ case Color_blue:
+ case Color_cyan:
+ case Color_magenta:
+ case Color_yellow:
+ case Color_inherit:
+ font_.fontInfo().setColor(val);
break;
default:
break;
}
-string GuiCharacter::getLanguage() const
+QString GuiCharacter::getLanguage() const
{
if (reset_lang_)
return "reset";
if (font_.language())
- return font_.language()->lang();
+ return toqstr(font_.language()->lang());
return "ignore";
}
-void GuiCharacter::setLanguage(string const & val)
+void GuiCharacter::setLanguage(QString const & val)
{
if (val == "ignore")
font_.setLanguage(ignore_language);
// Ignored in getLanguage, but needed for dispatchParams
font_.setLanguage(buffer().params().language);
} else {
- font_.setLanguage(languages.getLanguage(val));
+ font_.setLanguage(languages.getLanguage(fromqstr(val)));
}
}
-Dialog * createGuiCharacter(LyXView & lv) { return new GuiCharacter(lv); }
+Dialog * createGuiCharacter(GuiView & lv) { return new GuiCharacter(lv); }
} // namespace frontend
projects / lyx.git / blobdiff