The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 006b50b22266b7ba5d16427cbfc21fca969ef608
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Oct 9 08:51:39 2012 +0200
Really put uncategorized items at the end if sortCats is true
diff --git a/src/frontends/qt4/CategorizedCombo.cpp
b/src/frontends/qt4/CategorizedCombo.cpp
index 7a9508b..d4410cf 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -516,9 +516,12 @@ void CategorizedCombo::addItemSort(QString const & item,
QString const & guiname
// find category
int i = 0;
if (sortedByCat) {
+ // If sortCats == true, sort categories alphabetically,
uncategorized at the end.
while (i < end && d->model_->item(i, 2)->text() != qcat
- && (!sortCats || (d->model_->item(i,
2)->text().localeAwareCompare(qcat) < 0)
- || (uncategorized && d->model_->item(i, 2)->text()
== qt_("Uncategorized"))))
+ && (!sortCats
+ || (!uncategorized && d->model_->item(i,
2)->text().localeAwareCompare(qcat) < 0
+ && d->model_->item(i, 2)->text() !=
qt_("Uncategorized"))
+ || (uncategorized && d->model_->item(i, 2)->text()
!= qt_("Uncategorized"))))
++i;
}
-----------------------------------------------------------------------
Summary of changes:
src/frontends/qt4/CategorizedCombo.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
