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();
// 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 || availSels.isEmpty() || isSelected(availSels.first())) {
+ 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());
+ string const modname = getAvailableModel()->getIDString(idx.row());
- int const srows = selectedModel->rowCount();
- // if no modules are yet selected, there is no more to check.
- if (srows == 0) {
- addPB->setEnabled(true);
- return;
- }
-
- vector<string> selModList;
- for (int i = 0; i < srows; ++i)
- selModList.push_back(getSelectedModel()->getIDString(i));
-
- vector<string>::const_iterator const selModStart = selModList.begin();
- vector<string>::const_iterator const selModEnd = selModList.end();
-
- // Check whether some required module is available
- vector<string> const reqs = getRequiredList(modName);
- if (!reqs.empty()) {
- bool foundOne = false;
- vector<string>::const_iterator it = reqs.begin();
- vector<string>::const_iterator en = reqs.end();
- for (; it != en; ++it) {
- if (find(selModStart, selModEnd, *it) != selModEnd) {
- foundOne = true;
- break;
- }
- }
- if (!foundOne) {
- addPB->setEnabled(false);
- return;
- }
- }
-
- // Check for conflicts with used modules
- vector<string>::const_iterator selModIt = selModStart;
- for (; selModIt != selModEnd; ++selModIt) {
- if (!LyXModule::areCompatible(modName, *selModIt)) {
- addPB->setEnabled(false);
- return;
- }
- }
-
- addPB->setEnabled(true);
+ bool const enable =
+ container_->params().moduleCanBeAdded(modname);
+ addPB->setEnabled(enable);
}
downPB->setEnabled(false);
return;
}
- QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
- int const curRow = curIdx.row();
+ 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
- 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()) {
// FIXME This should perhaps be more flexible and check whether, even
// 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;
}
- string const curModName = getSelectedModel()->getIDString(curRow);
+ string const curmodname = getSelectedModel()->getIDString(curRow);
// determine whether immediately preceding element is required by this one
- vector<string> reqs = getRequiredList(curModName);
+ vector<string> reqs = getRequiredList(curmodname);
// if this one doesn't require anything....
if (reqs.empty()) {
// Enable it if the preceding module isn't 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.
- string const preModName = getSelectedModel()->getIDString(curRow - 1);
- upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end());
+ string const premod = getSelectedModel()->getIDString(curRow - 1);
+ upPB->setEnabled(find(reqs.begin(), reqs.end(), premod) == reqs.end());
}
void ModuleSelectionManager::updateDelPB()
deletePB->setEnabled(false);
return;
}
-
- QModelIndex const & curIdx =
+
+ QModelIndex const & curidx =
selectedLV->selectionModel()->currentIndex();
- int const curRow = curIdx.row();
+ int const curRow = curidx.row();
if (curRow < 0 || curRow >= srows) { // invalid index?
deletePB->setEnabled(false);
return;
}
- string const curModName = getSelectedModel()->getIDString(curRow);
+ 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
string const thisMod = getSelectedModel()->getIDString(i);
vector<string> reqs = getRequiredList(thisMod);
//does this one require us?
- if (find(reqs.begin(), reqs.end(), 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"));
string const classname = classes_model_.getIDString(idx);
// check whether the selected modules have changed.
- bool modulesChanged = false;
+ bool modules_changed = false;
unsigned int const srows = selectedModel()->rowCount();
if (srows != bp_.getModules().size())
- modulesChanged = true;
+ 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) {
- modulesChanged = true;
+ modules_changed = true;
break;
}
}
- if (modulesChanged || 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"
}
+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++) {
- 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) {
- 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::applyView()
-{
- apply(params());
-}
-
-
void GuiDocument::saveDocDefault()
{
// we have to apply the params first