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;
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()));
connect(colorCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(langCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(toggleallCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- connect(autoapplyCB, SIGNAL(stateChanged(int)), 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();
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);
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
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.
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;
case IGNORE:
fi.setEmph(FONT_IGNORE);
fi.setUnderbar(FONT_IGNORE);
+ fi.setStrikeout(FONT_IGNORE);
fi.setNoun(FONT_IGNORE);
break;
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;
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;
}
} // namespace frontend
} // namespace lyx
-#include "GuiCharacter_moc.cpp"
+#include "moc_GuiCharacter.cpp"