#include "insets/InsetListingsParams.h"
-//#include "support/debug.h"
#include "support/FileName.h"
#include "support/filetools.h"
#include "support/lstrings.h"
+#include "frontends/alert.h"
+
#include <boost/bind.hpp>
#include <QCloseEvent>
using namespace std;
using namespace lyx::support;
+
///
template<class Pair>
vector<typename Pair::second_type> const
return tmp;
}
+
char const * const tex_graphics[] =
{
"default", "dvips", "dvitops", "emtex",
namespace lyx {
namespace frontend {
+
+///
+QModelIndex getSelectedIndex(QListView * lv)
+{
+ QModelIndex retval = QModelIndex();
+ QModelIndexList selIdx =
+ lv->selectionModel()->selectedIndexes();
+ if (!selIdx.empty())
+ retval = selIdx.first();
+ return retval;
+}
+
+
namespace {
vector<string> getRequiredList(string const & modName)
{
LyXModule const * const mod = moduleList[modName];
if (!mod)
return _("Module not found!");
- return from_ascii(mod->getDescription());
+ return _(mod->getDescription());
}
QPushButton * delPB,
QPushButton * upPB,
QPushButton * downPB,
- QStringListModel * availableModel,
- QStringListModel * selectedModel) :
+ GuiIdListModel * availableModel,
+ GuiIdListModel * selectedModel) :
GuiSelectionManager(availableLV, selectedLV, addPB, delPB,
upPB, downPB, availableModel, selectedModel)
{}
-
+
void ModuleSelMan::updateAddPB()
{
- int const arows = availableModel->stringList().size();
+ int const arows = availableModel->rowCount();
QModelIndexList const availSels =
availableLV->selectionModel()->selectedIndexes();
if (arows == 0 || availSels.isEmpty() || isSelected(availSels.first())) {
}
QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
- string const modName = fromqstr(idx.data().toString());
+ string const modName = getAvailableModel()->getIDString(idx.row());
vector<string> reqs = getRequiredList(modName);
vector<string> excl = getExcludedList(modName);
return;
}
- QStringList const & qsl = selectedModel->stringList();
+ int const srows = selectedModel->rowCount();
+ vector<string> selModList;
+ for (int i = 0; i < srows; ++i)
+ selModList.push_back(getSelectedModel()->getIDString(i));
+
+ vector<string>::const_iterator selModStart = selModList.begin();
+ vector<string>::const_iterator selModEnd = selModList.end();
//Check whether some required module is available
if (!reqs.empty()) {
vector<string>::const_iterator it = reqs.begin();
vector<string>::const_iterator end = reqs.end();
for (; it != end; ++it) {
- if (qsl.contains(toqstr(*it))) {
+ if (find(selModStart, selModEnd, *it) != selModEnd) {
foundOne = true;
break;
}
vector<string>::const_iterator it = excl.begin();
vector<string>::const_iterator end = excl.end();
for (; it != end; ++it) {
- if (qsl.contains(toqstr(*it))) {
+ if (find(selModStart, selModEnd, *it) != selModEnd) {
addPB->setEnabled(false);
return;
}
addPB->setEnabled(true);
}
+
void ModuleSelMan::updateDownPB()
{
- int const srows = selectedModel->stringList().size();
+ int const srows = selectedModel->rowCount();
if (srows == 0) {
downPB->setEnabled(false);
return;
return;
}
//determine whether immediately succeding element requires this one
- QString const curModName =
- selectedLV->selectionModel()->currentIndex().data().toString();
- QStringList const & qsl = selectedModel->stringList();
- int const curIdx = qsl.indexOf(curModName);
- if (curIdx < 0 || curIdx == srows - 1) { //this shouldn't happen...
+ 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 nextModName = fromqstr(qsl[curIdx + 1]);
+ string const curModName = getSelectedModel()->getIDString(curRow);
+ string const nextModName = getSelectedModel()->getIDString(curRow + 1);
vector<string> reqs = getRequiredList(nextModName);
//if this one is required, there is also an earlier one that is required.
//enable it if this module isn't required
downPB->setEnabled(
- find(reqs.begin(), reqs.end(), fromqstr(curModName)) == reqs.end());
+ find(reqs.begin(), reqs.end(), curModName) == reqs.end());
}
void ModuleSelMan::updateUpPB()
{
- int const srows = selectedModel->stringList().size();
+ int const srows = selectedModel->rowCount();
if (srows == 0) {
upPB->setEnabled(false);
return;
upPB->setEnabled(false);
return;
}
+
//determine whether immediately preceding element is required by this one
- QString const curModName =
- selectedLV->selectionModel()->currentIndex().data().toString();
- vector<string> reqs = getRequiredList(fromqstr(curModName));
+ QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
+ int curRow = curIdx.row();
+ if (curRow <= -1 || curRow > srows - 1) { //sanity check
+ downPB->setEnabled(false);
+ return;
+ }
+ string const curModName = getSelectedModel()->getIDString(curRow);
+ vector<string> reqs = getRequiredList(curModName);
//if this one doesn't require anything....
if (reqs.empty()) {
return;
}
- QStringList const & qsl = selectedModel->stringList();
- int const curIdx = qsl.indexOf(curModName);
- if (curIdx <= 0) { //this shouldn't happen...
- upPB->setEnabled(false);
- return;
- }
- string preModName = fromqstr(qsl[curIdx - 1]);
+ 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.
void ModuleSelMan::updateDelPB()
{
- int const srows = selectedModel->stringList().size();
+ int const srows = selectedModel->rowCount();
if (srows == 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.
- QString const curModName =
- selectedLV->selectionModel()->currentIndex().data().toString();
- QStringList const & qsl = selectedModel->stringList();
+ QModelIndex const & curIdx =
+ selectedLV->selectionModel()->currentIndex();
+ int const curRow = curIdx.row();
+ if (curRow < 0 || curRow >= srows) { //this shouldn't happen
+ 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.
- QStringList::const_iterator it = qsl.begin();
- QStringList::const_iterator end = qsl.end();
- bool found = false;
- for (; it != end; ++it) {
- //skip over the ones preceding this one
- if (!found) {
- if (*it == curModName) {
- found = true;
- }
- continue;
- }
-
- string const mod = fromqstr(*it);
- vector<string> reqs = getRequiredList(mod);
+ for (int i = curRow + 1; i < srows; ++i) {
+ string const thisMod = getSelectedModel()->getIDString(i);
+ vector<string> reqs = getRequiredList(thisMod);
//does this one require us?
if (find(reqs.begin(), reqs.end(), fromqstr(curModName)) == reqs.end())
//no...
continue;
- //OK, so there is a module that requires us
- //is there an EARLIER module that satisfies the require?
+ //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 " << mod << std::endl;
- QStringList::const_iterator it2 = qsl.begin();
- QStringList::const_iterator end2 = qsl.end();
- for (; it2 != end2; ++it2) {
- //lyxerr << "In loop: Testing " << fromqstr(*it2) << std::endl;
- if (*it2 == curModName) { //EARLIER!!
- //no other module was found before this one, so...
- //lyxerr << "Reached the end of the loop." << std::endl;
- deletePB->setEnabled(false);
- return;
- }
+ //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?
- if (find(reqs.begin(), reqs.end(), fromqstr(*it2)) != reqs.end()) {
- //lyxerr << fromqstr(*it2) << " does the trick." << std::endl;
+ if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) {
+ //lyxerr << mod << " does the trick." << std::endl;
+ foundOne = true;
break;
}
}
- //did we reach the end of the list?
- if (it2 == end2) {
- //lyxerr << "Reached end of list." << std::endl;
+ //did we find a module to satisfy the require?
+ if (!foundOne) {
+ //lyxerr << "No matching module found." << std::endl;
deletePB->setEnabled(false);
return;
}
GuiDocument::GuiDocument(GuiView & lv)
- : GuiDialog(lv, "document")
+ : GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
{
setupUi(this);
- setViewTitle(_("Document Settings"));
-
+
lang_ = getSecond(getLanguageData(false));
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
this, SLOT(change_adaptor()));
connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)),
this, SLOT(setLSpacing(int)));
- connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString&)),
+ connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
connect(textLayoutModule->skipRB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
this, SLOT(enableSkip(bool)));
connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
+ connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
+ this, SLOT(setColSep()));
connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
this, SLOT(change_adaptor()));
connect(textLayoutModule->bypassCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
connect(marginsModule->footskipUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(marginsModule->columnsepLE, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_adaptor()));
+ connect(marginsModule->columnsepUnit, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
marginsModule->topLE->setValidator(unsignedLengthValidator(
marginsModule->topLE));
marginsModule->bottomLE->setValidator(unsignedLengthValidator(
marginsModule->headheightLE));
marginsModule->footskipLE->setValidator(unsignedLengthValidator(
marginsModule->footskipLE));
+ marginsModule->columnsepLE->setValidator(unsignedLengthValidator(
+ marginsModule->columnsepLE));
bc().addCheckedLineEdit(marginsModule->topLE,
marginsModule->topL);
marginsModule->headheightL);
bc().addCheckedLineEdit(marginsModule->footskipLE,
marginsModule->footskipL);
+ bc().addCheckedLineEdit(marginsModule->columnsepLE,
+ marginsModule->columnsepL);
langModule = new UiWidget<Ui::LanguageUi>;
latexModule = new UiWidget<Ui::LaTeXUi>;
// latex class
- connect(latexModule->classCO, SIGNAL(activated(int)),
- this, SLOT(change_adaptor()));
connect(latexModule->optionsLE, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
connect(latexModule->psdriverCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(latexModule->classCO, SIGNAL(activated(int)),
this, SLOT(classChanged()));
+ connect(latexModule->classCO, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
selectionManager =
new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV,
}
-void GuiDocument::closeEvent(QCloseEvent * e)
-{
- slotClose();
- e->accept();
-}
-
-
void GuiDocument::setLSpacing(int item)
{
textLayoutModule->lspacingLE->setEnabled(item == 3);
}
+void GuiDocument::setColSep()
+{
+ setCustomMargins(marginsModule->marginCB->checkState() == Qt::Checked);
+}
+
+
void GuiDocument::setCustomMargins(bool custom)
{
marginsModule->topL->setEnabled(!custom);
marginsModule->footskipL->setEnabled(!custom);
marginsModule->footskipLE->setEnabled(!custom);
marginsModule->footskipUnit->setEnabled(!custom);
+
+ bool const enableColSep = !custom &&
+ textLayoutModule->twoColumnCB->checkState() == Qt::Checked;
+ marginsModule->columnsepL->setEnabled(enableColSep);
+ marginsModule->columnsepLE->setEnabled(enableColSep);
+ marginsModule->columnsepUnit->setEnabled(enableColSep);
}
{
textclass_type const tc = latexModule->classCO->currentIndex();
bp_.setBaseClass(tc);
- if (lyxrc.auto_reset_options)
+ if (lyxrc.auto_reset_options) {
+ if (applyPB->isEnabled()) {
+ int const ret = Alert::prompt(_("Unapplied changes"),
+ _("Some changes in the dialog were not yet applied."
+ "If you do not apply now, they will be lost after this action."),
+ 1, 1, _("&Apply"), _("&Dismiss"));
+ if (ret == 0)
+ applyView();
+ }
bp_.useClassDefaults();
- updateContents();
+ forceUpdate();
+ }
}
t = subst(t, _("and"), s);
return bformat(t, retval, from_ascii(v[vSize - 2]), from_ascii(v[vSize - 1]));
}
+
+ vector<string> idsToNames(vector<string> const & idList)
+ {
+ vector<string> retval;
+ vector<string>::const_iterator it = idList.begin();
+ vector<string>::const_iterator end = idList.end();
+ for (; it != end; ++it) {
+ LyXModule const * const mod = moduleList[*it];
+ if (!mod)
+ retval.push_back(*it + " (Unavailable)");
+ else
+ retval.push_back(mod->getName());
+ }
+ return retval;
+ }
}
void GuiDocument::updateModuleInfo()
{
selectionManager->update();
+
//Module description
- QListView const * const lv = selectionManager->selectedFocused() ?
- latexModule->selectedLV :
- latexModule->availableLV;
- if (lv->selectionModel()->selectedIndexes().isEmpty())
+ bool const focusOnSelected = selectionManager->selectedFocused();
+ QListView const * const lv =
+ focusOnSelected ? latexModule->selectedLV : latexModule->availableLV;
+ if (lv->selectionModel()->selectedIndexes().isEmpty()) {
latexModule->infoML->document()->clear();
- else {
- QModelIndex const & idx = lv->selectionModel()->currentIndex();
- string const modName = fromqstr(idx.data().toString());
- docstring desc = getModuleDescription(modName);
-
- vector<string> pkgList = getPackageList(modName);
- docstring pkgdesc = formatStrVec(pkgList, _("and"));
- if (!pkgdesc.empty()) {
- if (!desc.empty())
- desc += "\n";
- desc += bformat(_("Package(s) required: %1$s."), pkgdesc);
- }
+ return;
+ }
+ QModelIndex const & idx = lv->selectionModel()->currentIndex();
+ GuiIdListModel const & idModel =
+ focusOnSelected ? selected_model_ : available_model_;
+ string const modName = idModel.getIDString(idx.row());
+ docstring desc = getModuleDescription(modName);
+
+ vector<string> 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);
- pkgdesc = formatStrVec(pkgList, _("or"));
- if (!pkgdesc.empty()) {
- if (!desc.empty())
- desc += "\n";
- desc += bformat(_("Module required: %1$s."), pkgdesc);
- }
+ pkgList = getRequiredList(modName);
+ if (!pkgList.empty()) {
+ vector<string> const reqDescs = idsToNames(pkgList);
+ pkgdesc = formatStrVec(reqDescs, _("or"));
+ if (!desc.empty())
+ desc += "\n";
+ desc += bformat(_("Module required: %1$s."), pkgdesc);
+ }
- pkgList = getExcludedList(modName);
- pkgdesc = formatStrVec(pkgList, _( "and"));
- if (!pkgdesc.empty()) {
- if (!desc.empty())
- desc += "\n";
- desc += bformat(_("Modules excluded: %1$s."), pkgdesc);
- }
+ pkgList = getExcludedList(modName);
+ if (!pkgList.empty()) {
+ vector<string> const reqDescs = idsToNames(pkgList);
+ pkgdesc = formatStrVec(reqDescs, _( "and"));
+ if (!desc.empty())
+ desc += "\n";
+ desc += bformat(_("Modules excluded: %1$s."), pkgdesc);
+ }
- if (!isModuleAvailable(modName)) {
- if (!desc.empty())
- desc += "\n";
- desc += _("WARNING: Some packages are unavailable!");
- }
- latexModule->infoML->document()->setPlainText(toqstr(desc));
+ if (!isModuleAvailable(modName)) {
+ if (!desc.empty())
+ desc += "\n";
+ desc += _("WARNING: Some packages are unavailable!");
}
+
+ latexModule->infoML->document()->setPlainText(toqstr(desc));
}
void GuiDocument::updateNumbering()
{
- TextClass const & tclass = bp_.getTextClass();
+ TextClass const & tclass = bp_.textClass();
numberingModule->tocTW->setUpdatesEnabled(false);
numberingModule->tocTW->clear();
int const toc = numberingModule->tocSL->value();
QString const no = qt_("No");
QString const yes = qt_("Yes");
- TextClass::const_iterator end = tclass.end();
- TextClass::const_iterator cit = tclass.begin();
QTreeWidgetItem * item = 0;
- for ( ; cit != end ; ++cit) {
- int const toclevel = (*cit)->toclevel;
- if (toclevel != Layout::NOT_IN_TOC
- && (*cit)->labeltype == LABEL_COUNTER) {
+ for (size_t i = 0; i != tclass.layoutCount(); ++i) {
+ Layout const & lt = *tclass.layout(i);
+ int const toclevel = lt.toclevel;
+ if (toclevel != Layout::NOT_IN_TOC && lt.labeltype == LABEL_COUNTER) {
item = new QTreeWidgetItem(numberingModule->tocTW);
- item->setText(0, toqstr(translateIfPossible((*cit)->name())));
+ item->setText(0, toqstr(translateIfPossible(lt.name())));
item->setText(1, (toclevel <= depth) ? yes : no);
item->setText(2, (toclevel <= toc) ? yes : no);
}
params.language = lyx::languages.getLanguage(lang_[pos]);
// numbering
- if (params.getTextClass().hasTocLevels()) {
+ if (params.textClass().hasTocLevels()) {
params.tocdepth = numberingModule->tocSL->value();
params.secnumdepth = numberingModule->depthSL->value();
}
// Modules
params.clearLayoutModules();
- QStringList const selMods = selectedModel()->stringList();
- for (int i = 0; i != selMods.size(); ++i)
- params.addLayoutModule(lyx::fromqstr(selMods[i]));
+ int const srows = selected_model_.rowCount();
+ vector<string> selModList;
+ for (int i = 0; i < srows; ++i)
+ params.addLayoutModule(selected_model_.getIDString(i));
if (mathsModule->amsautoCB->isChecked()) {
params.use_amsmath = BufferParams::package_auto;
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);
branchesModule->apply(params);
}
// text layout
- latexModule->classCO->setCurrentIndex(params.getBaseClass());
+ latexModule->classCO->setCurrentIndex(params.baseClass());
updatePagestyle(textClass().opt_pagestyle(),
params.pagestyle);
lengthToWidgets(m->footskipLE, m->footskipUnit,
params.footskip, defaultUnit);
+ lengthToWidgets(m->columnsepLE, m->columnsepUnit,
+ params.columnsep, defaultUnit);
+
branchesModule->update(params);
// PDF support
}
-void GuiDocument::updateContents()
+void GuiDocument::updateAvailableModules()
+{
+ available_model_.clear();
+ vector<modInfoStruct> const modInfoList = getModuleInfo();
+ int const mSize = modInfoList.size();
+ for (int i = 0; i < mSize; ++i) {
+ modInfoStruct const & modInfo = modInfoList[i];
+ available_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+ }
+}
+
+
+void GuiDocument::updateSelectedModules()
{
- //update list of available modules
- QStringList strlist;
- vector<string> const modNames = getModuleNames();
- vector<string>::const_iterator it = modNames.begin();
- for (; it != modNames.end(); ++it)
- strlist.push_back(toqstr(*it));
- available_model_.setStringList(strlist);
//and selected ones, too
- QStringList strlist2;
- vector<string> const & selMods = getSelectedModules();
- it = selMods.begin();
- for (; it != selMods.end(); ++it)
- strlist2.push_back(toqstr(*it));
+ selected_model_.clear();
+ vector<modInfoStruct> const selModList = getSelectedModules();
+ int const sSize = selModList.size();
+ for (int i = 0; i < sSize; ++i) {
+ modInfoStruct const & modInfo = selModList[i];
+ selected_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+ }
+}
+
+
+void GuiDocument::updateContents()
+{
+ if (id() == current_id_)
+ return;
+
+ 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.
- selected_model_.setStringList(strlist2);
-
updateParams(bp_);
+ current_id_ = id();
}
+
+void GuiDocument::forceUpdate()
+{
+ // reset to force dialog update
+ current_id_ = 0;
+ updateContents();
+}
+
+
void GuiDocument::useClassDefaults()
{
+ if (applyPB->isEnabled()) {
+ int const ret = Alert::prompt(_("Unapplied changes"),
+ _("Some changes in the dialog were not yet applied."
+ "If you do not apply now, they will be lost after this action."),
+ 1, 1, _("&Apply"), _("&Dismiss"));
+ if (ret == 0)
+ applyView();
+ }
+
bp_.setBaseClass(latexModule->classCO->currentIndex());
bp_.useClassDefaults();
- updateContents();
+ forceUpdate();
}
bool GuiDocument::isValid()
{
- return validate_listings_params().empty();
+ return (validate_listings_params().empty() &&
+ (textLayoutModule->skipCO->currentIndex() != 3 ||
+ !textLayoutModule->skipLE->text().isEmpty()));
}
bool GuiDocument::initialiseParams(string const &)
{
bp_ = buffer().params();
- loadModuleNames();
+ loadModuleInfo();
return true;
}
}
-vector<string> const & GuiDocument::getModuleNames()
+vector<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
{
return moduleNames_;
}
-vector<string> const & GuiDocument::getSelectedModules()
+vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
{
- return params().getModules();
+ vector<string> const & mods = params().getModules();
+ vector<string>::const_iterator it = mods.begin();
+ vector<string>::const_iterator end = mods.end();
+ vector<modInfoStruct> mInfo;
+ for (; it != end; ++it) {
+ modInfoStruct m;
+ m.id = *it;
+ LyXModule * mod = moduleList[*it];
+ if (mod)
+ m.name = mod->getName();
+ else
+ m.name = *it + " (Not Found)";
+ mInfo.push_back(m);
+ }
+ return mInfo;
}
TextClass const & GuiDocument::textClass() const
{
- return textclasslist[bp_.getBaseClass()];
+ return textclasslist[bp_.baseClass()];
}
}
-void GuiDocument::loadModuleNames ()
+void GuiDocument::loadModuleInfo()
{
moduleNames_.clear();
- LyXModuleList::const_iterator it = moduleList.begin();
- for (; it != moduleList.end(); ++it)
- moduleNames_.push_back(it->getName());
- if (!moduleNames_.empty())
- sort(moduleNames_.begin(), moduleNames_.end());
+ LyXModuleList::const_iterator it = moduleList.begin();
+ LyXModuleList::const_iterator end = moduleList.end();
+ for (; it != end; ++it) {
+ modInfoStruct m;
+ m.id = it->getID();
+ m.name = it->getName();
+ moduleNames_.push_back(m);
+ }
}
projects / lyx.git / blobdiff