X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=0a96469935b7f29f82ae6c92a6cb962ae837c754;hb=bbfc419c10010c1ebf6ab59adf2eaf6f63104a9e;hp=9cbaec7436d01f5c9b03d1a537968002d92992ac;hpb=15676a062fab4a9dfccf28ebdd50a52958810129;p=features.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 9cbaec7436..0a96469935 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -15,6 +15,8 @@ #include "GuiApplication.h" #include "GuiBranches.h" +#include "GuiIndices.h" +#include "GuiSelectionManager.h" #include "LaTeXHighlighter.h" #include "LengthCombo.h" #include "PanelStack.h" @@ -27,13 +29,17 @@ #include "BufferParams.h" #include "BufferView.h" #include "Color.h" +#include "ColorCache.h" #include "Encoding.h" #include "FloatPlacement.h" +#include "Format.h" #include "FuncRequest.h" +#include "IndicesList.h" #include "Language.h" #include "LaTeXFeatures.h" #include "Layout.h" -#include "LyXRC.h" // defaultUnit +#include "LayoutModuleList.h" +#include "LyXRC.h" #include "ModuleList.h" #include "OutputParams.h" #include "PDFOptions.h" @@ -51,17 +57,34 @@ #include "frontends/alert.h" #include +#include +#include #include +#include #include #include #include +#include #ifdef IN #undef IN #endif +// a style sheet for buttons +// this is for example used for the background color setting button +static inline QString colorButtonStyleSheet(QColor const & bgColor) +{ + if (bgColor.isValid()) { + QString rc = QLatin1String("background:"); + rc += bgColor.name(); + return rc; + } + return QString(); +} + + using namespace std; using namespace lyx::support; @@ -70,15 +93,21 @@ namespace { char const * const tex_graphics[] = { - "default", "dvips", "dvitops", "emtex", - "ln", "oztex", "textures", "none", "" + "default", "dvialw", "dvilaser", "dvipdf", "dvipdfm", "dvipdfmx", + "dvips", "dvipsone", "dvitops", "dviwin", "dviwindo", "dvi2ps", "emtex", + "ln", "oztex", "pctexhp", "pctexps", "pctexwin", "pctex32", "pdftex", + "psprint", "pubps", "tcidvi", "textures", "truetex", "vtex", "xdvi", + "xetex", "none", "" }; char const * const tex_graphics_gui[] = { - N_("Default"), "Dvips", "DVItoPS", "EmTeX", - "LN", "OzTeX", "Textures", N_("None"), "" + N_("Default"), "dvialw", "DviLaser", "dvipdf", "DVIPDFM", "DVIPDFMx", + "Dvips", "DVIPSONE", "DVItoPS", "DVIWIN", "DVIWindo", "dvi2ps", "EmTeX", + "LN", "OzTeX", "pctexhp", "pctexps", "pctexwin", "PCTeX32", "pdfTeX", + "psprint", "pubps", "tcidvi", "Textures", "TrueTeX", "VTeX", "xdvi", + "XeTeX", N_("None"), "" }; @@ -127,314 +156,302 @@ char const * tex_fonts_monospaced_gui[] = }; -vector > pagestyles; +char const * backref_opts[] = +{ + "false", "section", "slide", "page", "" +}; + + +char const * backref_opts_gui[] = +{ + N_("Off"), N_("Section"), N_("Slide"), N_("Page"), "" +}; + + +vector > pagestyles; } // anonymous namespace namespace lyx { +RGBColor set_backgroundcolor; + namespace { // used when sorting the textclass list. class less_textclass_avail_desc : public binary_function { public: - int operator()(string const & lhs, string const & rhs) const + bool operator()(string const & lhs, string const & rhs) const { // Ordering criteria: // 1. Availability of text class // 2. Description (lexicographic) LayoutFile const & tc1 = LayoutFileList::get()[lhs]; LayoutFile const & tc2 = LayoutFileList::get()[rhs]; + int const rel = compare_no_case( + translateIfPossible(from_utf8(tc1.description())), + translateIfPossible(from_utf8(tc2.description()))); return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) || - (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && - _(tc1.description()) < _(tc2.description())); + (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && rel < 0); } }; } namespace frontend { +namespace { + +vector getRequiredList(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //empty such thing + return mod->getRequiredModules(); +} -/// -QModelIndex getSelectedIndex(QListView * lv) +vector getExcludedList(string const & modName) { - QModelIndex retval = QModelIndex(); - QModelIndexList selIdx = - lv->selectionModel()->selectedIndexes(); - if (!selIdx.empty()) - retval = selIdx.first(); - return retval; + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //empty such thing + return mod->getExcludedModules(); } -namespace { - vector getRequiredList(string const & modName) - { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //empty such thing - return mod->getRequiredModules(); - } +docstring getModuleDescription(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return _("Module not found!"); + // FIXME Unicode + return translateIfPossible(from_utf8(mod->getDescription())); +} - vector getExcludedList(string const & modName) - { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //empty such thing - return mod->getExcludedModules(); - } +vector getPackageList(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //empty such thing + return mod->getPackageList(); +} - docstring getModuleDescription(string const & modName) - { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return _("Module not found!"); - return _(mod->getDescription()); - } +bool isModuleAvailable(string const & modName) +{ + LyXModule * mod = moduleList[modName]; + if (!mod) + return false; + return mod->isAvailable(); +} +} // anonymous namespace - vector getPackageList(string const & modName) - { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //empty such thing - return mod->getPackageList(); - } +///////////////////////////////////////////////////////////////////// +// +// ModuleSelectionManager +// +///////////////////////////////////////////////////////////////////// - bool isModuleAvailable(string const & modName) +/// SelectionManager for use with modules +class ModuleSelectionManager : public GuiSelectionManager +{ +public: + /// + ModuleSelectionManager( + QListView * availableLV, + QListView * selectedLV, + QPushButton * addPB, + QPushButton * delPB, + QPushButton * upPB, + QPushButton * downPB, + GuiIdListModel * availableModel, + GuiIdListModel * selectedModel, + GuiDocument const * container) + : GuiSelectionManager(availableLV, selectedLV, addPB, delPB, + upPB, downPB, availableModel, selectedModel), container_(container) + {} + /// + void updateProvidedModules(LayoutModuleList const & pm) + { provided_modules_ = pm.list(); } + /// + void updateExcludedModules(LayoutModuleList const & em) + { excluded_modules_ = em.list(); } +private: + /// + virtual void updateAddPB(); + /// + virtual void updateUpPB(); + /// + virtual void updateDownPB(); + /// + virtual void updateDelPB(); + /// returns availableModel as a GuiIdListModel + GuiIdListModel * getAvailableModel() { - LyXModule * mod = moduleList[modName]; - if (!mod) - return false; - return mod->isAvailable(); - } -} //anonymous namespace - - -ModuleSelMan::ModuleSelMan( - QListView * availableLV, - QListView * selectedLV, - QPushButton * addPB, - QPushButton * delPB, - QPushButton * upPB, - QPushButton * downPB, - GuiIdListModel * availableModel, - GuiIdListModel * selectedModel) : -GuiSelectionManager(availableLV, selectedLV, addPB, delPB, - upPB, downPB, availableModel, selectedModel) -{} - + return dynamic_cast(availableModel); + } + /// returns selectedModel as a GuiIdListModel + GuiIdListModel * getSelectedModel() + { + return dynamic_cast(selectedModel); + } + /// keeps a list of the modules the text class provides + std::list provided_modules_; + /// similarly... + std::list excluded_modules_; + /// + GuiDocument const * container_; +}; -void ModuleSelMan::updateAddPB() +void ModuleSelectionManager::updateAddPB() { int const arows = availableModel->rowCount(); - QModelIndexList const availSels = + QModelIndexList const avail_sels = availableLV->selectionModel()->selectedIndexes(); - if (arows == 0 || availSels.isEmpty() || isSelected(availSels.first())) { + + // disable if there aren't any modules (?), if none of them is chosen + // in the dialog, or if the chosen one is already selected for use. + if (arows == 0 || avail_sels.isEmpty() || isSelected(avail_sels.first())) { addPB->setEnabled(false); return; } - - QModelIndex const & idx = availableLV->selectionModel()->currentIndex(); - string const modName = getAvailableModel()->getIDString(idx.row()); - vector reqs = getRequiredList(modName); - vector excl = getExcludedList(modName); - - if (reqs.empty() && excl.empty()) { - addPB->setEnabled(true); - return; - } - - int const srows = selectedModel->rowCount(); - vector selModList; - for (int i = 0; i < srows; ++i) - selModList.push_back(getSelectedModel()->getIDString(i)); - vector::const_iterator selModStart = selModList.begin(); - vector::const_iterator selModEnd = selModList.end(); - - //Check whether some required module is available - if (!reqs.empty()) { - bool foundOne = false; - vector::const_iterator it = reqs.begin(); - vector::const_iterator end = reqs.end(); - for (; it != end; ++it) { - if (find(selModStart, selModEnd, *it) != selModEnd) { - foundOne = true; - break; - } - } - if (!foundOne) { - addPB->setEnabled(false); - return; - } - } - - //Check whether any excluded module is being used - if (!excl.empty()) { - vector::const_iterator it = excl.begin(); - vector::const_iterator end = excl.end(); - for (; it != end; ++it) { - if (find(selModStart, selModEnd, *it) != selModEnd) { - addPB->setEnabled(false); - return; - } - } - } + QModelIndex const & idx = availableLV->selectionModel()->currentIndex(); + string const modname = getAvailableModel()->getIDString(idx.row()); - addPB->setEnabled(true); + bool const enable = + container_->params().moduleCanBeAdded(modname); + addPB->setEnabled(enable); } -void ModuleSelMan::updateDownPB() +void ModuleSelectionManager::updateDownPB() { int const srows = selectedModel->rowCount(); if (srows == 0) { downPB->setEnabled(false); return; } - QModelIndexList const selSels = - selectedLV->selectionModel()->selectedIndexes(); - //disable if empty or last item is selected - if (selSels.empty() || selSels.first().row() == srows - 1) { + QModelIndex const & curidx = selectedLV->selectionModel()->currentIndex(); + int const curRow = curidx.row(); + if (curRow < 0 || curRow >= srows - 1) { // invalid or last item downPB->setEnabled(false); return; } - //determine whether immediately succeding element requires this one - QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex(); - int curRow = curIdx.row(); - if (curRow < 0 || curRow >= srows - 1) { //this shouldn't happen... - downPB->setEnabled(false); - return; - } - string const curModName = getSelectedModel()->getIDString(curRow); - string const nextModName = getSelectedModel()->getIDString(curRow + 1); - vector reqs = getRequiredList(nextModName); + // determine whether immediately succeding element requires this one + string const curmodname = getSelectedModel()->getIDString(curRow); + string const nextmodname = getSelectedModel()->getIDString(curRow + 1); + + vector reqs = getRequiredList(nextmodname); - //if it doesn't require anything.... + // if it doesn't require anything.... if (reqs.empty()) { downPB->setEnabled(true); return; } - //FIXME This should perhaps be more flexible and check whether, even - //if this one is required, there is also an earlier one that is required. - //enable it if this module isn't required + // Enable it if this module isn't required. + // FIXME This should perhaps be more flexible and check whether, even + // if the next one is required, there is also an earlier one that will do. downPB->setEnabled( - find(reqs.begin(), reqs.end(), curModName) == reqs.end()); + find(reqs.begin(), reqs.end(), curmodname) == reqs.end()); } -void ModuleSelMan::updateUpPB() +void ModuleSelectionManager::updateUpPB() { int const srows = selectedModel->rowCount(); if (srows == 0) { upPB->setEnabled(false); return; } - QModelIndexList const selSels = - selectedLV->selectionModel()->selectedIndexes(); - //disable if empty or first item is selected - if (selSels.empty() || selSels.first().row() == 0) { - upPB->setEnabled(false); - return; - } - //determine whether immediately preceding element is required by this one QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex(); int curRow = curIdx.row(); - if (curRow <= -1 || curRow > srows - 1) { //sanity check - downPB->setEnabled(false); + if (curRow <= 0 || curRow > srows - 1) { // first item or invalid + upPB->setEnabled(false); return; } - string const curModName = getSelectedModel()->getIDString(curRow); - vector reqs = getRequiredList(curModName); - - //if this one doesn't require anything.... + string const curmodname = getSelectedModel()->getIDString(curRow); + + // determine whether immediately preceding element is required by this one + vector reqs = getRequiredList(curmodname); + + // if this one doesn't require anything.... if (reqs.empty()) { upPB->setEnabled(true); return; } - string preModName = getSelectedModel()->getIDString(curRow - 1); - //NOTE This is less flexible than it might be. You could check whether, even - //if this one is required, there is also an earlier one that is required. - //enable it if the preceding module isn't required - upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end()); + // Enable it if the preceding module isn't required. + // NOTE This is less flexible than it might be. We could check whether, even + // if the previous one is required, there is an earlier one that would do. + string const premod = getSelectedModel()->getIDString(curRow - 1); + upPB->setEnabled(find(reqs.begin(), reqs.end(), premod) == reqs.end()); } -void ModuleSelMan::updateDelPB() +void ModuleSelectionManager::updateDelPB() { int const srows = selectedModel->rowCount(); if (srows == 0) { deletePB->setEnabled(false); return; } - QModelIndexList const selSels = - selectedLV->selectionModel()->selectedIndexes(); - if (selSels.empty() || selSels.first().row() < 0) { - deletePB->setEnabled(false); - return; - } - - //determine whether some LATER module requires this one - //NOTE Things are arranged so that this is the only way there - //can be a problem. At least, we hope so. - QModelIndex const & curIdx = + + QModelIndex const & curidx = selectedLV->selectionModel()->currentIndex(); - int const curRow = curIdx.row(); - if (curRow < 0 || curRow >= srows) { //this shouldn't happen + int const curRow = curidx.row(); + if (curRow < 0 || curRow >= srows) { // invalid index? deletePB->setEnabled(false); return; } - - QString const curModName = curIdx.data().toString(); - - //We're looking here for a reason NOT to enable the button. If we - //find one, we disable it and return. If we don't, we'll end up at - //the end of the function, and then we enable it. + + string const curmodname = getSelectedModel()->getIDString(curRow); + + // We're looking here for a reason NOT to enable the button. If we + // find one, we disable it and return. If we don't, we'll end up at + // the end of the function, and then we enable it. for (int i = curRow + 1; i < srows; ++i) { string const thisMod = getSelectedModel()->getIDString(i); vector reqs = getRequiredList(thisMod); //does this one require us? - if (find(reqs.begin(), reqs.end(), fromqstr(curModName)) == reqs.end()) + if (find(reqs.begin(), reqs.end(), curmodname) == reqs.end()) //no... continue; - //OK, so this module requires us - //is there an EARLIER module that also satisfies the require? - //NOTE We demand that it be earlier to keep the list of modules - //consistent with the rule that a module must be proceeded by a - //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; - bool foundOne = false; + // OK, so this module requires us + // is there an EARLIER module that also satisfies the require? + // NOTE We demand that it be earlier to keep the list of modules + // consistent with the rule that a module must be proceeded by a + // 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; + bool foundone = false; for (int j = 0; j < curRow; ++j) { string const mod = getSelectedModel()->getIDString(j); - //lyxerr << "In loop: Testing " << mod << std::endl; - //do we satisfy the require? + // lyxerr << "In loop: Testing " << mod << std::endl; + // do we satisfy the require? if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) { - //lyxerr << mod << " does the trick." << std::endl; - foundOne = true; + // lyxerr << mod << " does the trick." << std::endl; + foundone = true; break; } } - //did we find a module to satisfy the require? - if (!foundOne) { - //lyxerr << "No matching module found." << std::endl; + // did we find a module to satisfy the require? + if (!foundone) { + // lyxerr << "No matching module found." << std::endl; deletePB->setEnabled(false); return; } } - //lyxerr << "All's well that ends well." << std::endl; + // lyxerr << "All's well that ends well." << std::endl; deletePB->setEnabled(true); } @@ -445,7 +462,7 @@ void ModuleSelMan::updateDelPB() // ///////////////////////////////////////////////////////////////////// -PreambleModule::PreambleModule(): current_id_(0) +PreambleModule::PreambleModule() : current_id_(0) { // This is not a memory leak. The object will be destroyed // with this. @@ -474,7 +491,7 @@ void PreambleModule::update(BufferParams const & params, BufferId id) Coords::const_iterator it = preamble_coords_.find(current_id_); if (it == preamble_coords_.end()) // First time we open this one. - preamble_coords_[current_id_] = make_pair(0,0); + preamble_coords_[current_id_] = make_pair(0, 0); else { // Restore saved coords. QTextCursor cur = preambleTE->textCursor(); @@ -559,9 +576,9 @@ GuiDocument::GuiDocument(GuiView & lv) connect(textLayoutModule->bypassCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(textLayoutModule->bypassCB, SIGNAL(clicked()), - this, SLOT(set_listings_msg())); + this, SLOT(setListingsMessage())); connect(textLayoutModule->listingsED, SIGNAL(textChanged()), - this, SLOT(set_listings_msg())); + this, SLOT(setListingsMessage())); textLayoutModule->listingsTB->setPlainText( qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); textLayoutModule->lspacingLE->setValidator(new QDoubleValidator( @@ -587,8 +604,18 @@ GuiDocument::GuiDocument(GuiView & lv) // initialize the length validator bc().addCheckedLineEdit(textLayoutModule->skipLE); - fontModule = new UiWidget; + // output + outputModule = new UiWidget; + + connect(outputModule->xetexCB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(outputModule->xetexCB, SIGNAL(toggled(bool)), + this, SLOT(xetexChanged(bool))); + connect(outputModule->defaultFormatCO, SIGNAL(activated(int)), + this, SLOT(change_adaptor())); + // fonts + fontModule = new UiWidget; connect(fontModule->fontsRomanCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(fontModule->fontsRomanCO, SIGNAL(activated(int)), @@ -616,24 +643,7 @@ GuiDocument::GuiDocument(GuiView & lv) connect(fontModule->fontOsfCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - for (int n = 0; tex_fonts_roman[n][0]; ++n) { - QString font = qt_(tex_fonts_roman_gui[n]); - if (!isFontAvailable(tex_fonts_roman[n])) - font += qt_(" (not installed)"); - fontModule->fontsRomanCO->addItem(font); - } - for (int n = 0; tex_fonts_sans[n][0]; ++n) { - QString font = qt_(tex_fonts_sans_gui[n]); - if (!isFontAvailable(tex_fonts_sans[n])) - font += qt_(" (not installed)"); - fontModule->fontsSansCO->addItem(font); - } - for (int n = 0; tex_fonts_monospaced[n][0]; ++n) { - QString font = qt_(tex_fonts_monospaced_gui[n]); - if (!isFontAvailable(tex_fonts_monospaced[n])) - font += qt_(" (not installed)"); - fontModule->fontsTypewriterCO->addItem(font); - } + updateFontlist(); fontModule->fontsizeCO->addItem(qt_("Default")); fontModule->fontsizeCO->addItem(qt_("10")); @@ -671,6 +681,10 @@ 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")); @@ -710,35 +724,35 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(setCustomMargins(bool))); connect(marginsModule->marginCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(marginsModule->topLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->topLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->topUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->bottomLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->bottomLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->bottomUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->innerLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->innerLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->innerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->outerLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->outerLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->outerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->headheightLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->headheightLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->headheightUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->headsepLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->headsepLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->headsepUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)), + connect(marginsModule->footskipLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->footskipUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->columnsepLE, SIGNAL(textChanged(const QString&)), + connect(marginsModule->columnsepLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->columnsepUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); @@ -796,12 +810,14 @@ GuiDocument::GuiDocument(GuiView & lv) langModule->languageCO->setModel(language_model); // Always put the default encoding in the first position. - // It is special because the displayed text is translated. - langModule->encodingCO->addItem(qt_("LaTeX default")); + langModule->encodingCO->addItem(qt_("Language Default (no inputenc)")); + QStringList encodinglist; Encodings::const_iterator it = encodings.begin(); Encodings::const_iterator const end = encodings.end(); for (; it != end; ++it) - langModule->encodingCO->addItem(toqstr(it->latexName())); + encodinglist.append(qt_(it->guiName())); + encodinglist.sort(); + langModule->encodingCO->addItems(encodinglist); langModule->quoteStyleCO->addItem(qt_("``text''")); langModule->quoteStyleCO->addItem(qt_("''text''")); @@ -843,10 +859,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; @@ -866,7 +900,9 @@ GuiDocument::GuiDocument(GuiView & lv) latexModule = new UiWidget; // latex class - connect(latexModule->optionsLE, SIGNAL(textChanged(const QString &)), + connect(latexModule->optionsLE, SIGNAL(textChanged(QString)), + this, SLOT(change_adaptor())); + connect(latexModule->defaultOptionsCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(latexModule->psdriverCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); @@ -876,23 +912,15 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(latexModule->layoutPB, SIGNAL(clicked()), this, SLOT(browseLayout())); + connect(latexModule->layoutPB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); connect(latexModule->childDocGB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(latexModule->childDocLE, SIGNAL(textChanged(const QString &)), + connect(latexModule->childDocLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(latexModule->childDocPB, SIGNAL(clicked()), this, SLOT(browseMaster())); - - selectionManager = - new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV, - latexModule->addPB, latexModule->deletePB, - latexModule->upPB, latexModule->downPB, - availableModel(), selectedModel()); - connect(selectionManager, SIGNAL(updateHook()), - this, SLOT(updateModuleInfo())); - connect(selectionManager, SIGNAL(updateHook()), - this, SLOT(change_adaptor())); - + // postscript drivers for (int n = 0; tex_graphics[n][0]; ++n) { QString enc = qt_(tex_graphics_gui[n]); @@ -918,6 +946,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; @@ -929,18 +960,34 @@ GuiDocument::GuiDocument(GuiView & lv) connect(bulletsModule, SIGNAL(changed()), this, SLOT(change_adaptor())); + // Modules + modulesModule = new UiWidget; + + selectionManager = + new ModuleSelectionManager(modulesModule->availableLV, + modulesModule->selectedLV, + modulesModule->addPB, modulesModule->deletePB, + modulesModule->upPB, modulesModule->downPB, + availableModel(), selectedModel(), this); + connect(selectionManager, SIGNAL(updateHook()), + this, SLOT(updateModuleInfo())); + connect(selectionManager, SIGNAL(updateHook()), + this, SLOT(change_adaptor())); + 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(const QString &)), + connect(pdfSupportModule->titleLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->authorLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->authorLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->subjectLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->subjectLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->keywordsLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->keywordsLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(pdfSupportModule->bookmarksGB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); @@ -956,23 +1003,25 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(pdfSupportModule->colorlinksCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->backrefCB, SIGNAL(toggled(bool)), + connect(pdfSupportModule->backrefCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(pdfSupportModule->pdfusetitleCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->pagebackrefCB, SIGNAL(toggled(bool)), - this, SLOT(change_adaptor())); connect(pdfSupportModule->fullscreenCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); + 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())); docPS->addPanel(latexModule, qt_("Document Class")); + docPS->addPanel(modulesModule, qt_("Modules")); docPS->addPanel(fontModule, qt_("Fonts")); docPS->addPanel(textLayoutModule, qt_("Text Layout")); docPS->addPanel(pageLayoutModule, qt_("Page Layout")); @@ -980,11 +1029,13 @@ 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(bulletsModule, qt_("Bullets")); docPS->addPanel(branchesModule, qt_("Branches")); + docPS->addPanel(outputModule, qt_("Output")); docPS->addPanel(preambleModule, qt_("LaTeX Preamble")); docPS->setCurrentPanel(qt_("Document Class")); // FIXME: hack to work around resizing bug in Qt >= 4.2 @@ -1019,40 +1070,41 @@ void GuiDocument::change_adaptor() } -docstring GuiDocument::validate_listings_params() +QString GuiDocument::validateListingsParameters() { // use a cache here to avoid repeated validation // of the same parameters - static string param_cache = string(); - static docstring msg_cache = docstring(); + static string param_cache; + static QString msg_cache; if (textLayoutModule->bypassCB->isChecked()) - return docstring(); + return QString(); string params = fromqstr(textLayoutModule->listingsED->toPlainText()); if (params != param_cache) { param_cache = params; - msg_cache = InsetListingsParams(params).validate(); + msg_cache = toqstr(InsetListingsParams(params).validate()); } return msg_cache; } -void GuiDocument::set_listings_msg() +void GuiDocument::setListingsMessage() { static bool isOK = true; - docstring msg = validate_listings_params(); - if (msg.empty()) { + QString msg = validateListingsParameters(); + if (msg.isEmpty()) { if (isOK) return; isOK = true; // listingsTB->setTextColor("black"); textLayoutModule->listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + qt_("Input listings parameters on the right. " + "Enter ? for a list of parameters.")); } else { isOK = false; // listingsTB->setTextColor("red"); - textLayoutModule->listingsTB->setPlainText(toqstr(msg)); + textLayoutModule->listingsTB->setPlainText(msg); } } @@ -1080,13 +1132,23 @@ void GuiDocument::enableSkip(bool skip) setSkip(textLayoutModule->skipCO->currentIndex()); } + void GuiDocument::portraitChanged() { setMargins(pageLayoutModule->papersizeCO->currentIndex()); } + void GuiDocument::setMargins(bool custom) { + bool const extern_geometry = + documentClass().provides("geometry"); + marginsModule->marginCB->setEnabled(!extern_geometry); + if (extern_geometry) { + marginsModule->marginCB->setChecked(false); + setCustomMargins(true); + return; + } marginsModule->marginCB->setChecked(custom); setCustomMargins(custom); } @@ -1149,6 +1211,62 @@ 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( + colorButtonStyleSheet(newColor)); + // save color + set_backgroundcolor = rgbFromHexName(fromqstr(newColor.name())); + 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_backgroundcolor = rgbFromHexName("#ffffff"); + changed(); +} + + +void GuiDocument::xetexChanged(bool xetex) +{ + updateFontlist(); + updateDefaultFormat(); + langModule->encodingCO->setEnabled(!xetex && + !langModule->defaultencodingRB->isChecked()); + langModule->defaultencodingRB->setEnabled(!xetex); + langModule->otherencodingRB->setEnabled(!xetex); + + fontModule->fontsDefaultCO->setEnabled(!xetex); + fontModule->fontsDefaultLA->setEnabled(!xetex); + fontModule->cjkFontLE->setEnabled(!xetex); + fontModule->cjkFontLA->setEnabled(!xetex); + string font; + if (!xetex) + font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()]; + bool scaleable = providesScale(font); + fontModule->scaleSansSB->setEnabled(scaleable); + fontModule->scaleSansLA->setEnabled(scaleable); + if (!xetex) + font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()]; + scaleable = providesScale(font); + fontModule->scaleTypewriterSB->setEnabled(scaleable); + fontModule->scaleTypewriterLA->setEnabled(scaleable); + if (!xetex) + font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()]; + fontModule->fontScCB->setEnabled(providesSC(font)); + fontModule->fontOsfCB->setEnabled(providesOSF(font)); +} + void GuiDocument::updateFontsize(string const & items, string const & sel) { @@ -1168,8 +1286,53 @@ void GuiDocument::updateFontsize(string const & items, string const & sel) } +void GuiDocument::updateFontlist() +{ + fontModule->fontsRomanCO->clear(); + fontModule->fontsSansCO->clear(); + fontModule->fontsTypewriterCO->clear(); + + // With XeTeX, we have access to all system fonts, but not the LaTeX fonts + if (outputModule->xetexCB->isChecked()) { + fontModule->fontsRomanCO->addItem(qt_("Default")); + fontModule->fontsSansCO->addItem(qt_("Default")); + fontModule->fontsTypewriterCO->addItem(qt_("Default")); + + QFontDatabase fontdb; + QStringList families(fontdb.families()); + for (QStringList::Iterator it = families.begin(); it != families.end(); ++it) { + fontModule->fontsRomanCO->addItem(*it); + fontModule->fontsSansCO->addItem(*it); + fontModule->fontsTypewriterCO->addItem(*it); + } + return; + } + + for (int n = 0; tex_fonts_roman[n][0]; ++n) { + QString font = qt_(tex_fonts_roman_gui[n]); + if (!isFontAvailable(tex_fonts_roman[n])) + font += qt_(" (not installed)"); + fontModule->fontsRomanCO->addItem(font); + } + for (int n = 0; tex_fonts_sans[n][0]; ++n) { + QString font = qt_(tex_fonts_sans_gui[n]); + if (!isFontAvailable(tex_fonts_sans[n])) + font += qt_(" (not installed)"); + fontModule->fontsSansCO->addItem(font); + } + for (int n = 0; tex_fonts_monospaced[n][0]; ++n) { + QString font = qt_(tex_fonts_monospaced_gui[n]); + if (!isFontAvailable(tex_fonts_monospaced[n])) + font += qt_(" (not installed)"); + fontModule->fontsTypewriterCO->addItem(font); + } +} + + void GuiDocument::romanChanged(int item) { + if (outputModule->xetexCB->isChecked()) + return; string const font = tex_fonts_roman[item]; fontModule->fontScCB->setEnabled(providesSC(font)); fontModule->fontOsfCB->setEnabled(providesOSF(font)); @@ -1178,6 +1341,8 @@ void GuiDocument::romanChanged(int item) void GuiDocument::sansChanged(int item) { + if (outputModule->xetexCB->isChecked()) + return; string const font = tex_fonts_sans[item]; bool scaleable = providesScale(font); fontModule->scaleSansSB->setEnabled(scaleable); @@ -1187,6 +1352,8 @@ void GuiDocument::sansChanged(int item) void GuiDocument::ttChanged(int item) { + if (outputModule->xetexCB->isChecked()) + return; string const font = tex_fonts_monospaced[item]; bool scaleable = providesScale(font); fontModule->scaleTypewriterSB->setEnabled(scaleable); @@ -1200,11 +1367,11 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel) pageLayoutModule->pagestyleCO->clear(); pageLayoutModule->pagestyleCO->addItem(qt_("Default")); - for (int n = 0; !token(items,'|',n).empty(); ++n) { + for (int n = 0; !token(items, '|', n).empty(); ++n) { string style = token(items, '|', n); - docstring style_gui = _(style); - pagestyles.push_back(pair(style, style_gui)); - pageLayoutModule->pagestyleCO->addItem(toqstr(style_gui)); + QString style_gui = qt_(style); + pagestyles.push_back(pair(style, style_gui)); + pageLayoutModule->pagestyleCO->addItem(style_gui); } if (sel == "default") { @@ -1216,8 +1383,7 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel) for (size_t i = 0; i < pagestyles.size(); ++i) if (pagestyles[i].first == sel) - nn = pageLayoutModule->pagestyleCO->findText( - toqstr(pagestyles[i].second)); + nn = pageLayoutModule->pagestyleCO->findText(pagestyles[i].second); if (nn > 0) pageLayoutModule->pagestyleCO->setCurrentIndex(nn); @@ -1239,13 +1405,22 @@ void GuiDocument::browseLayout() FileName layoutFile = support::makeAbsPath(fromqstr(file), fromqstr(bufferFilepath())); + int const ret = Alert::prompt(_("Local layout file"), + _("The layout file you have selected is a local layout\n" + "file, not one in the system or user directory. Your\n" + "document may not work with this layout if you do not\n" + "keep the layout file in the document directory."), + 1, 1, _("&Set Layout"), _("&Cancel")); + if (ret == 1) + return; + // load the layout file LayoutFileList & bcl = LayoutFileList::get(); string classname = layoutFile.onlyFileName(); - LayoutFileIndex name = bcl.addLayoutFile( + // 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(), - LayoutFileList::Local); + layoutFile.onlyPath().absFilename()); if (name.empty()) { Alert::error(_("Error"), @@ -1264,6 +1439,7 @@ void GuiDocument::browseLayout() latexModule->classCO->setCurrentIndex(0); } else latexModule->classCO->setCurrentIndex(idx); + classChanged(); } @@ -1288,29 +1464,23 @@ void GuiDocument::classChanged() if (idx < 0) return; string const classname = classes_model_.getIDString(idx); - // check if this is a local layout file - if (prefixIs(classname, LayoutFileList::localPrefix)) { - int const ret = Alert::prompt(_("Local layout file"), - _("The layout file you have selected is a local layout\n" - "file, not one in the system or user directory. Your\n" - "document may not work with this layout if you do not\n" - "keep the layout file in the same directory."), - 1, 1, _("&Set Layout"), _("&Cancel")); - if (ret == 1) { - // try to reset the layout combo - setLayoutComboByIDString(bp_.baseClassID()); - return; - } - } - // FIXME Note that by doing things this way, we load the TextClass - // as soon as it is selected. So, if you use the scroll wheel when - // sitting on the combo box, we'll load a lot of TextClass objects - // very quickly. This could be changed. - if (!bp_.setBaseClass(classname)) { - Alert::error(_("Error"), _("Unable to set document class.")); - return; + + // check whether the selected modules have changed. + bool modules_changed = false; + unsigned int const srows = selectedModel()->rowCount(); + if (srows != bp_.getModules().size()) + modules_changed = true; + else { + list::const_iterator mit = bp_.getModules().begin(); + list::const_iterator men = bp_.getModules().end(); + for (unsigned int i = 0; i < srows && mit != men; ++i, ++mit) + if (selectedModel()->getIDString(i) != *mit) { + modules_changed = true; + break; + } } - if (lyxrc.auto_reset_options) { + + if (modules_changed || lyxrc.auto_reset_options) { if (applyPB->isEnabled()) { int const ret = Alert::prompt(_("Unapplied changes"), _("Some changes in the dialog were not yet applied.\n" @@ -1319,9 +1489,35 @@ void GuiDocument::classChanged() if (ret == 0) applyView(); } - bp_.useClassDefaults(); - paramsToDialog(bp_); } + + // We load the TextClass as soon as it is selected. This is + // necessary so that other options in the dialog can be updated + // according to the new class. Note, however, that, if you use + // the scroll wheel when sitting on the combo box, we'll load a + // lot of TextClass objects very quickly.... + if (!bp_.setBaseClass(classname)) { + Alert::error(_("Error"), _("Unable to set document class.")); + return; + } + if (lyxrc.auto_reset_options) + bp_.useClassDefaults(); + + // With the introduction of modules came a distinction between the base + // class and the document class. The former corresponds to the main layout + // file; the latter is that plus the modules (or the document-specific layout, + // or whatever else there could be). Our parameters come from the document + // class. So when we set the base class, we also need to recreate the document + // class. Otherwise, we still have the old one. + bp_.makeDocumentClass(); + paramsToDialog(); +} + + +void GuiDocument::bibtexChanged(int n) +{ + biblioModule->bibtexOptionsED->setEnabled(n != 0); + changed(); } @@ -1331,25 +1527,25 @@ namespace { docstring formatStrVec(vector const & v, docstring const & s) { //this mess formats the list as "v[0], v[1], ..., [s] v[n]" - int const vSize = v.size(); if (v.size() == 0) return docstring(); - else if (v.size() == 1) - return from_ascii(v[0]); - else if (v.size() == 2) { + if (v.size() == 1) + return from_utf8(v[0]); + if (v.size() == 2) { docstring retval = _("%1$s and %2$s"); retval = subst(retval, _("and"), s); - return bformat(retval, from_ascii(v[0]), from_ascii(v[1])); + return bformat(retval, from_utf8(v[0]), from_utf8(v[1])); } - //The idea here is to format all but the last two items... + // The idea here is to format all but the last two items... + int const vSize = v.size(); docstring t2 = _("%1$s, %2$s"); - docstring retval = from_ascii(v[0]); + docstring retval = from_utf8(v[0]); for (int i = 1; i < vSize - 2; ++i) - retval = bformat(t2, retval, from_ascii(v[i])); + retval = bformat(t2, retval, from_utf8(v[i])); //...and then to plug them, and the last two, into this schema docstring t = _("%1$s, %2$s, and %3$s"); t = subst(t, _("and"), s); - return bformat(t, retval, from_ascii(v[vSize - 2]), from_ascii(v[vSize - 1])); + return bformat(t, retval, from_utf8(v[vSize - 2]), from_utf8(v[vSize - 1])); } vector idsToNames(vector const & idList) @@ -1369,45 +1565,92 @@ namespace { } +void GuiDocument::modulesToParams(BufferParams & bp) +{ + // update list of loaded modules + bp.clearLayoutModules(); + int const srows = modules_sel_model_.rowCount(); + for (int i = 0; i < srows; ++i) + bp.addLayoutModule(modules_sel_model_.getIDString(i)); + + // update the list of removed modules + bp.clearRemovedModules(); + LayoutModuleList const & reqmods = bp.baseClass()->defaultModules(); + list::const_iterator rit = reqmods.begin(); + list::const_iterator ren = reqmods.end(); + + // check each of the default modules + for (; rit != ren; rit++) { + list::const_iterator mit = bp.getModules().begin(); + list::const_iterator men = bp.getModules().end(); + bool found = false; + for (; mit != men; mit++) { + if (*rit == *mit) { + found = true; + break; + } + } + if (!found) { + // the module isn't present so must have been removed by the user + bp.addRemovedModule(*rit); + } + } +} + +void GuiDocument::modulesChanged() +{ + modulesToParams(bp_); + bp_.makeDocumentClass(); + paramsToDialog(); +} + + void GuiDocument::updateModuleInfo() { selectionManager->update(); //Module description - bool const focusOnSelected = selectionManager->selectedFocused(); + bool const focus_on_selected = selectionManager->selectedFocused(); QListView const * const lv = - focusOnSelected ? latexModule->selectedLV : latexModule->availableLV; + focus_on_selected ? modulesModule->selectedLV : modulesModule->availableLV; if (lv->selectionModel()->selectedIndexes().isEmpty()) { - latexModule->infoML->document()->clear(); + modulesModule->infoML->document()->clear(); return; } QModelIndex const & idx = lv->selectionModel()->currentIndex(); - GuiIdListModel const & idModel = - focusOnSelected ? modules_sel_model_ : modules_av_model_; - string const modName = idModel.getIDString(idx.row()); + GuiIdListModel const & id_model = + focus_on_selected ? modules_sel_model_ : modules_av_model_; + string const modName = id_model.getIDString(idx.row()); docstring desc = getModuleDescription(modName); - vector pkgList = getPackageList(modName); - docstring pkgdesc = formatStrVec(pkgList, _("and")); + LayoutModuleList const & provmods = bp_.baseClass()->providedModules(); + if (std::find(provmods.begin(), provmods.end(), modName) != provmods.end()) { + if (!desc.empty()) + desc += "\n"; + desc += _("Module provided by document class."); + } + + vector pkglist = getPackageList(modName); + docstring pkgdesc = formatStrVec(pkglist, _("and")); if (!pkgdesc.empty()) { if (!desc.empty()) desc += "\n"; desc += bformat(_("Package(s) required: %1$s."), pkgdesc); } - pkgList = getRequiredList(modName); - if (!pkgList.empty()) { - vector const reqDescs = idsToNames(pkgList); - pkgdesc = formatStrVec(reqDescs, _("or")); + pkglist = getRequiredList(modName); + if (!pkglist.empty()) { + vector const reqdescs = idsToNames(pkglist); + pkgdesc = formatStrVec(reqdescs, _("or")); if (!desc.empty()) desc += "\n"; desc += bformat(_("Module required: %1$s."), pkgdesc); } - pkgList = getExcludedList(modName); - if (!pkgList.empty()) { - vector const reqDescs = idsToNames(pkgList); - pkgdesc = formatStrVec(reqDescs, _( "and")); + pkglist = getExcludedList(modName); + if (!pkglist.empty()) { + vector const reqdescs = idsToNames(pkglist); + pkgdesc = formatStrVec(reqdescs, _( "and")); if (!desc.empty()) desc += "\n"; desc += bformat(_("Modules excluded: %1$s."), pkgdesc); @@ -1416,16 +1659,16 @@ void GuiDocument::updateModuleInfo() if (!isModuleAvailable(modName)) { if (!desc.empty()) desc += "\n"; - desc += _("WARNING: Some packages are unavailable!"); + desc += _("WARNING: Some required packages are unavailable!"); } - latexModule->infoML->document()->setPlainText(toqstr(desc)); + modulesModule->infoML->document()->setPlainText(toqstr(desc)); } void GuiDocument::updateNumbering() { - DocumentClass const & tclass = bp_.documentClass(); + DocumentClass const & tclass = documentClass(); numberingModule->tocTW->setUpdatesEnabled(false); numberingModule->tocTW->clear(); @@ -1453,38 +1696,93 @@ void GuiDocument::updateNumbering() } -void GuiDocument::apply(BufferParams & params) +void GuiDocument::updateDefaultFormat() +{ + // make a copy in order to consider unapplied changes + Buffer * tmpbuf = const_cast(&buffer()); + tmpbuf->params().useXetex = outputModule->xetexCB->isChecked(); + int idx = latexModule->classCO->currentIndex(); + if (idx >= 0) { + string const classname = classes_model_.getIDString(idx); + tmpbuf->params().setBaseClass(classname); + tmpbuf->params().makeDocumentClass(); + } + outputModule->defaultFormatCO->blockSignals(true); + outputModule->defaultFormatCO->clear(); + outputModule->defaultFormatCO->addItem(qt_("Default"), + QVariant(QString("default"))); + typedef vector Formats; + Formats formats = tmpbuf->exportableFormats(true); + Formats::const_iterator cit = formats.begin(); + Formats::const_iterator end = formats.end(); + for (; cit != end; ++cit) + outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()), + QVariant(toqstr((*cit)->name()))); + outputModule->defaultFormatCO->blockSignals(false); +} + + +void GuiDocument::applyView() { // preamble - preambleModule->apply(params); + preambleModule->apply(bp_); // biblio - params.setCiteEngine(ENGINE_BASIC); + bp_.setCiteEngine(ENGINE_BASIC); if (biblioModule->citeNatbibRB->isChecked()) { bool const use_numerical_citations = biblioModule->citeStyleCO->currentIndex(); if (use_numerical_citations) - params.setCiteEngine(ENGINE_NATBIB_NUMERICAL); + bp_.setCiteEngine(ENGINE_NATBIB_NUMERICAL); else - params.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR); + bp_.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR); } else if (biblioModule->citeJurabibRB->isChecked()) - params.setCiteEngine(ENGINE_JURABIB); + bp_.setCiteEngine(ENGINE_JURABIB); - params.use_bibtopic = + 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()) { - params.inputenc = "auto"; + bp_.inputenc = "auto"; } else { int i = langModule->encodingCO->currentIndex(); if (i == 0) - params.inputenc = "default"; - else - params.inputenc = - fromqstr(langModule->encodingCO->currentText()); + bp_.inputenc = "default"; + else { + QString const enc_gui = + langModule->encodingCO->currentText(); + Encodings::const_iterator it = encodings.begin(); + Encodings::const_iterator const end = encodings.end(); + bool found = false; + for (; it != end; ++it) { + if (qt_(it->guiName()) == enc_gui) { + bp_.inputenc = it->latexName(); + found = true; + break; + } + } + if (!found) { + // should not happen + lyxerr << "GuiDocument::apply: Unknown encoding! Resetting to default" << endl; + bp_.inputenc = "default"; + } + } } InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes; @@ -1508,109 +1806,104 @@ void GuiDocument::apply(BufferParams & params) lga = InsetQuotes::DanishQuotes; break; } - params.quotes_language = lga; + bp_.quotes_language = lga; QString const lang = langModule->languageCO->itemData( langModule->languageCO->currentIndex()).toString(); - params.language = lyx::languages.getLanguage(fromqstr(lang)); + bp_.language = languages.getLanguage(fromqstr(lang)); // numbering - if (params.documentClass().hasTocLevels()) { - params.tocdepth = numberingModule->tocSL->value(); - params.secnumdepth = numberingModule->depthSL->value(); + if (bp_.documentClass().hasTocLevels()) { + bp_.tocdepth = numberingModule->tocSL->value(); + bp_.secnumdepth = numberingModule->depthSL->value(); } // bullets - params.user_defined_bullet(0) = bulletsModule->getBullet(0); - params.user_defined_bullet(1) = bulletsModule->getBullet(1); - params.user_defined_bullet(2) = bulletsModule->getBullet(2); - params.user_defined_bullet(3) = bulletsModule->getBullet(3); + bp_.user_defined_bullet(0) = bulletsModule->bullet(0); + bp_.user_defined_bullet(1) = bulletsModule->bullet(1); + bp_.user_defined_bullet(2) = bulletsModule->bullet(2); + bp_.user_defined_bullet(3) = bulletsModule->bullet(3); // packages - params.graphicsDriver = + bp_.graphicsDriver = tex_graphics[latexModule->psdriverCO->currentIndex()]; // text layout int idx = latexModule->classCO->currentIndex(); if (idx >= 0) { string const classname = classes_model_.getIDString(idx); - params.setBaseClass(classname); + bp_.setBaseClass(classname); } // Modules - params.clearLayoutModules(); - int const srows = modules_sel_model_.rowCount(); - vector selModList; - for (int i = 0; i < srows; ++i) - params.addLayoutModule(modules_sel_model_.getIDString(i)); + modulesToParams(bp_); if (mathsModule->amsautoCB->isChecked()) { - params.use_amsmath = BufferParams::package_auto; + bp_.use_amsmath = BufferParams::package_auto; } else { if (mathsModule->amsCB->isChecked()) - params.use_amsmath = BufferParams::package_on; + bp_.use_amsmath = BufferParams::package_on; else - params.use_amsmath = BufferParams::package_off; + bp_.use_amsmath = BufferParams::package_off; } if (mathsModule->esintautoCB->isChecked()) - params.use_esint = BufferParams::package_auto; + bp_.use_esint = BufferParams::package_auto; else { if (mathsModule->esintCB->isChecked()) - params.use_esint = BufferParams::package_on; + bp_.use_esint = BufferParams::package_on; else - params.use_esint = BufferParams::package_off; + bp_.use_esint = BufferParams::package_off; } if (pageLayoutModule->pagestyleCO->currentIndex() == 0) - params.pagestyle = "default"; + bp_.pagestyle = "default"; else { - docstring style_gui = - qstring_to_ucs4(pageLayoutModule->pagestyleCO->currentText()); - for (size_t i = 0; i < pagestyles.size(); ++i) + QString style_gui = pageLayoutModule->pagestyleCO->currentText(); + for (size_t i = 0; i != pagestyles.size(); ++i) if (pagestyles[i].second == style_gui) - params.pagestyle = pagestyles[i].first; + bp_.pagestyle = pagestyles[i].first; } switch (textLayoutModule->lspacingCO->currentIndex()) { case 0: - params.spacing().set(Spacing::Single); + bp_.spacing().set(Spacing::Single); break; case 1: - params.spacing().set(Spacing::Onehalf); + bp_.spacing().set(Spacing::Onehalf); break; case 2: - params.spacing().set(Spacing::Double); + bp_.spacing().set(Spacing::Double); break; case 3: - params.spacing().set(Spacing::Other, - fromqstr(textLayoutModule->lspacingLE->text())); + bp_.spacing().set(Spacing::Other, + widgetToDoubleStr(textLayoutModule->lspacingLE)); break; } if (textLayoutModule->twoColumnCB->isChecked()) - params.columns = 2; + bp_.columns = 2; else - params.columns = 1; + bp_.columns = 1; // text should have passed validation - params.listings_params = + bp_.listings_params = InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params(); if (textLayoutModule->indentRB->isChecked()) - params.paragraph_separation = BufferParams::ParagraphIndentSeparation; + bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation; else - params.paragraph_separation = BufferParams::ParagraphSkipSeparation; + bp_.paragraph_separation = BufferParams::ParagraphSkipSeparation; switch (textLayoutModule->skipCO->currentIndex()) { case 0: - params.setDefSkip(VSpace(VSpace::SMALLSKIP)); + bp_.setDefSkip(VSpace(VSpace::SMALLSKIP)); break; case 1: - params.setDefSkip(VSpace(VSpace::MEDSKIP)); + bp_.setDefSkip(VSpace(VSpace::MEDSKIP)); break; case 2: - params.setDefSkip(VSpace(VSpace::BIGSKIP)); + bp_.setDefSkip(VSpace(VSpace::BIGSKIP)); break; case 3: { @@ -1618,100 +1911,136 @@ void GuiDocument::apply(BufferParams & params) widgetsToLength(textLayoutModule->skipLE, textLayoutModule->skipLengthCO) ); - params.setDefSkip(vs); + bp_.setDefSkip(vs); break; } default: // DocumentDefskipCB assures that this never happens // so Assert then !!! - jbl - params.setDefSkip(VSpace(VSpace::MEDSKIP)); + bp_.setDefSkip(VSpace(VSpace::MEDSKIP)); break; } - params.options = + bp_.options = fromqstr(latexModule->optionsLE->text()); + bp_.use_default_options = + latexModule->defaultOptionsCB->isChecked(); + if (latexModule->childDocGB->isChecked()) - params.master = + bp_.master = fromqstr(latexModule->childDocLE->text()); else - params.master = string(); + bp_.master = string(); - params.float_placement = floatModule->get(); + bp_.float_placement = floatModule->get(); - // fonts - params.fontsRoman = - tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()]; + // output + bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData( + outputModule->defaultFormatCO->currentIndex()).toString()); - params.fontsSans = - tex_fonts_sans[fontModule->fontsSansCO->currentIndex()]; + bool const xetex = outputModule->xetexCB->isChecked(); + bp_.useXetex = xetex; - params.fontsTypewriter = - tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()]; + // fonts + if (xetex) { + if (fontModule->fontsRomanCO->currentIndex() == 0) + bp_.fontsRoman = "default"; + else + bp_.fontsRoman = + fromqstr(fontModule->fontsRomanCO->currentText()); + + if (fontModule->fontsSansCO->currentIndex() == 0) + bp_.fontsSans = "default"; + else + bp_.fontsSans = + fromqstr(fontModule->fontsSansCO->currentText()); + + if (fontModule->fontsTypewriterCO->currentIndex() == 0) + bp_.fontsTypewriter = "default"; + else + bp_.fontsTypewriter = + fromqstr(fontModule->fontsTypewriterCO->currentText()); + } else { + bp_.fontsRoman = + tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()]; + + bp_.fontsSans = + tex_fonts_sans[fontModule->fontsSansCO->currentIndex()]; + + bp_.fontsTypewriter = + tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()]; + } - params.fontsCJK = + bp_.fontsCJK = fromqstr(fontModule->cjkFontLE->text()); - params.fontsSansScale = fontModule->scaleSansSB->value(); + bp_.fontsSansScale = fontModule->scaleSansSB->value(); - params.fontsTypewriterScale = fontModule->scaleTypewriterSB->value(); + bp_.fontsTypewriterScale = fontModule->scaleTypewriterSB->value(); - params.fontsSC = fontModule->fontScCB->isChecked(); + bp_.fontsSC = fontModule->fontScCB->isChecked(); - params.fontsOSF = fontModule->fontOsfCB->isChecked(); + bp_.fontsOSF = fontModule->fontOsfCB->isChecked(); - params.fontsDefaultFamily = GuiDocument::fontfamilies[ - fontModule->fontsDefaultCO->currentIndex()]; + if (xetex) + bp_.fontsDefaultFamily = "default"; + else + bp_.fontsDefaultFamily = GuiDocument::fontfamilies[ + fontModule->fontsDefaultCO->currentIndex()]; if (fontModule->fontsizeCO->currentIndex() == 0) - params.fontsize = "default"; + bp_.fontsize = "default"; else - params.fontsize = + bp_.fontsize = fromqstr(fontModule->fontsizeCO->currentText()); // paper - params.papersize = PAPER_SIZE( + 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); - params.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE, + bp_.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE, pageLayoutModule->paperwidthUnitCO); - params.paperheight = widgetsToLength(pageLayoutModule->paperheightLE, + bp_.paperheight = widgetsToLength(pageLayoutModule->paperheightLE, pageLayoutModule->paperheightUnitCO); if (pageLayoutModule->facingPagesCB->isChecked()) - params.sides = TwoSides; + bp_.sides = TwoSides; else - params.sides = OneSide; + bp_.sides = OneSide; if (pageLayoutModule->landscapeRB->isChecked()) - params.orientation = ORIENTATION_LANDSCAPE; + bp_.orientation = ORIENTATION_LANDSCAPE; else - params.orientation = ORIENTATION_PORTRAIT; + bp_.orientation = ORIENTATION_PORTRAIT; + + bp_.backgroundcolor = set_backgroundcolor; // margins - params.use_geometry = !marginsModule->marginCB->isChecked() + bp_.use_geometry = !marginsModule->marginCB->isChecked() || geom_papersize; Ui::MarginsUi const * m = marginsModule; - params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit); - params.topmargin = widgetsToLength(m->topLE, m->topUnit); - params.rightmargin = widgetsToLength(m->outerLE, m->outerUnit); - params.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit); - params.headheight = widgetsToLength(m->headheightLE, m->headheightUnit); - params.headsep = widgetsToLength(m->headsepLE, m->headsepUnit); - params.footskip = widgetsToLength(m->footskipLE, m->footskipUnit); - params.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit); + bp_.leftmargin = widgetsToLength(m->innerLE, m->innerUnit); + bp_.topmargin = widgetsToLength(m->topLE, m->topUnit); + bp_.rightmargin = widgetsToLength(m->outerLE, m->outerUnit); + bp_.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit); + bp_.headheight = widgetsToLength(m->headheightLE, m->headheightUnit); + bp_.headsep = widgetsToLength(m->headsepLE, m->headsepUnit); + bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit); + bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit); - branchesModule->apply(params); + // branches + branchesModule->apply(bp_); // PDF support - PDFOptions & pdf = params.pdfoptions(); + PDFOptions & pdf = bp_.pdfoptions(); pdf.use_hyperref = pdfSupportModule->use_hyperrefGB->isChecked(); pdf.title = fromqstr(pdfSupportModule->titleLE->text()); pdf.author = fromqstr(pdfSupportModule->authorLE->text()); @@ -1727,8 +2056,8 @@ void GuiDocument::apply(BufferParams & params) pdf.pdfborder = pdfSupportModule->pdfborderCB->isChecked(); pdf.pdfusetitle = pdfSupportModule->pdfusetitleCB->isChecked(); pdf.colorlinks = pdfSupportModule->colorlinksCB->isChecked(); - pdf.backref = pdfSupportModule->backrefCB->isChecked(); - pdf.pagebackref = pdfSupportModule->pagebackrefCB->isChecked(); + pdf.backref = + backref_opts[pdfSupportModule->backrefCO->currentIndex()]; if (pdfSupportModule->fullscreenCB->isChecked()) pdf.pagemode = pdf.pagemode_fullscreen; else @@ -1738,67 +2067,74 @@ void GuiDocument::apply(BufferParams & params) } -void GuiDocument::paramsToDialog(BufferParams const & params) +void GuiDocument::paramsToDialog() { // set the default unit - Length::UNIT defaultUnit = Length::CM; - switch (lyxrc.default_papersize) { - case PAPER_DEFAULT: break; - - case PAPER_USLETTER: - case PAPER_USLEGAL: - case PAPER_USEXECUTIVE: - defaultUnit = Length::IN; - break; - - case PAPER_A3: - case PAPER_A4: - case PAPER_A5: - case PAPER_B3: - case PAPER_B4: - case PAPER_B5: - defaultUnit = Length::CM; - break; - case PAPER_CUSTOM: - break; - } + Length::UNIT const defaultUnit = Length::defaultUnit(); // preamble - preambleModule->update(params, id()); + preambleModule->update(bp_, id()); // biblio biblioModule->citeDefaultRB->setChecked( - params.citeEngine() == ENGINE_BASIC); + bp_.citeEngine() == ENGINE_BASIC); biblioModule->citeNatbibRB->setChecked( - params.citeEngine() == ENGINE_NATBIB_NUMERICAL || - params.citeEngine() == ENGINE_NATBIB_AUTHORYEAR); + bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL || + bp_.citeEngine() == ENGINE_NATBIB_AUTHORYEAR); biblioModule->citeStyleCO->setCurrentIndex( - params.citeEngine() == ENGINE_NATBIB_NUMERICAL); + bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL); biblioModule->citeJurabibRB->setChecked( - params.citeEngine() == ENGINE_JURABIB); + bp_.citeEngine() == ENGINE_JURABIB); biblioModule->bibtopicCB->setChecked( - params.use_bibtopic); + 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( - params.language->lang())); + bp_.language->lang())); langModule->languageCO->setCurrentIndex(pos); langModule->quoteStyleCO->setCurrentIndex( - params.quotes_language); + bp_.quotes_language); bool default_enc = true; - if (params.inputenc != "auto") { + if (bp_.inputenc != "auto") { default_enc = false; - if (params.inputenc == "default") { + if (bp_.inputenc == "default") { langModule->encodingCO->setCurrentIndex(0); } else { + string enc_gui; + Encodings::const_iterator it = encodings.begin(); + Encodings::const_iterator const end = encodings.end(); + for (; it != end; ++it) { + if (it->latexName() == bp_.inputenc) { + enc_gui = it->guiName(); + break; + } + } int const i = langModule->encodingCO->findText( - toqstr(params.inputenc)); + qt_(enc_gui)); if (i >= 0) langModule->encodingCO->setCurrentIndex(i); else @@ -1816,10 +2152,10 @@ void GuiDocument::paramsToDialog(BufferParams const & params) numberingModule->setEnabled(true); numberingModule->depthSL->setMinimum(min_toclevel - 1); numberingModule->depthSL->setMaximum(max_toclevel); - numberingModule->depthSL->setValue(params.secnumdepth); + numberingModule->depthSL->setValue(bp_.secnumdepth); numberingModule->tocSL->setMaximum(min_toclevel - 1); numberingModule->tocSL->setMaximum(max_toclevel); - numberingModule->tocSL->setValue(params.tocdepth); + numberingModule->tocSL->setValue(bp_.tocdepth); updateNumbering(); } else { numberingModule->setEnabled(false); @@ -1827,29 +2163,29 @@ void GuiDocument::paramsToDialog(BufferParams const & params) } // bullets - bulletsModule->setBullet(0, params.user_defined_bullet(0)); - bulletsModule->setBullet(1, params.user_defined_bullet(1)); - bulletsModule->setBullet(2, params.user_defined_bullet(2)); - bulletsModule->setBullet(3, params.user_defined_bullet(3)); + bulletsModule->setBullet(0, bp_.user_defined_bullet(0)); + bulletsModule->setBullet(1, bp_.user_defined_bullet(1)); + bulletsModule->setBullet(2, bp_.user_defined_bullet(2)); + bulletsModule->setBullet(3, bp_.user_defined_bullet(3)); bulletsModule->init(); // packages - int nitem = findToken(tex_graphics, params.graphicsDriver); + int nitem = findToken(tex_graphics, bp_.graphicsDriver); if (nitem >= 0) latexModule->psdriverCO->setCurrentIndex(nitem); updateModuleInfo(); mathsModule->amsCB->setChecked( - params.use_amsmath == BufferParams::package_on); + bp_.use_amsmath == BufferParams::package_on); mathsModule->amsautoCB->setChecked( - params.use_amsmath == BufferParams::package_auto); + bp_.use_amsmath == BufferParams::package_auto); mathsModule->esintCB->setChecked( - params.use_esint == BufferParams::package_on); + bp_.use_esint == BufferParams::package_on); mathsModule->esintautoCB->setChecked( - params.use_esint == BufferParams::package_auto); + bp_.use_esint == BufferParams::package_auto); - switch (params.spacing().getSpace()) { + switch (bp_.spacing().getSpace()) { case Spacing::Other: nitem = 3; break; case Spacing::Double: nitem = 2; break; case Spacing::Onehalf: nitem = 1; break; @@ -1857,26 +2193,26 @@ void GuiDocument::paramsToDialog(BufferParams const & params) } // text layout - string const & layoutID = params.baseClassID(); + string const & layoutID = bp_.baseClassID(); setLayoutComboByIDString(layoutID); updatePagestyle(documentClass().opt_pagestyle(), - params.pagestyle); + bp_.pagestyle); textLayoutModule->lspacingCO->setCurrentIndex(nitem); - if (params.spacing().getSpace() == Spacing::Other) { - textLayoutModule->lspacingLE->setText( - toqstr(params.spacing().getValueAsString())); + if (bp_.spacing().getSpace() == Spacing::Other) { + doubleToWidget(textLayoutModule->lspacingLE, + bp_.spacing().getValueAsString()); } setLSpacing(nitem); - if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation) + if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation) textLayoutModule->indentRB->setChecked(true); else textLayoutModule->skipRB->setChecked(true); int skip = 0; - switch (params.getDefSkip().kind()) { + switch (bp_.getDefSkip().kind()) { case VSpace::SMALLSKIP: skip = 0; break; @@ -1889,7 +2225,7 @@ void GuiDocument::paramsToDialog(BufferParams const & params) case VSpace::LENGTH: { skip = 3; - string const length = params.getDefSkip().asLyXCommand(); + string const length = bp_.getDefSkip().asLyXCommand(); lengthToWidgets(textLayoutModule->skipLE, textLayoutModule->skipLengthCO, length, defaultUnit); @@ -1903,120 +2239,190 @@ void GuiDocument::paramsToDialog(BufferParams const & params) setSkip(skip); textLayoutModule->twoColumnCB->setChecked( - params.columns == 2); + bp_.columns == 2); // break listings_params to multiple lines string lstparams = - InsetListingsParams(params.listings_params).separatedParams(); + InsetListingsParams(bp_.listings_params).separatedParams(); textLayoutModule->listingsED->setPlainText(toqstr(lstparams)); - if (!params.options.empty()) { + if (!bp_.options.empty()) { latexModule->optionsLE->setText( - toqstr(params.options)); + toqstr(bp_.options)); } else { latexModule->optionsLE->setText(QString()); } - if (!params.master.empty()) { + // latex + latexModule->defaultOptionsCB->setChecked( + bp_.use_default_options); + updateSelectedModules(); + selectionManager->updateProvidedModules( + bp_.baseClass()->providedModules()); + selectionManager->updateExcludedModules( + bp_.baseClass()->excludedModules()); + + if (!documentClass().options().empty()) { + latexModule->defaultOptionsLE->setText( + toqstr(documentClass().options())); + } else { + latexModule->defaultOptionsLE->setText( + toqstr(_("[No options predefined]"))); + } + + latexModule->defaultOptionsLE->setEnabled( + bp_.use_default_options + && !documentClass().options().empty()); + + latexModule->defaultOptionsCB->setEnabled( + !documentClass().options().empty()); + + if (!bp_.master.empty()) { latexModule->childDocGB->setChecked(true); latexModule->childDocLE->setText( - toqstr(params.master)); + toqstr(bp_.master)); } else { latexModule->childDocLE->setText(QString()); latexModule->childDocGB->setChecked(false); } - floatModule->set(params.float_placement); + floatModule->set(bp_.float_placement); + + // Output + // update combobox with formats + updateDefaultFormat(); + int index = outputModule->defaultFormatCO->findData(toqstr( + bp_.defaultOutputFormat)); + // set to default if format is not found + if (index == -1) + index = 0; + outputModule->defaultFormatCO->setCurrentIndex(index); + outputModule->xetexCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX); + outputModule->xetexCB->setChecked( + bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex); // Fonts updateFontsize(documentClass().opt_fontsize(), - params.fontsize); - - int n = findToken(tex_fonts_roman, params.fontsRoman); - if (n >= 0) { - fontModule->fontsRomanCO->setCurrentIndex(n); - romanChanged(n); - } - - n = findToken(tex_fonts_sans, params.fontsSans); - if (n >= 0) { - fontModule->fontsSansCO->setCurrentIndex(n); - sansChanged(n); - } + bp_.fontsize); - n = findToken(tex_fonts_monospaced, params.fontsTypewriter); - if (n >= 0) { - fontModule->fontsTypewriterCO->setCurrentIndex(n); - ttChanged(n); + if (bp_.useXetex) { + for (int i = 0; i < fontModule->fontsRomanCO->count(); ++i) { + if (fontModule->fontsRomanCO->itemText(i) == toqstr(bp_.fontsRoman)) { + fontModule->fontsRomanCO->setCurrentIndex(i); + return; + } + } + + for (int i = 0; i < fontModule->fontsSansCO->count(); ++i) { + if (fontModule->fontsSansCO->itemText(i) == toqstr(bp_.fontsSans)) { + fontModule->fontsSansCO->setCurrentIndex(i); + return; + } + } + for (int i = 0; i < fontModule->fontsTypewriterCO->count(); ++i) { + if (fontModule->fontsTypewriterCO->itemText(i) == + toqstr(bp_.fontsTypewriter)) { + fontModule->fontsTypewriterCO->setCurrentIndex(i); + return; + } + } + } else { + int n = findToken(tex_fonts_roman, bp_.fontsRoman); + if (n >= 0) { + fontModule->fontsRomanCO->setCurrentIndex(n); + romanChanged(n); + } + + n = findToken(tex_fonts_sans, bp_.fontsSans); + if (n >= 0) { + fontModule->fontsSansCO->setCurrentIndex(n); + sansChanged(n); + } + + n = findToken(tex_fonts_monospaced, bp_.fontsTypewriter); + if (n >= 0) { + fontModule->fontsTypewriterCO->setCurrentIndex(n); + ttChanged(n); + } } - if (!params.fontsCJK.empty()) + if (!bp_.fontsCJK.empty()) fontModule->cjkFontLE->setText( - toqstr(params.fontsCJK)); + toqstr(bp_.fontsCJK)); else fontModule->cjkFontLE->setText(QString()); - fontModule->fontScCB->setChecked(params.fontsSC); - fontModule->fontOsfCB->setChecked(params.fontsOSF); - fontModule->scaleSansSB->setValue(params.fontsSansScale); - fontModule->scaleTypewriterSB->setValue(params.fontsTypewriterScale); - n = findToken(GuiDocument::fontfamilies, params.fontsDefaultFamily); - if (n >= 0) - fontModule->fontsDefaultCO->setCurrentIndex(n); + fontModule->fontScCB->setChecked(bp_.fontsSC); + 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); // paper - int const psize = params.papersize; + bool const extern_geometry = + documentClass().provides("geometry"); + int const psize = bp_.papersize; pageLayoutModule->papersizeCO->setCurrentIndex(psize); - setCustomPapersize(psize); + setCustomPapersize(!extern_geometry && psize); + pageLayoutModule->papersizeCO->setEnabled(!extern_geometry); bool const landscape = - params.orientation == ORIENTATION_LANDSCAPE; + bp_.orientation == ORIENTATION_LANDSCAPE; pageLayoutModule->landscapeRB->setChecked(landscape); pageLayoutModule->portraitRB->setChecked(!landscape); + pageLayoutModule->landscapeRB->setEnabled(!extern_geometry); + pageLayoutModule->portraitRB->setEnabled(!extern_geometry); pageLayoutModule->facingPagesCB->setChecked( - params.sides == TwoSides); + bp_.sides == TwoSides); + pageLayoutModule->backgroundPB->setStyleSheet( + colorButtonStyleSheet(rgb2qcolor(bp_.backgroundcolor))); + set_backgroundcolor = bp_.backgroundcolor; lengthToWidgets(pageLayoutModule->paperwidthLE, - pageLayoutModule->paperwidthUnitCO, params.paperwidth, defaultUnit); - + pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, defaultUnit); lengthToWidgets(pageLayoutModule->paperheightLE, - pageLayoutModule->paperheightUnitCO, params.paperheight, defaultUnit); + pageLayoutModule->paperheightUnitCO, bp_.paperheight, defaultUnit); // margins Ui::MarginsUi * m = marginsModule; - setMargins(!params.use_geometry); + setMargins(!bp_.use_geometry); lengthToWidgets(m->topLE, m->topUnit, - params.topmargin, defaultUnit); + bp_.topmargin, defaultUnit); lengthToWidgets(m->bottomLE, m->bottomUnit, - params.bottommargin, defaultUnit); + bp_.bottommargin, defaultUnit); lengthToWidgets(m->innerLE, m->innerUnit, - params.leftmargin, defaultUnit); + bp_.leftmargin, defaultUnit); lengthToWidgets(m->outerLE, m->outerUnit, - params.rightmargin, defaultUnit); + bp_.rightmargin, defaultUnit); lengthToWidgets(m->headheightLE, m->headheightUnit, - params.headheight, defaultUnit); + bp_.headheight, defaultUnit); lengthToWidgets(m->headsepLE, m->headsepUnit, - params.headsep, defaultUnit); + bp_.headsep, defaultUnit); lengthToWidgets(m->footskipLE, m->footskipUnit, - params.footskip, defaultUnit); + bp_.footskip, defaultUnit); lengthToWidgets(m->columnsepLE, m->columnsepUnit, - params.columnsep, defaultUnit); + bp_.columnsep, defaultUnit); - branchesModule->update(params); + // branches + updateUnknownBranches(); + branchesModule->update(bp_); // PDF support - PDFOptions const & pdf = params.pdfoptions(); + PDFOptions const & pdf = bp_.pdfoptions(); pdfSupportModule->use_hyperrefGB->setChecked(pdf.use_hyperref); pdfSupportModule->titleLE->setText(toqstr(pdf.title)); pdfSupportModule->authorLE->setText(toqstr(pdf.author)); @@ -2033,19 +2439,23 @@ void GuiDocument::paramsToDialog(BufferParams const & params) pdfSupportModule->pdfborderCB->setChecked(pdf.pdfborder); pdfSupportModule->pdfusetitleCB->setChecked(pdf.pdfusetitle); pdfSupportModule->colorlinksCB->setChecked(pdf.colorlinks); - pdfSupportModule->backrefCB->setChecked(pdf.backref); - pdfSupportModule->pagebackrefCB->setChecked(pdf.pagebackref); + + nn = findToken(backref_opts, pdf.backref); + if (nn >= 0) + pdfSupportModule->backrefCO->setCurrentIndex(nn); + pdfSupportModule->fullscreenCB->setChecked (pdf.pagemode == pdf.pagemode_fullscreen); pdfSupportModule->optionsLE->setText( toqstr(pdf.quoted_options)); -} + // Make sure that the bc is in the INITIAL state + if (bc().policy().buttonStatus(ButtonPolicy::RESTORE)) + bc().restore(); -void GuiDocument::applyView() -{ - apply(params()); + // clear changed branches cache + changedBranches_.clear(); } @@ -2060,27 +2470,24 @@ void GuiDocument::saveDocDefault() void GuiDocument::updateAvailableModules() { modules_av_model_.clear(); - vector const & modInfoList = getModuleInfo(); - int const mSize = modInfoList.size(); - for (int i = 0; i != mSize; ++i) { - modInfoStruct const & modInfo = modInfoList[i]; - modules_av_model_.insertRow(i, modInfo.name, modInfo.id, - modInfo.description); - } + list const & modInfoList = getModuleInfo(); + list::const_iterator mit = modInfoList.begin(); + list::const_iterator men = modInfoList.end(); + for (int i = 0; mit != men; ++mit, ++i) + modules_av_model_.insertRow(i, mit->name, mit->id, + mit->description); } void GuiDocument::updateSelectedModules() { - // and selected ones, too modules_sel_model_.clear(); - vector const selModList = getSelectedModules(); - int const sSize = selModList.size(); - for (int i = 0; i != sSize; ++i) { - modInfoStruct const & modInfo = selModList[i]; - modules_sel_model_.insertRow(i, modInfo.name, modInfo.id, - modInfo.description); - } + list const selModList = getSelectedModules(); + list::const_iterator mit = selModList.begin(); + list::const_iterator men = selModList.end(); + for (int i = 0; mit != men; ++mit, ++i) + modules_sel_model_.insertRow(i, mit->name, mit->id, + mit->description); } @@ -2109,11 +2516,11 @@ void GuiDocument::useClassDefaults() return; } bp_.useClassDefaults(); - paramsToDialog(bp_); + paramsToDialog(); } -void GuiDocument::setLayoutComboByIDString(std::string const & idString) +void GuiDocument::setLayoutComboByIDString(string const & idString) { int idx = classes_model_.findIDString(idString); if (idx < 0) @@ -2126,7 +2533,7 @@ void GuiDocument::setLayoutComboByIDString(std::string const & idString) bool GuiDocument::isValid() { - return validate_listings_params().empty() + return validateListingsParameters().isEmpty() && (textLayoutModule->skipCO->currentIndex() != 3 || !textLayoutModule->skipLE->text().isEmpty()); } @@ -2144,21 +2551,20 @@ char const * GuiDocument::fontfamilies_gui[5] = { bool GuiDocument::initialiseParams(string const &) { - BufferView * view = bufferview(); + BufferView const * view = bufferview(); if (!view) { bp_ = BufferParams(); - paramsToDialog(bp_); + paramsToDialog(); return true; } bp_ = view->buffer().params(); loadModuleInfo(); updateAvailableModules(); - updateSelectedModules(); //FIXME It'd be nice to make sure here that the selected //modules are consistent: That required modules are actually //selected, and that we don't have conflicts. If so, we could //at least pop up a warning. - paramsToDialog(bp_); + paramsToDialog(); return true; } @@ -2176,24 +2582,25 @@ BufferId GuiDocument::id() const } -vector const & GuiDocument::getModuleInfo() +list const & GuiDocument::getModuleInfo() { return moduleNames_; } -vector const GuiDocument::getSelectedModules() +list const + GuiDocument::makeModuleInfo(LayoutModuleList const & mods) { - vector const & mods = params().getModules(); - vector::const_iterator it = mods.begin(); - vector::const_iterator end = mods.end(); - vector mInfo; + LayoutModuleList::const_iterator it = mods.begin(); + LayoutModuleList::const_iterator end = mods.end(); + list mInfo; for (; it != end; ++it) { modInfoStruct m; m.id = *it; LyXModule * mod = moduleList[*it]; if (mod) - m.name = qt_(mod->getName()); + // FIXME Unicode + m.name = toqstr(translateIfPossible(from_utf8(mod->getName()))); else m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")"); mInfo.push_back(m); @@ -2202,6 +2609,18 @@ vector const GuiDocument::getSelectedModules() } +list const GuiDocument::getSelectedModules() +{ + return makeModuleInfo(params().getModules()); +} + + +list const GuiDocument::getProvidedModules() +{ + return makeModuleInfo(params().baseClass()->providedModules()); +} + + DocumentClass const & GuiDocument::documentClass() const { return bp_.documentClass(); @@ -2233,7 +2652,19 @@ void GuiDocument::dispatchParams() support::onlyPath(buffer().absFileName())); if (isLyXFilename(master_file.absFilename())) { Buffer * master = checkAndLoadLyXFile(master_file); - buffer().setParent(master); + if (master) { + if (master->isChild(const_cast(&buffer()))) + const_cast(buffer()).setParent(master); + else + Alert::warning(_("Assigned master does not include this file"), + bformat(_("You must include this file in the document\n" + "'%1$s' in order to use the master document\n" + "feature."), from_utf8(params().master))); + } else + Alert::warning(_("Could not load master"), + bformat(_("The master document '%1$s'\n" + "could not be loaded."), + from_utf8(params().master))); } } @@ -2243,9 +2674,9 @@ void GuiDocument::dispatchParams() BranchList::const_iterator it = branchlist.begin(); BranchList::const_iterator const end = branchlist.end(); for (; it != end; ++it) { - docstring const & current_branch = it->getBranch(); + docstring const & current_branch = it->branch(); Branch const * branch = branchlist.find(current_branch); - string const x11hexname = X11hexname(branch->getColor()); + string const x11hexname = X11hexname(branch->color()); // display the new color docstring const str = current_branch + ' ' + from_ascii(x11hexname); dispatch(FuncRequest(LFUN_SET_COLOR, str)); @@ -2255,8 +2686,28 @@ 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()->processUpdateFlags(Update::Force | Update::FitCursor); + BufferView * bv = const_cast(bufferview()); + bv->processUpdateFlags(Update::Force | Update::FitCursor); } @@ -2302,6 +2753,10 @@ bool GuiDocument::isFontAvailable(string const & font) const bool GuiDocument::providesOSF(string const & font) const { + if (outputModule->xetexCB->isChecked()) + // FIXME: we should check if the fonts really + // have OSF support. But how? + return true; if (font == "cmr") return isFontAvailable("eco"); if (font == "palatino") @@ -2312,6 +2767,8 @@ bool GuiDocument::providesOSF(string const & font) const bool GuiDocument::providesSC(string const & font) const { + if (outputModule->xetexCB->isChecked()) + return false; if (font == "palatino") return isFontAvailable("mathpazo"); if (font == "utopia") @@ -2322,6 +2779,8 @@ bool GuiDocument::providesSC(string const & font) const bool GuiDocument::providesScale(string const & font) const { + if (outputModule->xetexCB->isChecked()) + return true; return font == "helvet" || font == "luximono" || font == "berasans" || font == "beramono"; } @@ -2335,9 +2794,12 @@ void GuiDocument::loadModuleInfo() for (; it != end; ++it) { modInfoStruct m; m.id = it->getID(); - m.name = qt_(it->getName()); + // FIXME Unicode + m.name = toqstr(translateIfPossible(from_utf8(it->getName()))); // this is supposed to give us the first sentence of the description - QString desc = qt_(it->getDescription()); + // FIXME Unicode + QString desc = + toqstr(translateIfPossible(from_utf8(it->getDescription()))); int const pos = desc.indexOf("."); if (pos > 0) desc.truncate(pos + 1); @@ -2347,10 +2809,49 @@ 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); } } // namespace frontend } // namespace lyx -#include "GuiDocument_moc.cpp" +#include "moc_GuiDocument.cpp"