X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=8c71cf93c2d58b5ce23c1eeedddd0846a90b55d9;hb=fb99c8115a65abd2b510af7a78e0d13e218885fa;hp=7bb3db697316c387fbda928c84978bebf03715d3;hpb=e58280676d0315d180559cc91b7101e55467ac29;p=lyx.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 7bb3db6973..8c71cf93c2 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -58,6 +58,7 @@ #include "frontends/alert.h" #include +#include #include #include #include @@ -78,7 +79,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; } @@ -177,6 +178,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. @@ -302,9 +308,9 @@ private: return dynamic_cast(selectedModel); } /// keeps a list of the modules the text class provides - std::list provided_modules_; + list provided_modules_; /// similarly... - std::list excluded_modules_; + list excluded_modules_; /// GuiDocument const * container_; }; @@ -433,26 +439,26 @@ void ModuleSelectionManager::updateDelPB() // required module. There would be more flexible ways to proceed, // 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; + // lyxerr << "Testing " << thisMod << endl; bool foundone = false; for (int j = 0; j < curRow; ++j) { string const mod = getSelectedModel()->getIDString(j); - // lyxerr << "In loop: Testing " << mod << std::endl; + // lyxerr << "In loop: Testing " << mod << endl; // do we satisfy the require? if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) { - // lyxerr << mod << " does the trick." << std::endl; + // lyxerr << mod << " does the trick." << endl; foundone = true; break; } } // did we find a module to satisfy the require? if (!foundone) { - // lyxerr << "No matching module found." << std::endl; + // lyxerr << "No matching module found." << endl; deletePB->setEnabled(false); return; } } - // lyxerr << "All's well that ends well." << std::endl; + // lyxerr << "All's well that ends well." << endl; deletePB->setEnabled(true); } @@ -546,8 +552,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)), @@ -616,6 +623,29 @@ GuiDocument::GuiDocument(GuiView & lv) bc().addCheckedLineEdit(textLayoutModule->indentLE); bc().addCheckedLineEdit(textLayoutModule->skipLE); + + // master/child handling + masterChildModule = new UiWidget; + + connect(masterChildModule->childrenTW, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), + this, SLOT(includeonlyClicked(QTreeWidgetItem *, int))); + connect(masterChildModule->includeonlyRB, SIGNAL(toggled(bool)), + masterChildModule->childrenTW, SLOT(setEnabled(bool))); + connect(masterChildModule->includeonlyRB, SIGNAL(toggled(bool)), + masterChildModule->maintainAuxCB, SLOT(setEnabled(bool))); + connect(masterChildModule->includeallRB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(masterChildModule->includeonlyRB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(masterChildModule->maintainAuxCB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + masterChildModule->childrenTW->setColumnCount(2); + masterChildModule->childrenTW->headerItem()->setText(0, qt_("Child Document")); + masterChildModule->childrenTW->headerItem()->setText(1, qt_("Include to Output")); + masterChildModule->childrenTW->resizeColumnToContents(1); + masterChildModule->childrenTW->resizeColumnToContents(2); + + // output outputModule = new UiWidget; @@ -625,6 +655,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; @@ -642,6 +687,12 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(ttChanged(int))); connect(fontModule->fontsDefaultCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); + connect(fontModule->fontencCO, SIGNAL(activated(int)), + this, SLOT(change_adaptor())); + connect(fontModule->fontencCO, SIGNAL(activated(int)), + this, SLOT(fontencChanged(int))); + connect(fontModule->fontencLE, SIGNAL(textChanged(const QString &)), + this, SLOT(change_adaptor())); connect(fontModule->fontsizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(fontModule->cjkFontLE, SIGNAL(textChanged(const QString &)), @@ -662,19 +713,23 @@ GuiDocument::GuiDocument(GuiView & lv) fontModule->fontsizeCO->addItem(qt_("11")); fontModule->fontsizeCO->addItem(qt_("12")); + fontModule->fontencCO->addItem(qt_("Default")); + fontModule->fontencCO->addItem(qt_("Custom")); + fontModule->fontencCO->addItem(qt_("None (no fontenc)")); + for (int n = 0; GuiDocument::fontfamilies_gui[n][0]; ++n) fontModule->fontsDefaultCO->addItem( 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 &)), @@ -693,11 +748,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")); @@ -708,19 +759,33 @@ 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_("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(); @@ -730,8 +795,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()), @@ -803,8 +868,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()), @@ -815,11 +880,12 @@ 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); langModule->languageCO->setModel(language_model); + langModule->languageCO->setModelColumn(0); // Always put the default encoding in the first position. langModule->encodingCO->addItem(qt_("Language Default (no inputenc)")); @@ -839,8 +905,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)), @@ -855,12 +941,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()), @@ -875,19 +961,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; @@ -895,12 +981,15 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); + // maths mathsModule = new UiWidget; connect(mathsModule->amsautoCB, SIGNAL(toggled(bool)), mathsModule->amsCB, SLOT(setDisabled(bool))); connect(mathsModule->esintautoCB, SIGNAL(toggled(bool)), mathsModule->esintCB, SLOT(setDisabled(bool))); - // maths + connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)), + mathsModule->mhchemCB, SLOT(setDisabled(bool))); + connect(mathsModule->amsCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(mathsModule->amsautoCB, SIGNAL(clicked()), @@ -909,9 +998,14 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(mathsModule->esintautoCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); + connect(mathsModule->mhchemCB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(mathsModule->mhchemautoCB, 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()), @@ -956,6 +1050,7 @@ GuiDocument::GuiDocument(GuiView & lv) classes_model_.insertRow(i, toqstr(item), *cit); } + // branches branchesModule = new GuiBranches; connect(branchesModule, SIGNAL(changed()), @@ -964,16 +1059,19 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(branchesRename(docstring const &, docstring const &))); updateUnknownBranches(); + // preamble preambleModule = new PreambleModule; connect(preambleModule, 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); @@ -990,9 +1088,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)), @@ -1029,11 +1127,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()), @@ -1047,13 +1147,17 @@ 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(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")); @@ -1098,6 +1202,26 @@ void GuiDocument::change_adaptor() } +void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int) +{ + if (item == 0) + return; + + string child = fromqstr(item->text(0)); + if (child.empty()) + return; + + if (std::find(includeonlys_.begin(), + includeonlys_.end(), child) != includeonlys_.end()) + includeonlys_.remove(child); + else + includeonlys_.push_back(child); + + updateIncludeonlys(); + changed(); +} + + QString GuiDocument::validateListingsParameters() { // use a cache here to avoid repeated validation @@ -1181,13 +1305,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"); @@ -1195,10 +1313,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); } @@ -1263,28 +1381,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(); } @@ -1317,6 +1522,13 @@ void GuiDocument::xetexChanged(bool xetex) font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()]; fontModule->fontScCB->setEnabled(providesSC(font)); fontModule->fontOsfCB->setEnabled(providesOSF(font)); + + fontModule->fontencLA->setEnabled(!xetex); + fontModule->fontencCO->setEnabled(!xetex); + if (xetex) + fontModule->fontencLE->setEnabled(false); + else + fontencChanged(fontModule->fontencCO->currentIndex()); } @@ -1381,6 +1593,12 @@ void GuiDocument::updateFontlist() } +void GuiDocument::fontencChanged(int item) +{ + fontModule->fontencLE->setEnabled(item == 1); +} + + void GuiDocument::romanChanged(int item) { if (outputModule->xetexCB->isChecked()) @@ -1447,7 +1665,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); @@ -1455,7 +1673,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" @@ -1472,7 +1690,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"), @@ -1506,7 +1724,8 @@ void GuiDocument::browseMaster() QString file = browseRelFile(old, docpath, title, filter, false, qt_("Documents|#o#O"), toqstr(lyxrc.document_path)); - latexModule->childDocLE->setText(file); + if (!file.isEmpty()) + latexModule->childDocLE->setText(file); } @@ -1753,8 +1972,10 @@ void GuiDocument::updateNumbering() 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) { @@ -1774,6 +1995,17 @@ void GuiDocument::updateDefaultFormat() outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()), QVariant(toqstr((*cit)->name()))); outputModule->defaultFormatCO->blockSignals(false); + // delete the copy + delete tmpbuf; +} + + +bool GuiDocument::isChildIncluded(string const & child) +{ + if (includeonlys_.empty()) + return false; + return (std::find(includeonlys_.begin(), + includeonlys_.end(), child) != includeonlys_.end()); } @@ -1868,7 +2100,15 @@ void GuiDocument::applyView() QString const lang = langModule->languageCO->itemData( langModule->languageCO->currentIndex()).toString(); - bp_.language = languages.getLanguage(fromqstr(lang)); + 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()) { @@ -1905,7 +2145,6 @@ void GuiDocument::applyView() else bp_.use_amsmath = BufferParams::package_off; } - if (mathsModule->esintautoCB->isChecked()) bp_.use_esint = BufferParams::package_auto; else { @@ -1914,6 +2153,14 @@ void GuiDocument::applyView() else bp_.use_esint = BufferParams::package_off; } + if (mathsModule->mhchemautoCB->isChecked()) + bp_.use_mhchem = BufferParams::package_auto; + else { + if (mathsModule->mhchemCB->isChecked()) + bp_.use_mhchem = BufferParams::package_on; + else + bp_.use_mhchem = BufferParams::package_off; + } // Page Layout if (pageLayoutModule->pagestyleCO->currentIndex() == 0) @@ -1936,10 +2183,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()) @@ -2008,6 +2259,17 @@ void GuiDocument::applyView() else bp_.master = string(); + // Master/Child + bp_.clearIncludedChildren(); + if (masterChildModule->includeonlyRB->isChecked()) { + list::const_iterator it = includeonlys_.begin(); + for (; it != includeonlys_.end() ; ++it) { + bp_.addIncludedChildren(*it); + } + } + bp_.maintain_unincluded_children = + masterChildModule->maintainAuxCB->isChecked(); + // Float Placement bp_.float_placement = floatModule->get(); @@ -2023,6 +2285,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) @@ -2053,6 +2327,13 @@ void GuiDocument::applyView() tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()]; } + if (fontModule->fontencCO->currentIndex() == 0) + bp_.fontenc = "global"; + else if (fontModule->fontencCO->currentIndex() == 1) + bp_.fontenc = fromqstr(fontModule->fontencLE->text()); + else if (fontModule->fontencCO->currentIndex() == 2) + bp_.fontenc = "default"; + bp_.fontsCJK = fromqstr(fontModule->cjkFontLE->text()); @@ -2080,10 +2361,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); @@ -2100,11 +2377,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; @@ -2229,6 +2503,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(); @@ -2269,6 +2566,11 @@ void GuiDocument::paramsToDialog() mathsModule->esintautoCB->setChecked( bp_.use_esint == BufferParams::package_auto); + mathsModule->mhchemCB->setChecked( + bp_.use_mhchem == BufferParams::package_on); + mathsModule->mhchemautoCB->setChecked( + bp_.use_mhchem == BufferParams::package_auto); + switch (bp_.spacing().getSpace()) { case Spacing::Other: nitem = 3; break; case Spacing::Double: nitem = 2; break; @@ -2375,6 +2677,25 @@ void GuiDocument::paramsToDialog() latexModule->childDocGB->setChecked(false); } + // Master/Child + std::vector children; + if (bufferview()) + children = buffer().getChildren(false); + if (children.empty()) { + masterChildModule->childrenTW->clear(); + includeonlys_.clear(); + docPS->showPanel(qt_("Child Documents"), false); + if (docPS->isCurrentPanel(qt_("Child Documents"))) + docPS->setCurrentPanel(qt_("Document Class")); + } else { + docPS->showPanel(qt_("Child Documents"), true); + masterChildModule->setEnabled(true); + includeonlys_ = bp_.getIncludedChildren(); + updateIncludeonlys(); + } + masterChildModule->maintainAuxCB->setChecked( + bp_.maintain_unincluded_children); + // Float Settings floatModule->set(bp_.float_placement); @@ -2397,11 +2718,21 @@ 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); if (bp_.useXetex) { + fontModule->fontencLA->setEnabled(false); + fontModule->fontencCO->setEnabled(false); + fontModule->fontencLE->setEnabled(false); for (int i = 0; i < fontModule->fontsRomanCO->count(); ++i) { if (fontModule->fontsRomanCO->itemText(i) == toqstr(bp_.fontsRoman)) { fontModule->fontsRomanCO->setCurrentIndex(i); @@ -2423,6 +2754,9 @@ void GuiDocument::paramsToDialog() } } } else { + fontModule->fontencLA->setEnabled(true); + fontModule->fontencCO->setEnabled(true); + fontModule->fontencLE->setEnabled(true); int n = findToken(tex_fonts_roman, bp_.fontsRoman); if (n >= 0) { fontModule->fontsRomanCO->setCurrentIndex(n); @@ -2452,11 +2786,22 @@ 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") { + fontModule->fontencCO->setCurrentIndex(0); + fontModule->fontencLE->setEnabled(false); + } else if (bp_.fontenc == "default") { + fontModule->fontencCO->setCurrentIndex(2); + fontModule->fontencLE->setEnabled(false); + } else { + fontModule->fontencCO->setCurrentIndex(1); + fontModule->fontencLE->setText(toqstr(bp_.fontenc)); + } + // paper bool const extern_geometry = documentClass().provides("geometry"); @@ -2475,10 +2820,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, @@ -2487,7 +2828,7 @@ void GuiDocument::paramsToDialog() // margins Ui::MarginsUi * m = marginsModule; - setMargins(!bp_.use_geometry); + setMargins(); lengthToWidgets(m->topLE, m->topUnit, bp_.topmargin, defaultUnit); @@ -2587,6 +2928,54 @@ void GuiDocument::updateSelectedModules() } +void GuiDocument::updateIncludeonlys() +{ + masterChildModule->childrenTW->clear(); + QString const no = qt_("No"); + QString const yes = qt_("Yes"); + + if (includeonlys_.empty()) { + masterChildModule->includeallRB->setChecked(true); + masterChildModule->childrenTW->setEnabled(false); + masterChildModule->maintainAuxCB->setEnabled(false); + } else { + masterChildModule->includeonlyRB->setChecked(true); + masterChildModule->childrenTW->setEnabled(true); + 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(); + 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()), + from_utf8(buffer().filePath()))); + item->setText(0, toqstr(name)); + item->setText(1, isChildIncluded(name) ? yes : no); + if (!isChildIncluded(name)) + has_unincluded = true; + else + all_unincluded = false; + } + // Both if all childs are included and if none is included + // is equal to "include all" (i.e., ommit \includeonly). + // Thus, reset the GUI. + if (!has_unincluded || all_unincluded) { + masterChildModule->includeallRB->setChecked(true); + masterChildModule->childrenTW->setEnabled(false); + includeonlys_.clear(); + } + // If all are included, we need to update again. + if (!has_unincluded) + updateIncludeonlys(); +} + + void GuiDocument::updateContents() { // Nothing to do here as the document settings is not cursor dependant. @@ -2750,7 +3139,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()))) @@ -2783,8 +3172,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(); @@ -2911,6 +3300,8 @@ void GuiDocument::loadModuleInfo() void GuiDocument::updateUnknownBranches() { + if (!bufferview()) + return; list used_branches; buffer().getUsedBranches(used_branches); list::const_iterator it = used_branches.begin();