Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-31 19:45:31 +01:00
Code Issues Releases Wiki Activity

Show "Unknown" instead of "0" when sorting by year for albums that don't have a year set. Updates issue #188

Browse Source
This commit is contained in:
David Sansome 2010-04-08 20:30:50 +00:00
parent 539f0a517b
commit 55946ac2ba
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/library.cpp
View File

@ -239,7 +239,7 @@ QString Library::DividerKey(GroupBy type, LibraryItem* item) const {
return SortTextForYear(item->sort_text.toInt() / 10 * 10); return SortTextForYear(item->sort_text.toInt() / 10 * 10);
case GroupBy_YearAlbum: case GroupBy_YearAlbum:
return QString::number(item->metadata.year()); return SortTextForYear(item->metadata.year());
case GroupBy_None: case GroupBy_None:
default: default:
@ -258,12 +258,16 @@ QString Library::DividerDisplayText(GroupBy type, const QString& key) const {
case GroupBy_Genre: case GroupBy_Genre:
if (key == "0") if (key == "0")
return "0-9"; return "0-9";
// fallthrough return key.toUpper();
case GroupBy_YearAlbum: case GroupBy_YearAlbum:
return key; if (key == "0000")
return tr("Unknown");
return key.toUpper();
case GroupBy_Year: case GroupBy_Year:
if (key == "0000")
return tr("Unknown");
return QString::number(key.toInt()); // To remove leading 0s return QString::number(key.toInt()); // To remove leading 0s
case GroupBy_None: case GroupBy_None:
@ -683,6 +687,8 @@ QString Library::TextOrUnknown(const QString& text) const {
} }
QString Library::PrettyYearAlbum(int year, const QString& album) const { QString Library::PrettyYearAlbum(int year, const QString& album) const {
if (year <= 0)
return TextOrUnknown(album);
return QString::number(year) + " - " + TextOrUnknown(album); return QString::number(year) + " - " + TextOrUnknown(album);
} }

2
src/libraryview.cpp
View File

@ -38,7 +38,7 @@ void LibraryItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
switch (type) { switch (type) {
case LibraryItem::Type_Divider: { case LibraryItem::Type_Divider: {
QString text(index.data().toString().toUpper()); QString text(index.data().toString());
// Draw the background // Draw the background
//QStyledItemDelegate::paint(painter, opt, QModelIndex()); //QStyledItemDelegate::paint(painter, opt, QModelIndex());