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_("Strike out"), STRIKEOUT_TOGGLE);
+ bars << BarPair(qt_("Cross out"), XOUT_TOGGLE);
bars << BarPair(qt_("Noun"), NOUN_TOGGLE);
bars << BarPair(qt_("Reset"), INHERIT);
return bars;
combo->addItem(qt_("Reset"), "inherit");
}
-
-bool ColorSorter(ColorCode lhs, ColorCode rhs)
-{
- return support::compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
-}
-
-} // namespace anon
+} // namespace
GuiCharacter::GuiCharacter(GuiView & lv)
: GuiDialog(lv, "character", qt_("Text Style")), font_(ignore_font, ignore_language),
if (fi.strikeout() == FONT_TOGGLE)
return STRIKEOUT_TOGGLE;
+ if (fi.xout() == FONT_TOGGLE)
+ return XOUT_TOGGLE;
+
if (fi.uuline() == FONT_TOGGLE)
return UULINE_TOGGLE;
fi.setEmph(FONT_IGNORE);
fi.setUnderbar(FONT_IGNORE);
fi.setStrikeout(FONT_IGNORE);
+ fi.setXout(FONT_IGNORE);
fi.setUuline(FONT_IGNORE);
fi.setUwave(FONT_IGNORE);
fi.setNoun(FONT_IGNORE);
fi.setStrikeout(FONT_TOGGLE);
break;
+ case XOUT_TOGGLE:
+ setBar(fi, INHERIT);
+ fi.setXout(FONT_TOGGLE);
+ break;
+
case UULINE_TOGGLE:
setBar(fi, INHERIT);
fi.setUuline(FONT_TOGGLE);
fi.setEmph(FONT_INHERIT);
fi.setUnderbar(FONT_INHERIT);
fi.setStrikeout(FONT_INHERIT);
+ fi.setXout(FONT_INHERIT);
fi.setUuline(FONT_INHERIT);
fi.setUwave(FONT_INHERIT);
fi.setNoun(FONT_INHERIT);
}
-void GuiCharacter::saveSession() const
+void GuiCharacter::saveSession(QSettings & settings) const
{
- Dialog::saveSession();
- QSettings settings;
+ Dialog::saveSession(settings);
settings.setValue(sessionKey() + "/toggleall", toggleallCB->isChecked());
settings.setValue(sessionKey() + "/autoapply", autoapplyCB->isChecked());
}