X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=782a05f7ea16538e31f8ebd6bbc2691bb416cdbd;hb=5a46224f7311067cda747e0cae32d22dd919f179;hp=318c1a297b97b41db12994f0b0ca7e7b5cf88ee5;hpb=5c59e8c7cb3a804d403061e76a34c0378320b9b0;p=lyx.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 318c1a297b..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" @@ -79,7 +80,7 @@ static inline QString colorButtonStyleSheet(QColor const & bgColor) { if (bgColor.isValid()) { - QString rc = QLatin1String("background:"); + QString rc = QLatin1String("background-color:"); rc += bgColor.name(); return rc; } @@ -178,6 +179,11 @@ vector > pagestyles; namespace lyx { RGBColor set_backgroundcolor; +bool is_backgroundcolor; +RGBColor set_fontcolor; +bool is_fontcolor; +RGBColor set_notefontcolor; +RGBColor set_boxbgcolor; namespace { // used when sorting the textclass list. @@ -520,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 @@ -547,8 +629,9 @@ GuiDocument::GuiDocument(GuiView & lv) bc().setCancel(closePB); bc().setRestore(restorePB); - textLayoutModule = new UiWidget; + // text layout + textLayoutModule = new UiWidget; connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)), @@ -617,6 +700,7 @@ GuiDocument::GuiDocument(GuiView & lv) bc().addCheckedLineEdit(textLayoutModule->indentLE); bc().addCheckedLineEdit(textLayoutModule->skipLE); + // master/child handling masterChildModule = new UiWidget; @@ -638,6 +722,7 @@ GuiDocument::GuiDocument(GuiView & lv) masterChildModule->childrenTW->resizeColumnToContents(1); masterChildModule->childrenTW->resizeColumnToContents(2); + // output outputModule = new UiWidget; @@ -647,6 +732,21 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(xetexChanged(bool))); connect(outputModule->defaultFormatCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); + connect(outputModule->mathimgSB, SIGNAL(valueChanged(double)), + this, SLOT(change_adaptor())); + connect(outputModule->strictCB, SIGNAL(stateChanged(int)), + this, SLOT(change_adaptor())); + 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; @@ -699,14 +799,14 @@ GuiDocument::GuiDocument(GuiView & lv) qt_(GuiDocument::fontfamilies_gui[n])); - pageLayoutModule = new UiWidget; // page layout + pageLayoutModule = new UiWidget; connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(papersizeChanged(int))); connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(papersizeChanged(int))); connect(pageLayoutModule->portraitRB, SIGNAL(clicked()), - this, SLOT(portraitChanged())); + this, SLOT(change_adaptor())); connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(pageLayoutModule->paperheightLE, SIGNAL(textChanged(const QString &)), @@ -725,11 +825,7 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(pageLayoutModule->pagestyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(pageLayoutModule->backgroundPB, SIGNAL(clicked()), - this, SLOT(changeBackgroundColor())); - connect(pageLayoutModule->delbackgroundTB, SIGNAL(clicked()), - this, SLOT(deleteBackgroundColor())); - + pageLayoutModule->pagestyleCO->addItem(qt_("Default")); pageLayoutModule->pagestyleCO->addItem(qt_("empty")); pageLayoutModule->pagestyleCO->addItem(qt_("plain")); @@ -740,19 +836,40 @@ GuiDocument::GuiDocument(GuiView & lv) bc().addCheckedLineEdit(pageLayoutModule->paperwidthLE, pageLayoutModule->paperwidthL); - // paper QComboBox * cb = pageLayoutModule->papersizeCO; cb->addItem(qt_("Default")); cb->addItem(qt_("Custom")); cb->addItem(qt_("US letter")); cb->addItem(qt_("US legal")); cb->addItem(qt_("US executive")); + cb->addItem(qt_("A0")); + cb->addItem(qt_("A1")); + cb->addItem(qt_("A2")); cb->addItem(qt_("A3")); cb->addItem(qt_("A4")); cb->addItem(qt_("A5")); + cb->addItem(qt_("A6")); + cb->addItem(qt_("B0")); + cb->addItem(qt_("B1")); + cb->addItem(qt_("B2")); cb->addItem(qt_("B3")); 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")); + cb->addItem(qt_("JIS B3")); + cb->addItem(qt_("JIS B4")); + cb->addItem(qt_("JIS B5")); + cb->addItem(qt_("JIS B6")); // remove the %-items from the unit choice pageLayoutModule->paperwidthUnitCO->noPercents(); pageLayoutModule->paperheightUnitCO->noPercents(); @@ -762,8 +879,8 @@ GuiDocument::GuiDocument(GuiView & lv) pageLayoutModule->paperwidthLE)); - marginsModule = new UiWidget; // margins + marginsModule = new UiWidget; connect(marginsModule->marginCB, SIGNAL(toggled(bool)), this, SLOT(setCustomMargins(bool))); connect(marginsModule->marginCB, SIGNAL(clicked()), @@ -835,8 +952,8 @@ GuiDocument::GuiDocument(GuiView & lv) marginsModule->columnsepL); - langModule = new UiWidget; // language & quote + langModule = new UiWidget; connect(langModule->languageCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(langModule->defaultencodingRB, SIGNAL(clicked()), @@ -847,7 +964,7 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(langModule->quoteStyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - // language & quotes + QAbstractItemModel * language_model = guiApp->languageModel(); // FIXME: it would be nice if sorting was enabled/disabled via a checkbox. language_model->sort(0); @@ -872,8 +989,28 @@ GuiDocument::GuiDocument(GuiView & lv) langModule->quoteStyleCO->addItem(qt_(">>text<<")); - numberingModule = new UiWidget; + // color + colorModule = new UiWidget; + connect(colorModule->fontColorPB, SIGNAL(clicked()), + this, SLOT(changeFontColor())); + connect(colorModule->delFontColorTB, SIGNAL(clicked()), + this, SLOT(deleteFontColor())); + connect(colorModule->noteFontColorPB, SIGNAL(clicked()), + this, SLOT(changeNoteFontColor())); + connect(colorModule->delNoteFontColorTB, SIGNAL(clicked()), + this, SLOT(deleteNoteFontColor())); + connect(colorModule->backgroundPB, SIGNAL(clicked()), + this, SLOT(changeBackgroundColor())); + connect(colorModule->delBackgroundTB, SIGNAL(clicked()), + this, SLOT(deleteBackgroundColor())); + connect(colorModule->boxBackgroundPB, SIGNAL(clicked()), + this, SLOT(changeBoxBackgroundColor())); + connect(colorModule->delBoxBackgroundTB, SIGNAL(clicked()), + this, SLOT(deleteBoxBackgroundColor())); + + // numbering + numberingModule = new UiWidget; connect(numberingModule->depthSL, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor())); connect(numberingModule->tocSL, SIGNAL(valueChanged(int)), @@ -888,12 +1025,12 @@ GuiDocument::GuiDocument(GuiView & lv) numberingModule->tocTW->headerItem()->setText(2, qt_("Appears in TOC")); + // biblio biblioModule = new UiWidget; connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)), biblioModule->citationStyleL, SLOT(setEnabled(bool))); connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)), biblioModule->citeStyleCO, SLOT(setEnabled(bool))); - // biblio connect(biblioModule->citeDefaultRB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(biblioModule->citeNatbibRB, SIGNAL(clicked()), @@ -908,19 +1045,19 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(bibtexChanged(int))); connect(biblioModule->bibtexOptionsED, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - // biblio + biblioModule->citeStyleCO->addItem(qt_("Author-year")); biblioModule->citeStyleCO->addItem(qt_("Numerical")); biblioModule->citeStyleCO->setCurrentIndex(0); biblioModule->bibtexCO->clear(); - biblioModule->bibtexCO->addItem(qt_("Default"), QString("default")); for (set::const_iterator it = lyxrc.bibtex_alternatives.begin(); it != lyxrc.bibtex_alternatives.end(); ++it) { QString const command = toqstr(*it).left(toqstr(*it).indexOf(" ")); biblioModule->bibtexCO->addItem(command, command); } + // indices indicesModule = new GuiIndices; @@ -928,6 +1065,7 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); + // maths mathsModule = new UiWidget; connect(mathsModule->amsautoCB, SIGNAL(toggled(bool)), mathsModule->amsCB, SLOT(setDisabled(bool))); @@ -935,7 +1073,9 @@ GuiDocument::GuiDocument(GuiView & lv) mathsModule->esintCB, SLOT(setDisabled(bool))); connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)), mathsModule->mhchemCB, SLOT(setDisabled(bool))); - // maths + connect(mathsModule->mathdotsautoCB, SIGNAL(toggled(bool)), + mathsModule->mathdotsCB, SLOT(setDisabled(bool))); + connect(mathsModule->amsCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(mathsModule->amsautoCB, SIGNAL(clicked()), @@ -948,9 +1088,14 @@ 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())); + - latexModule = new UiWidget; // latex class + latexModule = new UiWidget; connect(latexModule->optionsLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(latexModule->defaultOptionsCB, SIGNAL(clicked()), @@ -995,6 +1140,7 @@ GuiDocument::GuiDocument(GuiView & lv) classes_model_.insertRow(i, toqstr(item), *cit); } + // branches branchesModule = new GuiBranches; connect(branchesModule, SIGNAL(changed()), @@ -1003,16 +1149,23 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(branchesRename(docstring const &, docstring const &))); updateUnknownBranches(); + // preamble preambleModule = new PreambleModule; connect(preambleModule, SIGNAL(changed()), this, SLOT(change_adaptor())); + + localLayout = new LocalLayout; + connect(localLayout, SIGNAL(changed()), + this, SLOT(change_adaptor())); + // bullets bulletsModule = new BulletsModule; connect(bulletsModule, SIGNAL(changed()), this, SLOT(change_adaptor())); + // Modules modulesModule = new UiWidget; modulesModule->availableLV->header()->setVisible(false); @@ -1029,9 +1182,9 @@ GuiDocument::GuiDocument(GuiView & lv) connect(selectionManager, SIGNAL(selectionChanged()), this, SLOT(modulesChanged())); + // PDF support pdfSupportModule = new UiWidget; - connect(pdfSupportModule->use_hyperrefGB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); connect(pdfSupportModule->titleLE, SIGNAL(textChanged(QString)), @@ -1068,11 +1221,13 @@ GuiDocument::GuiDocument(GuiView & lv) for (int i = 0; backref_opts[i][0]; ++i) pdfSupportModule->backrefCO->addItem(qt_(backref_opts_gui[i])); + // float floatModule = new FloatPlacement; connect(floatModule, SIGNAL(changed()), this, SLOT(change_adaptor())); + // listings listingsModule = new UiWidget; connect(listingsModule->listingsED, SIGNAL(textChanged()), @@ -1086,14 +1241,18 @@ GuiDocument::GuiDocument(GuiView & lv) listingsModule->listingsTB->setPlainText( qt_("Input listings parameters below. Enter ? for a list of parameters.")); + + // add the panels 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(marginsModule, qt_("Page Margins")); docPS->addPanel(langModule, qt_("Language")); + docPS->addPanel(colorModule, qt_("Colors")); docPS->addPanel(numberingModule, qt_("Numbering & TOC")); docPS->addPanel(biblioModule, qt_("Bibliography")); docPS->addPanel(indicesModule, qt_("Indexes")); @@ -1114,12 +1273,6 @@ GuiDocument::GuiDocument(GuiView & lv) } -void GuiDocument::showPreamble() -{ - docPS->setCurrentPanel(qt_("LaTeX Preamble")); -} - - void GuiDocument::saveDefaultClicked() { saveDocDefault(); @@ -1241,13 +1394,7 @@ void GuiDocument::enableSkip(bool skip) } -void GuiDocument::portraitChanged() -{ - setMargins(pageLayoutModule->papersizeCO->currentIndex()); -} - - -void GuiDocument::setMargins(bool custom) +void GuiDocument::setMargins() { bool const extern_geometry = documentClass().provides("geometry"); @@ -1255,10 +1402,10 @@ void GuiDocument::setMargins(bool custom) if (extern_geometry) { marginsModule->marginCB->setChecked(false); setCustomMargins(true); - return; + } else { + marginsModule->marginCB->setChecked(!bp_.use_geometry); + setCustomMargins(!bp_.use_geometry); } - marginsModule->marginCB->setChecked(custom); - setCustomMargins(custom); } @@ -1323,28 +1470,115 @@ void GuiDocument::setCustomMargins(bool custom) marginsModule->columnsepUnit->setEnabled(enableColSep); } + void GuiDocument::changeBackgroundColor() { QColor const & newColor = QColorDialog::getColor( rgb2qcolor(set_backgroundcolor), asQWidget()); if (!newColor.isValid()) return; - // set the button color - pageLayoutModule->backgroundPB->setStyleSheet( + // set the button color and text + colorModule->backgroundPB->setStyleSheet( colorButtonStyleSheet(newColor)); + colorModule->backgroundPB->setText(toqstr("Change...")); // save color set_backgroundcolor = rgbFromHexName(fromqstr(newColor.name())); + is_backgroundcolor = true; changed(); } void GuiDocument::deleteBackgroundColor() { - // set the button color back to white - pageLayoutModule->backgroundPB->setStyleSheet( - colorButtonStyleSheet(QColor(Qt::white))); - // save white as the set color + // set the button color back to default by setting an epmty StyleSheet + colorModule->backgroundPB->setStyleSheet(QLatin1String("")); + // change button text + colorModule->backgroundPB->setText(toqstr("Default...")); + // save default color (white) set_backgroundcolor = rgbFromHexName("#ffffff"); + is_backgroundcolor = false; + changed(); +} + + +void GuiDocument::changeFontColor() +{ + QColor const & newColor = QColorDialog::getColor( + rgb2qcolor(set_fontcolor), asQWidget()); + if (!newColor.isValid()) + return; + // set the button color and text + colorModule->fontColorPB->setStyleSheet( + colorButtonStyleSheet(newColor)); + colorModule->fontColorPB->setText(toqstr("Change...")); + // save color + set_fontcolor = rgbFromHexName(fromqstr(newColor.name())); + is_fontcolor = true; + changed(); +} + + +void GuiDocument::deleteFontColor() +{ + // set the button color back to default by setting an epmty StyleSheet + colorModule->fontColorPB->setStyleSheet(QLatin1String("")); + // change button text + colorModule->fontColorPB->setText(toqstr("Default...")); + // save default color (black) + set_fontcolor = rgbFromHexName("#000000"); + is_fontcolor = false; + changed(); +} + + +void GuiDocument::changeNoteFontColor() +{ + QColor const & newColor = QColorDialog::getColor( + rgb2qcolor(set_notefontcolor), asQWidget()); + if (!newColor.isValid()) + return; + // set the button color + colorModule->noteFontColorPB->setStyleSheet( + colorButtonStyleSheet(newColor)); + // save color + set_notefontcolor = rgbFromHexName(fromqstr(newColor.name())); + changed(); +} + + +void GuiDocument::deleteNoteFontColor() +{ + // set the button color back to light gray + colorModule->noteFontColorPB->setStyleSheet( + colorButtonStyleSheet(QColor(204, 204, 204, 255))); + // save light gray as the set color + set_notefontcolor = rgbFromHexName("#cccccc"); + changed(); +} + + +void GuiDocument::changeBoxBackgroundColor() +{ + QColor const & newColor = QColorDialog::getColor( + rgb2qcolor(set_boxbgcolor), asQWidget()); + if (!newColor.isValid()) + return; + // set the button color + colorModule->boxBackgroundPB->setStyleSheet( + colorButtonStyleSheet(newColor)); + // save color + set_boxbgcolor = rgbFromHexName(fromqstr(newColor.name())); + changed(); +} + + +void GuiDocument::deleteBoxBackgroundColor() +{ + // set the button color back to red + colorModule->boxBackgroundPB->setStyleSheet( + colorButtonStyleSheet(QColor(Qt::red))); + // save red as the set color + set_boxbgcolor = rgbFromHexName("#ff0000"); changed(); } @@ -1380,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()); } @@ -1517,7 +1754,7 @@ void GuiDocument::browseLayout() QString const label1 = qt_("Layouts|#o#O"); QString const dir1 = toqstr(lyxrc.document_path); QStringList const filter(qt_("LyX Layout (*.layout)")); - QString file = browseRelFile(QString(), bufferFilepath(), + QString file = browseRelFile(QString(), bufferFilePath(), qt_("Local layout file"), filter, false, label1, dir1); @@ -1525,7 +1762,7 @@ void GuiDocument::browseLayout() return; FileName layoutFile = support::makeAbsPath(fromqstr(file), - fromqstr(bufferFilepath())); + fromqstr(bufferFilePath())); int const ret = Alert::prompt(_("Local layout file"), _("The layout file you have selected is a local layout\n" @@ -1542,7 +1779,7 @@ void GuiDocument::browseLayout() // this will update an existing layout if that layout has been loaded before. LayoutFileIndex name = bcl.addLocalLayout( classname.substr(0, classname.size() - 7), - layoutFile.onlyPath().absFilename()); + layoutFile.onlyPath().absFileName()); if (name.empty()) { Alert::error(_("Error"), @@ -1679,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) @@ -1827,7 +2064,7 @@ void GuiDocument::updateDefaultFormat() if (!bufferview()) return; // make a copy in order to consider unapplied changes - Buffer * tmpbuf = const_cast(&buffer()); + Buffer * tmpbuf = buffer().clone(); tmpbuf->params().useXetex = outputModule->xetexCB->isChecked(); int idx = latexModule->classCO->currentIndex(); if (idx >= 0) { @@ -1847,6 +2084,8 @@ void GuiDocument::updateDefaultFormat() outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()), QVariant(toqstr((*cit)->name()))); outputModule->defaultFormatCO->blockSignals(false); + // delete the copy + delete tmpbuf; } @@ -1863,6 +2102,7 @@ void GuiDocument::applyView() { // preamble preambleModule->apply(bp_); + localLayout->apply(bp_); // date bp_.suppress_date = latexModule->suppressDateCB->isChecked(); @@ -1952,6 +2192,14 @@ void GuiDocument::applyView() langModule->languageCO->currentIndex()).toString(); bp_.language = lyx::languages.getLanguage(fromqstr(lang)); + //color + bp_.backgroundcolor = set_backgroundcolor; + bp_.isbackgroundcolor = is_backgroundcolor; + bp_.fontcolor = set_fontcolor; + bp_.isfontcolor = is_fontcolor; + bp_.notefontcolor = set_notefontcolor; + bp_.boxbgcolor = set_boxbgcolor; + // numbering if (bp_.documentClass().hasTocLevels()) { bp_.tocdepth = numberingModule->tocSL->value(); @@ -1979,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 @@ -2003,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"; @@ -2025,10 +2281,14 @@ void GuiDocument::applyView() case 2: bp_.spacing().set(Spacing::Double); break; - case 3: - bp_.spacing().set(Spacing::Other, - widgetToDoubleStr(textLayoutModule->lspacingLE)); + case 3: { + string s = widgetToDoubleStr(textLayoutModule->lspacingLE); + if (s.empty()) + bp_.spacing().set(Spacing::Single); + else + bp_.spacing().set(Spacing::Other, s); break; + } } if (textLayoutModule->twoColumnCB->isChecked()) @@ -2123,6 +2383,18 @@ 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; + BufferParams::MathOutput const mo = + static_cast(mathfmt); + bp_.html_math_output = mo; + bp_.html_be_strict = outputModule->strictCB->isChecked(); + bp_.html_math_img_scale = outputModule->mathimgSB->value(); + // fonts if (xetex) { if (fontModule->fontsRomanCO->currentIndex() == 0) @@ -2187,10 +2459,6 @@ void GuiDocument::applyView() 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); - bp_.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE, pageLayoutModule->paperwidthUnitCO); @@ -2207,11 +2475,8 @@ void GuiDocument::applyView() else bp_.orientation = ORIENTATION_PORTRAIT; - bp_.backgroundcolor = set_backgroundcolor; - // margins - bp_.use_geometry = !marginsModule->marginCB->isChecked() - || geom_papersize; + bp_.use_geometry = !marginsModule->marginCB->isChecked(); Ui::MarginsUi const * m = marginsModule; @@ -2262,6 +2527,7 @@ void GuiDocument::paramsToDialog() // preamble preambleModule->update(bp_, id()); + localLayout->update(bp_, id()); // date latexModule->suppressDateCB->setChecked(bp_.suppress_date); @@ -2336,6 +2602,29 @@ void GuiDocument::paramsToDialog() langModule->defaultencodingRB->setChecked(default_enc); langModule->otherencodingRB->setChecked(!default_enc); + //color + if (bp_.isfontcolor) { + colorModule->fontColorPB->setStyleSheet( + colorButtonStyleSheet(rgb2qcolor(bp_.fontcolor))); + } + set_fontcolor = bp_.fontcolor; + is_fontcolor = bp_.isfontcolor; + + colorModule->noteFontColorPB->setStyleSheet( + colorButtonStyleSheet(rgb2qcolor(bp_.notefontcolor))); + set_notefontcolor = bp_.notefontcolor; + + if (bp_.isbackgroundcolor) { + colorModule->backgroundPB->setStyleSheet( + colorButtonStyleSheet(rgb2qcolor(bp_.backgroundcolor))); + } + set_backgroundcolor = bp_.backgroundcolor; + is_backgroundcolor = bp_.isbackgroundcolor; + + colorModule->boxBackgroundPB->setStyleSheet( + colorButtonStyleSheet(rgb2qcolor(bp_.boxbgcolor))); + set_boxbgcolor = bp_.boxbgcolor; + // numbering int const min_toclevel = documentClass().min_toclevel(); int const max_toclevel = documentClass().max_toclevel(); @@ -2381,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; @@ -2488,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); @@ -2528,6 +2819,13 @@ 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); + // Fonts updateFontsize(documentClass().opt_fontsize(), bp_.fontsize); @@ -2589,16 +2887,18 @@ void GuiDocument::paramsToDialog() fontModule->fontOsfCB->setChecked(bp_.fontsOSF); fontModule->scaleSansSB->setValue(bp_.fontsSansScale); fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale); - + int nn = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily); 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)); } @@ -2621,10 +2921,6 @@ void GuiDocument::paramsToDialog() pageLayoutModule->facingPagesCB->setChecked( bp_.sides == TwoSides); - pageLayoutModule->backgroundPB->setStyleSheet( - colorButtonStyleSheet(rgb2qcolor(bp_.backgroundcolor))); - set_backgroundcolor = bp_.backgroundcolor; - lengthToWidgets(pageLayoutModule->paperwidthLE, pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, defaultUnit); lengthToWidgets(pageLayoutModule->paperheightLE, @@ -2633,7 +2929,7 @@ void GuiDocument::paramsToDialog() // margins Ui::MarginsUi * m = marginsModule; - setMargins(!bp_.use_geometry); + setMargins(); lengthToWidgets(m->topLE, m->topUnit, bp_.topmargin, defaultUnit); @@ -2749,16 +3045,16 @@ 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) { item = new QTreeWidgetItem(masterChildModule->childrenTW); // FIXME Unicode string const name = - to_utf8(makeRelPath(from_utf8((*it)->fileName().absFilename()), + to_utf8(makeRelPath(from_utf8((*it)->fileName().absFileName()), from_utf8(buffer().filePath()))); item->setText(0, toqstr(name)); item->setText(1, isChildIncluded(name) ? yes : no); @@ -2823,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() + ); } @@ -2944,7 +3252,7 @@ void GuiDocument::dispatchParams() if (!params().master.empty()) { FileName const master_file = support::makeAbsPath(params().master, support::onlyPath(buffer().absFileName())); - if (isLyXFilename(master_file.absFilename())) { + if (isLyXFileName(master_file.absFileName())) { Buffer * master = checkAndLoadLyXFile(master_file); if (master) { if (master->isChild(const_cast(&buffer()))) @@ -2977,8 +3285,8 @@ void GuiDocument::dispatchParams() } // Open insets of selected branches, close deselected ones - dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE, - "assign branch")); + dispatch(FuncRequest(LFUN_INSET_FORALL, + "Branch inset-toggle assign")); } // rename branches in the document executeBranchRenaming();