toqstr("<p style=\"color: #c00000; font-weight: bold; \">")
+ invalid + toqstr("</p>");
- string const layout = fromqstr(locallayoutTE->document()->toPlainText());
- if (layout.empty())
+ string const layout =
+ fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+ if (layout.empty()) {
is_valid_ = true;
- else
+ infoLB->setText("");
+ } else {
is_valid_ = TextClass::validate(layout);
- infoLB->setText(is_valid_ ? vtext : ivtext);
+ infoLB->setText(is_valid_ ? vtext : ivtext);
+ }
validatePB->setEnabled(false);
}
mathsModule->esintCB, SLOT(setDisabled(bool)));
connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)),
mathsModule->mhchemCB, SLOT(setDisabled(bool)));
+ connect(mathsModule->mathdotsautoCB, SIGNAL(toggled(bool)),
+ mathsModule->mathdotsCB, SLOT(setDisabled(bool)));
connect(mathsModule->amsCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
this, SLOT(change_adaptor()));
connect(mathsModule->mhchemautoCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
-
+ connect(mathsModule->mathdotsCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(mathsModule->mathdotsautoCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+
// latex class
latexModule = new UiWidget<Ui::LaTeXUi>;
docPS->addPanel(latexModule, qt_("Document Class"));
docPS->addPanel(masterChildModule, qt_("Child Documents"));
docPS->addPanel(modulesModule, qt_("Modules"));
+ docPS->addPanel(localLayout, qt_("Local Layout"));
docPS->addPanel(fontModule, qt_("Fonts"));
docPS->addPanel(textLayoutModule, qt_("Text Layout"));
docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
docPS->addPanel(branchesModule, qt_("Branches"));
docPS->addPanel(outputModule, qt_("Output"));
docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
- docPS->addPanel(localLayout, qt_("Local Layout"));
docPS->setCurrentPanel(qt_("Document Class"));
// FIXME: hack to work around resizing bug in Qt >= 4.2
// bug verified with Qt 4.2.{0-3} (JSpitzm)
modulesToParams(bp_);
// Math
- if (mathsModule->amsautoCB->isChecked()) {
+ if (mathsModule->amsautoCB->isChecked())
bp_.use_amsmath = BufferParams::package_auto;
- } else {
+ else {
if (mathsModule->amsCB->isChecked())
bp_.use_amsmath = BufferParams::package_on;
else
else
bp_.use_mhchem = BufferParams::package_off;
}
-
+ if (mathsModule->mathdotsautoCB->isChecked())
+ bp_.use_mathdots = BufferParams::package_auto;
+ else {
+ if (mathsModule->mathdotsCB->isChecked())
+ bp_.use_mathdots = BufferParams::package_on;
+ else
+ bp_.use_mathdots = BufferParams::package_off;
+ }
+
// Page Layout
if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
bp_.pagestyle = "default";
mathsModule->mhchemautoCB->setChecked(
bp_.use_mhchem == BufferParams::package_auto);
+ mathsModule->mathdotsCB->setChecked(
+ bp_.use_mathdots == BufferParams::package_on);
+ mathsModule->mathdotsautoCB->setChecked(
+ bp_.use_mathdots == BufferParams::package_auto);
+
switch (bp_.spacing().getSpace()) {
case Spacing::Other: nitem = 3; break;
case Spacing::Double: nitem = 2; break;
}
// Master/Child
- std::vector<Buffer *> children;
- if (bufferview())
- children = buffer().getChildren(false);
- if (children.empty()) {
+ if (!buffer().hasChildren()) {
masterChildModule->childrenTW->clear();
includeonlys_.clear();
docPS->showPanel(qt_("Child Documents"), false);
masterChildModule->maintainAuxCB->setEnabled(true);
}
QTreeWidgetItem * item = 0;
- std::vector<Buffer *> children = buffer().getChildren(false);
- vector<Buffer *>::const_iterator it = children.begin();
- vector<Buffer *>::const_iterator end = children.end();
+ ListOfBuffers children = buffer().getChildren();
+ ListOfBuffers::const_iterator it = children.begin();
+ ListOfBuffers::const_iterator end = children.end();
bool has_unincluded = false;
bool all_unincluded = true;
for (; it != end; ++it) {