#include "GuiCharacter.h"
+#include "GuiApplication.h"
#include "qt_helpers.h"
+
#include "Font.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "Language.h"
#include "Paragraph.h"
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QSettings>
+#include <QVariant>
using namespace std;
bars << BarPair(qt_("No change"), IGNORE);
bars << BarPair(qt_("Emph"), EMPH_TOGGLE);
bars << BarPair(qt_("Underbar"), UNDERBAR_TOGGLE);
+ bars << BarPair(qt_("Double underbar"), UULINE_TOGGLE);
+ bars << BarPair(qt_("Wavy underbar"), UWAVE_TOGGLE);
+ bars << BarPair(qt_("Strikeout"), STRIKEOUT_TOGGLE);
bars << BarPair(qt_("Noun"), NOUN_TOGGLE);
bars << BarPair(qt_("Reset"), INHERIT);
return bars;
return families;
}
+
+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<class T>
-void fillCombo(QComboBox * combo, QList<T> list)
+template<typename T>
+void fillCombo(QComboBox * combo, QList<T> const & list)
{
- QList<T>::const_iterator cit = list.begin();
+ typename QList<T>::const_iterator cit = list.begin();
for (; cit != list.end(); ++cit)
combo->addItem(cit->first);
}
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+ connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
+ SLOT(slotAutoApply()));
connect(miscCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(sizeCO, 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
-
family = familyData();
series = seriesData();
shape = shapeData();
fillCombo(colorCO, color);
fillCombo(langCO, language);
- bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
+ 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(toggleallCB);
bc().addReadOnly(autoapplyCB);
+#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
+
// FIXME: hack to work around resizing bug in Qt >= 4.2
// bug verified with Qt 4.2.{0-3} (JSpitzm)
#if QT_VERSION >= 0x040200
void GuiCharacter::updateContents()
{
- if (!autoapplyCB->isChecked())
+ if (!autoapplyCB->isChecked()) {
+ bc().setValid(true);
return;
+ }
if (bufferview()->cursor().selection()) {
//FIXME: it would be better to check if each font attribute is constant
// for the selection range.
if (fi.underbar() == FONT_TOGGLE)
return UNDERBAR_TOGGLE;
+ if (fi.strikeout() == FONT_TOGGLE)
+ return STRIKEOUT_TOGGLE;
+
+ if (fi.uuline() == FONT_TOGGLE)
+ return UULINE_TOGGLE;
+
+ if (fi.uwave() == FONT_TOGGLE)
+ return UWAVE_TOGGLE;
+
if (fi.noun() == FONT_TOGGLE)
return NOUN_TOGGLE;
case IGNORE:
fi.setEmph(FONT_IGNORE);
fi.setUnderbar(FONT_IGNORE);
+ fi.setStrikeout(FONT_IGNORE);
fi.setNoun(FONT_IGNORE);
break;
fi.setUnderbar(FONT_TOGGLE);
break;
+ case STRIKEOUT_TOGGLE:
+ fi.setStrikeout(FONT_TOGGLE);
+ break;
+
+ case UULINE_TOGGLE:
+ fi.setUuline(FONT_TOGGLE);
+ break;
+
+ case UWAVE_TOGGLE:
+ fi.setUwave(FONT_TOGGLE);
+ break;
+
case NOUN_TOGGLE:
fi.setNoun(FONT_TOGGLE);
break;
case INHERIT:
fi.setEmph(FONT_INHERIT);
fi.setUnderbar(FONT_INHERIT);
+ fi.setStrikeout(FONT_INHERIT);
+ fi.setUuline(FONT_INHERIT);
+ fi.setUwave(FONT_INHERIT);
fi.setNoun(FONT_INHERIT);
break;
}
miscCO->setCurrentIndex(findPos2nd(bar, getBar(fi)));
colorCO->setCurrentIndex(findPos2nd(color, fi.color()));
- QString const lang = (font.language() == ignore_language)
- ? "ignore" : toqstr(font.language()->lang());
+ // reset_language is a null pointer.
+ QString const lang = (font.language() == reset_language)
+ ? "reset" : toqstr(font.language()->lang());
langCO->setCurrentIndex(findPos2nd(language, lang));
toggleallCB->setChecked(toggleall_);
bool GuiCharacter::initialiseParams(string const &)
{
+ if (autoapplyCB->isChecked())
+ return true;
+
FontInfo & fi = font_.fontInfo();
// so that the user can press Ok
}
+void GuiCharacter::saveSession() const
+{
+ Dialog::saveSession();
+ QSettings settings;
+ settings.setValue(sessionKey() + "/toggleall", toggleallCB->isChecked());
+ settings.setValue(sessionKey() + "/autoapply", autoapplyCB->isChecked());
+}
+
+
+void GuiCharacter::restoreSession()
+{
+ Dialog::restoreSession();
+ QSettings settings;
+ toggleallCB->setChecked(
+ settings.value(sessionKey() + "/toggleall").toBool());
+ 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"
projects / lyx.git / blobdiff