X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCharacter.cpp;h=53ca720d2f2ac129451d935ffa76fa5d8bd1ff3c;hb=d3312032eeea9a682840e3a6b6a762cb4adec729;hp=3086fa5d9891283795e50666a9f5f3bde26f67d7;hpb=281487872f26a0ba1cdf660ac91fc7d10b2470e7;p=lyx.git diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index 3086fa5d98..53ca720d2f 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -14,13 +14,22 @@ #include "GuiCharacter.h" +#include "GuiApplication.h" #include "qt_helpers.h" + #include "Font.h" #include "Buffer.h" #include "BufferParams.h" +#include "BufferView.h" +#include "Cursor.h" #include "FuncRequest.h" #include "Language.h" +#include "Paragraph.h" +#include +#include +#include +#include using namespace std; @@ -67,6 +76,9 @@ static QList barData() bars << BarPair(qt_("No change"), IGNORE); bars << BarPair(qt_("Emph"), EMPH_TOGGLE); bars << BarPair(qt_("Underbar"), UNDERBAR_TOGGLE); + bars << BarPair(qt_("Double underbar"), UULINE_TOGGLE); + bars << BarPair(qt_("Wavy underbar"), UWAVE_TOGGLE); + bars << BarPair(qt_("Strikeout"), STRIKEOUT_TOGGLE); bars << BarPair(qt_("Noun"), NOUN_TOGGLE); bars << BarPair(qt_("Reset"), INHERIT); return bars; @@ -114,6 +126,38 @@ static QList familyData() } +static QList languageData() +{ + QList list; + // FIXME (Abdel 14/05/2008): it would be nice if we could use this model + // directly in the language combo; but, as we need also the 'No Change' and + // 'Reset' items, this is not possible right now. Separating those two + // entries in radio buttons would be a better GUI IMHO. + QAbstractItemModel * language_model = guiApp->languageModel(); + // Make sure the items are sorted. + language_model->sort(0); + + for (int i = 0; i != language_model->rowCount(); ++i) { + QModelIndex index = language_model->index(i, 0); + list << LanguagePair(index.data(Qt::DisplayRole).toString(), + index.data(Qt::UserRole).toString()); + } + return list; +} + + +namespace { + +template +void fillCombo(QComboBox * combo, QList const & list) +{ + typename QList::const_iterator cit = list.begin(); + for (; cit != list.end(); ++cit) + combo->addItem(cit->first); +} + +} + GuiCharacter::GuiCharacter(GuiView & lv) : GuiDialog(lv, "character", qt_("Text Style")), font_(ignore_font, ignore_language), toggleall_(false), reset_lang_(false) @@ -123,6 +167,8 @@ GuiCharacter::GuiCharacter(GuiView & lv) connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(autoapplyCB, SIGNAL(stateChanged(int)), this, + SLOT(slotAutoApply())); connect(miscCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(sizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); @@ -133,55 +179,30 @@ GuiCharacter::GuiCharacter(GuiView & lv) connect(langCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(toggleallCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); -#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 (QList::const_iterator cit = family.begin(); - cit != family.end(); ++cit) { - familyCO->addItem(cit->first); - } + language = languageData(); + language.prepend(LanguagePair(qt_("Reset"), "reset")); + language.prepend(LanguagePair(qt_("No change"), "ignore")); - for (QList::const_iterator cit = series.begin(); - cit != series.end(); ++cit) { - seriesCO->addItem(cit->first); - } - for (QList::const_iterator cit = shape.begin(); - cit != shape.end(); ++cit) { - shapeCO->addItem(cit->first); - } - for (QList::const_iterator cit = size.begin(); - cit != size.end(); ++cit) { - sizeCO->addItem(cit->first); - } - for (QList::const_iterator cit = bar.begin(); - cit != bar.end(); ++cit) { - miscCO->addItem(cit->first); - } - for (QList::const_iterator cit = color.begin(); - cit != color.end(); ++cit) { - colorCO->addItem(cit->first); - } - for (QList::const_iterator cit = language.begin(); - cit != language.end(); ++cit) { - langCO->addItem(cit->first); - } + fillCombo(familyCO, family); + fillCombo(seriesCO, series); + fillCombo(sizeCO, size); + fillCombo(shapeCO, shape); + fillCombo(miscCO, bar); + fillCombo(colorCO, color); + fillCombo(langCO, language); - bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy); + bc().setPolicy(ButtonPolicy::OkApplyCancelAutoReadOnlyPolicy); bc().setOK(okPB); bc().setApply(applyPB); bc().setCancel(closePB); + bc().setAutoApply(autoapplyCB); bc().addReadOnly(familyCO); bc().addReadOnly(seriesCO); bc().addReadOnly(sizeCO); @@ -192,6 +213,13 @@ GuiCharacter::GuiCharacter(GuiView & lv) bc().addReadOnly(toggleallCB); bc().addReadOnly(autoapplyCB); +#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 + // FIXME: hack to work around resizing bug in Qt >= 4.2 // bug verified with Qt 4.2.{0-3} (JSpitzm) #if QT_VERSION >= 0x040200 @@ -213,13 +241,6 @@ void GuiCharacter::change_adaptor() // stay the same between applys. Might be difficult though wrt to a // moved cursor - jbl slotApply(); - familyCO->setCurrentIndex(0); - seriesCO->setCurrentIndex(0); - sizeCO->setCurrentIndex(0); - shapeCO->setCurrentIndex(0); - miscCO->setCurrentIndex(0); - langCO->setCurrentIndex(0); - colorCO->setCurrentIndex(0); } @@ -235,201 +256,177 @@ static int findPos2nd(QList

