X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCharacter.cpp;h=53ca720d2f2ac129451d935ffa76fa5d8bd1ff3c;hb=d3312032eeea9a682840e3a6b6a762cb4adec729;hp=c2c0feedd722992afb1eaeeb82f7972754736c50;hpb=63897c2959b77b33edade692f41a16a599c0f7bf;p=lyx.git diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index c2c0feedd7..53ca720d2f 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -14,7 +14,9 @@ #include "GuiCharacter.h" +#include "GuiApplication.h" #include "qt_helpers.h" + #include "Font.h" #include "Buffer.h" #include "BufferParams.h" @@ -24,6 +26,10 @@ #include "Language.h" #include "Paragraph.h" +#include +#include +#include +#include using namespace std; @@ -70,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; @@ -120,10 +129,18 @@ static QList familyData() static QList languageData() { QList list; - Languages::const_iterator it = languages.begin(); - for (; it != languages.end(); ++it) { - list << LanguagePair( - qt_(it->second.display()), toqstr(it->second.lang())); + // 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; } @@ -150,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())); @@ -160,13 +179,6 @@ 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(); @@ -186,10 +198,11 @@ GuiCharacter::GuiCharacter(GuiView & lv) 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); @@ -200,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 @@ -236,8 +256,10 @@ static int findPos2nd(QList

const & vec, B const & val) void GuiCharacter::updateContents() { - if (!autoapplyCB->isChecked()) + 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. @@ -257,6 +279,15 @@ static FontState getBar(FontInfo const & fi) if (fi.underbar() == FONT_TOGGLE) return UNDERBAR_TOGGLE; + if (fi.strikeout() == FONT_TOGGLE) + return STRIKEOUT_TOGGLE; + + if (fi.uuline() == FONT_TOGGLE) + return UULINE_TOGGLE; + + if (fi.uwave() == FONT_TOGGLE) + return UWAVE_TOGGLE; + if (fi.noun() == FONT_TOGGLE) return NOUN_TOGGLE; @@ -275,6 +306,7 @@ static void setBar(FontInfo & fi, FontState val) case IGNORE: fi.setEmph(FONT_IGNORE); fi.setUnderbar(FONT_IGNORE); + fi.setStrikeout(FONT_IGNORE); fi.setNoun(FONT_IGNORE); break; @@ -286,6 +318,18 @@ static void setBar(FontInfo & fi, FontState val) fi.setUnderbar(FONT_TOGGLE); break; + case STRIKEOUT_TOGGLE: + fi.setStrikeout(FONT_TOGGLE); + break; + + case UULINE_TOGGLE: + fi.setUuline(FONT_TOGGLE); + break; + + case UWAVE_TOGGLE: + fi.setUwave(FONT_TOGGLE); + break; + case NOUN_TOGGLE: fi.setNoun(FONT_TOGGLE); break; @@ -293,6 +337,9 @@ static void setBar(FontInfo & fi, FontState 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; } @@ -363,10 +410,30 @@ void GuiCharacter::dispatchParams() } +void GuiCharacter::saveSession() const +{ + Dialog::saveSession(); + QSettings settings; + settings.setValue(sessionKey() + "/toggleall", toggleallCB->isChecked()); + settings.setValue(sessionKey() + "/autoapply", autoapplyCB->isChecked()); +} + + +void GuiCharacter::restoreSession() +{ + Dialog::restoreSession(); + QSettings settings; + toggleallCB->setChecked( + settings.value(sessionKey() + "/toggleall").toBool()); + autoapplyCB->setChecked( + settings.value(sessionKey() + "/autoapply").toBool()); +} + + Dialog * createGuiCharacter(GuiView & lv) { return new GuiCharacter(lv); } } // namespace frontend } // namespace lyx -#include "GuiCharacter_moc.cpp" +#include "moc_GuiCharacter.cpp"