]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiCharacter.cpp
Have OK/Apply buttons initially disabled.
[lyx.git] / src / frontends / qt4 / GuiCharacter.cpp
index 3086fa5d9891283795e50666a9f5f3bde26f67d7..349fea2c508ef47bc39fe7d1175d37c8e5ae42cc 100644 (file)
@@ -6,6 +6,7 @@
  * \author Angus Leeming
  * \author Edwin Leuven
  * \author John Levon
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
 
 #include "GuiCharacter.h"
 
+#include "GuiApplication.h"
 #include "qt_helpers.h"
+
 #include "Font.h"
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "BufferView.h"
+#include "Color.h"
+#include "ColorCache.h"
+#include "ColorSet.h"
+#include "Cursor.h"
 #include "FuncRequest.h"
 #include "Language.h"
+#include "Paragraph.h"
+
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
+#include <QAbstractItemModel>
+#include <QComboBox>
+#include <QModelIndex>
+#include <QSettings>
+#include <QVariant>
 
 using namespace std;
 
@@ -65,28 +82,49 @@ static QList<BarPair> barData()
 {
        QList<BarPair> bars;
        bars << BarPair(qt_("No change"), IGNORE);
-       bars << BarPair(qt_("Emph"),      EMPH_TOGGLE);
-       bars << BarPair(qt_("Underbar"),  UNDERBAR_TOGGLE);
-       bars << BarPair(qt_("Noun"),      NOUN_TOGGLE);
-       bars << BarPair(qt_("Reset"),     INHERIT);
+       bars << BarPair(qt_("(Without)[[underlining]]"), NONE);
+       bars << BarPair(qt_("Single[[underlining]]"), UNDERBAR);
+       bars << BarPair(qt_("Double[[underlining]]"), UULINE);
+       bars << BarPair(qt_("Wavy"), UWAVE);
+       bars << BarPair(qt_("Reset"), INHERIT);
        return bars;
 }
 
 
-static QList<ColorPair> colorData()
+static QList<BarPair> strikeData()
 {
-       QList<ColorPair> colors;
-       colors << ColorPair(qt_("No change"), Color_ignore);
-       colors << ColorPair(qt_("No color"), Color_none);
-       colors << ColorPair(qt_("Black"), Color_black);
-       colors << ColorPair(qt_("White"), Color_white);
-       colors << ColorPair(qt_("Red"), Color_red);
-       colors << ColorPair(qt_("Green"), Color_green);
-       colors << ColorPair(qt_("Blue"), Color_blue);
-       colors << ColorPair(qt_("Cyan"), Color_cyan);
-       colors << ColorPair(qt_("Magenta"), Color_magenta);
-       colors << ColorPair(qt_("Yellow"), Color_yellow);
-       colors << ColorPair(qt_("Reset"), Color_inherit);
+       QList<BarPair> strike;
+       strike << BarPair(qt_("No change"), IGNORE);
+       strike << BarPair(qt_("(Without)[[strikethrough]]"), NONE);
+       strike << BarPair(qt_("Single[[strikethrough]]"), STRIKEOUT);
+       strike << BarPair(qt_("With /"), XOUT);
+       strike << BarPair(qt_("Reset"), INHERIT);
+       return strike;
+}
+
+
+static QList<ColorCode> colorData()
+{
+       QList<ColorCode> colors;
+       colors << Color_black;
+       colors << Color_blue;
+       colors << Color_brown;
+       colors << Color_cyan;
+       colors << Color_darkgray;
+       colors << Color_gray;
+       colors << Color_green;
+       colors << Color_lightgray;
+       colors << Color_lime;
+       colors << Color_magenta;
+       colors << Color_olive;
+       colors << Color_orange;
+       colors << Color_pink;
+       colors << Color_purple;
+       colors << Color_red;
+       colors << Color_teal;
+       colors << Color_violet;
+       colors << Color_white;
+       colors << Color_yellow;
        return colors;
 }
 
@@ -114,93 +152,150 @@ static QList<FamilyPair> familyData()
 }
 
 
