anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GuiRef: only show "<No prefix>" if non-empty

Browse Source 
If "Group" is checked, "<No prefix>" is shown only if there exists a
label with no prefix. Before, it was shown even when it was empty and
even when there were no labels at all.
This commit is contained in:
Scott Kostyshak 2013-04-19 07:48:26 -04:00
parent 914b1d8200
commit 9887dd48ca
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontends/qt4/GuiRef.cpp
View File

@ -350,19 +350,29 @@ void GuiRef::redoRefs()
QStringList refsStrings; QStringList refsStrings;
QStringList refsCategories; QStringList refsCategories;
vector<docstring>::const_iterator iter; vector<docstring>::const_iterator iter;
bool noprefix = false;
for (iter = refs_.begin(); iter != refs_.end(); ++iter) { for (iter = refs_.begin(); iter != refs_.end(); ++iter) {
QString const lab = toqstr(*iter); QString const lab = toqstr(*iter);
refsStrings.append(lab); refsStrings.append(lab);
if (groupCB->isChecked() && lab.contains(":")) { if (groupCB->isChecked()) {
QString const pref = lab.split(':')[0]; if (lab.contains(":")) {
if (!pref.isEmpty() && !refsCategories.contains(pref)) QString const pref = lab.split(':')[0];
refsCategories.append(pref); if (!refsCategories.contains(pref)) {
if (!pref.isEmpty())
refsCategories.append(pref);
else
noprefix = true;
}
}
else
noprefix = true;
} }
} }
// sort categories case-intensively // sort categories case-intensively
qSort(refsCategories.begin(), refsCategories.end(), qSort(refsCategories.begin(), refsCategories.end(),
caseInsensitiveLessThan /*defined above*/); caseInsensitiveLessThan /*defined above*/);
refsCategories.insert(0, qt_("<No prefix>")); if (noprefix)
refsCategories.insert(0, qt_("<No prefix>"));
if (sortCB->isEnabled() && sortCB->isChecked()) { if (sortCB->isEnabled() && sortCB->isChecked()) {
if(caseSensitiveCB->isEnabled() && caseSensitiveCB->isChecked()) if(caseSensitiveCB->isEnabled() && caseSensitiveCB->isChecked())