const & vec, B const & val) void GuiCharacter::updateContents() { - familyCO->setCurrentIndex(findPos2nd(family, getFamily())); - seriesCO->setCurrentIndex(findPos2nd(series, getSeries())); - shapeCO->setCurrentIndex(findPos2nd(shape, getShape())); - sizeCO->setCurrentIndex(findPos2nd(size, getSize())); - miscCO->setCurrentIndex(findPos2nd(bar, getBar())); - colorCO->setCurrentIndex(findPos2nd(color, getColor())); - langCO->setCurrentIndex(findPos2nd(language, getLanguage())); - - toggleallCB->setChecked(toggleall_); + if (!autoapplyCB->isChecked()) { + bc().setValid(true); + return; + } + if (bufferview()->cursor().selection()) { + //FIXME: it would be better to check if each font attribute is constant + // for the selection range. + font_ = Font(ignore_font, ignore_language); + } else + font_ = bufferview()->cursor().current_font; + + paramsToDialog(font_); } -void GuiCharacter::applyView() +static FontState getBar(FontInfo const & fi) { - setFamily(family[familyCO->currentIndex()].second); - setSeries(series[seriesCO->currentIndex()].second); - setShape(shape[shapeCO->currentIndex()].second); - setSize(size[sizeCO->currentIndex()].second); - setBar(bar[miscCO->currentIndex()].second); - setColor(color[colorCO->currentIndex()].second); - setLanguage(language[langCO->currentIndex()].second); + if (fi.emph() == FONT_TOGGLE) + return EMPH_TOGGLE; - toggleall_ = toggleallCB->isChecked(); -} + if (fi.underbar() == FONT_TOGGLE) + return UNDERBAR_TOGGLE; + if (fi.strikeout() == FONT_TOGGLE) + return STRIKEOUT_TOGGLE; -bool GuiCharacter::initialiseParams(string const &) -{ - // so that the user can press Ok - if (getFamily() != IGNORE_FAMILY - || getSeries() != IGNORE_SERIES - || getShape() != IGNORE_SHAPE - || getSize() != FONT_SIZE_IGNORE - || getBar() != IGNORE - || getColor() != Color_ignore - || font_.language() != ignore_language) - setButtonsValid(true); + if (fi.uuline() == FONT_TOGGLE) + return UULINE_TOGGLE; - return true; -} + if (fi.uwave() == FONT_TOGGLE) + return UWAVE_TOGGLE; + if (fi.noun() == FONT_TOGGLE) + return NOUN_TOGGLE; -void GuiCharacter::dispatchParams() -{ - dispatch(FuncRequest(getLfun(), font_.toString(toggleall_))); -} - + if (fi.emph() == FONT_IGNORE + && fi.underbar() == FONT_IGNORE + && fi.noun() == FONT_IGNORE) + return IGNORE; -FontFamily GuiCharacter::getFamily() const -{ - return font_.fontInfo().family(); + return INHERIT; } -void GuiCharacter::setFamily(FontFamily val) +static void setBar(FontInfo & fi, FontState val) { - font_.fontInfo().setFamily(val); -} - + switch (val) { + case IGNORE: + fi.setEmph(FONT_IGNORE); + fi.setUnderbar(FONT_IGNORE); + fi.setStrikeout(FONT_IGNORE); + fi.setNoun(FONT_IGNORE); + break; -FontSeries GuiCharacter::getSeries() const -{ - return font_.fontInfo().series(); -} + case EMPH_TOGGLE: + fi.setEmph(FONT_TOGGLE); + break; + case UNDERBAR_TOGGLE: + fi.setUnderbar(FONT_TOGGLE); + break; -void GuiCharacter::setSeries(FontSeries val) -{ - font_.fontInfo().setSeries(val); -} + case STRIKEOUT_TOGGLE: + fi.setStrikeout(FONT_TOGGLE); + break; + case UULINE_TOGGLE: + fi.setUuline(FONT_TOGGLE); + break; -FontShape GuiCharacter::getShape() const -{ - return font_.fontInfo().shape(); -} + case UWAVE_TOGGLE: + fi.setUwave(FONT_TOGGLE); + break; + case NOUN_TOGGLE: + fi.setNoun(FONT_TOGGLE); + break; -void GuiCharacter::setShape(FontShape val) -{ - font_.fontInfo().setShape(val); + case INHERIT: + fi.setEmph(FONT_INHERIT); + fi.setUnderbar(FONT_INHERIT); + fi.setStrikeout(FONT_INHERIT); + fi.setUuline(FONT_INHERIT); + fi.setUwave(FONT_INHERIT); + fi.setNoun(FONT_INHERIT); + break; + } } -FontSize GuiCharacter::getSize() const +void GuiCharacter::paramsToDialog(Font const & font) { - return font_.fontInfo().size(); -} - + FontInfo const & fi = font.fontInfo(); + familyCO->setCurrentIndex(findPos2nd(family, fi.family())); + seriesCO->setCurrentIndex(findPos2nd(series, fi.series())); + shapeCO->setCurrentIndex(findPos2nd(shape, fi.shape())); + sizeCO->setCurrentIndex(findPos2nd(size, fi.size())); + miscCO->setCurrentIndex(findPos2nd(bar, getBar(fi))); + colorCO->setCurrentIndex(findPos2nd(color, fi.color())); + + // reset_language is a null pointer. + QString const lang = (font.language() == reset_language) + ? "reset" : toqstr(font.language()->lang()); + langCO->setCurrentIndex(findPos2nd(language, lang)); -void GuiCharacter::setSize(FontSize val) -{ - font_.fontInfo().setSize(val); + toggleallCB->setChecked(toggleall_); } -FontState GuiCharacter::getBar() const +void GuiCharacter::applyView() { - if (font_.fontInfo().emph() == FONT_TOGGLE) - return EMPH_TOGGLE; - - if (font_.fontInfo().underbar() == FONT_TOGGLE) - return UNDERBAR_TOGGLE; + FontInfo & fi = font_.fontInfo(); + fi.setFamily(family[familyCO->currentIndex()].second); + fi.setSeries(series[seriesCO->currentIndex()].second); + fi.setShape(shape[shapeCO->currentIndex()].second); + fi.setSize(size[sizeCO->currentIndex()].second); + setBar(fi, bar[miscCO->currentIndex()].second); + fi.setColor(color[colorCO->currentIndex()].second); - if (font_.fontInfo().noun() == FONT_TOGGLE) - return NOUN_TOGGLE; - - if (font_.fontInfo().emph() == FONT_IGNORE - && font_.fontInfo().underbar() == FONT_IGNORE - && font_.fontInfo().noun() == FONT_IGNORE) - return IGNORE; + font_.setLanguage(languages.getLanguage( + fromqstr(language[langCO->currentIndex()].second))); - return INHERIT; + toggleall_ = toggleallCB->isChecked(); } -void GuiCharacter::setBar(FontState val) +bool GuiCharacter::initialiseParams(string const &) { - switch (val) { - case IGNORE: - font_.fontInfo().setEmph(FONT_IGNORE); - font_.fontInfo().setUnderbar(FONT_IGNORE); - font_.fontInfo().setNoun(FONT_IGNORE); - break; - - case EMPH_TOGGLE: - font_.fontInfo().setEmph(FONT_TOGGLE); - break; - - case UNDERBAR_TOGGLE: - font_.fontInfo().setUnderbar(FONT_TOGGLE); - break; + if (autoapplyCB->isChecked()) + return true; - case NOUN_TOGGLE: - font_.fontInfo().setNoun(FONT_TOGGLE); - break; - - case INHERIT: - font_.fontInfo().setEmph(FONT_INHERIT); - font_.fontInfo().setUnderbar(FONT_INHERIT); - font_.fontInfo().setNoun(FONT_INHERIT); - break; - } -} + FontInfo & fi = font_.fontInfo(); + // so that the user can press Ok + if (fi.family() != IGNORE_FAMILY + || fi.series() != IGNORE_SERIES + || fi.shape() != IGNORE_SHAPE + || fi.size() != FONT_SIZE_IGNORE + || getBar(fi) != IGNORE + || fi.color() != Color_ignore + || font_.language() != ignore_language) + setButtonsValid(true); -ColorCode GuiCharacter::getColor() const -{ - return font_.fontInfo().color(); + paramsToDialog(font_); + return true; } -void GuiCharacter::setColor(ColorCode val) +void GuiCharacter::dispatchParams() { - 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_.fontInfo().setColor(val); - break; - default: - break; - } + dispatch(FuncRequest(getLfun(), font_.toString(toggleall_))); } -QString GuiCharacter::getLanguage() const +void GuiCharacter::saveSession() const { - if (reset_lang_) - return "reset"; - if (font_.language()) - return toqstr(font_.language()->lang()); - return "ignore"; + Dialog::saveSession(); + QSettings settings; + settings.setValue(sessionKey() + "/toggleall", toggleallCB->isChecked()); + settings.setValue(sessionKey() + "/autoapply", autoapplyCB->isChecked()); } -void GuiCharacter::setLanguage(QString const & val) +void GuiCharacter::restoreSession() { - if (val == "ignore") - font_.setLanguage(ignore_language); - else if (val == "reset") { - reset_lang_ = true; - // Ignored in getLanguage, but needed for dispatchParams - font_.setLanguage(buffer().params().language); - } else { - font_.setLanguage(languages.getLanguage(fromqstr(val))); - } + Dialog::restoreSession(); + QSettings settings; + toggleallCB->setChecked( + settings.value(sessionKey() + "/toggleall").toBool()); + autoapplyCB->setChecked( + settings.value(sessionKey() + "/autoapply").toBool()); } @@ -439,4 +436,4 @@ Dialog * createGuiCharacter(GuiView & lv) { return new GuiCharacter(lv); } } // namespace frontend } // namespace lyx -#include "GuiCharacter_moc.cpp" +#include "moc_GuiCharacter.cpp"