From: Scott Kostyshak <skostysh@lyx.org>
Date: Fri, 19 Apr 2013 11:48:26 +0000 (-0400)
Subject: GuiRef: only show "<No prefix>" if non-empty
X-Git-Tag: 2.1.0beta1~361
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9887dd48ca52914b79763b8d689cbe5f335938b9;p=lyx.git

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

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.
---

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