+static QList<LanguagePair> languageData()
+{
+       QList<LanguagePair> list;
+       // FIXME (Abdel 14/05/2008): it would be nice if we could use this model
+       // directly in the language combo; but, as we need also the 'No Change' and
+       // 'Reset' items, this is not possible right now. Separating those two
+       // entries in radio buttons would be a better GUI IMHO.
+       QAbstractItemModel * language_model = guiApp->languageModel();
+       // Make sure the items are sorted.
+       language_model->sort(0);
+
+       for (int i = 0; i != language_model->rowCount(); ++i) {
+               QModelIndex index = language_model->index(i, 0);
+               list << LanguagePair(index.data(Qt::DisplayRole).toString(),
+                       index.data(Qt::UserRole).toString());
+       }
+       return list;
+}
+
+
+namespace {
+
+template<typename T>
+void fillCombo(QComboBox * combo, QList<T> const & list)
+{
+       typename QList<T>::const_iterator cit = list.begin();
+       for (; cit != list.end(); ++cit)
+               combo->addItem(cit->first);
+}
+
+template<typename T>
+void fillComboColor(QComboBox * combo, QList<T> const & list)
+{
+       // at first add the 2 colors "No change" and "No color"
+       combo->addItem(qt_("No change"), "ignore");
+       combo->addItem(qt_("(Without)[[color]]"), "none");
+       // now add the real colors
+       QPixmap coloritem(32, 32);
+       QColor color;
+       QList<ColorCode>::const_iterator cit = list.begin();
+       for (; cit != list.end(); ++cit) {
+               QString const lyxname = toqstr(lcolor.getLyXName(*cit));
+               QString const guiname = toqstr(translateIfPossible(lcolor.getGUIName(*cit)));
+               color = QColor(guiApp->colorCache().get(*cit, false));
+               coloritem.fill(color);
+               combo->addItem(QIcon(coloritem), guiname, lyxname);
+       }
+       //the last color is "Reset"
+       combo->addItem(qt_("Reset"), "inherit");
+}
+
+} // namespace
+
 GuiCharacter::GuiCharacter(GuiView & lv)
