X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCharacter.cpp;h=53ca720d2f2ac129451d935ffa76fa5d8bd1ff3c;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=d3bbc9b5174e3c7c05e66dc1d0aba8aa748249be;hpb=2afc45c53897e97b8c38516aa7bef9b8d077e74a;p=lyx.git

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index d3bbc9b517..53ca720d2f 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -76,6 +76,9 @@ static QList<BarPair> 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;
@@ -253,8 +256,10 @@ static int findPos2nd(QList<P> 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.
@@ -274,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;
 
@@ -292,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;
 
@@ -303,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;
@@ -310,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;
 	}