]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiCharacter.cpp
Use <cstdint> instead of <boost/cstdint.hpp>
[lyx.git] / src / frontends / qt4 / GuiCharacter.cpp
index 369486cd60731817e210646f4b97a2ee351486dc..59b7ca3f0e50074d3d79fd11b3452fcec5c91947 100644 (file)
@@ -3,8 +3,10 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
+ * \author Angus Leeming
  * \author Edwin Leuven
  * \author John Levon
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
 #include <config.h>
 
 #include "GuiCharacter.h"
-#include "qt_helpers.h"
-#include "frontend_helpers.h"
-#include "Color.h"
 
-#include <QCloseEvent>
+#include "GuiApplication.h"
+#include "qt_helpers.h"
 
-using std::vector;
+#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 <QPushButton>
+#include <QComboBox>
+#include <QMenu>
+#include <QModelIndex>
+#include <QSettings>
+#include <QVariant>
+
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-/////////////////////////////////////////////////////////////////////
-//
-// GuiCharacterDialog
-//
-/////////////////////////////////////////////////////////////////////
-
-GuiCharacterDialog::GuiCharacterDialog(GuiCharacter * form)
-       : form_(form)
+static QList<ShapePair> shapeData()
 {
-       setupUi(this);
-       connect(okPB, SIGNAL(clicked()), form_, SLOT(slotOK()));
-       connect(applyPB, SIGNAL(clicked()), form_, SLOT(slotApply()));
-       connect(closePB, SIGNAL(clicked()), form_, 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()));
+       QList<ShapePair> shapes;
+       shapes << ShapePair(qt_("No change"), IGNORE_SHAPE);
+       shapes << ShapePair(qt_("Default"), INHERIT_SHAPE);
+       shapes << ShapePair(qt_("Upright"), UP_SHAPE);
+       shapes << ShapePair(qt_("Italic"), ITALIC_SHAPE);
+       shapes << ShapePair(qt_("Slanted"), SLANTED_SHAPE);
+       shapes << ShapePair(qt_("Small Caps"), SMALLCAPS_SHAPE);
+       return shapes;
 }
 
 
-void GuiCharacterDialog::change_adaptor()
+static QList<SizePair> sizeData()
 {
-       form_->changed();
+       QList<SizePair> sizes;
+       sizes << SizePair(qt_("No change"), IGNORE_SIZE);
+       sizes << SizePair(qt_("Default"), INHERIT_SIZE);
+       sizes << SizePair(qt_("Tiny"), TINY_SIZE);
+       sizes << SizePair(qt_("Smallest"), SCRIPT_SIZE);
+       sizes << SizePair(qt_("Smaller"), FOOTNOTE_SIZE);
+       sizes << SizePair(qt_("Small"), SMALL_SIZE);
+       sizes << SizePair(qt_("Normal"), NORMAL_SIZE);
+       sizes << SizePair(qt_("Large"), LARGE_SIZE);
+       sizes << SizePair(qt_("Larger"), LARGER_SIZE);
+       sizes << SizePair(qt_("Largest"), LARGEST_SIZE);
+       sizes << SizePair(qt_("Huge"), HUGE_SIZE);
+       sizes << SizePair(qt_("Huger"), HUGER_SIZE);
+       sizes << SizePair(qt_("Increase"), INCREASE_SIZE);
+       sizes << SizePair(qt_("Decrease"), DECREASE_SIZE);
+       return sizes;
+}
 
-       if (!autoapplyCB->isChecked())
-               return;
 
-       // to be really good here, we should set the combos to the values of
-       // the current text, and make it appear as "no change" if the values
-       // stay the same between applys. Might be difficult though wrt to a
-       // moved cursor - jbl
-       form_->slotApply();
-       familyCO->setCurrentIndex(0);
-       seriesCO->setCurrentIndex(0);
-       sizeCO->setCurrentIndex(0);
-       shapeCO->setCurrentIndex(0);
-       miscCO->setCurrentIndex(0);
-       langCO->setCurrentIndex(0);
-       colorCO->setCurrentIndex(0);
+static QList<BarPair> barData()
+{
+       QList<BarPair> bars;
+       bars << BarPair(qt_("No change"), IGNORE);
+       bars << BarPair(qt_("Default"), INHERIT);
+       bars << BarPair(qt_("(Without)[[underlining]]"), NONE);
+       bars << BarPair(qt_("Single[[underlining]]"), UNDERBAR);
+       bars << BarPair(qt_("Double[[underlining]]"), UULINE);
+       bars << BarPair(qt_("Wavy"), UWAVE);
+       return bars;
 }
 
 