-       : GuiDialog(lv, "character", qt_("Text Style")), font_(ignore_font, ignore_language),
-         toggleall_(false), reset_lang_(false)
+       : GuiDialog(lv, "character", qt_("Text Style")),
+         font_(ignore_font, ignore_language), emph_(false), noun_(false)
 {
        setupUi(this);
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-
-       connect(miscCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(sizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(familyCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(seriesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-       connect(shapeCO, 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()));
-
-#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
+       connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
+               SLOT(slotAutoApply()));
+
+       connect(ulineCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(strikeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(sizeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(familyCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(seriesCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(shapeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(colorCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(langCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
 
        family = familyData();
        series = seriesData();
        shape  = shapeData();
        size   = sizeData();
        bar    = barData();
+       strike = strikeData();
        color  = colorData();
-       language = languageData(true);
-
-       for (QList<FamilyPair>::const_iterator cit = family.begin();
-               cit != family.end(); ++cit) {
-               familyCO->addItem(cit->first);
-       }
-
-       for (QList<SeriesPair>::const_iterator cit = series.begin();
-               cit != series.end(); ++cit) {
-               seriesCO->addItem(cit->first);
-       }
-       for (QList<ShapePair>::const_iterator cit = shape.begin();
-               cit != shape.end(); ++cit) {
-               shapeCO->addItem(cit->first);
-       }
-       for (QList<SizePair>::const_iterator cit = size.begin();
-               cit != size.end(); ++cit) {
-               sizeCO->addItem(cit->first);
-       }
-       for (QList<BarPair>::const_iterator cit = bar.begin();
-               cit != bar.end(); ++cit) {
-               miscCO->addItem(cit->first);
-       }
-       for (QList<ColorPair>::const_iterator cit = color.begin();
-               cit != color.end(); ++cit) {
-               colorCO->addItem(cit->first);
-       }
-       for (QList<LanguagePair>::const_iterator cit = language.begin();
-               cit != language.end(); ++cit) {
-               langCO->addItem(cit->first);
-       }
-
-       bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
+       qSort(color.begin(), color.end(), ColorSorter);
+
+       language = languageData();
+       language.prepend(LanguagePair(qt_("Reset"), "reset"));
+       language.prepend(LanguagePair(qt_("No change"), "ignore"));
+
+       fillCombo(familyCO, family);
+       fillCombo(seriesCO, series);
+       fillCombo(sizeCO, size);
+       fillCombo(shapeCO, shape);
+       fillCombo(ulineCO, bar);
+       fillCombo(strikeCO, strike);
+       fillComboColor(colorCO, color);
+       fillCombo(langCO, language);
+
+       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(shapeCO);
-       bc().addReadOnly(miscCO);
+       bc().addReadOnly(ulineCO);
+       bc().addReadOnly(strikeCO);
+       bc().addReadOnly(nounCB);
+       bc().addReadOnly(emphCB);
        bc().addReadOnly(langCO);
        bc().addReadOnly(colorCO);
-       bc().addReadOnly(toggleallCB);
        bc().addReadOnly(autoapplyCB);
 
-// FIXME: hack to work around resizing bug in Qt >= 4.2
-// bug verified with Qt 4.2.{0-3} (JSpitzm)
-#if QT_VERSION >= 0x040200
-       // qt resizes the comboboxes only after show(), so ...
-       QDialog::show();
+#ifdef Q_OS_MAC
+       // 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
 }
 
 
+void GuiCharacter::on_emphCB_clicked()
+{
+       // skip intermediate state at user click
+       if (!emph_) {
+               emphCB->setCheckState(Qt::Checked);
+               emph_ = true;
+       }
+       change_adaptor();
+}
+
+
+void GuiCharacter::on_nounCB_clicked()
+{
+       // skip intermediate state at user click
+       if (!noun_) {
+               nounCB->setCheckState(Qt::Checked);
+               noun_ = true;
+       }
+       change_adaptor();
+}
+
+
 void GuiCharacter::change_adaptor()
 {
        changed();
@@ -213,13 +308,6 @@ void GuiCharacter::change_adaptor()
        // stay the same between applys. Might be difficult though wrt to a
        // moved cursor - jbl
        slotApply();
-       familyCO->setCurrentIndex(0);
-       seriesCO->setCurrentIndex(0);
-       sizeCO->setCurrentIndex(0);
-       shapeCO->setCurrentIndex(0);
-       miscCO->setCurrentIndex(0);
-       langCO->setCurrentIndex(0);
-       colorCO->setCurrentIndex(0);
 }
 
 
@@ -233,203 +321,275 @@ static int findPos2nd(QList<P> const & vec, B const & val)
 }
 
 
-void GuiCharacter::updateContents()
+namespace{
+FontState getBar(FontInfo const & fi)
 {
-       familyCO->setCurrentIndex(findPos2nd(family, getFamily()));
-       seriesCO->setCurrentIndex(findPos2nd(series, getSeries()));
-       shapeCO->setCurrentIndex(findPos2nd(shape, getShape()));
-       sizeCO->setCurrentIndex(findPos2nd(size, getSize()));
-       miscCO->setCurrentIndex(findPos2nd(bar, getBar()));
-       colorCO->setCurrentIndex(findPos2nd(color, getColor()));
-       langCO->setCurrentIndex(findPos2nd(language, getLanguage()));
-
-       toggleallCB->setChecked(toggleall_);
-}
+       if (fi.underbar() == FONT_ON)
+               return UNDERBAR;
 
+       if (fi.uuline() == FONT_ON)
+               return UULINE;
 
-void GuiCharacter::applyView()
-{
-       setFamily(family[familyCO->currentIndex()].second);
-       setSeries(series[seriesCO->currentIndex()].second);
-       setShape(shape[shapeCO->currentIndex()].second);
-       setSize(size[sizeCO->currentIndex()].second);
-       setBar(bar[miscCO->currentIndex()].second);
-       setColor(color[colorCO->currentIndex()].second);
-       setLanguage(language[langCO->currentIndex()].second);
-
-       toggleall_ = toggleallCB->isChecked();
-}
-
+       if (fi.uwave() == FONT_ON)
+               return UWAVE;
 
-bool GuiCharacter::initialiseParams(string const &)
-{
-       // so that the user can press Ok
-       if (getFamily()    != IGNORE_FAMILY
-           || getSeries() != IGNORE_SERIES
-           || getShape()  != IGNORE_SHAPE
-           || getSize()   != FONT_SIZE_IGNORE
-           || getBar()    != IGNORE
-           || getColor()  != Color_ignore
-           || font_.language() != ignore_language)
-               setButtonsValid(true);
+       if (fi.underbar() == FONT_IGNORE)
+               return IGNORE;
 
-       return true;
+       return NONE;
 }
 
 
-void GuiCharacter::dispatchParams()
+FontState getStrike(FontInfo const & fi)
 {
-       dispatch(FuncRequest(getLfun(), font_.toString(toggleall_)));
-}
+       if (fi.strikeout() == FONT_ON)
+               return STRIKEOUT;
 
+       if (fi.xout() == FONT_ON)
+               return XOUT;
 
-FontFamily GuiCharacter::getFamily() const
-{
-       return font_.fontInfo().family();
-}
-
+       if (fi.strikeout() == FONT_IGNORE)
+               return IGNORE;
 
-void GuiCharacter::setFamily(FontFamily val)
-{
-       font_.fontInfo().setFamily(val);
+       return NONE;
 }
 
 
-FontSeries GuiCharacter::getSeries() const
+Qt::CheckState getMarkupState(lyx::FontState fs)
 {
-       return font_.fontInfo().series();
+       switch (fs) {
+       case FONT_OFF:
+               return Qt::Unchecked;
+       case FONT_ON:
+               return Qt::Checked;
+       case FONT_TOGGLE:
+       case FONT_INHERIT:
+       case FONT_IGNORE:
+       default:
+               return Qt::PartiallyChecked;
+       }
 }
 
-
-void GuiCharacter::setSeries(FontSeries val)
+lyx::FontState setMarkupState(Qt::CheckState cs)
 {
-       font_.fontInfo().setSeries(val);
+       switch (cs) {
+       case Qt::Unchecked:
+               return FONT_OFF;
+       case Qt::Checked:
+               return FONT_ON;
+       case Qt::PartiallyChecked:
+       default:
+               return FONT_IGNORE;
+       }
 }
 
+} // end namespace anon
 
-FontShape GuiCharacter::getShape() const
+
+void GuiCharacter::updateContents()
 {
-       return font_.fontInfo().shape();
+       if (bufferview()->cursor().selection()) {
+               Font font = bufferview()->cursor().real_current_font;
+               FontInfo fi = font.fontInfo();
+               BufferParams const & bp = buffer().masterParams();
+
+               // Check if each font attribute is constant for the selection range.
+               DocIterator const from = bufferview()->cursor().selectionBegin();
+               DocIterator const to = bufferview()->cursor().selectionEnd();
+               for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) {
+                       if (!dit.inTexted()) {
+                               dit.forwardPos();
+                               continue;
+                       }
+                       Paragraph const & par = dit.paragraph();
+                       pos_type const pos = dit.pos();
+                       Font tmp = par.getFont(bp, pos, font);
+                       if (font.language() != tmp.language())
+                               font.setLanguage(ignore_language);
+                       if (fi.family() != tmp.fontInfo().family())
+                               font.fontInfo().setFamily(IGNORE_FAMILY);
+                       if (fi.series() != tmp.fontInfo().series())
+                               font.fontInfo().setSeries(IGNORE_SERIES);
+                       if (fi.shape() != tmp.fontInfo().shape())
+                               font.fontInfo().setShape(IGNORE_SHAPE);
+                       if (fi.size() != tmp.fontInfo().size())
+                               font.fontInfo().setSize(FONT_SIZE_IGNORE);
+                       if (fi.emph() != tmp.fontInfo().emph())
+                               font.fontInfo().setEmph(FONT_IGNORE);
+                       if (fi.noun() != tmp.fontInfo().noun())
+                               font.fontInfo().setNoun(FONT_IGNORE);
+                       if (fi.color() != tmp.fontInfo().color())
+                               font.fontInfo().setColor(Color_ignore);
+                       if (fi.underbar() != tmp.fontInfo().underbar()
+                           || fi.uuline() != tmp.fontInfo().uuline()
+                           || fi.uwave() != tmp.fontInfo().uwave())
+                               setBar(font.fontInfo(), IGNORE);
+                       if (fi.strikeout() != tmp.fontInfo().strikeout()
+                           || fi.xout() != tmp.fontInfo().xout())
+                               setStrike(font.fontInfo(), IGNORE);
+                       dit.forwardPos();
+               }
+               font_ = font;
+       } else
+               font_ = bufferview()->cursor().real_current_font;
+
+       paramsToDialog(font_);
 }
 
 
-void GuiCharacter::setShape(FontShape val)
+void GuiCharacter::setBar(FontInfo & fi, FontState val)
 {
-       font_.fontInfo().setShape(val);
+       switch (val) {
+       case IGNORE:
+               fi.setUnderbar(FONT_IGNORE);
+               fi.setUuline(FONT_IGNORE);
+               fi.setUwave(FONT_IGNORE);
+               break;
+       case UNDERBAR:
+               setBar(fi, NONE);
+               fi.setUnderbar(FONT_ON);
+               break;
+       case UULINE:
+               setBar(fi, NONE);
+               fi.setUuline(FONT_ON);
+               break;
+       case UWAVE:
+               setBar(fi, NONE);
+               fi.setUwave(FONT_ON);
+               break;
+       case INHERIT:
+               fi.setUnderbar(FONT_INHERIT);
+               fi.setUuline(FONT_INHERIT);
+               fi.setUwave(FONT_INHERIT);
+               break;
+       case NONE:
+               fi.setUnderbar(FONT_OFF);
+               fi.setUuline(FONT_OFF);
+               fi.setUwave(FONT_OFF);
+               break;
+       case XOUT:
+       case STRIKEOUT:
+       default:
+               break;
+       }
 }
 
 
-FontSize GuiCharacter::getSize() const
+void GuiCharacter::setStrike(FontInfo & fi, FontState val)
 {
-       return font_.fontInfo().size();
+       switch (val) {
+       case IGNORE:
+               fi.setStrikeout(FONT_IGNORE);
+               fi.setXout(FONT_IGNORE);
+               break;
+       case STRIKEOUT:
+               setStrike(fi, NONE);
+               fi.setStrikeout(FONT_ON);
+               break;
+       case XOUT:
+               setStrike(fi, NONE);
+               fi.setXout(FONT_ON);
+               break;
+       case INHERIT:
+               fi.setStrikeout(FONT_INHERIT);
+               fi.setXout(FONT_INHERIT);
+               break;
+       case NONE:
+               fi.setStrikeout(FONT_OFF);
+               fi.setXout(FONT_OFF);
+               break;
+       case UNDERBAR:
+       case UWAVE:
+       case UULINE:
+       default:
+               break;
+       }
 }
 
 
-void GuiCharacter::setSize(FontSize val)
+void GuiCharacter::paramsToDialog(Font const & font)
 {
-       font_.fontInfo().setSize(val);
+       FontInfo const & fi = font.fontInfo();
+       familyCO->setCurrentIndex(findPos2nd(family, fi.family()));
+       seriesCO->setCurrentIndex(findPos2nd(series, fi.series()));
+       shapeCO->setCurrentIndex(findPos2nd(shape, fi.shape()));
+       sizeCO->setCurrentIndex(findPos2nd(size, fi.size()));
+       ulineCO->setCurrentIndex(findPos2nd(bar, getBar(fi)));
+       strikeCO->setCurrentIndex(findPos2nd(strike, getStrike(fi)));
+       colorCO->setCurrentIndex(colorCO->findData(toqstr(lcolor.getLyXName(fi.color()))));
+       emphCB->setCheckState(getMarkupState(fi.emph()));
+       nounCB->setCheckState(getMarkupState(fi.noun()));
+       emph_ = emphCB->checkState() == Qt::Checked;
+       noun_ = nounCB->checkState() == Qt::Checked;
+
+       // reset_language is a null pointer.
+       QString const lang = (font.language() == reset_language)
+               ? "reset" : toqstr(font.language()->lang());
+       langCO->setCurrentIndex(findPos2nd(language, lang));
+       // disable the OK/Apply buttons, since we have no changes yet
+       bc().setValid(false);
 }
 
 
-FontState GuiCharacter::getBar() const
+void GuiCharacter::applyView()
 {
-       if (font_.fontInfo().emph() == FONT_TOGGLE)
-               return EMPH_TOGGLE;
-
-       if (font_.fontInfo().underbar() == FONT_TOGGLE)
-               return UNDERBAR_TOGGLE;
-
-       if (font_.fontInfo().noun() == FONT_TOGGLE)
-               return NOUN_TOGGLE;
-
-       if (font_.fontInfo().emph() == FONT_IGNORE
-           && font_.fontInfo().underbar() == FONT_IGNORE
-           && font_.fontInfo().noun() == FONT_IGNORE)
-               return IGNORE;
-
-       return INHERIT;
+       FontInfo & fi = font_.fontInfo();
+       fi.setFamily(family[familyCO->currentIndex()].second);
+       fi.setSeries(series[seriesCO->currentIndex()].second);
+       fi.setShape(shape[shapeCO->currentIndex()].second);
+       fi.setSize(size[sizeCO->currentIndex()].second);
+       fi.setEmph(setMarkupState(emphCB->checkState()));
+       fi.setNoun(setMarkupState(nounCB->checkState()));
+       setBar(fi, bar[ulineCO->currentIndex()].second);
+       setStrike(fi, strike[strikeCO->currentIndex()].second);
+       fi.setColor(lcolor.getFromLyXName(fromqstr(colorCO->itemData(colorCO->currentIndex()).toString())));
+
+       font_.setLanguage(languages.getLanguage(
+               fromqstr(language[langCO->currentIndex()].second)));
 }
 
 
-void GuiCharacter::setBar(FontState val)
+bool GuiCharacter::initialiseParams(string const &)
 {
-       switch (val) {
-       case IGNORE:
-               font_.fontInfo().setEmph(FONT_IGNORE);
-               font_.fontInfo().setUnderbar(FONT_IGNORE);
-               font_.fontInfo().setNoun(FONT_IGNORE);
-               break;
-
-       case EMPH_TOGGLE:
-               font_.fontInfo().setEmph(FONT_TOGGLE);
-               break;
+       if (autoapplyCB->isChecked())
+               return true;
 
-       case UNDERBAR_TOGGLE:
-               font_.fontInfo().setUnderbar(FONT_TOGGLE);
-               break;
-
-       case NOUN_TOGGLE:
-               font_.fontInfo().setNoun(FONT_TOGGLE);
-               break;
-
-       case INHERIT:
-               font_.fontInfo().setEmph(FONT_INHERIT);
-               font_.fontInfo().setUnderbar(FONT_INHERIT);
-               font_.fontInfo().setNoun(FONT_INHERIT);
-               break;
-       }
-}
+       FontInfo & fi = font_.fontInfo();
 
+       // so that the user can press Ok
+       if (fi.family()    != IGNORE_FAMILY
+           || fi.series() != IGNORE_SERIES
+           || fi.shape()  != IGNORE_SHAPE
+           || fi.size()   != FONT_SIZE_IGNORE
+           || getBar(fi)  != IGNORE
+           || fi.color()  != Color_ignore
+           || font_.language() != ignore_language)
+               setButtonsValid(true);
 
-ColorCode GuiCharacter::getColor() const
-{
-       return font_.fontInfo().color();
+       paramsToDialog(font_);
+       return true;
 }
 
 
-void GuiCharacter::setColor(ColorCode val)
+void GuiCharacter::dispatchParams()
 {
-       switch (val) {
-       case Color_ignore:
-       case Color_none:
-       case Color_black:
-       case Color_white:
-       case Color_red:
-       case Color_green:
-       case Color_blue:
-       case Color_cyan:
-       case Color_magenta:
-       case Color_yellow:
-       case Color_inherit:
-               font_.fontInfo().setColor(val);
-               break;
-       default:
-               break;
-       }
+       dispatch(FuncRequest(getLfun(), font_.toString(false)));
 }
 
 
-QString GuiCharacter::getLanguage() const
+void GuiCharacter::saveSession(QSettings & settings) const
 {
-       if (reset_lang_)
-               return "reset";
-       if (font_.language())
-               return toqstr(font_.language()->lang());
-       return "ignore";
+       Dialog::saveSession(settings);
+       settings.setValue(sessionKey() + "/autoapply", autoapplyCB->isChecked());
 }
 
 
-void GuiCharacter::setLanguage(QString const & val)
+void GuiCharacter::restoreSession()
 {
-       if (val == "ignore")
-               font_.setLanguage(ignore_language);
-       else if (val == "reset") {
-               reset_lang_ = true;
-               // Ignored in getLanguage, but needed for dispatchParams
-               font_.setLanguage(buffer().params().language);
-       } else {
-               font_.setLanguage(languages.getLanguage(fromqstr(val)));
-       }
+       Dialog::restoreSession();
+       QSettings settings;
+       autoapplyCB->setChecked(
+               settings.value(sessionKey() + "/autoapply").toBool());
 }
 
 
@@ -439,4 +599,4 @@ Dialog * createGuiCharacter(GuiView & lv) { return new GuiCharacter(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCharacter_moc.cpp"
+#include "moc_GuiCharacter.cpp"