anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a bug involving module conflicts. We need to check not only that we

Browse Source 
do not exclude some used module, but also that no used module excludes us.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26920 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-10-16 15:04:48 +00:00
parent 3e41704579
commit 28047741c2
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/layouts/g-brief2.layout
View File

@ -11,7 +11,7 @@ Input stdcounters.inc
Input stdinsets.inc
# General textclass parameters
Format 10
Format 11
Columns 1
Sides 1
PageStyle Empty

39
src/frontends/qt4/GuiDocument.cpp
View File

@ -274,30 +274,33 @@ void ModuleSelectionManager::updateAddPB()
int const arows = availableModel->rowCount();
QModelIndexList const availSels =
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 || availSels.isEmpty() || isSelected(availSels.first())) {
addPB->setEnabled(false);
return;
}
QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
string const modName = getAvailableModel()->getIDString(idx.row());
vector<string> const reqs = getRequiredList(modName);
vector<string> const excl = getExcludedList(modName);
if (reqs.empty() && excl.empty()) {
addPB->setEnabled(true);
return;
}
int const srows = selectedModel->rowCount();
// if no modules are yet selected, there is no more to check.
if (srows == 0) {
addPB->setEnabled(true);
return;
}
vector<string> selModList;
for (int i = 0; i < srows; ++i)
selModList.push_back(getSelectedModel()->getIDString(i));
vector<string>::const_iterator const selModStart = selModList.begin();
vector<string>::const_iterator const selModEnd = selModList.end();
// Check whether some required module is available
vector<string> const reqs = getRequiredList(modName);
if (!reqs.empty()) {
bool foundOne = false;
vector<string>::const_iterator it = reqs.begin();
@ -314,7 +317,8 @@ void ModuleSelectionManager::updateAddPB()
}
}
// Check whether any excluded module is being used
// Check whether any excluded module is being used...
vector<string> const excl = getExcludedList(modName);
if (!excl.empty()) {
vector<string>::const_iterator it = excl.begin();
vector<string>::const_iterator en = excl.end();
@ -326,6 +330,19 @@ void ModuleSelectionManager::updateAddPB()
}
}
// ...and whether any used module excludes us.
vector<string>::const_iterator selModIt = selModStart;
for (; selModIt != selModEnd; ++selModIt) {
string selMod = *selModIt;
vector<string> excMods = getExcludedList(selMod);
vector<string>::const_iterator const eit = excMods.begin();
vector<string>::const_iterator const een = excMods.end();
if (find(eit, een, modName) != een) {
addPB->setEnabled(false);
return;
}
}
addPB->setEnabled(true);
}