On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / GuiCharacter.cpp

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 28dfdb560ccffaf12ac54852440491ad6b8fc327..2d2c3e2b7ef679001320285b3a2fb88ed652685a 100644 (file)
--- 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;
@@ -157,7 +160,7 @@ void fillCombo(QComboBox * combo, QList<T> const & list)
 
 GuiCharacter::GuiCharacter(GuiView & lv)
        : GuiDialog(lv, "character", qt_("Text Style")), font_(ignore_font, ignore_language),
-         toggleall_(false), reset_lang_(false)
+         toggleall_(false)
 {
        setupUi(this);
 
@@ -276,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;
 
@@ -294,24 +306,48 @@ static void setBar(FontInfo & fi, FontState val)
        case IGNORE:
                fi.setEmph(FONT_IGNORE);
                fi.setUnderbar(FONT_IGNORE);
+               fi.setStrikeout(FONT_IGNORE);
+               fi.setUuline(FONT_IGNORE);
+               fi.setUwave(FONT_IGNORE);
                fi.setNoun(FONT_IGNORE);
                break;
 
        case EMPH_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setEmph(FONT_TOGGLE);
                break;
 
        case UNDERBAR_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setUnderbar(FONT_TOGGLE);
                break;
 
+       case STRIKEOUT_TOGGLE:
+               setBar(fi, INHERIT);
+               fi.setStrikeout(FONT_TOGGLE);
+               break;
+
+       case UULINE_TOGGLE:
+               setBar(fi, INHERIT);
+               fi.setUuline(FONT_TOGGLE);
+               break;
+
+       case UWAVE_TOGGLE:
+               setBar(fi, INHERIT);
+               fi.setUwave(FONT_TOGGLE);
+               break;
+
        case NOUN_TOGGLE:
+               setBar(fi, INHERIT);
                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;
        }