-void GuiCharacterDialog::closeEvent(QCloseEvent * e)
+static QList<BarPair> strikeData()
 {
-       form_->slotWMHide();
-       e->accept();
+       QList<BarPair> strike;
+       strike << BarPair(qt_("No change"), IGNORE);
+       strike << BarPair(qt_("Default"), INHERIT);
+       strike << BarPair(qt_("(Without)[[strikethrough]]"), NONE);
+       strike << BarPair(qt_("Single[[strikethrough]]"), STRIKEOUT);
+       strike << BarPair(qt_("With /"), XOUT);
+       return strike;
 }
 
 
-/////////////////////////////////////////////////////////////////////
-//
-// GuiCharacter
-//
-/////////////////////////////////////////////////////////////////////
+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;
+}
 
 
-GuiCharacter::GuiCharacter(GuiDialog & parent)
-       : GuiView<GuiCharacterDialog>(parent, _("Text Style"))
+static QList<SeriesPair> seriesData()
 {
+       QList<SeriesPair> series;
+       series << SeriesPair(qt_("No change"), IGNORE_SERIES);
+       series << SeriesPair(qt_("Default"),     INHERIT_SERIES);
+       series << SeriesPair(qt_("Medium"),    MEDIUM_SERIES);
+       series << SeriesPair(qt_("Bold"),      BOLD_SERIES);
+       return series;
 }
 
 
-void GuiCharacter::build_dialog()
+static QList<FamilyPair> familyData()
 {
-       dialog_.reset(new GuiCharacterDialog(this));
+       QList<FamilyPair> families;
+       families << FamilyPair(qt_("No change"),  IGNORE_FAMILY);
+       families << FamilyPair(qt_("Default"),      INHERIT_FAMILY);
+       families << FamilyPair(qt_("Roman"),      ROMAN_FAMILY);
+       families << FamilyPair(qt_("Sans Serif"), SANS_FAMILY);
+       families << FamilyPair(qt_("Typewriter"), TYPEWRITER_FAMILY);
+       return families;
+}
 
-       family = getFamilyData();
-       series = getSeriesData();
-       shape  = getShapeData();
-       size   = getSizeData();
-       bar    = getBarData();
-       color  = getColorData();
-       language = getLanguageData(true);
 
-       for (vector<FamilyPair>::const_iterator cit = family.begin();
-               cit != family.end(); ++cit) {
-               dialog_->familyCO->addItem(toqstr(cit->first));
+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
+       // 'Default' 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);
+}
 
-       for (vector<SeriesPair>::const_iterator cit = series.begin();
-               cit != series.end(); ++cit) {
-               dialog_->seriesCO->addItem(toqstr(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_("Default"), "inherit");
+       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);
        }
