On Mac, moving down a paragraph should place the cursor at the end of the current...

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

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 8aad329218e80a3759bb5edb25974c973b6164f9..e1fe98491c12343c6649b192753eaf6c55674dae 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -76,6 +76,8 @@ 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);
@@ -158,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);
 
@@ -280,6 +282,12 @@ static FontState getBar(FontInfo const & fi)
        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;
 
@@ -314,6 +322,14 @@ static void setBar(FontInfo & fi, FontState val)
                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;
@@ -322,6 +338,8 @@ static void setBar(FontInfo & fi, FontState val)
                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;
        }