#include "support/lstrings.h"
#include <QAbstractItemModel>
+#include <QPushButton>
#include <QComboBox>
+#include <QMenu>
#include <QModelIndex>
#include <QSettings>
#include <QVariant>
{
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;
}
static QList<SizePair> sizeData()
{
QList<SizePair> sizes;
- sizes << SizePair(qt_("No change"), FONT_SIZE_IGNORE);
- 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_("Reset"), FONT_SIZE_INHERIT);
+ 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;
}
{
QList<BarPair> bars;
bars << BarPair(qt_("No change"), IGNORE);
+ bars << BarPair(qt_("Default"), INHERIT);
bars << BarPair(qt_("(Without)[[underlining]]"), NONE);
- bars << BarPair(qt_("Single"), UNDERBAR);
- bars << BarPair(qt_("Double"), UULINE);
+ bars << BarPair(qt_("Single[[underlining]]"), UNDERBAR);
+ bars << BarPair(qt_("Double[[underlining]]"), UULINE);
bars << BarPair(qt_("Wavy"), UWAVE);
- bars << BarPair(qt_("Reset"), INHERIT);
return bars;
}
{
QList<BarPair> strike;
strike << BarPair(qt_("No change"), IGNORE);
+ strike << BarPair(qt_("Default"), INHERIT);
strike << BarPair(qt_("(Without)[[strikethrough]]"), NONE);
- strike << BarPair(qt_("Single"), STRIKEOUT);
+ strike << BarPair(qt_("Single[[strikethrough]]"), STRIKEOUT);
strike << BarPair(qt_("With /"), XOUT);
- strike << BarPair(qt_("Reset"), INHERIT);
return strike;
}
{
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;
}
{
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;
}
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.
{
// at first add the 2 colors "No change" and "No color"
combo->addItem(qt_("No change"), "ignore");
- combo->addItem(qt_("No color"), "none");
+ combo->addItem(qt_("Default"), "inherit");
+ combo->addItem(qt_("(Without)[[color]]"), "none");
// now add the real colors
QPixmap coloritem(32, 32);
QColor color;
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()));
+ // 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(activated(int)), this, SLOT(change_adaptor()));
- connect(strikeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
- connect(emphCB, SIGNAL(clicked(bool)), 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(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();
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);
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().setRestore(buttonBox->button(QDialogButtonBox::Reset));
bc().setAutoApply(autoapplyCB);
bc().addReadOnly(familyCO);
bc().addReadOnly(seriesCO);
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
-
-// 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();
-#endif
}
}
-void GuiCharacter::change_adaptor()
+void GuiCharacter::on_nospellcheckCB_clicked()
{
- changed();
+ // skip intermediate state at user click
+ if (!nospellcheck_) {
+ nospellcheckCB->setCheckState(Qt::Checked);
+ nospellcheck_ = true;
+ }
+ change_adaptor();
+}
- 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();
+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();
}
namespace{
-FontState getBar(FontInfo const & fi)
+FontDeco getBar(FontInfo const & fi)
{
if (fi.underbar() == FONT_ON)
return UNDERBAR;
if (fi.underbar() == FONT_IGNORE)
return IGNORE;
+ if (fi.underbar() == FONT_INHERIT)
+ return INHERIT;
+
return NONE;
}
-FontState getStrike(FontInfo const & fi)
+FontDeco getStrike(FontInfo const & fi)
{
if (fi.strikeout() == FONT_ON)
return STRIKEOUT;
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_INHERIT:
case FONT_IGNORE:
default:
return Qt::PartiallyChecked;
} // 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();
+}
+
+
+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);
+}
+
+
void GuiCharacter::updateContents()
{
if (bufferview()->cursor().selection()) {
- Font font = bufferview()->cursor().real_current_font;
+ Font font = bufferview()->cursor().current_font;
FontInfo fi = font.fontInfo();
- BufferParams const bp = buffer().masterParams();
+ BufferParams const & bp = buffer().masterParams();
// Check if each font attribute is constant for the selection range.
- DocIterator from = bufferview()->cursor().selectionBegin();
- DocIterator to = bufferview()->cursor().selectionEnd();
+ 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();
}
Paragraph const & par = dit.paragraph();
pos_type const pos = dit.pos();
- Font tmp = par.getFont(bp, pos, font);
+ Font tmp = par.getFontSettings(bp, pos);
if (font.language() != tmp.language())
font.setLanguage(ignore_language);
if (fi.family() != tmp.fontInfo().family())
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())
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()
}
font_ = font;
} else
- font_ = bufferview()->cursor().real_current_font;
+ 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();
}
-void GuiCharacter::setBar(FontInfo & fi, FontState val)
+void GuiCharacter::setBar(FontInfo & fi, FontDeco val)
{
switch (val) {
case IGNORE:
}
-void GuiCharacter::setStrike(FontInfo & fi, FontState val)
+void GuiCharacter::setStrike(FontInfo & fi, FontDeco val)
{
switch (val) {
case IGNORE:
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)
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())));
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)
setButtonsValid(true);
paramsToDialog(font_);
+ // Make sure that the bc is in the INITIAL state
+ if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
+ bc().restore();
return true;
}
projects / lyx.git / blobdiff