Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 54d90ccaacf6e14b05ea2d2c8055aada22eb1c5d..59b7ca3f0e50074d3d79fd11b3452fcec5c91947 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -36,6 +36,7 @@
 #include <QAbstractItemModel>
 #include <QPushButton>
 #include <QComboBox>
+#include <QMenu>
 #include <QModelIndex>
 #include <QSettings>
 #include <QVariant>
@@ -61,20 +62,20 @@ static QList<ShapePair> shapeData()
 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);
-       sizes << SizePair(qt_("Small"), FONT_SIZE_SMALL);
-       sizes << SizePair(qt_("Normal"), FONT_SIZE_NORMAL);
-       sizes << SizePair(qt_("Large"), FONT_SIZE_LARGE);
-       sizes << SizePair(qt_("Larger"), FONT_SIZE_LARGER);
-       sizes << SizePair(qt_("Largest"), FONT_SIZE_LARGEST);
-       sizes << SizePair(qt_("Huge"), FONT_SIZE_HUGE);
-       sizes << SizePair(qt_("Huger"), FONT_SIZE_HUGER);
-       sizes << SizePair(qt_("Increase"), FONT_SIZE_INCREASE);
-       sizes << SizePair(qt_("Decrease"), FONT_SIZE_DECREASE);
+       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;
 }
 
@@ -212,6 +213,9 @@ GuiCharacter::GuiCharacter(GuiView & lv)
 {
        setupUi(this);
 
+       // fix height to minimum
+       setFixedHeight(sizeHint().height());
+
        connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
                this, SLOT(slotButtonBox(QAbstractButton *)));
        connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
@@ -267,6 +271,18 @@ GuiCharacter::GuiCharacter(GuiView & lv)
        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.
@@ -309,7 +325,7 @@ void GuiCharacter::on_nospellcheckCB_clicked()
 }
 
 
-void GuiCharacter::slotRestoreDefaults()
+void GuiCharacter::resetToDefault()
 {
        Font font(inherit_font);
        font.setLanguage(reset_language);
@@ -318,6 +334,15 @@ void GuiCharacter::slotRestoreDefaults()
 }
 
 
+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)
 {
@@ -329,7 +354,7 @@ static int findPos2nd(QList<P> const & vec, B const & val)
 
 
 namespace{
-FontState getBar(FontInfo const & fi)
+FontDeco getBar(FontInfo const & fi)
 {
        if (fi.underbar() == FONT_ON)
                return UNDERBAR;
@@ -350,7 +375,7 @@ FontState getBar(FontInfo const & fi)
 }
 
 
-FontState getStrike(FontInfo const & fi)
+FontDeco getStrike(FontInfo const & fi)
 {
        if (fi.strikeout() == FONT_ON)
                return STRIKEOUT;
@@ -418,12 +443,19 @@ void GuiCharacter::change_adaptor()
 
 void GuiCharacter::checkRestoreDefaults()
 {
-       // (De)Activate Restore Defaults button
-       buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(
+       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 != FONT_SIZE_INHERIT
+               || size[sizeCO->currentIndex()].second != INHERIT_SIZE
                || setMarkupState(emphCB->checkState()) != FONT_OFF
                || setMarkupState(nounCB->checkState()) != FONT_OFF
                || setMarkupState(nospellcheckCB->checkState()) != FONT_OFF
@@ -431,6 +463,19 @@ void GuiCharacter::checkRestoreDefaults()
                || 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);
 }
 
 
@@ -461,7 +506,7 @@ void GuiCharacter::updateContents()
                        if (fi.shape() != tmp.fontInfo().shape())
                                font.fontInfo().setShape(IGNORE_SHAPE);
                        if (fi.size() != tmp.fontInfo().size())
-                               font.fontInfo().setSize(FONT_SIZE_IGNORE);
+                               font.fontInfo().setSize(IGNORE_SIZE);
                        if (fi.emph() != tmp.fontInfo().emph())
                                font.fontInfo().setEmph(FONT_IGNORE);
                        if (fi.noun() != tmp.fontInfo().noun())
@@ -493,7 +538,7 @@ void GuiCharacter::updateContents()
 }
 
 
-void GuiCharacter::setBar(FontInfo & fi, FontState val)
+void GuiCharacter::setBar(FontInfo & fi, FontDeco val)
 {
        switch (val) {
        case IGNORE:
@@ -531,7 +576,7 @@ void GuiCharacter::setBar(FontInfo & fi, FontState val)
 }
 
 
-void GuiCharacter::setStrike(FontInfo & fi, FontState val)
+void GuiCharacter::setStrike(FontInfo & fi, FontDeco val)
 {
        switch (val) {
        case IGNORE:
@@ -617,7 +662,7 @@ bool GuiCharacter::initialiseParams(string const &)
        if (fi.family()    != IGNORE_FAMILY
            || fi.series() != IGNORE_SERIES
            || fi.shape()  != IGNORE_SHAPE
-           || fi.size()   != FONT_SIZE_IGNORE
+           || fi.size()   != IGNORE_SIZE
            || getBar(fi)  != IGNORE
            || fi.color()  != Color_ignore
            || font_.language() != ignore_language)