iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only show sub-text if we have some info

Browse Source
This commit is contained in:
Craig Drummond
2017-02-26 11:14:52 +00:00
committed by Craig Drummond
parent 85db2b6a55
commit 7aaab192d6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models/playlistsmodel.cpp
View File

@@ -487,7 +487,9 @@ QVariant PlaylistsModel::data(const QModelIndex &index, int role) const
case Cantata::Role_MainText:
return s->title.isEmpty() ? s->file : s->title;
case Cantata::Role_SubText:
return s->artist+QLatin1String(" - ")+s->displayAlbum()+QLatin1String(" - ")+Utils::formatTime(s->time);
return (s->artist.isEmpty() ? QString() : (s->artist+QLatin1String(" - ")))+
(s->displayAlbum().isEmpty() ? QString() : (s->displayAlbum()+QLatin1String(" - ")))+
(s->time>0 ? Utils::formatTime(s->time) : QString());
default:
return ActionModel::data(index, role);
}