-       for (vector<ShapePair>::const_iterator cit = shape.begin();
-               cit != shape.end(); ++cit) {
-               dialog_->shapeCO->addItem(toqstr(cit->first));
+}
+
+} // namespace
+
+GuiCharacter::GuiCharacter(GuiView & lv)
+       : GuiDialog(lv, "character", qt_("Text Properties")),
+         font_(ignore_font, ignore_language),
+         emph_(false), noun_(false), nospellcheck_(false)
+{
+       setupUi(this);
+
+       // fix height to minimum
+       setFixedHeight(sizeHint().height());
+
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
+       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();
+       qSort(color.begin(), color.end(), ColorSorter);
+
+       language = languageData();
+       language.prepend(LanguagePair(qt_("Default"), "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(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
+       bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
+       bc().setAutoApply(autoapplyCB);
+       bc().addReadOnly(familyCO);
+       bc().addReadOnly(seriesCO);
+       bc().addReadOnly(sizeCO);
+       bc().addReadOnly(shapeCO);
+       bc().addReadOnly(ulineCO);
+       bc().addReadOnly(strikeCO);
+       bc().addReadOnly(nounCB);
+       bc().addReadOnly(emphCB);
+       bc().addReadOnly(nospellcheckCB);
+       bc().addReadOnly(langCO);
+       bc().addReadOnly(colorCO);
+       bc().addReadOnly(autoapplyCB);
+
+       // Add button menu to restore button to reset
+       // all widgets to "Defaults" or "No Change"
+       resetdefault_ = new QAction(qt_("Reset All To &Default"), this);
+       resetnochange_ = new QAction(qt_("Reset All To No Chan&ge"), this);
+       QMenu * resetmenu = new QMenu();
+       resetmenu->addAction(resetdefault_);
+       resetmenu->addAction(resetnochange_);
+       buttonBox->button(QDialogButtonBox::RestoreDefaults)->setMenu(resetmenu);
+       buttonBox->button(QDialogButtonBox::RestoreDefaults)->setText(qt_("&Reset All Fields"));
+       connect(resetdefault_, SIGNAL(triggered()), this, SLOT(resetToDefault()));
+       connect(resetnochange_, SIGNAL(triggered()), this, SLOT(resetToNoChange()));
+
+#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;
        }
-       for (vector<SizePair>::const_iterator cit = size.begin();
-               cit != size.end(); ++cit) {
-               dialog_->sizeCO->addItem(toqstr(cit->first));
+       change_adaptor();
+}
+
+
+void GuiCharacter::on_nounCB_clicked()
+{
+       // skip intermediate state at user click
+       if (!noun_) {
+               nounCB->setCheckState(Qt::Checked);
+               noun_ = true;
        }
-       for (vector<BarPair>::const_iterator cit = bar.begin();
-               cit != bar.end(); ++cit) {
-               dialog_->miscCO->addItem(toqstr(cit->first));
+       change_adaptor();
+}
+
+
+void GuiCharacter::on_nospellcheckCB_clicked()
+{
+       // skip intermediate state at user click
+       if (!nospellcheck_) {
+               nospellcheckCB->setCheckState(Qt::Checked);
+               nospellcheck_ = true;
        }
-       for (vector<ColorPair>::const_iterator cit = color.begin();
-               cit != color.end(); ++cit) {
-               dialog_->colorCO->addItem(toqstr(cit->first));
+       change_adaptor();
+}
+
+
+void GuiCharacter::resetToDefault()
+{
+       Font font(inherit_font);
+       font.setLanguage(reset_language);
+       paramsToDialog(font);
+       change_adaptor();
+}
+
+
+void GuiCharacter::resetToNoChange()
+{
+       Font font(ignore_font);
+       font.setLanguage(ignore_language);
+       paramsToDialog(font);
+       change_adaptor();
+}
+
+
+template<class P, class B>
+static int findPos2nd(QList<P> const & vec, B const & val)
+{
+       for (int i = 0; i != vec.size(); ++i)
+               if (vec[i].second == val)
+                       return i;
+       return 0;
+}
+
+
+namespace{
+FontDeco getBar(FontInfo const & fi)
+{
+       if (fi.underbar() == FONT_ON)
+               return UNDERBAR;
+
+       if (fi.uuline() == FONT_ON)
+               return UULINE;
+
+       if (fi.uwave() == FONT_ON)
+               return UWAVE;
+
+       if (fi.underbar() == FONT_IGNORE)
+               return IGNORE;
+
+       if (fi.underbar() == FONT_INHERIT)
+               return INHERIT;
+
+       return NONE;
+}
+
+
+FontDeco getStrike(FontInfo const & fi)
+{
+       if (fi.strikeout() == FONT_ON)
+               return STRIKEOUT;
+
+       if (fi.xout() == FONT_ON)
+               return XOUT;
+
+       if (fi.strikeout() == FONT_IGNORE)
+               return IGNORE;
+
+       if (fi.strikeout() == FONT_INHERIT)
+               return INHERIT;
+
+       return NONE;
+}
+
+
+Qt::CheckState getMarkupState(lyx::FontState fs)
+{
+       switch (fs) {
+       case FONT_INHERIT:
+       case FONT_OFF:
+               return Qt::Unchecked;
+       case FONT_ON:
+               return Qt::Checked;
+       case FONT_TOGGLE:
+       case FONT_IGNORE:
+       default:
+               return Qt::PartiallyChecked;
        }
-       for (vector<LanguagePair>::const_iterator cit = language.begin();
-               cit != language.end(); ++cit) {
-               dialog_->langCO->addItem(toqstr(cit->first));
+}
+
+lyx::FontState setMarkupState(Qt::CheckState cs)
+{
+       switch (cs) {
+       case Qt::Unchecked:
+               return FONT_OFF;
+       case Qt::Checked:
+               return FONT_ON;
+       case Qt::PartiallyChecked:
+       default:
+               return FONT_IGNORE;
        }
+}
 
-       bc().setOK(dialog_->okPB);
-       bc().setApply(dialog_->applyPB);
-       bc().setCancel(dialog_->closePB);
-       bc().addReadOnly(dialog_->familyCO);
-       bc().addReadOnly(dialog_->seriesCO);
-       bc().addReadOnly(dialog_->sizeCO);
-       bc().addReadOnly(dialog_->shapeCO);
-       bc().addReadOnly(dialog_->miscCO);
-       bc().addReadOnly(dialog_->langCO);
-       bc().addReadOnly(dialog_->colorCO);
-       bc().addReadOnly(dialog_->toggleallCB);
-       bc().addReadOnly(dialog_->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 ...
-       dialog_->show();
-#endif
+} // end namespace anon
+
+
+void GuiCharacter::change_adaptor()
+{
+       changed();
+
+       checkRestoreDefaults();
+
+       if (!autoapplyCB->isChecked())
+               return;
+
+       // to be really good here, we should set the combos to the values of
+       // the current text, and make it appear as "no change" if the values
+       // stay the same between applys. Might be difficult though wrt to a
+       // moved cursor - jbl
+       slotApply();
 }
 
 
-namespace {
+void GuiCharacter::checkRestoreDefaults()
+{
+       if (familyCO->currentIndex() == -1 || seriesCO->currentIndex() == -1
+           || shapeCO->currentIndex() == -1 || sizeCO->currentIndex() == -1
+           || ulineCO->currentIndex() == -1 || strikeCO->currentIndex() == -1
+           || colorCO->currentIndex() == -1 || langCO->currentIndex() == -1)
+               // dialog not yet built
+               return;
+
+       // (De)Activate Restore Defaults menu items
+       resetdefault_->setEnabled(
+               family[familyCO->currentIndex()].second != INHERIT_FAMILY
+               || series[seriesCO->currentIndex()].second != INHERIT_SERIES
+               || shape[shapeCO->currentIndex()].second != INHERIT_SHAPE
+               || size[sizeCO->currentIndex()].second != INHERIT_SIZE
+               || setMarkupState(emphCB->checkState()) != FONT_OFF
+               || setMarkupState(nounCB->checkState()) != FONT_OFF
+               || setMarkupState(nospellcheckCB->checkState()) != FONT_OFF
+               || bar[ulineCO->currentIndex()].second != INHERIT
+               || strike[strikeCO->currentIndex()].second != INHERIT
+               || lcolor.getFromLyXName(fromqstr(colorCO->itemData(colorCO->currentIndex()).toString())) != Color_inherit
+               || languages.getLanguage(fromqstr(language[langCO->currentIndex()].second)) != reset_language);
+
+       resetnochange_->setEnabled(
+               family[familyCO->currentIndex()].second != IGNORE_FAMILY
+               || series[seriesCO->currentIndex()].second != IGNORE_SERIES
+               || shape[shapeCO->currentIndex()].second != IGNORE_SHAPE
+               || size[sizeCO->currentIndex()].second != IGNORE_SIZE
+               || setMarkupState(emphCB->checkState()) != FONT_IGNORE
+               || setMarkupState(nounCB->checkState()) != FONT_IGNORE
+               || setMarkupState(nospellcheckCB->checkState()) != FONT_IGNORE
+               || bar[ulineCO->currentIndex()].second != IGNORE
+               || strike[strikeCO->currentIndex()].second != IGNORE
+               || lcolor.getFromLyXName(fromqstr(colorCO->itemData(colorCO->currentIndex()).toString())) != Color_ignore
+               || languages.getLanguage(fromqstr(language[langCO->currentIndex()].second)) != ignore_language);
+}
+
 
-template<class A, class B>
-int findPos2nd(vector<std::pair<A,B> > const & vec, B const & val)
+void GuiCharacter::updateContents()
 {
-       typedef typename vector<std::pair<A, B> >::const_iterator
-               const_iterator;
+       if (bufferview()->cursor().selection()) {
+               Font font = bufferview()->cursor().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.getFontSettings(bp, pos);
+                       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(IGNORE_SIZE);
+                       if (fi.emph() != tmp.fontInfo().emph())
+                               font.fontInfo().setEmph(FONT_IGNORE);
+                       if (fi.noun() != tmp.fontInfo().noun())
+                               font.fontInfo().setNoun(FONT_IGNORE);
+                       if (fi.nospellcheck() != tmp.fontInfo().nospellcheck())
+                               font.fontInfo().setNoSpellcheck(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().current_font;
+
+       // If we use the buffer language, display "Default"
+       if (font_.language() == buffer().params().language)
+               font_.setLanguage(reset_language);
+
+       paramsToDialog(font_);
+
+       checkRestoreDefaults();
+}
+
 
-       const_iterator cit = vec.begin();
-       for (; cit != vec.end(); ++cit) {
-               if (cit->second == val)
-                       return int(cit - vec.begin());
+void GuiCharacter::setBar(FontInfo & fi, FontDeco 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;
        }
-       return 0;
 }
 
-} // namespace anon
+
+void GuiCharacter::setStrike(FontInfo & fi, FontDeco val)
+{
+       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::update_contents()
+void GuiCharacter::paramsToDialog(Font const & font)
 {
-       ControlCharacter const & ctrl = controller();
+       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()));
+       nospellcheckCB->setCheckState(getMarkupState(fi.nospellcheck()));
+       emph_ = emphCB->checkState() == Qt::Checked;
+       noun_ = nounCB->checkState() == Qt::Checked;
+       nospellcheck_ = nospellcheckCB->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));
+}
+
+
+void GuiCharacter::applyView()
+{
+       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()));
+       fi.setNoSpellcheck(setMarkupState(nospellcheckCB->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)));
+}
 
-       dialog_->familyCO->setCurrentIndex(findPos2nd(family,
-                                                    ctrl.getFamily()));
-       dialog_->seriesCO->setCurrentIndex(findPos2nd(series,
-                                                    ctrl.getSeries()));
-       dialog_->shapeCO->setCurrentIndex(findPos2nd(shape, ctrl.getShape()));
-       dialog_->sizeCO->setCurrentIndex(findPos2nd(size, ctrl.getSize()));
-       dialog_->miscCO->setCurrentIndex(findPos2nd(bar, ctrl.getBar()));
-       dialog_->colorCO->setCurrentIndex(findPos2nd(color, ctrl.getColor()));
-       dialog_->langCO->setCurrentIndex(findPos2nd(language,
-                                                  ctrl.getLanguage()));
 
-       dialog_->toggleallCB->setChecked(ctrl.getToggleAll());
+bool GuiCharacter::initialiseParams(string const &)
+{
+       if (autoapplyCB->isChecked())
+               return true;
+
+       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()   != IGNORE_SIZE
+           || getBar(fi)  != IGNORE
+           || fi.color()  != Color_ignore
+           || font_.language() != ignore_language)
+               setButtonsValid(true);
+
+       paramsToDialog(font_);
+       // Make sure that the bc is in the INITIAL state
+       if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
+               bc().restore();
+       return true;
 }
 
 
-void GuiCharacter::apply()
+void GuiCharacter::dispatchParams()
 {
-       ControlCharacter & ctrl = controller();
+       dispatch(FuncRequest(getLfun(), font_.toString(false)));
+}
 
-       ctrl.setFamily(family[dialog_->familyCO->currentIndex()].second);
-       ctrl.setSeries(series[dialog_->seriesCO->currentIndex()].second);
-       ctrl.setShape(shape[dialog_->shapeCO->currentIndex()].second);
-       ctrl.setSize(size[dialog_->sizeCO->currentIndex()].second);
-       ctrl.setBar(bar[dialog_->miscCO->currentIndex()].second);
-       ctrl.setColor(color[dialog_->colorCO->currentIndex()].second);
-       ctrl.setLanguage(language[dialog_->langCO->currentIndex()].second);
 
-       ctrl.setToggleAll(dialog_->toggleallCB->isChecked());
+void GuiCharacter::saveSession(QSettings & settings) const
+{
+       Dialog::saveSession(settings);
+       settings.setValue(sessionKey() + "/autoapply", autoapplyCB->isChecked());
 }
 
+
+void GuiCharacter::restoreSession()
+{
+       Dialog::restoreSession();
+       QSettings settings;
+       autoapplyCB->setChecked(
+               settings.value(sessionKey() + "/autoapply").toBool());
+}
+
+
+Dialog * createGuiCharacter(GuiView & lv) { return new GuiCharacter(lv); }
+
+
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCharacter_moc.cpp"
+#include "moc_GuiCharacter.cpp"