X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=71eff5b92c4de5481598a5698cfeff0c97e8e8c4;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=879e498df4499e8a95c5c9703e3ac118ecc2deb7;hpb=88f32018f7e3aac6c2e2e629f73691b75d49e54b;p=lyx.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 879e498df4..71eff5b92c 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -15,6 +15,7 @@ #include "GuiApplication.h" #include "GuiBranches.h" +#include "GuiIndices.h" #include "GuiSelectionManager.h" #include "LaTeXHighlighter.h" #include "LengthCombo.h" @@ -33,6 +34,8 @@ #include "FloatPlacement.h" #include "Format.h" #include "FuncRequest.h" +#include "HSpace.h" +#include "IndicesList.h" #include "Language.h" #include "LaTeXFeatures.h" #include "Layout.h" @@ -55,6 +58,7 @@ #include "frontends/alert.h" #include +#include #include #include #include @@ -188,11 +192,11 @@ public: // 2. Description (lexicographic) LayoutFile const & tc1 = LayoutFileList::get()[lhs]; LayoutFile const & tc2 = LayoutFileList::get()[rhs]; - int const rel = compare_no_case( + int const order = compare_no_case( translateIfPossible(from_utf8(tc1.description())), translateIfPossible(from_utf8(tc2.description()))); return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) || - (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && rel < 0); + (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && order < 0); } }; @@ -203,7 +207,7 @@ namespace { vector getRequiredList(string const & modName) { - LyXModule const * const mod = moduleList[modName]; + LyXModule const * const mod = theModuleList[modName]; if (!mod) return vector(); //empty such thing return mod->getRequiredModules(); @@ -212,7 +216,7 @@ vector getRequiredList(string const & modName) vector getExcludedList(string const & modName) { - LyXModule const * const mod = moduleList[modName]; + LyXModule const * const mod = theModuleList[modName]; if (!mod) return vector(); //empty such thing return mod->getExcludedModules(); @@ -221,7 +225,7 @@ vector getExcludedList(string const & modName) docstring getModuleDescription(string const & modName) { - LyXModule const * const mod = moduleList[modName]; + LyXModule const * const mod = theModuleList[modName]; if (!mod) return _("Module not found!"); // FIXME Unicode @@ -231,7 +235,7 @@ docstring getModuleDescription(string const & modName) vector getPackageList(string const & modName) { - LyXModule const * const mod = moduleList[modName]; + LyXModule const * const mod = theModuleList[modName]; if (!mod) return vector(); //empty such thing return mod->getPackageList(); @@ -240,7 +244,7 @@ vector getPackageList(string const & modName) bool isModuleAvailable(string const & modName) { - LyXModule * mod = moduleList[modName]; + LyXModule const * const mod = theModuleList[modName]; if (!mod) return false; return mod->isAvailable(); @@ -261,7 +265,7 @@ class ModuleSelectionManager : public GuiSelectionManager public: /// ModuleSelectionManager( - QListView * availableLV, + QTreeView * availableLV, QListView * selectedLV, QPushButton * addPB, QPushButton * delPB, @@ -299,9 +303,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_; }; @@ -430,26 +434,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); } @@ -551,45 +555,56 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(setLSpacing(int))); connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(textLayoutModule->skipRB, SIGNAL(clicked()), - this, SLOT(change_adaptor())); + connect(textLayoutModule->indentRB, SIGNAL(clicked()), this, SLOT(change_adaptor())); + connect(textLayoutModule->indentRB, SIGNAL(toggled(bool)), + textLayoutModule->indentCO, SLOT(setEnabled(bool))); + connect(textLayoutModule->indentCO, SIGNAL(activated(int)), + this, SLOT(change_adaptor())); + connect(textLayoutModule->indentCO, SIGNAL(activated(int)), + this, SLOT(setIndent(int))); + connect(textLayoutModule->indentLE, SIGNAL(textChanged(const QString &)), + this, SLOT(change_adaptor())); + connect(textLayoutModule->indentLengthCO, SIGNAL(activated(int)), + this, SLOT(change_adaptor())); + + connect(textLayoutModule->skipRB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)), + textLayoutModule->skipCO, SLOT(setEnabled(bool))); connect(textLayoutModule->skipCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); + connect(textLayoutModule->skipCO, SIGNAL(activated(int)), + this, SLOT(setSkip(int))); connect(textLayoutModule->skipLE, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); connect(textLayoutModule->skipLengthCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(textLayoutModule->skipCO, SIGNAL(activated(int)), - this, SLOT(setSkip(int))); + + connect(textLayoutModule->indentRB, SIGNAL(toggled(bool)), + this, SLOT(enableIndent(bool))); connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)), this, SLOT(enableSkip(bool))); + connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()), this, SLOT(setColSep())); - connect(textLayoutModule->listingsED, SIGNAL(textChanged()), - this, SLOT(change_adaptor())); - connect(textLayoutModule->bypassCB, SIGNAL(clicked()), - this, SLOT(change_adaptor())); - connect(textLayoutModule->bypassCB, SIGNAL(clicked()), - this, SLOT(setListingsMessage())); - connect(textLayoutModule->listingsED, SIGNAL(textChanged()), - this, SLOT(setListingsMessage())); - textLayoutModule->listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + textLayoutModule->lspacingLE->setValidator(new QDoubleValidator( textLayoutModule->lspacingLE)); - textLayoutModule->skipLE->setValidator(unsignedLengthValidator( + textLayoutModule->indentLE->setValidator(unsignedLengthValidator( + textLayoutModule->indentLE)); + textLayoutModule->skipLE->setValidator(unsignedGlueLengthValidator( textLayoutModule->skipLE)); + textLayoutModule->indentCO->addItem(qt_("Default")); + textLayoutModule->indentCO->addItem(qt_("Custom")); textLayoutModule->skipCO->addItem(qt_("SmallSkip")); textLayoutModule->skipCO->addItem(qt_("MedSkip")); textLayoutModule->skipCO->addItem(qt_("BigSkip")); - textLayoutModule->skipCO->addItem(qt_("Length")); - // remove the %-items from the unit choice - textLayoutModule->skipLengthCO->noPercents(); + textLayoutModule->skipCO->addItem(qt_("Custom")); textLayoutModule->lspacingCO->insertItem( Spacing::Single, qt_("Single")); textLayoutModule->lspacingCO->insertItem( @@ -598,10 +613,31 @@ GuiDocument::GuiDocument(GuiView & lv) Spacing::Double, qt_("Double")); textLayoutModule->lspacingCO->insertItem( Spacing::Other, qt_("Custom")); - // initialize the length validator + 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; @@ -628,6 +664,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 &)), @@ -648,6 +690,10 @@ 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])); @@ -656,9 +702,9 @@ GuiDocument::GuiDocument(GuiView & lv) pageLayoutModule = new UiWidget; // page layout connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), - this, SLOT(setCustomPapersize(int))); + this, SLOT(papersizeChanged(int))); connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), - this, SLOT(setCustomPapersize(int))); + this, SLOT(papersizeChanged(int))); connect(pageLayoutModule->portraitRB, SIGNAL(clicked()), this, SLOT(portraitChanged())); connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), @@ -679,7 +725,7 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(pageLayoutModule->pagestyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(pageLayoutModule->backgroundTB, SIGNAL(clicked()), + connect(pageLayoutModule->backgroundPB, SIGNAL(clicked()), this, SLOT(changeBackgroundColor())); connect(pageLayoutModule->delbackgroundTB, SIGNAL(clicked()), this, SLOT(deleteBackgroundColor())); @@ -857,10 +903,28 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(biblioModule->bibtopicCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); + connect(biblioModule->bibtexCO, SIGNAL(activated(int)), + 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; + connect(indicesModule, SIGNAL(changed()), + this, SLOT(change_adaptor())); mathsModule = new UiWidget; @@ -868,6 +932,8 @@ GuiDocument::GuiDocument(GuiView & lv) mathsModule->amsCB, SLOT(setDisabled(bool))); connect(mathsModule->esintautoCB, SIGNAL(toggled(bool)), mathsModule->esintCB, SLOT(setDisabled(bool))); + connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)), + mathsModule->mhchemCB, SLOT(setDisabled(bool))); // maths connect(mathsModule->amsCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); @@ -877,6 +943,10 @@ 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 @@ -900,6 +970,8 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(latexModule->childDocPB, SIGNAL(clicked()), this, SLOT(browseMaster())); + connect(latexModule->suppressDateCB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); // postscript drivers for (int n = 0; tex_graphics[n][0]; ++n) { @@ -926,6 +998,9 @@ GuiDocument::GuiDocument(GuiView & lv) branchesModule = new GuiBranches; connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor())); + connect(branchesModule, SIGNAL(renameBranches(docstring const &, docstring const &)), + this, SLOT(branchesRename(docstring const &, docstring const &))); + updateUnknownBranches(); // preamble preambleModule = new PreambleModule; @@ -939,7 +1014,7 @@ GuiDocument::GuiDocument(GuiView & lv) // Modules modulesModule = new UiWidget; - + modulesModule->availableLV->header()->setVisible(false); selectionManager = new ModuleSelectionManager(modulesModule->availableLV, modulesModule->selectedLV, @@ -997,7 +1072,21 @@ GuiDocument::GuiDocument(GuiView & lv) connect(floatModule, SIGNAL(changed()), this, SLOT(change_adaptor())); + // listings + listingsModule = new UiWidget; + connect(listingsModule->listingsED, SIGNAL(textChanged()), + this, SLOT(change_adaptor())); + connect(listingsModule->bypassCB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(listingsModule->bypassCB, SIGNAL(clicked()), + this, SLOT(setListingsMessage())); + connect(listingsModule->listingsED, SIGNAL(textChanged()), + this, SLOT(setListingsMessage())); + listingsModule->listingsTB->setPlainText( + qt_("Input listings parameters below. Enter ? for a list of parameters.")); + 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")); @@ -1006,9 +1095,11 @@ GuiDocument::GuiDocument(GuiView & lv) docPS->addPanel(langModule, qt_("Language")); docPS->addPanel(numberingModule, qt_("Numbering & TOC")); docPS->addPanel(biblioModule, qt_("Bibliography")); + docPS->addPanel(indicesModule, qt_("Indexes")); docPS->addPanel(pdfSupportModule, qt_("PDF Properties")); docPS->addPanel(mathsModule, qt_("Math Options")); docPS->addPanel(floatModule, qt_("Float Placement")); + docPS->addPanel(listingsModule, qt_("Listings")); docPS->addPanel(bulletsModule, qt_("Bullets")); docPS->addPanel(branchesModule, qt_("Branches")); docPS->addPanel(outputModule, qt_("Output")); @@ -1046,6 +1137,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 @@ -1053,10 +1164,10 @@ QString GuiDocument::validateListingsParameters() static string param_cache; static QString msg_cache; - if (textLayoutModule->bypassCB->isChecked()) + if (listingsModule->bypassCB->isChecked()) return QString(); - string params = fromqstr(textLayoutModule->listingsED->toPlainText()); + string params = fromqstr(listingsModule->listingsED->toPlainText()); if (params != param_cache) { param_cache = params; msg_cache = toqstr(InsetListingsParams(params).validate()); @@ -1074,13 +1185,13 @@ void GuiDocument::setListingsMessage() return; isOK = true; // listingsTB->setTextColor("black"); - textLayoutModule->listingsTB->setPlainText( - qt_("Input listings parameters on the right. " + listingsModule->listingsTB->setPlainText( + qt_("Input listings parameters below. " "Enter ? for a list of parameters.")); } else { isOK = false; // listingsTB->setTextColor("red"); - textLayoutModule->listingsTB->setPlainText(msg); + listingsModule->listingsTB->setPlainText(msg); } } @@ -1091,19 +1202,39 @@ void GuiDocument::setLSpacing(int item) } +void GuiDocument::setIndent(int item) +{ + bool const enable = (item == 1); + textLayoutModule->indentLE->setEnabled(enable); + textLayoutModule->indentLengthCO->setEnabled(enable); + textLayoutModule->skipLE->setEnabled(false); + textLayoutModule->skipLengthCO->setEnabled(false); + isValid(); +} + + +void GuiDocument::enableIndent(bool indent) +{ + textLayoutModule->skipLE->setEnabled(!indent); + textLayoutModule->skipLengthCO->setEnabled(!indent); + if (indent) + setIndent(textLayoutModule->indentCO->currentIndex()); +} + + void GuiDocument::setSkip(int item) { bool const enable = (item == 3); textLayoutModule->skipLE->setEnabled(enable); textLayoutModule->skipLengthCO->setEnabled(enable); + isValid(); } void GuiDocument::enableSkip(bool skip) { - textLayoutModule->skipCO->setEnabled(skip); - textLayoutModule->skipLE->setEnabled(skip); - textLayoutModule->skipLengthCO->setEnabled(skip); + textLayoutModule->indentLE->setEnabled(!skip); + textLayoutModule->indentLengthCO->setEnabled(!skip); if (skip) setSkip(textLayoutModule->skipCO->currentIndex()); } @@ -1130,10 +1261,14 @@ void GuiDocument::setMargins(bool custom) } -void GuiDocument::setCustomPapersize(int papersize) +void GuiDocument::papersizeChanged(int paper_size) { - bool const custom = (papersize == 1); + setCustomPapersize(paper_size == 1); +} + +void GuiDocument::setCustomPapersize(bool custom) +{ pageLayoutModule->paperwidthL->setEnabled(custom); pageLayoutModule->paperwidthLE->setEnabled(custom); pageLayoutModule->paperwidthUnitCO->setEnabled(custom); @@ -1194,7 +1329,7 @@ void GuiDocument::changeBackgroundColor() if (!newColor.isValid()) return; // set the button color - pageLayoutModule->backgroundTB->setStyleSheet( + pageLayoutModule->backgroundPB->setStyleSheet( colorButtonStyleSheet(newColor)); // save color set_backgroundcolor = rgbFromHexName(fromqstr(newColor.name())); @@ -1205,7 +1340,7 @@ void GuiDocument::changeBackgroundColor() void GuiDocument::deleteBackgroundColor() { // set the button color back to white - pageLayoutModule->backgroundTB->setStyleSheet( + pageLayoutModule->backgroundPB->setStyleSheet( colorButtonStyleSheet(QColor(Qt::white))); // save white as the set color set_backgroundcolor = rgbFromHexName("#ffffff"); @@ -1241,6 +1376,10 @@ 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); + fontModule->fontencLE->setEnabled(!xetex); } @@ -1305,6 +1444,12 @@ void GuiDocument::updateFontlist() } +void GuiDocument::fontencChanged(int item) +{ + fontModule->fontencLE->setEnabled(item == 1); +} + + void GuiDocument::romanChanged(int item) { if (outputModule->xetexCB->isChecked()) @@ -1430,7 +1575,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); } @@ -1490,6 +1636,13 @@ void GuiDocument::classChanged() } +void GuiDocument::bibtexChanged(int n) +{ + biblioModule->bibtexOptionsED->setEnabled(n != 0); + changed(); +} + + namespace { // This is an insanely complicated attempt to make this sort of thing // work with RTL languages. @@ -1523,7 +1676,7 @@ namespace { vector::const_iterator it = idList.begin(); vector::const_iterator end = idList.end(); for (; it != end; ++it) { - LyXModule const * const mod = moduleList[*it]; + LyXModule const * const mod = theModuleList[*it]; if (!mod) retval.push_back(*it + " (Unavailable)"); else @@ -1580,8 +1733,11 @@ void GuiDocument::updateModuleInfo() //Module description bool const focus_on_selected = selectionManager->selectedFocused(); - QListView const * const lv = - focus_on_selected ? modulesModule->selectedLV : modulesModule->availableLV; + QAbstractItemView * lv; + if (focus_on_selected) + lv = modulesModule->selectedLV; + else + lv= modulesModule->availableLV; if (lv->selectionModel()->selectedIndexes().isEmpty()) { modulesModule->infoML->document()->clear(); return; @@ -1691,11 +1847,23 @@ void GuiDocument::updateDefaultFormat() } +bool GuiDocument::isChildIncluded(string const & child) +{ + if (includeonlys_.empty()) + return false; + return (std::find(includeonlys_.begin(), + includeonlys_.end(), child) != includeonlys_.end()); +} + + void GuiDocument::applyView() { // preamble preambleModule->apply(bp_); + // date + bp_.suppress_date = latexModule->suppressDateCB->isChecked(); + // biblio bp_.setCiteEngine(ENGINE_BASIC); @@ -1713,6 +1881,19 @@ void GuiDocument::applyView() bp_.use_bibtopic = biblioModule->bibtopicCB->isChecked(); + string const bibtex_command = + fromqstr(biblioModule->bibtexCO->itemData( + biblioModule->bibtexCO->currentIndex()).toString()); + string const bibtex_options = + fromqstr(biblioModule->bibtexOptionsED->text()); + if (bibtex_command == "default" || bibtex_options.empty()) + bp_.bibtex_command = bibtex_command; + else + bp_.bibtex_command = bibtex_command + " " + bibtex_options; + + // Indices + indicesModule->apply(bp_); + // language & quotes if (langModule->defaultencodingRB->isChecked()) { bp_.inputenc = "auto"; @@ -1766,7 +1947,7 @@ 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)); // numbering if (bp_.documentClass().hasTocLevels()) { @@ -1794,6 +1975,7 @@ void GuiDocument::applyView() // Modules modulesToParams(bp_); + // Math if (mathsModule->amsautoCB->isChecked()) { bp_.use_amsmath = BufferParams::package_auto; } else { @@ -1802,7 +1984,6 @@ void GuiDocument::applyView() else bp_.use_amsmath = BufferParams::package_off; } - if (mathsModule->esintautoCB->isChecked()) bp_.use_esint = BufferParams::package_auto; else { @@ -1811,7 +1992,16 @@ 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) bp_.pagestyle = "default"; else { @@ -1821,6 +2011,7 @@ void GuiDocument::applyView() bp_.pagestyle = pagestyles[i].first; } + // Text Layout switch (textLayoutModule->lspacingCO->currentIndex()) { case 0: bp_.spacing().set(Spacing::Single); @@ -1833,7 +2024,7 @@ void GuiDocument::applyView() break; case 3: bp_.spacing().set(Spacing::Other, - fromqstr(textLayoutModule->lspacingLE->text())); + widgetToDoubleStr(textLayoutModule->lspacingLE)); break; } @@ -1842,39 +2033,53 @@ void GuiDocument::applyView() else bp_.columns = 1; - // text should have passed validation - bp_.listings_params = - InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params(); - - if (textLayoutModule->indentRB->isChecked()) + if (textLayoutModule->indentRB->isChecked()) { + // if paragraphs are separated by an indentation bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation; - else + switch (textLayoutModule->indentCO->currentIndex()) { + case 0: + bp_.setIndentation(HSpace(HSpace::DEFAULT)); + break; + case 1: { + HSpace indent = HSpace( + widgetsToLength(textLayoutModule->indentLE, + textLayoutModule->indentLengthCO) + ); + bp_.setIndentation(indent); + break; + } + default: + // this should never happen + bp_.setIndentation(HSpace(HSpace::DEFAULT)); + break; + } + } else { + // if paragraphs are separated by a skip bp_.paragraph_separation = BufferParams::ParagraphSkipSeparation; - - switch (textLayoutModule->skipCO->currentIndex()) { - case 0: - bp_.setDefSkip(VSpace(VSpace::SMALLSKIP)); - break; - case 1: - bp_.setDefSkip(VSpace(VSpace::MEDSKIP)); - break; - case 2: - bp_.setDefSkip(VSpace(VSpace::BIGSKIP)); - break; - case 3: - { - VSpace vs = VSpace( - widgetsToLength(textLayoutModule->skipLE, + switch (textLayoutModule->skipCO->currentIndex()) { + case 0: + bp_.setDefSkip(VSpace(VSpace::SMALLSKIP)); + break; + case 1: + bp_.setDefSkip(VSpace(VSpace::MEDSKIP)); + break; + case 2: + bp_.setDefSkip(VSpace(VSpace::BIGSKIP)); + break; + case 3: + { + VSpace vs = VSpace( + widgetsToLength(textLayoutModule->skipLE, textLayoutModule->skipLengthCO) - ); - bp_.setDefSkip(vs); - break; - } - default: - // DocumentDefskipCB assures that this never happens - // so Assert then !!! - jbl - bp_.setDefSkip(VSpace(VSpace::MEDSKIP)); - break; + ); + bp_.setDefSkip(vs); + break; + } + default: + // this should never happen + bp_.setDefSkip(VSpace(VSpace::MEDSKIP)); + break; + } } bp_.options = @@ -1889,8 +2094,25 @@ 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(); + // Listings + // text should have passed validation + bp_.listings_params = + InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params(); + // output bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData( outputModule->defaultFormatCO->currentIndex()).toString()); @@ -1928,6 +2150,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()); @@ -1992,6 +2221,7 @@ void GuiDocument::applyView() bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit); bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit); + // branches branchesModule->apply(bp_); // PDF support @@ -2030,6 +2260,9 @@ void GuiDocument::paramsToDialog() // preamble preambleModule->update(bp_, id()); + // date + latexModule->suppressDateCB->setChecked(bp_.suppress_date); + // biblio biblioModule->citeDefaultRB->setChecked( bp_.citeEngine() == ENGINE_BASIC); @@ -2047,6 +2280,24 @@ void GuiDocument::paramsToDialog() biblioModule->bibtopicCB->setChecked( bp_.use_bibtopic); + string command; + string options = + split(bp_.bibtex_command, command, ' '); + + int const bpos = biblioModule->bibtexCO->findData(toqstr(command)); + if (bpos != -1) { + biblioModule->bibtexCO->setCurrentIndex(bpos); + biblioModule->bibtexOptionsED->setText(toqstr(options).trimmed()); + } else { + biblioModule->bibtexCO->setCurrentIndex(0); + biblioModule->bibtexOptionsED->clear(); + } + biblioModule->bibtexOptionsED->setEnabled( + biblioModule->bibtexCO->currentIndex() != 0); + + // indices + indicesModule->update(bp_); + // language & quotes int const pos = langModule->languageCO->findData(toqstr( bp_.language->lang())); @@ -2122,6 +2373,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; @@ -2138,51 +2394,56 @@ void GuiDocument::paramsToDialog() textLayoutModule->lspacingCO->setCurrentIndex(nitem); if (bp_.spacing().getSpace() == Spacing::Other) { - textLayoutModule->lspacingLE->setText( - toqstr(bp_.spacing().getValueAsString())); + doubleToWidget(textLayoutModule->lspacingLE, + bp_.spacing().getValueAsString()); } setLSpacing(nitem); - if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation) + if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation) { textLayoutModule->indentRB->setChecked(true); - else + string indentation = bp_.getIndentation().asLyXCommand(); + int indent = 0; + if (indentation != "default") { + lengthToWidgets(textLayoutModule->indentLE, + textLayoutModule->indentLengthCO, + indentation, defaultUnit); + indent = 1; + } + textLayoutModule->indentCO->setCurrentIndex(indent); + setIndent(indent); + } else { textLayoutModule->skipRB->setChecked(true); - - int skip = 0; - switch (bp_.getDefSkip().kind()) { - case VSpace::SMALLSKIP: - skip = 0; - break; - case VSpace::MEDSKIP: - skip = 1; - break; - case VSpace::BIGSKIP: - skip = 2; - break; - case VSpace::LENGTH: - { - skip = 3; - string const length = bp_.getDefSkip().asLyXCommand(); - lengthToWidgets(textLayoutModule->skipLE, - textLayoutModule->skipLengthCO, - length, defaultUnit); - break; - } - default: - skip = 0; - break; + int skip = 0; + switch (bp_.getDefSkip().kind()) { + case VSpace::SMALLSKIP: + skip = 0; + break; + case VSpace::MEDSKIP: + skip = 1; + break; + case VSpace::BIGSKIP: + skip = 2; + break; + case VSpace::LENGTH: + { + skip = 3; + string const length = bp_.getDefSkip().asLyXCommand(); + lengthToWidgets(textLayoutModule->skipLE, + textLayoutModule->skipLengthCO, + length, defaultUnit); + break; + } + default: + skip = 0; + break; + } + textLayoutModule->skipCO->setCurrentIndex(skip); + setSkip(skip); } - textLayoutModule->skipCO->setCurrentIndex(skip); - setSkip(skip); textLayoutModule->twoColumnCB->setChecked( bp_.columns == 2); - // break listings_params to multiple lines - string lstparams = - InsetListingsParams(bp_.listings_params).separatedParams(); - textLayoutModule->listingsED->setPlainText(toqstr(lstparams)); - if (!bp_.options.empty()) { latexModule->optionsLE->setText( toqstr(bp_.options)); @@ -2223,8 +2484,32 @@ void GuiDocument::paramsToDialog() latexModule->childDocGB->setChecked(false); } + // Master/Child + std::vector 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); + // ListingsSettings + // break listings_params to multiple lines + string lstparams = + InsetListingsParams(bp_.listings_params).separatedParams(); + listingsModule->listingsED->setPlainText(toqstr(lstparams)); + // Output // update combobox with formats updateDefaultFormat(); @@ -2243,6 +2528,9 @@ void GuiDocument::paramsToDialog() 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); @@ -2264,6 +2552,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); @@ -2298,12 +2589,21 @@ void GuiDocument::paramsToDialog() if (nn >= 0) fontModule->fontsDefaultCO->setCurrentIndex(nn); + if (bp_.fontenc == "global") + fontModule->fontencCO->setCurrentIndex(0); + else if (bp_.fontenc == "default") + fontModule->fontencCO->setCurrentIndex(2); + else { + fontModule->fontencCO->setCurrentIndex(1); + fontModule->fontencLE->setText(toqstr(bp_.fontenc)); + } + // paper bool const extern_geometry = documentClass().provides("geometry"); int const psize = bp_.papersize; pageLayoutModule->papersizeCO->setCurrentIndex(psize); - setCustomPapersize(!extern_geometry && psize); + setCustomPapersize(!extern_geometry && psize == 1); pageLayoutModule->papersizeCO->setEnabled(!extern_geometry); bool const landscape = @@ -2316,7 +2616,7 @@ void GuiDocument::paramsToDialog() pageLayoutModule->facingPagesCB->setChecked( bp_.sides == TwoSides); - pageLayoutModule->backgroundTB->setStyleSheet( + pageLayoutModule->backgroundPB->setStyleSheet( colorButtonStyleSheet(rgb2qcolor(bp_.backgroundcolor))); set_backgroundcolor = bp_.backgroundcolor; @@ -2354,6 +2654,8 @@ void GuiDocument::paramsToDialog() lengthToWidgets(m->columnsepLE, m->columnsepUnit, bp_.columnsep, defaultUnit); + // branches + updateUnknownBranches(); branchesModule->update(bp_); // PDF support @@ -2388,6 +2690,9 @@ void GuiDocument::paramsToDialog() // Make sure that the bc is in the INITIAL state if (bc().policy().buttonStatus(ButtonPolicy::RESTORE)) bc().restore(); + + // clear changed branches cache + changedBranches_.clear(); } @@ -2423,6 +2728,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. @@ -2467,7 +2820,11 @@ bool GuiDocument::isValid() { return validateListingsParameters().isEmpty() && (textLayoutModule->skipCO->currentIndex() != 3 - || !textLayoutModule->skipLE->text().isEmpty()); + || !textLayoutModule->skipLE->text().isEmpty() + || textLayoutModule->indentRB->isChecked()) + && (textLayoutModule->indentCO->currentIndex() != 1 + || !textLayoutModule->indentLE->text().isEmpty() + || textLayoutModule->skipRB->isChecked()); } @@ -2529,7 +2886,7 @@ list const for (; it != end; ++it) { modInfoStruct m; m.id = *it; - LyXModule * mod = moduleList[*it]; + LyXModule const * const mod = theModuleList[*it]; if (mod) // FIXME Unicode m.name = toqstr(translateIfPossible(from_utf8(mod->getName()))); @@ -2618,6 +2975,25 @@ void GuiDocument::dispatchParams() dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE, "assign branch")); } + // rename branches in the document + executeBranchRenaming(); + // and clear changed branches cache + changedBranches_.clear(); + + // Generate the colours requested by indices. + IndicesList & indiceslist = params().indiceslist(); + if (!indiceslist.empty()) { + IndicesList::const_iterator it = indiceslist.begin(); + IndicesList::const_iterator const end = indiceslist.end(); + for (; it != end; ++it) { + docstring const & current_index = it->shortcut(); + Index const * index = indiceslist.findShortcut(current_index); + string const x11hexname = X11hexname(index->color()); + // display the new color + docstring const str = current_index + ' ' + from_ascii(x11hexname); + dispatch(FuncRequest(LFUN_SET_COLOR, str)); + } + } // FIXME: If we used an LFUN, we would not need those two lines: BufferView * bv = const_cast(bufferview()); bv->processUpdateFlags(Update::Force | Update::FitCursor); @@ -2702,8 +3078,8 @@ bool GuiDocument::providesScale(string const & font) const void GuiDocument::loadModuleInfo() { moduleNames_.clear(); - LyXModuleList::const_iterator it = moduleList.begin(); - LyXModuleList::const_iterator end = moduleList.end(); + LyXModuleList::const_iterator it = theModuleList.begin(); + LyXModuleList::const_iterator end = theModuleList.end(); for (; it != end; ++it) { modInfoStruct m; m.id = it->getID(); @@ -2722,6 +3098,45 @@ void GuiDocument::loadModuleInfo() } +void GuiDocument::updateUnknownBranches() +{ + list used_branches; + buffer().getUsedBranches(used_branches); + list::const_iterator it = used_branches.begin(); + QStringList unknown_branches; + for (; it != used_branches.end() ; ++it) { + if (!buffer().params().branchlist().find(*it)) + unknown_branches.append(toqstr(*it)); + } + branchesModule->setUnknownBranches(unknown_branches); +} + + +void GuiDocument::branchesRename(docstring const & oldname, docstring const & newname) +{ + map::iterator it = changedBranches_.begin(); + for (; it != changedBranches_.end() ; ++it) { + if (it->second == oldname) { + // branch has already been renamed + it->second = newname; + return; + } + } + // store new name + changedBranches_[oldname] = newname; +} + + +void GuiDocument::executeBranchRenaming() const +{ + map::const_iterator it = changedBranches_.begin(); + for (; it != changedBranches_.end() ; ++it) { + docstring const arg = '"' + it->first + '"' + " " + '"' + it->second + '"'; + dispatch(FuncRequest(LFUN_BRANCHES_RENAME, arg)); + } +} + + Dialog * createGuiDocument(GuiView & lv) { return new GuiDocument(lv); }