diff options
author | Arno <am@disconnect.de> | 2013-07-12 14:48:53 +0200 |
---|---|---|
committer | Arno <am@disconnect.de> | 2013-07-12 14:48:53 +0200 |
commit | ea96c5b64b1fd1a0ae152363c5ec804eaf960dcf (patch) | |
tree | adfc0237ab2c922c0f99cfa6dab5a4c69403b36b | |
parent | 9954c11ac9bc51fe81cc9949ff9799ac87512d92 (diff) | |
download | SheMov-ea96c5b64b1fd1a0ae152363c5ec804eaf960dcf.tar.gz SheMov-ea96c5b64b1fd1a0ae152363c5ec804eaf960dcf.tar.bz2 SheMov-ea96c5b64b1fd1a0ae152363c5ec804eaf960dcf.zip |
Always show subtitle in ArchiveModel
-rw-r--r-- | archivemodel.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/archivemodel.cpp b/archivemodel.cpp index fe0ffff..621ee9c 100644 --- a/archivemodel.cpp +++ b/archivemodel.cpp @@ -67,16 +67,14 @@ QVariant ArchiveModel::data(const QModelIndex &index, int role) const{ if(nodeType == SeriesNode || nodeType == GenreNode || nodeType == ActorNode){ retval = QString("%1 (%2)").arg(item->data(Name).toString()).arg(QString::number(childCount)); }else if(nodeType == SeriesPartNode){ + retval = item->data(Name).toString(); + QString subtitle = item->data(Subtitle).toString(); if(part > 0){ - retval = QString("%1 %2").arg(item->data(Name).toString()).arg(QString::number(part)); - }else{ - QString subtitle = item->data(Subtitle).toString(); - if(!subtitle.isEmpty()){ - retval = QString("%1 - %2").arg(item->data(Name).toString()).arg(item->data(Subtitle).toString()); - } + retval = QString("%1 %2").arg(retval).arg(QString::number(part)); + } + if(!subtitle.isEmpty()){ + retval = QString("%1 - %2").arg(retval).arg(subtitle); } - }else{ - retval = item->data(Name).toString(); } return retval; } |