X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=782a05f7ea16538e31f8ebd6bbc2691bb416cdbd;hb=5a46224f7311067cda747e0cae32d22dd919f179;hp=ddfed79a963525a00a842b35c74b6395cf03e22a;hpb=84bc1aa4b46958072b897d684bdf3d8e25b824a3;p=lyx.git
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index ddfed79a96..782a05f7ea 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -46,6 +46,7 @@
#include "PDFOptions.h"
#include "qt_helpers.h"
#include "Spacing.h"
+#include "TextClass.h"
#include "insets/InsetListingsParams.h"
@@ -525,6 +526,82 @@ void PreambleModule::closeEvent(QCloseEvent * e)
}
+/////////////////////////////////////////////////////////////////////
+//
+// LocalLayout
+//
+/////////////////////////////////////////////////////////////////////
+
+
+LocalLayout::LocalLayout() : current_id_(0), is_valid_(false)
+{
+ connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
+ connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
+}
+
+
+void LocalLayout::update(BufferParams const & params, BufferId id)
+{
+ QString layout = toqstr(params.local_layout);
+ // Nothing to do if the params and preamble are unchanged.
+ if (id == current_id_
+ && layout == locallayoutTE->document()->toPlainText())
+ return;
+
+ // Save the params address for further use.
+ current_id_ = id;
+ locallayoutTE->document()->setPlainText(layout);
+ validate();
+}
+
+
+void LocalLayout::apply(BufferParams & params)
+{
+ string const layout = fromqstr(locallayoutTE->document()->toPlainText());
+ params.local_layout = layout;
+}
+
+
+void LocalLayout::textChanged()
+{
+ static const QString unknown = qt_("Press button to check validity...");
+
+ is_valid_ = false;
+ infoLB->setText(unknown);
+ validatePB->setEnabled(true);
+ changed();
+}
+
+
+void LocalLayout::validate() {
+ static const QString valid = qt_("Layout is valid!");
+ static const QString vtext =
+ toqstr("")
+ + valid + toqstr("
");
+ static const QString invalid = qt_("Layout is invalid!");
+ static const QString ivtext =
+ toqstr("")
+ + invalid + toqstr("
");
+
+ string const layout =
+ fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+ if (layout.empty()) {
+ is_valid_ = true;
+ infoLB->setText("");
+ } else {
+ is_valid_ = TextClass::validate(layout);
+ infoLB->setText(is_valid_ ? vtext : ivtext);
+ }
+ validatePB->setEnabled(false);
+}
+
+
+void LocalLayout::validatePressed() {
+ validate();
+ changed();
+}
+
+
/////////////////////////////////////////////////////////////////////
//
// DocumentDialog
@@ -662,6 +739,14 @@ GuiDocument::GuiDocument(GuiView & lv)
connect(outputModule->mathoutCB, SIGNAL(currentIndexChanged(int)),
this, SLOT(change_adaptor()));
+ connect(outputModule->outputsyncCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(outputModule->synccustomCB, SIGNAL(editTextChanged(QString)),
+ this, SLOT(change_adaptor()));
+ outputModule->synccustomCB->addItem("");
+ outputModule->synccustomCB->addItem("\\synctex=1");
+ outputModule->synccustomCB->addItem("\\synctex=-1");
+ outputModule->synccustomCB->addItem("\\usepackage[active]{srcltx}");
// fonts
fontModule = new UiWidget;
@@ -771,6 +856,13 @@ GuiDocument::GuiDocument(GuiView & lv)
cb->addItem(qt_("B4"));
cb->addItem(qt_("B5"));
cb->addItem(qt_("B6"));
+ cb->addItem(qt_("C0"));
+ cb->addItem(qt_("C1"));
+ cb->addItem(qt_("C2"));
+ cb->addItem(qt_("C3"));
+ cb->addItem(qt_("C4"));
+ cb->addItem(qt_("C5"));
+ cb->addItem(qt_("C6"));
cb->addItem(qt_("JIS B0"));
cb->addItem(qt_("JIS B1"));
cb->addItem(qt_("JIS B2"));
@@ -981,6 +1073,8 @@ GuiDocument::GuiDocument(GuiView & lv)
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()));
@@ -994,7 +1088,11 @@ GuiDocument::GuiDocument(GuiView & lv)
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;
@@ -1056,6 +1154,10 @@ GuiDocument::GuiDocument(GuiView & lv)
preambleModule = new PreambleModule;
connect(preambleModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
+
+ localLayout = new LocalLayout;
+ connect(localLayout, SIGNAL(changed()),
+ this, SLOT(change_adaptor()));
// bullets
@@ -1144,6 +1246,7 @@ GuiDocument::GuiDocument(GuiView & lv)
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"));
@@ -1170,12 +1273,6 @@ GuiDocument::GuiDocument(GuiView & lv)
}
-void GuiDocument::showPreamble()
-{
- docPS->setCurrentPanel(qt_("LaTeX Preamble"));
-}
-
-
void GuiDocument::saveDefaultClicked()
{
saveDocDefault();
@@ -1517,7 +1614,10 @@ void GuiDocument::xetexChanged(bool xetex)
fontModule->fontencLA->setEnabled(!xetex);
fontModule->fontencCO->setEnabled(!xetex);
- fontModule->fontencLE->setEnabled(!xetex);
+ if (xetex)
+ fontModule->fontencLE->setEnabled(false);
+ else
+ fontencChanged(fontModule->fontencCO->currentIndex());
}
@@ -1816,13 +1916,13 @@ namespace {
for (; it != end; ++it) {
LyXModule const * const mod = theModuleList[*it];
if (!mod)
- retval.push_back(*it + " (Unavailable)");
+ retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"), from_utf8(*it))));
else
retval.push_back(mod->getName());
}
return retval;
}
-}
+} // end anonymous namespace
void GuiDocument::modulesToParams(BufferParams & bp)
@@ -2002,6 +2102,7 @@ void GuiDocument::applyView()
{
// preamble
preambleModule->apply(bp_);
+ localLayout->apply(bp_);
// date
bp_.suppress_date = latexModule->suppressDateCB->isChecked();
@@ -2126,9 +2227,9 @@ void GuiDocument::applyView()
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
@@ -2150,7 +2251,15 @@ void GuiDocument::applyView()
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";
@@ -2274,6 +2383,9 @@ void GuiDocument::applyView()
bool const xetex = outputModule->xetexCB->isChecked();
bp_.useXetex = xetex;
+ bp_.output_sync = outputModule->outputsyncCB->isChecked();
+ bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
+
int mathfmt = outputModule->mathoutCB->currentIndex();
if (mathfmt == -1)
mathfmt = 0;
@@ -2415,6 +2527,7 @@ void GuiDocument::paramsToDialog()
// preamble
preambleModule->update(bp_, id());
+ localLayout->update(bp_, id());
// date
latexModule->suppressDateCB->setChecked(bp_.suppress_date);
@@ -2557,6 +2670,11 @@ void GuiDocument::paramsToDialog()
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;
@@ -2664,10 +2782,7 @@ void GuiDocument::paramsToDialog()
}
// Master/Child
- std::vector children;
- if (bufferview())
- children = buffer().getChildren(false);
- if (children.empty()) {
+ if (!buffer().hasChildren()) {
masterChildModule->childrenTW->clear();
includeonlys_.clear();
docPS->showPanel(qt_("Child Documents"), false);
@@ -2704,6 +2819,9 @@ void GuiDocument::paramsToDialog()
outputModule->xetexCB->setChecked(
bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex);
+ outputModule->outputsyncCB->setChecked(bp_.output_sync);
+ outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
+
outputModule->mathimgSB->setValue(bp_.html_math_img_scale);
outputModule->mathoutCB->setCurrentIndex(bp_.html_math_output);
outputModule->strictCB->setChecked(bp_.html_be_strict);
@@ -2774,11 +2892,13 @@ void GuiDocument::paramsToDialog()
if (nn >= 0)
fontModule->fontsDefaultCO->setCurrentIndex(nn);
- if (bp_.fontenc == "global")
+ if (bp_.fontenc == "global") {
fontModule->fontencCO->setCurrentIndex(0);
- else if (bp_.fontenc == "default")
+ fontModule->fontencLE->setEnabled(false);
+ } else if (bp_.fontenc == "default") {
fontModule->fontencCO->setCurrentIndex(2);
- else {
+ fontModule->fontencLE->setEnabled(false);
+ } else {
fontModule->fontencCO->setCurrentIndex(1);
fontModule->fontencLE->setText(toqstr(bp_.fontenc));
}
@@ -2925,9 +3045,9 @@ void GuiDocument::updateIncludeonlys()
masterChildModule->maintainAuxCB->setEnabled(true);
}
QTreeWidgetItem * item = 0;
- std::vector children = buffer().getChildren(false);
- vector::const_iterator it = children.begin();
- vector::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) {
@@ -2999,13 +3119,25 @@ void GuiDocument::setLayoutComboByIDString(string const & idString)
bool GuiDocument::isValid()
{
- return validateListingsParameters().isEmpty()
- && (textLayoutModule->skipCO->currentIndex() != 3
- || !textLayoutModule->skipLE->text().isEmpty()
- || textLayoutModule->indentRB->isChecked())
- && (textLayoutModule->indentCO->currentIndex() != 1
- || !textLayoutModule->indentLE->text().isEmpty()
- || textLayoutModule->skipRB->isChecked());
+ return
+ validateListingsParameters().isEmpty() &&
+ localLayout->isValid() &&
+ (
+ // if we're asking for skips between paragraphs
+ !textLayoutModule->skipRB->isChecked() ||
+ // then either we haven't chosen custom
+ textLayoutModule->skipCO->currentIndex() != 3 ||
+ // or else a length has been given
+ !textLayoutModule->skipLE->text().isEmpty()
+ ) &&
+ (
+ // if we're asking for indentation
+ !textLayoutModule->indentRB->isChecked() ||
+ // then either we haven't chosen custom
+ textLayoutModule->indentCO->currentIndex() != 1 ||
+ // or else a length has been given
+ !textLayoutModule->indentLE->text().isEmpty()
+ );
}