#include <QTextCursor>
#include <sstream>
+#include <vector>
#ifdef IN
#undef IN
GuiIdListModel * availableModel,
GuiIdListModel * selectedModel)
: GuiSelectionManager(availableLV, selectedLV, addPB, delPB,
- upPB, downPB, availableModel, selectedModel)
+ upPB, downPB, availableModel, selectedModel)
{}
-
-
private:
///
virtual void updateAddPB();
downPB->setEnabled(false);
return;
}
- QModelIndexList const selSels =
- selectedLV->selectionModel()->selectedIndexes();
- // disable if empty or last item is selected
- if (selSels.empty() || selSels.first().row() == srows - 1) {
- downPB->setEnabled(false);
- return;
- }
- // determine whether immediately succeding element requires this one
QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
- int curRow = curIdx.row();
- if (curRow < 0 || curRow >= srows - 1) { //this shouldn't happen...
+ int const curRow = curIdx.row();
+ if (curRow < 0 || curRow >= srows - 1) { // invalid or last item
downPB->setEnabled(false);
return;
}
+
+ // determine whether immediately succeding element requires this one
string const curModName = getSelectedModel()->getIDString(curRow);
string const nextModName = getSelectedModel()->getIDString(curRow + 1);
// Enable it if this module isn't required.
// FIXME This should perhaps be more flexible and check whether, even
- // if this one is required, there is also an earlier one that is required.
+ // if the next one is required, there is also an earlier one that will do.
downPB->setEnabled(
find(reqs.begin(), reqs.end(), curModName) == reqs.end());
}
upPB->setEnabled(false);
return;
}
- QModelIndexList const selSels =
- selectedLV->selectionModel()->selectedIndexes();
- //disable if empty or first item is selected
- if (selSels.empty() || selSels.first().row() == 0) {
- upPB->setEnabled(false);
- return;
- }
- // determine whether immediately preceding element is required by this one
QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
int curRow = curIdx.row();
- if (curRow <= -1 || curRow > srows - 1) { //sanity check
- downPB->setEnabled(false);
+ if (curRow <= 0 || curRow > srows - 1) { // first item or invalid
+ upPB->setEnabled(false);
return;
}
string const curModName = getSelectedModel()->getIDString(curRow);
+
+ // determine whether immediately preceding element is required by this one
vector<string> reqs = getRequiredList(curModName);
// if this one doesn't require anything....
string preModName = getSelectedModel()->getIDString(curRow - 1);
// Enable it if the preceding module isn't required.
- // NOTE This is less flexible than it might be. You could check whether, even
- // if this one is required, there is also an earlier one that is required.
+ // NOTE This is less flexible than it might be. We could check whether, even
+ // if the previous one is required, there is an earlier one that would do.
upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end());
}
deletePB->setEnabled(false);
return;
}
- QModelIndexList const selSels =
- selectedLV->selectionModel()->selectedIndexes();
- if (selSels.empty() || selSels.first().row() < 0) {
- deletePB->setEnabled(false);
- return;
- }
- // determine whether some LATER module requires this one
- // NOTE Things are arranged so that this is the only way there
- // can be a problem. At least, we hope so.
QModelIndex const & curIdx =
selectedLV->selectionModel()->currentIndex();
int const curRow = curIdx.row();
- if (curRow < 0 || curRow >= srows) { // this shouldn't happen
+ if (curRow < 0 || curRow >= srows) { // invalid index?
deletePB->setEnabled(false);
return;
}
+ // determine whether some LATER module requires this one
+ // NOTE Things are arranged so that this is the only way there
+ // can be a problem. At least, we hope so.
QString const curModName = curIdx.data().toString();
// We're looking here for a reason NOT to enable the button. If we
// necessary so that other options in the dialog can be updated
// according to the new class. Note, however, that, if you use
// the scroll wheel when sitting on the combo box, we'll load a
- // lot of TextClass objects very quickly....
+ // lot of TextClass objects very quickly....
if (!bp_.setBaseClass(classname)) {
Alert::error(_("Error"), _("Unable to set document class."));
return;
}
- // FIXME We should really check here whether the modules have been
- // changed, I think, even if auto_reset_options is false. And, if so,
- // pop the same dialog. So we would need to compare what is in
- // modules_sel_model with what is in the OLD bp_.getModules() and
- // so do that before we reset things.
- if (lyxrc.auto_reset_options) {
+ // check whether the selected modules have changed.
+ bool modulesChanged = false;
+ unsigned int const srows = selectedModel()->rowCount();
+ if (srows != bp_.getModules().size())
+ modulesChanged = true;
+ else {
+ list<string>::const_iterator mit = bp_.getModules().begin();
+ list<string>::const_iterator men = bp_.getModules().end();
+ for (unsigned int i = 0; i < srows && mit != men; ++i, ++mit)
+ if (selectedModel()->getIDString(i) != *mit) {
+ modulesChanged = true;
+ break;
+ }
+ }
+
+ if (modulesChanged || lyxrc.auto_reset_options) {
if (applyPB->isEnabled()) {
int const ret = Alert::prompt(_("Unapplied changes"),
_("Some changes in the dialog were not yet applied.\n"
if (ret == 0)
applyView();
}
- bp_.useClassDefaults();
+ if (lyxrc.auto_reset_options)
+ bp_.useClassDefaults();
}
// With the introduction of modules came a distinction between the base
// class and the document class. The former corresponds to the main layout
bp_.makeDocumentClass();
// the new class may require some default modules.
updateSelectedModules();
- paramsToDialog(bp_);
+ paramsToDialog();
}
list<string>::const_iterator ren = reqmods.end();
// check each of the required modules
for (; rit != ren; rit++) {
- vector<string>::const_iterator mit = params.getModules().begin();
- vector<string>::const_iterator men = params.getModules().end();
+ list<string>::const_iterator mit = params.getModules().begin();
+ list<string>::const_iterator men = params.getModules().end();
bool found = false;
for (; mit != men; mit++) {
if (*rit == *mit) {
}
-void GuiDocument::paramsToDialog(BufferParams const & params)
+void GuiDocument::paramsToDialog()
{
// set the default unit
Length::UNIT defaultUnit = Length::CM;
}
// preamble
- preambleModule->update(params, id());
+ preambleModule->update(bp_, id());
// biblio
biblioModule->citeDefaultRB->setChecked(
- params.citeEngine() == ENGINE_BASIC);
+ bp_.citeEngine() == ENGINE_BASIC);
biblioModule->citeNatbibRB->setChecked(
- params.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
- params.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
+ bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
+ bp_.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
biblioModule->citeStyleCO->setCurrentIndex(
- params.citeEngine() == ENGINE_NATBIB_NUMERICAL);
+ bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL);
biblioModule->citeJurabibRB->setChecked(
- params.citeEngine() == ENGINE_JURABIB);
+ bp_.citeEngine() == ENGINE_JURABIB);
biblioModule->bibtopicCB->setChecked(
- params.use_bibtopic);
+ bp_.use_bibtopic);
// language & quotes
int const pos = langModule->languageCO->findData(toqstr(
- params.language->lang()));
+ bp_.language->lang()));
langModule->languageCO->setCurrentIndex(pos);
langModule->quoteStyleCO->setCurrentIndex(
- params.quotes_language);
+ bp_.quotes_language);
bool default_enc = true;
- if (params.inputenc != "auto") {
+ if (bp_.inputenc != "auto") {
default_enc = false;
- if (params.inputenc == "default") {
+ if (bp_.inputenc == "default") {
langModule->encodingCO->setCurrentIndex(0);
} else {
string enc_gui;
Encodings::const_iterator it = encodings.begin();
Encodings::const_iterator const end = encodings.end();
for (; it != end; ++it) {
- if (it->latexName() == params.inputenc) {
+ if (it->latexName() == bp_.inputenc) {
enc_gui = it->guiName();
break;
}
numberingModule->setEnabled(true);
numberingModule->depthSL->setMinimum(min_toclevel - 1);
numberingModule->depthSL->setMaximum(max_toclevel);
- numberingModule->depthSL->setValue(params.secnumdepth);
+ numberingModule->depthSL->setValue(bp_.secnumdepth);
numberingModule->tocSL->setMaximum(min_toclevel - 1);
numberingModule->tocSL->setMaximum(max_toclevel);
- numberingModule->tocSL->setValue(params.tocdepth);
+ numberingModule->tocSL->setValue(bp_.tocdepth);
updateNumbering();
} else {
numberingModule->setEnabled(false);
}
// bullets
- bulletsModule->setBullet(0, params.user_defined_bullet(0));
- bulletsModule->setBullet(1, params.user_defined_bullet(1));
- bulletsModule->setBullet(2, params.user_defined_bullet(2));
- bulletsModule->setBullet(3, params.user_defined_bullet(3));
+ bulletsModule->setBullet(0, bp_.user_defined_bullet(0));
+ bulletsModule->setBullet(1, bp_.user_defined_bullet(1));
+ bulletsModule->setBullet(2, bp_.user_defined_bullet(2));
+ bulletsModule->setBullet(3, bp_.user_defined_bullet(3));
bulletsModule->init();
// packages
- int nitem = findToken(tex_graphics, params.graphicsDriver);
+ int nitem = findToken(tex_graphics, bp_.graphicsDriver);
if (nitem >= 0)
latexModule->psdriverCO->setCurrentIndex(nitem);
updateModuleInfo();
mathsModule->amsCB->setChecked(
- params.use_amsmath == BufferParams::package_on);
+ bp_.use_amsmath == BufferParams::package_on);
mathsModule->amsautoCB->setChecked(
- params.use_amsmath == BufferParams::package_auto);
+ bp_.use_amsmath == BufferParams::package_auto);
mathsModule->esintCB->setChecked(
- params.use_esint == BufferParams::package_on);
+ bp_.use_esint == BufferParams::package_on);
mathsModule->esintautoCB->setChecked(
- params.use_esint == BufferParams::package_auto);
+ bp_.use_esint == BufferParams::package_auto);
- switch (params.spacing().getSpace()) {
+ switch (bp_.spacing().getSpace()) {
case Spacing::Other: nitem = 3; break;
case Spacing::Double: nitem = 2; break;
case Spacing::Onehalf: nitem = 1; break;
}
// text layout
- string const & layoutID = params.baseClassID();
+ string const & layoutID = bp_.baseClassID();
setLayoutComboByIDString(layoutID);
updatePagestyle(documentClass().opt_pagestyle(),
- params.pagestyle);
+ bp_.pagestyle);
textLayoutModule->lspacingCO->setCurrentIndex(nitem);
- if (params.spacing().getSpace() == Spacing::Other) {
+ if (bp_.spacing().getSpace() == Spacing::Other) {
textLayoutModule->lspacingLE->setText(
- toqstr(params.spacing().getValueAsString()));
+ toqstr(bp_.spacing().getValueAsString()));
}
setLSpacing(nitem);
- if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation)
+ if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation)
textLayoutModule->indentRB->setChecked(true);
else
textLayoutModule->skipRB->setChecked(true);
int skip = 0;
- switch (params.getDefSkip().kind()) {
+ switch (bp_.getDefSkip().kind()) {
case VSpace::SMALLSKIP:
skip = 0;
break;
case VSpace::LENGTH:
{
skip = 3;
- string const length = params.getDefSkip().asLyXCommand();
+ string const length = bp_.getDefSkip().asLyXCommand();
lengthToWidgets(textLayoutModule->skipLE,
textLayoutModule->skipLengthCO,
length, defaultUnit);
setSkip(skip);
textLayoutModule->twoColumnCB->setChecked(
- params.columns == 2);
+ bp_.columns == 2);
// break listings_params to multiple lines
string lstparams =
- InsetListingsParams(params.listings_params).separatedParams();
+ InsetListingsParams(bp_.listings_params).separatedParams();
textLayoutModule->listingsED->setPlainText(toqstr(lstparams));
- if (!params.options.empty()) {
+ if (!bp_.options.empty()) {
latexModule->optionsLE->setText(
- toqstr(params.options));
+ toqstr(bp_.options));
} else {
latexModule->optionsLE->setText(QString());
}
+ // latex
latexModule->defaultOptionsCB->setChecked(
- params.use_default_options);
+ bp_.use_default_options);
if (!documentClass().options().empty()) {
latexModule->defaultOptionsLE->setText(
}
latexModule->defaultOptionsLE->setEnabled(
- params.use_default_options
+ bp_.use_default_options
&& !documentClass().options().empty());
latexModule->defaultOptionsCB->setEnabled(
!documentClass().options().empty());
- if (!params.master.empty()) {
+ if (!bp_.master.empty()) {
latexModule->childDocGB->setChecked(true);
latexModule->childDocLE->setText(
- toqstr(params.master));
+ toqstr(bp_.master));
} else {
latexModule->childDocLE->setText(QString());
latexModule->childDocGB->setChecked(false);
}
- floatModule->set(params.float_placement);
+ floatModule->set(bp_.float_placement);
// Fonts
updateFontsize(documentClass().opt_fontsize(),
- params.fontsize);
+ bp_.fontsize);
- int n = findToken(tex_fonts_roman, params.fontsRoman);
+ int n = findToken(tex_fonts_roman, bp_.fontsRoman);
if (n >= 0) {
fontModule->fontsRomanCO->setCurrentIndex(n);
romanChanged(n);
}
- n = findToken(tex_fonts_sans, params.fontsSans);
+ n = findToken(tex_fonts_sans, bp_.fontsSans);
if (n >= 0) {
fontModule->fontsSansCO->setCurrentIndex(n);
sansChanged(n);
}
- n = findToken(tex_fonts_monospaced, params.fontsTypewriter);
+ n = findToken(tex_fonts_monospaced, bp_.fontsTypewriter);
if (n >= 0) {
fontModule->fontsTypewriterCO->setCurrentIndex(n);
ttChanged(n);
}
- if (!params.fontsCJK.empty())
+ if (!bp_.fontsCJK.empty())
fontModule->cjkFontLE->setText(
- toqstr(params.fontsCJK));
+ toqstr(bp_.fontsCJK));
else
fontModule->cjkFontLE->setText(QString());
- fontModule->fontScCB->setChecked(params.fontsSC);
- fontModule->fontOsfCB->setChecked(params.fontsOSF);
- fontModule->scaleSansSB->setValue(params.fontsSansScale);
- fontModule->scaleTypewriterSB->setValue(params.fontsTypewriterScale);
- n = findToken(GuiDocument::fontfamilies, params.fontsDefaultFamily);
+ fontModule->fontScCB->setChecked(bp_.fontsSC);
+ fontModule->fontOsfCB->setChecked(bp_.fontsOSF);
+ fontModule->scaleSansSB->setValue(bp_.fontsSansScale);
+ fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale);
+ n = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily);
if (n >= 0)
fontModule->fontsDefaultCO->setCurrentIndex(n);
// paper
- int const psize = params.papersize;
+ int const psize = bp_.papersize;
pageLayoutModule->papersizeCO->setCurrentIndex(psize);
setCustomPapersize(psize);
bool const landscape =
- params.orientation == ORIENTATION_LANDSCAPE;
+ bp_.orientation == ORIENTATION_LANDSCAPE;
pageLayoutModule->landscapeRB->setChecked(landscape);
pageLayoutModule->portraitRB->setChecked(!landscape);
pageLayoutModule->facingPagesCB->setChecked(
- params.sides == TwoSides);
+ bp_.sides == TwoSides);
lengthToWidgets(pageLayoutModule->paperwidthLE,
- pageLayoutModule->paperwidthUnitCO, params.paperwidth, defaultUnit);
+ pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, defaultUnit);
lengthToWidgets(pageLayoutModule->paperheightLE,
- pageLayoutModule->paperheightUnitCO, params.paperheight, defaultUnit);
+ pageLayoutModule->paperheightUnitCO, bp_.paperheight, defaultUnit);
// margins
Ui::MarginsUi * m = marginsModule;
- setMargins(!params.use_geometry);
+ setMargins(!bp_.use_geometry);
lengthToWidgets(m->topLE, m->topUnit,
- params.topmargin, defaultUnit);
+ bp_.topmargin, defaultUnit);
lengthToWidgets(m->bottomLE, m->bottomUnit,
- params.bottommargin, defaultUnit);
+ bp_.bottommargin, defaultUnit);
lengthToWidgets(m->innerLE, m->innerUnit,
- params.leftmargin, defaultUnit);
+ bp_.leftmargin, defaultUnit);
lengthToWidgets(m->outerLE, m->outerUnit,
- params.rightmargin, defaultUnit);
+ bp_.rightmargin, defaultUnit);
lengthToWidgets(m->headheightLE, m->headheightUnit,
- params.headheight, defaultUnit);
+ bp_.headheight, defaultUnit);
lengthToWidgets(m->headsepLE, m->headsepUnit,
- params.headsep, defaultUnit);
+ bp_.headsep, defaultUnit);
lengthToWidgets(m->footskipLE, m->footskipUnit,
- params.footskip, defaultUnit);
+ bp_.footskip, defaultUnit);
lengthToWidgets(m->columnsepLE, m->columnsepUnit,
- params.columnsep, defaultUnit);
+ bp_.columnsep, defaultUnit);
- branchesModule->update(params);
+ branchesModule->update(bp_);
// PDF support
- PDFOptions const & pdf = params.pdfoptions();
+ PDFOptions const & pdf = bp_.pdfoptions();
pdfSupportModule->use_hyperrefGB->setChecked(pdf.use_hyperref);
pdfSupportModule->titleLE->setText(toqstr(pdf.title));
pdfSupportModule->authorLE->setText(toqstr(pdf.author));
void GuiDocument::updateAvailableModules()
{
modules_av_model_.clear();
- vector<modInfoStruct> const & modInfoList = getModuleInfo();
- int const mSize = modInfoList.size();
- for (int i = 0; i != mSize; ++i) {
- modInfoStruct const & modInfo = modInfoList[i];
- modules_av_model_.insertRow(i, modInfo.name, modInfo.id,
- modInfo.description);
- }
+ list<modInfoStruct> const & modInfoList = getModuleInfo();
+ list<modInfoStruct>::const_iterator mit = modInfoList.begin();
+ list<modInfoStruct>::const_iterator men = modInfoList.end();
+ for (int i = 0; mit != men; ++mit, ++i)
+ modules_av_model_.insertRow(i, mit->name, mit->id,
+ mit->description);
}
void GuiDocument::updateSelectedModules()
{
modules_sel_model_.clear();
- vector<modInfoStruct> const selModList = getSelectedModules();
- int const sSize = selModList.size();
- for (int i = 0; i != sSize; ++i) {
- modInfoStruct const & modInfo = selModList[i];
- modules_sel_model_.insertRow(i, modInfo.name, modInfo.id,
- modInfo.description);
- }
+ list<modInfoStruct> const selModList = getSelectedModules();
+ list<modInfoStruct>::const_iterator mit = selModList.begin();
+ list<modInfoStruct>::const_iterator men = selModList.end();
+ for (int i = 0; mit != men; ++mit, ++i)
+ modules_sel_model_.insertRow(i, mit->name, mit->id,
+ mit->description);
}
return;
}
bp_.useClassDefaults();
- paramsToDialog(bp_);
+ paramsToDialog();
}
-void GuiDocument::setLayoutComboByIDString(std::string const & idString)
+void GuiDocument::setLayoutComboByIDString(string const & idString)
{
int idx = classes_model_.findIDString(idString);
if (idx < 0)
BufferView const * view = bufferview();
if (!view) {
bp_ = BufferParams();
- paramsToDialog(bp_);
+ paramsToDialog();
return true;
}
bp_ = view->buffer().params();
//modules are consistent: That required modules are actually
//selected, and that we don't have conflicts. If so, we could
//at least pop up a warning.
- paramsToDialog(bp_);
+ paramsToDialog();
return true;
}
}
-vector<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
+list<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
{
return moduleNames_;
}
-vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
+list<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
{
- vector<string> const & mods = params().getModules();
- vector<string>::const_iterator it = mods.begin();
- vector<string>::const_iterator end = mods.end();
- vector<modInfoStruct> mInfo;
+ list<string> const & mods = params().getModules();
+ list<string>::const_iterator it = mods.begin();
+ list<string>::const_iterator end = mods.end();
+ list<modInfoStruct> mInfo;
for (; it != end; ++it) {
modInfoStruct m;
m.id = *it;
projects / lyx.git / blobdiff