#include <QTextCursor>
#include <sstream>
+#include <vector>
#ifdef IN
#undef IN
class ModuleSelectionManager : public GuiSelectionManager
{
public:
+ ///
ModuleSelectionManager(
QListView * availableLV,
QListView * selectedLV,
QPushButton * upPB,
QPushButton * downPB,
GuiIdListModel * availableModel,
- GuiIdListModel * selectedModel)
+ GuiIdListModel * selectedModel,
+ GuiDocument const * container)
: GuiSelectionManager(availableLV, selectedLV, addPB, delPB,
- upPB, downPB, availableModel, selectedModel)
+ upPB, downPB, availableModel, selectedModel), container_(container)
{}
private:
///
{
return dynamic_cast<GuiIdListModel *>(selectedModel);
}
+ ///
+ GuiDocument const * container_;
};
void ModuleSelectionManager::updateAddPB()
{
int const arows = availableModel->rowCount();
- QModelIndexList const availSels =
+ QModelIndexList const avail_sels =
availableLV->selectionModel()->selectedIndexes();
- if (arows == 0 || availSels.isEmpty() || isSelected(availSels.first())) {
+
+ // disable if there aren't any modules (?), if none of them is chosen
+ // in the dialog, or if the chosen one is already selected for use.
+ if (arows == 0 || avail_sels.isEmpty() || isSelected(avail_sels.first())) {
addPB->setEnabled(false);
return;
}
-
- QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
- string const modName = getAvailableModel()->getIDString(idx.row());
- vector<string> reqs = getRequiredList(modName);
- vector<string> excl = getExcludedList(modName);
-
- if (reqs.empty() && excl.empty()) {
- addPB->setEnabled(true);
- return;
- }
-
- int const srows = selectedModel->rowCount();
- vector<string> selModList;
- for (int i = 0; i < srows; ++i)
- selModList.push_back(getSelectedModel()->getIDString(i));
- vector<string>::const_iterator selModStart = selModList.begin();
- vector<string>::const_iterator selModEnd = selModList.end();
-
- // Check whether some required module is available
- if (!reqs.empty()) {
- bool foundOne = false;
- vector<string>::const_iterator it = reqs.begin();
- vector<string>::const_iterator end = reqs.end();
- for (; it != end; ++it) {
- if (find(selModStart, selModEnd, *it) != selModEnd) {
- foundOne = true;
- break;
- }
- }
- if (!foundOne) {
- addPB->setEnabled(false);
- return;
- }
- }
-
- // Check whether any excluded module is being used
- if (!excl.empty()) {
- vector<string>::const_iterator it = excl.begin();
- vector<string>::const_iterator end = excl.end();
- for (; it != end; ++it) {
- if (find(selModStart, selModEnd, *it) != selModEnd) {
- addPB->setEnabled(false);
- return;
- }
- }
- }
+ QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
+ string const modname = getAvailableModel()->getIDString(idx.row());
- addPB->setEnabled(true);
+ bool const enable =
+ container_->params().moduleCanBeAdded(modname);
+ addPB->setEnabled(enable);
}
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) {
+ QModelIndex const & curidx = selectedLV->selectionModel()->currentIndex();
+ 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
- QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
- int curRow = curIdx.row();
- if (curRow < 0 || curRow >= srows - 1) { //this shouldn't happen...
- downPB->setEnabled(false);
- return;
- }
- string const curModName = getSelectedModel()->getIDString(curRow);
- string const nextModName = getSelectedModel()->getIDString(curRow + 1);
+ string const curmodname = getSelectedModel()->getIDString(curRow);
+ string const nextmodname = getSelectedModel()->getIDString(curRow + 1);
- vector<string> reqs = getRequiredList(nextModName);
+ vector<string> reqs = getRequiredList(nextmodname);
// if it doesn't require anything....
if (reqs.empty()) {
// 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());
+ find(reqs.begin(), reqs.end(), curmodname) == reqs.end());
}
void ModuleSelectionManager::updateUpPB()
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);
- vector<string> reqs = getRequiredList(curModName);
-
+ 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....
if (reqs.empty()) {
upPB->setEnabled(true);
return;
}
- 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.
- upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end());
+ // 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.
+ string const premod = getSelectedModel()->getIDString(curRow - 1);
+ upPB->setEnabled(find(reqs.begin(), reqs.end(), premod) == reqs.end());
}
void ModuleSelectionManager::updateDelPB()
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 =
+
+ QModelIndex const & curidx =
selectedLV->selectionModel()->currentIndex();
- int const curRow = curIdx.row();
- if (curRow < 0 || curRow >= srows) { // this shouldn't happen
+ int const curRow = curidx.row();
+ if (curRow < 0 || curRow >= srows) { // invalid index?
deletePB->setEnabled(false);
return;
}
-
- QString const curModName = curIdx.data().toString();
-
+
+ string const curmodname = getSelectedModel()->getIDString(curRow);
+
// We're looking here for a reason NOT to enable the button. If we
// find one, we disable it and return. If we don't, we'll end up at
// the end of the function, and then we enable it.
string const thisMod = getSelectedModel()->getIDString(i);
vector<string> reqs = getRequiredList(thisMod);
//does this one require us?
- if (find(reqs.begin(), reqs.end(), fromqstr(curModName)) == reqs.end())
+ if (find(reqs.begin(), reqs.end(), curmodname) == reqs.end())
//no...
continue;
// but that would be a lot more complicated, and the logic here is
// already complicated. (That's why I've left the debugging code.)
// lyxerr << "Testing " << thisMod << std::endl;
- bool foundOne = false;
+ bool foundone = false;
for (int j = 0; j < curRow; ++j) {
string const mod = getSelectedModel()->getIDString(j);
// lyxerr << "In loop: Testing " << mod << std::endl;
// do we satisfy the require?
if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) {
// lyxerr << mod << " does the trick." << std::endl;
- foundOne = true;
+ foundone = true;
break;
}
}
// did we find a module to satisfy the require?
- if (!foundOne) {
+ if (!foundone) {
// lyxerr << "No matching module found." << std::endl;
deletePB->setEnabled(false);
return;
this, SLOT(change_adaptor()));
connect(latexModule->childDocPB, SIGNAL(clicked()),
this, SLOT(browseMaster()));
-
- selectionManager =
- new ModuleSelectionManager(latexModule->availableLV,
- latexModule->selectedLV,
- latexModule->addPB, latexModule->deletePB,
- latexModule->upPB, latexModule->downPB,
- availableModel(), selectedModel());
- connect(selectionManager, SIGNAL(updateHook()),
- this, SLOT(updateModuleInfo()));
- connect(selectionManager, SIGNAL(updateHook()),
- this, SLOT(change_adaptor()));
-
+
// postscript drivers
for (int n = 0; tex_graphics[n][0]; ++n) {
QString enc = qt_(tex_graphics_gui[n]);
connect(bulletsModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
+ // Modules
+ modulesModule = new UiWidget<Ui::ModulesUi>;
+
+ selectionManager =
+ new ModuleSelectionManager(modulesModule->availableLV,
+ modulesModule->selectedLV,
+ modulesModule->addPB, modulesModule->deletePB,
+ modulesModule->upPB, modulesModule->downPB,
+ availableModel(), selectedModel(), this);
+ connect(selectionManager, SIGNAL(updateHook()),
+ this, SLOT(updateModuleInfo()));
+ connect(selectionManager, SIGNAL(updateHook()),
+ this, SLOT(change_adaptor()));
+ connect(selectionManager, SIGNAL(selectionChanged()),
+ this, SLOT(modulesChanged()));
+
// PDF support
pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
this, SLOT(change_adaptor()));
docPS->addPanel(latexModule, qt_("Document Class"));
+ docPS->addPanel(modulesModule, qt_("Modules"));
docPS->addPanel(fontModule, qt_("Fonts"));
docPS->addPanel(textLayoutModule, qt_("Text Layout"));
docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
return;
string const classname = classes_model_.getIDString(idx);
- // We load the TextClass as soon as it is selected. This is
- // 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....
- if (!bp_.setBaseClass(classname)) {
- Alert::error(_("Error"), _("Unable to set document class."));
- return;
+ // check whether the selected modules have changed.
+ bool modules_changed = false;
+ unsigned int const srows = selectedModel()->rowCount();
+ if (srows != bp_.getModules().size())
+ modules_changed = 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) {
+ modules_changed = true;
+ break;
+ }
}
- // 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) {
+ if (modules_changed || 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();
}
+
+ // We load the TextClass as soon as it is selected. This is
+ // 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....
+ if (!bp_.setBaseClass(classname)) {
+ Alert::error(_("Error"), _("Unable to set document class."));
+ return;
+ }
+ 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
// file; the latter is that plus the modules (or the document-specific layout,
bp_.makeDocumentClass();
// the new class may require some default modules.
updateSelectedModules();
- paramsToDialog(bp_);
+ paramsToDialog();
}
}
+void GuiDocument::modulesToParams(BufferParams & bp)
+{
+ // update list of loaded modules
+ bp.clearLayoutModules();
+ int const srows = modules_sel_model_.rowCount();
+ for (int i = 0; i < srows; ++i)
+ bp.addLayoutModule(modules_sel_model_.getIDString(i));
+
+ // update the list of removed modules
+ bp.clearRemovedModules();
+ list<string> const & reqmods = bp.baseClass()->defaultModules();
+ list<string>::const_iterator rit = reqmods.begin();
+ list<string>::const_iterator ren = reqmods.end();
+
+ // check each of the default modules
+ for (; rit != ren; rit++) {
+ list<string>::const_iterator mit = bp.getModules().begin();
+ list<string>::const_iterator men = bp.getModules().end();
+ bool found = false;
+ for (; mit != men; mit++) {
+ if (*rit == *mit) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ // the module isn't present so must have been removed by the user
+ bp.addRemovedModule(*rit);
+ }
+ }
+}
+
+void GuiDocument::modulesChanged()
+{
+ modulesToParams(bp_);
+ bp_.makeDocumentClass();
+ paramsToDialog();
+}
+
+
void GuiDocument::updateModuleInfo()
{
selectionManager->update();
//Module description
- bool const focusOnSelected = selectionManager->selectedFocused();
+ bool const focus_on_selected = selectionManager->selectedFocused();
QListView const * const lv =
- focusOnSelected ? latexModule->selectedLV : latexModule->availableLV;
+ focus_on_selected ? modulesModule->selectedLV : modulesModule->availableLV;
if (lv->selectionModel()->selectedIndexes().isEmpty()) {
- latexModule->infoML->document()->clear();
+ modulesModule->infoML->document()->clear();
return;
}
QModelIndex const & idx = lv->selectionModel()->currentIndex();
- GuiIdListModel const & idModel =
- focusOnSelected ? modules_sel_model_ : modules_av_model_;
- string const modName = idModel.getIDString(idx.row());
+ GuiIdListModel const & id_model =
+ focus_on_selected ? modules_sel_model_ : modules_av_model_;
+ string const modName = id_model.getIDString(idx.row());
docstring desc = getModuleDescription(modName);
- vector<string> pkgList = getPackageList(modName);
- docstring pkgdesc = formatStrVec(pkgList, _("and"));
+ vector<string> pkglist = getPackageList(modName);
+ docstring pkgdesc = formatStrVec(pkglist, _("and"));
if (!pkgdesc.empty()) {
if (!desc.empty())
desc += "\n";
desc += bformat(_("Package(s) required: %1$s."), pkgdesc);
}
- pkgList = getRequiredList(modName);
- if (!pkgList.empty()) {
- vector<string> const reqDescs = idsToNames(pkgList);
- pkgdesc = formatStrVec(reqDescs, _("or"));
+ pkglist = getRequiredList(modName);
+ if (!pkglist.empty()) {
+ vector<string> const reqdescs = idsToNames(pkglist);
+ pkgdesc = formatStrVec(reqdescs, _("or"));
if (!desc.empty())
desc += "\n";
desc += bformat(_("Module required: %1$s."), pkgdesc);
}
- pkgList = getExcludedList(modName);
- if (!pkgList.empty()) {
- vector<string> const reqDescs = idsToNames(pkgList);
- pkgdesc = formatStrVec(reqDescs, _( "and"));
+ pkglist = getExcludedList(modName);
+ if (!pkglist.empty()) {
+ vector<string> const reqdescs = idsToNames(pkglist);
+ pkgdesc = formatStrVec(reqdescs, _( "and"));
if (!desc.empty())
desc += "\n";
desc += bformat(_("Modules excluded: %1$s."), pkgdesc);
if (!isModuleAvailable(modName)) {
if (!desc.empty())
desc += "\n";
- desc += _("WARNING: Some packages are unavailable!");
+ desc += _("WARNING: Some required packages are unavailable!");
}
- latexModule->infoML->document()->setPlainText(toqstr(desc));
+ modulesModule->infoML->document()->setPlainText(toqstr(desc));
}
}
-void GuiDocument::apply(BufferParams & params)
+void GuiDocument::applyView()
{
// preamble
- preambleModule->apply(params);
+ preambleModule->apply(bp_);
// biblio
- params.setCiteEngine(ENGINE_BASIC);
+ bp_.setCiteEngine(ENGINE_BASIC);
if (biblioModule->citeNatbibRB->isChecked()) {
bool const use_numerical_citations =
biblioModule->citeStyleCO->currentIndex();
if (use_numerical_citations)
- params.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
+ bp_.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
else
- params.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
+ bp_.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
} else if (biblioModule->citeJurabibRB->isChecked())
- params.setCiteEngine(ENGINE_JURABIB);
+ bp_.setCiteEngine(ENGINE_JURABIB);
- params.use_bibtopic =
+ bp_.use_bibtopic =
biblioModule->bibtopicCB->isChecked();
// language & quotes
if (langModule->defaultencodingRB->isChecked()) {
- params.inputenc = "auto";
+ bp_.inputenc = "auto";
} else {
int i = langModule->encodingCO->currentIndex();
if (i == 0)
- params.inputenc = "default";
+ bp_.inputenc = "default";
else {
QString const enc_gui =
langModule->encodingCO->currentText();
bool found = false;
for (; it != end; ++it) {
if (qt_(it->guiName()) == enc_gui) {
- params.inputenc = it->latexName();
+ bp_.inputenc = it->latexName();
found = true;
break;
}
if (!found) {
// should not happen
lyxerr << "GuiDocument::apply: Unknown encoding! Resetting to default" << endl;
- params.inputenc = "default";
+ bp_.inputenc = "default";
}
}
}
lga = InsetQuotes::DanishQuotes;
break;
}
- params.quotes_language = lga;
+ bp_.quotes_language = lga;
QString const lang = langModule->languageCO->itemData(
langModule->languageCO->currentIndex()).toString();
- params.language = lyx::languages.getLanguage(fromqstr(lang));
+ bp_.language = lyx::languages.getLanguage(fromqstr(lang));
// numbering
- if (params.documentClass().hasTocLevels()) {
- params.tocdepth = numberingModule->tocSL->value();
- params.secnumdepth = numberingModule->depthSL->value();
+ if (bp_.documentClass().hasTocLevels()) {
+ bp_.tocdepth = numberingModule->tocSL->value();
+ bp_.secnumdepth = numberingModule->depthSL->value();
}
// bullets
- params.user_defined_bullet(0) = bulletsModule->bullet(0);
- params.user_defined_bullet(1) = bulletsModule->bullet(1);
- params.user_defined_bullet(2) = bulletsModule->bullet(2);
- params.user_defined_bullet(3) = bulletsModule->bullet(3);
+ bp_.user_defined_bullet(0) = bulletsModule->bullet(0);
+ bp_.user_defined_bullet(1) = bulletsModule->bullet(1);
+ bp_.user_defined_bullet(2) = bulletsModule->bullet(2);
+ bp_.user_defined_bullet(3) = bulletsModule->bullet(3);
// packages
- params.graphicsDriver =
+ bp_.graphicsDriver =
tex_graphics[latexModule->psdriverCO->currentIndex()];
// text layout
int idx = latexModule->classCO->currentIndex();
if (idx >= 0) {
string const classname = classes_model_.getIDString(idx);
- params.setBaseClass(classname);
+ bp_.setBaseClass(classname);
}
// Modules
- params.clearLayoutModules();
- int const srows = modules_sel_model_.rowCount();
- vector<string> selModList;
- for (int i = 0; i < srows; ++i)
- params.addLayoutModule(modules_sel_model_.getIDString(i));
- // update the list of removed modules
- params.clearRemovedModules();
- list<string> const & reqmods = params.baseClass()->defaultModules();
- list<string>::const_iterator rit = reqmods.begin();
- 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();
- bool found = false;
- for (; mit != men; mit++) {
- if (*rit == *mit) {
- found = true;
- break;
- }
- }
- if (!found) {
- // the module isn't present so must have been removed by the user
- params.addRemovedModule(*rit);
- }
- }
+ modulesToParams(bp_);
if (mathsModule->amsautoCB->isChecked()) {
- params.use_amsmath = BufferParams::package_auto;
+ bp_.use_amsmath = BufferParams::package_auto;
} else {
if (mathsModule->amsCB->isChecked())
- params.use_amsmath = BufferParams::package_on;
+ bp_.use_amsmath = BufferParams::package_on;
else
- params.use_amsmath = BufferParams::package_off;
+ bp_.use_amsmath = BufferParams::package_off;
}
if (mathsModule->esintautoCB->isChecked())
- params.use_esint = BufferParams::package_auto;
+ bp_.use_esint = BufferParams::package_auto;
else {
if (mathsModule->esintCB->isChecked())
- params.use_esint = BufferParams::package_on;
+ bp_.use_esint = BufferParams::package_on;
else
- params.use_esint = BufferParams::package_off;
+ bp_.use_esint = BufferParams::package_off;
}
if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
- params.pagestyle = "default";
+ bp_.pagestyle = "default";
else {
QString style_gui = pageLayoutModule->pagestyleCO->currentText();
for (size_t i = 0; i != pagestyles.size(); ++i)
if (pagestyles[i].second == style_gui)
- params.pagestyle = pagestyles[i].first;
+ bp_.pagestyle = pagestyles[i].first;
}
switch (textLayoutModule->lspacingCO->currentIndex()) {
case 0:
- params.spacing().set(Spacing::Single);
+ bp_.spacing().set(Spacing::Single);
break;
case 1:
- params.spacing().set(Spacing::Onehalf);
+ bp_.spacing().set(Spacing::Onehalf);
break;
case 2:
- params.spacing().set(Spacing::Double);
+ bp_.spacing().set(Spacing::Double);
break;
case 3:
- params.spacing().set(Spacing::Other,
+ bp_.spacing().set(Spacing::Other,
fromqstr(textLayoutModule->lspacingLE->text()));
break;
}
if (textLayoutModule->twoColumnCB->isChecked())
- params.columns = 2;
+ bp_.columns = 2;
else
- params.columns = 1;
+ bp_.columns = 1;
// text should have passed validation
- params.listings_params =
+ bp_.listings_params =
InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
if (textLayoutModule->indentRB->isChecked())
- params.paragraph_separation = BufferParams::ParagraphIndentSeparation;
+ bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
else
- params.paragraph_separation = BufferParams::ParagraphSkipSeparation;
+ bp_.paragraph_separation = BufferParams::ParagraphSkipSeparation;
switch (textLayoutModule->skipCO->currentIndex()) {
case 0:
- params.setDefSkip(VSpace(VSpace::SMALLSKIP));
+ bp_.setDefSkip(VSpace(VSpace::SMALLSKIP));
break;
case 1:
- params.setDefSkip(VSpace(VSpace::MEDSKIP));
+ bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
break;
case 2:
- params.setDefSkip(VSpace(VSpace::BIGSKIP));
+ bp_.setDefSkip(VSpace(VSpace::BIGSKIP));
break;
case 3:
{
widgetsToLength(textLayoutModule->skipLE,
textLayoutModule->skipLengthCO)
);
- params.setDefSkip(vs);
+ bp_.setDefSkip(vs);
break;
}
default:
// DocumentDefskipCB assures that this never happens
// so Assert then !!! - jbl
- params.setDefSkip(VSpace(VSpace::MEDSKIP));
+ bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
break;
}
- params.options =
+ bp_.options =
fromqstr(latexModule->optionsLE->text());
- params.use_default_options =
+ bp_.use_default_options =
latexModule->defaultOptionsCB->isChecked();
if (latexModule->childDocGB->isChecked())
- params.master =
+ bp_.master =
fromqstr(latexModule->childDocLE->text());
else
- params.master = string();
+ bp_.master = string();
- params.float_placement = floatModule->get();
+ bp_.float_placement = floatModule->get();
// fonts
- params.fontsRoman =
+ bp_.fontsRoman =
tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
- params.fontsSans =
+ bp_.fontsSans =
tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
- params.fontsTypewriter =
+ bp_.fontsTypewriter =
tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
- params.fontsCJK =
+ bp_.fontsCJK =
fromqstr(fontModule->cjkFontLE->text());
- params.fontsSansScale = fontModule->scaleSansSB->value();
+ bp_.fontsSansScale = fontModule->scaleSansSB->value();
- params.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
+ bp_.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
- params.fontsSC = fontModule->fontScCB->isChecked();
+ bp_.fontsSC = fontModule->fontScCB->isChecked();
- params.fontsOSF = fontModule->fontOsfCB->isChecked();
+ bp_.fontsOSF = fontModule->fontOsfCB->isChecked();
- params.fontsDefaultFamily = GuiDocument::fontfamilies[
+ bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
fontModule->fontsDefaultCO->currentIndex()];
if (fontModule->fontsizeCO->currentIndex() == 0)
- params.fontsize = "default";
+ bp_.fontsize = "default";
else
- params.fontsize =
+ bp_.fontsize =
fromqstr(fontModule->fontsizeCO->currentText());
// paper
- params.papersize = PAPER_SIZE(
+ bp_.papersize = PAPER_SIZE(
pageLayoutModule->papersizeCO->currentIndex());
// custom, A3, B3 and B4 paper sizes need geometry
int psize = pageLayoutModule->papersizeCO->currentIndex();
bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
- params.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
+ bp_.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
pageLayoutModule->paperwidthUnitCO);
- params.paperheight = widgetsToLength(pageLayoutModule->paperheightLE,
+ bp_.paperheight = widgetsToLength(pageLayoutModule->paperheightLE,
pageLayoutModule->paperheightUnitCO);
if (pageLayoutModule->facingPagesCB->isChecked())
- params.sides = TwoSides;
+ bp_.sides = TwoSides;
else
- params.sides = OneSide;
+ bp_.sides = OneSide;
if (pageLayoutModule->landscapeRB->isChecked())
- params.orientation = ORIENTATION_LANDSCAPE;
+ bp_.orientation = ORIENTATION_LANDSCAPE;
else
- params.orientation = ORIENTATION_PORTRAIT;
+ bp_.orientation = ORIENTATION_PORTRAIT;
// margins
- params.use_geometry = !marginsModule->marginCB->isChecked()
+ bp_.use_geometry = !marginsModule->marginCB->isChecked()
|| geom_papersize;
Ui::MarginsUi const * m = marginsModule;
- params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
- params.topmargin = widgetsToLength(m->topLE, m->topUnit);
- params.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
- params.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
- params.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
- params.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
- params.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
- params.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
+ bp_.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
+ bp_.topmargin = widgetsToLength(m->topLE, m->topUnit);
+ bp_.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
+ bp_.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
+ bp_.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
+ bp_.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
+ bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
+ bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
- branchesModule->apply(params);
+ branchesModule->apply(bp_);
// PDF support
- PDFOptions & pdf = params.pdfoptions();
+ PDFOptions & pdf = bp_.pdfoptions();
pdf.use_hyperref = pdfSupportModule->use_hyperrefGB->isChecked();
pdf.title = fromqstr(pdfSupportModule->titleLE->text());
pdf.author = fromqstr(pdfSupportModule->authorLE->text());
}
-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::applyView()
-{
- apply(params());
-}
-
-
void GuiDocument::saveDocDefault()
{
// we have to apply the params first
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;