X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=782a05f7ea16538e31f8ebd6bbc2691bb416cdbd;hb=5a46224f7311067cda747e0cae32d22dd919f179;hp=6286db3d99e746fa1faf3b74cf07867a5db22414;hpb=53e7a924944709066ff37b76ed714325a09a21d2;p=lyx.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 6286db3d99..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" @@ -58,6 +59,7 @@ #include "frontends/alert.h" #include +#include #include #include #include @@ -78,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; } @@ -177,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. @@ -191,11 +198,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); } }; @@ -206,7 +213,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(); @@ -215,7 +222,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(); @@ -224,7 +231,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 @@ -234,7 +241,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(); @@ -243,7 +250,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(); @@ -264,7 +271,7 @@ class ModuleSelectionManager : public GuiSelectionManager public: /// ModuleSelectionManager( - QListView * availableLV, + QTreeView * availableLV, QListView * selectedLV, QPushButton * addPB, QPushButton * delPB, @@ -302,9 +309,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 +440,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); } @@ -519,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 @@ -546,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)), @@ -590,21 +674,12 @@ GuiDocument::GuiDocument(GuiView & lv) 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->indentLE->setValidator(unsignedLengthValidator( textLayoutModule->indentLE)); - textLayoutModule->skipLE->setValidator(unsignedLengthValidator( + textLayoutModule->skipLE->setValidator(unsignedGlueLengthValidator( textLayoutModule->skipLE)); textLayoutModule->indentCO->addItem(qt_("Default")); @@ -612,9 +687,7 @@ GuiDocument::GuiDocument(GuiView & lv) 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( @@ -627,6 +700,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; @@ -636,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; @@ -653,6 +764,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 &)), @@ -673,19 +790,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 &)), @@ -704,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")); @@ -719,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(); @@ -741,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()), @@ -814,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()), @@ -826,11 +964,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)")); @@ -850,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)), @@ -866,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()), @@ -886,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; @@ -906,12 +1065,17 @@ 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->mathdotsautoCB, SIGNAL(toggled(bool)), + mathsModule->mathdotsCB, SLOT(setDisabled(bool))); + connect(mathsModule->amsCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(mathsModule->amsautoCB, SIGNAL(clicked()), @@ -920,9 +1084,18 @@ 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())); + 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()), @@ -943,6 +1116,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) { @@ -965,6 +1140,7 @@ GuiDocument::GuiDocument(GuiView & lv) classes_model_.insertRow(i, toqstr(item), *cit); } + // branches branchesModule = new GuiBranches; connect(branchesModule, SIGNAL(changed()), @@ -973,19 +1149,26 @@ 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); selectionManager = new ModuleSelectionManager(modulesModule->availableLV, modulesModule->selectedLV, @@ -999,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)), @@ -1038,24 +1221,45 @@ 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()), + 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.")); + + + // 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")); 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")); @@ -1069,12 +1273,6 @@ GuiDocument::GuiDocument(GuiView & lv) } -void GuiDocument::showPreamble() -{ - docPS->setCurrentPanel(qt_("LaTeX Preamble")); -} - - void GuiDocument::saveDefaultClicked() { saveDocDefault(); @@ -1093,6 +1291,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 @@ -1100,10 +1318,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()); @@ -1121,13 +1339,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); } } @@ -1176,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"); @@ -1190,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); } @@ -1258,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(); } @@ -1312,6 +1611,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()); } @@ -1376,6 +1682,12 @@ void GuiDocument::updateFontlist() } +void GuiDocument::fontencChanged(int item) +{ + fontModule->fontencLE->setEnabled(item == 1); +} + + void GuiDocument::romanChanged(int item) { if (outputModule->xetexCB->isChecked()) @@ -1442,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); @@ -1450,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" @@ -1467,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"), @@ -1501,7 +1813,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); } @@ -1601,15 +1914,15 @@ 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)"); + 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) @@ -1658,8 +1971,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; @@ -1745,8 +2061,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) { @@ -1766,6 +2084,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()); } @@ -1773,6 +2102,10 @@ void GuiDocument::applyView() { // preamble preambleModule->apply(bp_); + localLayout->apply(bp_); + + // date + bp_.suppress_date = latexModule->suppressDateCB->isChecked(); // biblio bp_.setCiteEngine(ENGINE_BASIC); @@ -1857,7 +2190,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()) { @@ -1885,15 +2226,15 @@ void GuiDocument::applyView() // Modules modulesToParams(bp_); - if (mathsModule->amsautoCB->isChecked()) { + // Math + if (mathsModule->amsautoCB->isChecked()) bp_.use_amsmath = BufferParams::package_auto; - } else { + else { if (mathsModule->amsCB->isChecked()) bp_.use_amsmath = BufferParams::package_on; else bp_.use_amsmath = BufferParams::package_off; } - if (mathsModule->esintautoCB->isChecked()) bp_.use_esint = BufferParams::package_auto; else { @@ -1902,7 +2243,24 @@ 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; + } + 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"; else { @@ -1912,6 +2270,7 @@ void GuiDocument::applyView() bp_.pagestyle = pagestyles[i].first; } + // Text Layout switch (textLayoutModule->lspacingCO->currentIndex()) { case 0: bp_.spacing().set(Spacing::Single); @@ -1922,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()) @@ -1933,10 +2296,6 @@ 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 paragraphs are separated by an indentation bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation; @@ -1998,8 +2357,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()); @@ -2007,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) @@ -2037,6 +2425,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()); @@ -2064,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); @@ -2084,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; @@ -2139,6 +2527,10 @@ void GuiDocument::paramsToDialog() // preamble preambleModule->update(bp_, id()); + localLayout->update(bp_, id()); + + // date + latexModule->suppressDateCB->setChecked(bp_.suppress_date); // biblio biblioModule->citeDefaultRB->setChecked( @@ -2210,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(); @@ -2250,6 +2665,16 @@ 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); + + 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; @@ -2275,9 +2700,7 @@ void GuiDocument::paramsToDialog() textLayoutModule->indentRB->setChecked(true); string indentation = bp_.getIndentation().asLyXCommand(); int indent = 0; - if (indentation == "default") - indent = 0; - else { + if (indentation != "default") { lengthToWidgets(textLayoutModule->indentLE, textLayoutModule->indentLengthCO, indentation, defaultUnit); @@ -2318,11 +2741,6 @@ void GuiDocument::paramsToDialog() 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)); @@ -2363,8 +2781,31 @@ void GuiDocument::paramsToDialog() latexModule->childDocGB->setChecked(false); } + // Master/Child + if (!buffer().hasChildren()) { + 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(); @@ -2378,11 +2819,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); @@ -2404,6 +2855,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); @@ -2433,11 +2887,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"); @@ -2456,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, @@ -2468,7 +2929,7 @@ void GuiDocument::paramsToDialog() // margins Ui::MarginsUi * m = marginsModule; - setMargins(!bp_.use_geometry); + setMargins(); lengthToWidgets(m->topLE, m->topUnit, bp_.topmargin, defaultUnit); @@ -2568,6 +3029,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; + 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()), + 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. @@ -2610,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() + ); } @@ -2678,7 +3199,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()))); @@ -2731,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()))) @@ -2764,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(); @@ -2870,8 +3391,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(); @@ -2892,6 +3413,8 @@ void GuiDocument::loadModuleInfo() void GuiDocument::updateUnknownBranches() { + if (!bufferview()) + return; list used_branches; buffer().getUsedBranches(used_branches); list::const_iterator it = used_branches.begin();