QDialogButtonBox for the remaining dialogs.

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

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 295b59e95eb54f164e8776c5520b167facbe0615..8b7f3e83d37ce5e3e5e455a61421066e2c318927 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -48,11 +48,11 @@ static QList<ShapePair> shapeData()
 {
        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);
-       shapes << ShapePair(qt_("Reset"), INHERIT_SHAPE);
        return shapes;
 }
 
@@ -61,6 +61,7 @@ static QList<SizePair> sizeData()
 {
        QList<SizePair> sizes;
        sizes << SizePair(qt_("No change"), FONT_SIZE_IGNORE);
+       sizes << SizePair(qt_("Default"), FONT_SIZE_INHERIT);
        sizes << SizePair(qt_("Tiny"), FONT_SIZE_TINY);
        sizes << SizePair(qt_("Smallest"), FONT_SIZE_SCRIPT);
        sizes << SizePair(qt_("Smaller"), FONT_SIZE_FOOTNOTE);
@@ -73,7 +74,6 @@ static QList<SizePair> sizeData()
        sizes << SizePair(qt_("Huger"), FONT_SIZE_HUGER);
        sizes << SizePair(qt_("Increase"), FONT_SIZE_INCREASE);
        sizes << SizePair(qt_("Decrease"), FONT_SIZE_DECREASE);
-       sizes << SizePair(qt_("Reset"), FONT_SIZE_INHERIT);
        return sizes;
 }
 
@@ -82,11 +82,11 @@ 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);
-       bars << BarPair(qt_("Reset"), INHERIT);
        return bars;
 }
 
@@ -95,10 +95,10 @@ static QList<BarPair> strikeData()
 {
        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);
-       strike << BarPair(qt_("Reset"), INHERIT);
        return strike;
 }
 
@@ -133,9 +133,9 @@ 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);
-       series << SeriesPair(qt_("Reset"),     INHERIT_SERIES);
        return series;
 }
 
@@ -144,10 +144,10 @@ static QList<FamilyPair> familyData()
 {
        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);
-       families << FamilyPair(qt_("Reset"),      INHERIT_FAMILY);
        return families;
 }
 
@@ -157,7 +157,7 @@ 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
+       // '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.
@@ -187,6 +187,7 @@ 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);
@@ -199,21 +200,19 @@ void fillComboColor(QComboBox * combo, QList<T> const & list)
                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), emph_(false), noun_(false)
+       : GuiDialog(lv, "character", qt_("Text Properties")),
+         font_(ignore_font, ignore_language),
+         emph_(false), noun_(false), nospellcheck_(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(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
        connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
                SLOT(slotAutoApply()));
 
@@ -236,7 +235,7 @@ GuiCharacter::GuiCharacter(GuiView & lv)
        qSort(color.begin(), color.end(), ColorSorter);
 
        language = languageData();
-       language.prepend(LanguagePair(qt_("Reset"), "reset"));
+       language.prepend(LanguagePair(qt_("Default"), "reset"));
        language.prepend(LanguagePair(qt_("No change"), "ignore"));
 
        fillCombo(familyCO, family);
@@ -249,9 +248,9 @@ GuiCharacter::GuiCharacter(GuiView & lv)
        fillCombo(langCO, language);
 
        bc().setPolicy(ButtonPolicy::OkApplyCancelAutoReadOnlyPolicy);
-       bc().setOK(okPB);
-       bc().setApply(applyPB);
-       bc().setCancel(closePB);
+       bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
        bc().setAutoApply(autoapplyCB);
        bc().addReadOnly(familyCO);
        bc().addReadOnly(seriesCO);
@@ -261,6 +260,7 @@ GuiCharacter::GuiCharacter(GuiView & lv)
        bc().addReadOnly(strikeCO);
        bc().addReadOnly(nounCB);
        bc().addReadOnly(emphCB);
+       bc().addReadOnly(nospellcheckCB);
        bc().addReadOnly(langCO);
        bc().addReadOnly(colorCO);
        bc().addReadOnly(autoapplyCB);
@@ -296,6 +296,18 @@ void GuiCharacter::on_nounCB_clicked()
 }
 
 
+void GuiCharacter::on_nospellcheckCB_clicked()
+{
+       // skip intermediate state at user click
+       if (!nospellcheck_) {
+               nospellcheckCB->setCheckState(Qt::Checked);
+               nospellcheck_ = true;
+       }
+       change_adaptor();
+}
+
+
+
 void GuiCharacter::change_adaptor()
 {
        changed();
@@ -418,6 +430,8 @@ void GuiCharacter::updateContents()
                                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()
@@ -519,8 +533,10 @@ void GuiCharacter::paramsToDialog(Font const & font)
        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)
@@ -538,6 +554,7 @@ void GuiCharacter::applyView()
        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())));
@@ -565,6 +582,9 @@ bool GuiCharacter::initialiseParams(string const &)
                setButtonsValid(true);
 
        paramsToDialog(font_);
+       // Make sure that the bc is in the INITIAL state
+       if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
+               bc().restore();
        return true;
 }