X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=7c019ebdc25b96e2347c40c5c833cfccbaaa588f;hb=6a5a7d7e2087d97a3428216cab7afab5ea2f901a;hp=ab3b065cab5cb5a8d5283095f9c5016850283676;hpb=3b00c86b9df490105f67db76a2e89e975ce678d5;p=lyx.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index ab3b065cab..7c019ebdc2 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -15,6 +15,7 @@ #include "GuiApplication.h" #include "GuiBranches.h" +#include "GuiSelectionManager.h" #include "LaTeXHighlighter.h" #include "LengthCombo.h" #include "PanelStack.h" @@ -56,6 +57,7 @@ #include #include +#include #ifdef IN #undef IN @@ -70,15 +72,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,7 +135,19 @@ 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 @@ -140,7 +160,7 @@ 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 @@ -156,82 +176,99 @@ public: } 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!"); + return _(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) +///////////////////////////////////////////////////////////////////// +// +// ModuleSelectionManager +// +///////////////////////////////////////////////////////////////////// + +/// 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) + : GuiSelectionManager(availableLV, selectedLV, addPB, delPB, + upPB, downPB, availableModel, selectedModel) + {} +private: + /// + virtual void updateAddPB(); + /// + virtual void updateUpPB(); + /// + virtual void updateDownPB(); + /// + virtual void updateDelPB(); + /// returns availableModel as a GuiIdListModel + GuiIdListModel * getAvailableModel() { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //empty such thing - return mod->getPackageList(); + return dynamic_cast(availableModel); } - - - bool isModuleAvailable(string const & modName) + /// returns selectedModel as a GuiIdListModel + GuiIdListModel * getSelectedModel() { - 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(selectedModel); + } +}; -void ModuleSelMan::updateAddPB() +void ModuleSelectionManager::updateAddPB() { int const arows = availableModel->rowCount(); QModelIndexList const availSels = @@ -259,7 +296,7 @@ void ModuleSelMan::updateAddPB() vector::const_iterator selModStart = selModList.begin(); vector::const_iterator selModEnd = selModList.end(); - //Check whether some required module is available + // Check whether some required module is available if (!reqs.empty()) { bool foundOne = false; vector::const_iterator it = reqs.begin(); @@ -276,7 +313,7 @@ void ModuleSelMan::updateAddPB() } } - //Check whether any excluded module is being used + // Check whether any excluded module is being used if (!excl.empty()) { vector::const_iterator it = excl.begin(); vector::const_iterator end = excl.end(); @@ -292,71 +329,59 @@ void ModuleSelMan::updateAddPB() } -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) { - 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... + 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 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()); } -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); + + // determine whether immediately preceding element is required by this one vector reqs = getRequiredList(curModName); - //if this one doesn't require anything.... + // if this one doesn't require anything.... if (reqs.empty()) { upPB->setEnabled(true); return; @@ -364,42 +389,36 @@ void ModuleSelMan::updateUpPB() 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 + // 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. upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == 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 = selectedLV->selectionModel()->currentIndex(); int const curRow = curIdx.row(); - if (curRow < 0 || curRow >= srows) { //this shouldn't happen + if (curRow < 0 || curRow >= srows) { // invalid index? 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. 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. + // 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); @@ -408,33 +427,33 @@ void ModuleSelMan::updateDelPB() //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; + // 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; + // lyxerr << mod << " does the trick." << std::endl; foundOne = true; break; } } - //did we find a module to satisfy the require? + // did we find a module to satisfy the require? if (!foundOne) { - //lyxerr << "No matching module found." << std::endl; + // 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 +464,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 +493,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 +578,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( @@ -710,35 +729,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 +815,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''")); @@ -866,7 +887,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,15 +899,18 @@ 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, + selectionManager = + new ModuleSelectionManager(latexModule->availableLV, + latexModule->selectedLV, latexModule->addPB, latexModule->deletePB, latexModule->upPB, latexModule->downPB, availableModel(), selectedModel()); @@ -933,14 +959,14 @@ GuiDocument::GuiDocument(GuiView & lv) pdfSupportModule = new UiWidget; connect(pdfSupportModule->use_hyperrefGB, SIGNAL(toggled(bool)), - this, SLOT(useHyperrefClicked())); - connect(pdfSupportModule->titleLE, SIGNAL(textChanged(const QString &)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->authorLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->titleLE, SIGNAL(textChanged(QString)), + this, SLOT(change_adaptor())); + 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,17 +982,18 @@ 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()), @@ -1013,55 +1040,47 @@ void GuiDocument::useDefaultsClicked() } -void GuiDocument::useHyperrefClicked() -{ - // strange as it is, Qt seems to be unable to handle this by itself - pdfSupportModule->bookmarksopenlevelLA->setEnabled( - pdfSupportModule->bookmarksopenlevelSB->isEnabled()); - change_adaptor(); -} - - void GuiDocument::change_adaptor() { changed(); } -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); } } @@ -1209,11 +1228,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") { @@ -1225,8 +1244,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); @@ -1248,13 +1266,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"), @@ -1273,6 +1300,7 @@ void GuiDocument::browseLayout() latexModule->classCO->setCurrentIndex(0); } else latexModule->classCO->setCurrentIndex(idx); + classChanged(); } @@ -1297,29 +1325,33 @@ 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. + + // 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) { + + // check whether the selected modules have changed. + bool modulesChanged = false; + unsigned int const srows = selectedModel()->rowCount(); + if (srows != bp_.getModules().size()) + modulesChanged = 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) { + modulesChanged = true; + break; + } + } + + if (modulesChanged || lyxrc.auto_reset_options) { if (applyPB->isEnabled()) { int const ret = Alert::prompt(_("Unapplied changes"), _("Some changes in the dialog were not yet applied.\n" @@ -1328,9 +1360,19 @@ void GuiDocument::classChanged() if (ret == 0) applyView(); } - bp_.useClassDefaults(); - paramsToDialog(bp_); - } + 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(); + // the new class may require some default modules. + updateSelectedModules(); + paramsToDialog(); } @@ -1340,17 +1382,17 @@ 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) + if (v.size() == 1) return from_ascii(v[0]); - else if (v.size() == 2) { + 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])); } - //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]); for (int i = 1; i < vSize - 2; ++i) @@ -1434,7 +1476,7 @@ void GuiDocument::updateModuleInfo() void GuiDocument::updateNumbering() { - DocumentClass const & tclass = bp_.documentClass(); + DocumentClass const & tclass = documentClass(); numberingModule->tocTW->setUpdatesEnabled(false); numberingModule->tocTW->clear(); @@ -1491,9 +1533,25 @@ void GuiDocument::apply(BufferParams & params) int i = langModule->encodingCO->currentIndex(); if (i == 0) params.inputenc = "default"; - else - params.inputenc = - fromqstr(langModule->encodingCO->currentText()); + 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) { + params.inputenc = it->latexName(); + found = true; + break; + } + } + if (!found) { + // should not happen + lyxerr << "GuiDocument::apply: Unknown encoding! Resetting to default" << endl; + params.inputenc = "default"; + } + } } InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes; @@ -1530,10 +1588,10 @@ void GuiDocument::apply(BufferParams & params) } // 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); + params.user_defined_bullet(0) = bulletsModule->bullet(0); + params.user_defined_bullet(1) = bulletsModule->bullet(1); + params.user_defined_bullet(2) = bulletsModule->bullet(2); + params.user_defined_bullet(3) = bulletsModule->bullet(3); // packages params.graphicsDriver = @@ -1552,6 +1610,27 @@ void GuiDocument::apply(BufferParams & params) vector selModList; for (int i = 0; i < srows; ++i) params.addLayoutModule(modules_sel_model_.getIDString(i)); + // update the list of removed modules + params.clearRemovedModules(); + list const & reqmods = params.baseClass()->defaultModules(); + list::const_iterator rit = reqmods.begin(); + list::const_iterator ren = reqmods.end(); + // check each of the required modules + for (; rit != ren; rit++) { + list::const_iterator mit = params.getModules().begin(); + list::const_iterator men = params.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 + params.addRemovedModule(*rit); + } + } if (mathsModule->amsautoCB->isChecked()) { params.use_amsmath = BufferParams::package_auto; @@ -1574,9 +1653,8 @@ void GuiDocument::apply(BufferParams & params) if (pageLayoutModule->pagestyleCO->currentIndex() == 0) params.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; } @@ -1640,6 +1718,9 @@ void GuiDocument::apply(BufferParams & params) params.options = fromqstr(latexModule->optionsLE->text()); + params.use_default_options = + latexModule->defaultOptionsCB->isChecked(); + if (latexModule->childDocGB->isChecked()) params.master = fromqstr(latexModule->childDocLE->text()); @@ -1736,8 +1817,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 @@ -1747,7 +1828,7 @@ void GuiDocument::apply(BufferParams & params) } -void GuiDocument::paramsToDialog(BufferParams const & params) +void GuiDocument::paramsToDialog() { // set the default unit Length::UNIT defaultUnit = Length::CM; @@ -1773,41 +1854,50 @@ void GuiDocument::paramsToDialog(BufferParams const & params) } // 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); // 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 @@ -1825,10 +1915,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); @@ -1836,29 +1926,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; @@ -1866,26 +1956,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) { + if (bp_.spacing().getSpace() == Spacing::Other) { textLayoutModule->lspacingLE->setText( - toqstr(params.spacing().getValueAsString())); + toqstr(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; @@ -1898,7 +1988,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); @@ -1912,120 +2002,139 @@ 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); + + 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); // Fonts updateFontsize(documentClass().opt_fontsize(), - params.fontsize); + bp_.fontsize); - int n = findToken(tex_fonts_roman, params.fontsRoman); + int n = findToken(tex_fonts_roman, bp_.fontsRoman); if (n >= 0) { fontModule->fontsRomanCO->setCurrentIndex(n); romanChanged(n); } - n = findToken(tex_fonts_sans, params.fontsSans); + n = findToken(tex_fonts_sans, bp_.fontsSans); if (n >= 0) { fontModule->fontsSansCO->setCurrentIndex(n); sansChanged(n); } - n = findToken(tex_fonts_monospaced, params.fontsTypewriter); + 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); + fontModule->fontScCB->setChecked(bp_.fontsSC); + fontModule->fontOsfCB->setChecked(bp_.fontsOSF); + fontModule->scaleSansSB->setValue(bp_.fontsSansScale); + fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale); + n = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily); if (n >= 0) fontModule->fontsDefaultCO->setCurrentIndex(n); // paper - int const psize = params.papersize; + int const psize = bp_.papersize; pageLayoutModule->papersizeCO->setCurrentIndex(psize); setCustomPapersize(psize); bool const landscape = - params.orientation == ORIENTATION_LANDSCAPE; + bp_.orientation == ORIENTATION_LANDSCAPE; pageLayoutModule->landscapeRB->setChecked(landscape); pageLayoutModule->portraitRB->setChecked(!landscape); pageLayoutModule->facingPagesCB->setChecked( - params.sides == TwoSides); + bp_.sides == TwoSides); 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); + 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)); @@ -2042,8 +2151,11 @@ 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); + + n = findToken(backref_opts, pdf.backref); + if (n >= 0) + pdfSupportModule->backrefCO->setCurrentIndex(n); + pdfSupportModule->fullscreenCB->setChecked (pdf.pagemode == pdf.pagemode_fullscreen); @@ -2069,27 +2181,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); } @@ -2118,11 +2227,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) @@ -2135,7 +2244,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()); } @@ -2153,10 +2262,10 @@ 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(); @@ -2167,7 +2276,7 @@ bool GuiDocument::initialiseParams(string const &) //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; } @@ -2185,18 +2294,18 @@ BufferId GuiDocument::id() const } -vector const & GuiDocument::getModuleInfo() +list const & GuiDocument::getModuleInfo() { return moduleNames_; } -vector const GuiDocument::getSelectedModules() +list const GuiDocument::getSelectedModules() { - vector const & mods = params().getModules(); - vector::const_iterator it = mods.begin(); - vector::const_iterator end = mods.end(); - vector mInfo; + list const & mods = params().getModules(); + list::const_iterator it = mods.begin(); + list::const_iterator end = mods.end(); + list mInfo; for (; it != end; ++it) { modInfoStruct m; m.id = *it; @@ -2242,7 +2351,7 @@ void GuiDocument::dispatchParams() support::onlyPath(buffer().absFileName())); if (isLyXFilename(master_file.absFilename())) { Buffer * master = checkAndLoadLyXFile(master_file); - buffer().setParent(master); + const_cast(buffer()).setParent(master); } } @@ -2252,9 +2361,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)); @@ -2265,7 +2374,8 @@ void GuiDocument::dispatchParams() "assign branch")); } // 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); }