From 09c31915a7ea6cc8dafe129246a0b0ae602c2d3a Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sat, 9 Feb 2013 04:58:54 +0100
Subject: Fix display of series name in archive

When hovering or showing the series name in the status bar, the code
unconditionally assumed that any series has a series number. Since the
introduction of subtitles this is not true any more. Just let the model
figure it out by getting an index for the Name column.
---
 filestreewidget.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/filestreewidget.cpp b/filestreewidget.cpp
index 6f2fd79..401578a 100644
--- a/filestreewidget.cpp
+++ b/filestreewidget.cpp
@@ -306,9 +306,8 @@ void FilesTreeWidget::fileSelectionChanged(){
         int seriesId = mSeriesModel->seriesIdByPartId(seriesPartId);
         QModelIndex seriesIdx = mSeriesModel->findValue(seriesId, QModelIndex(), SeriesTreeModel::SeriesId);
         if(seriesIdx.isValid()){
-            QModelIndex seriesPartIdx = mSeriesModel->findValue(seriesPartId, seriesIdx, SeriesTreeModel::SeriesPartId);
-            QString seriesNumber = QString::number(seriesPartIdx.data(SeriesTreeModel::SeriesPartRole).toInt());
-            QString seriesString = QString("%1 %2").arg(seriesIdx.data(SeriesTreeModel::NameRole).toString()).arg(seriesNumber);
+            QModelIndex seriesPartIdx = mSeriesModel->findValue(seriesPartId, seriesIdx, SeriesTreeModel::SeriesPartId, SeriesTreeModel::Name);
+            QString seriesString = seriesPartIdx.data().toString();
             if(!selectedSeries.contains(seriesString)){
                 selectedSeries << seriesString;
             }
@@ -508,8 +507,8 @@ const QString FilesTreeView::fileNameText(const QModelIndex &idx) const{
 	}
 	FilesTreeModel *filesModel = qobject_cast<FilesTreeModel*>(SmGlobals::instance()->model("FilesModel"));
     QHash<QString, QString> files = filesModel->filesBySeriesPartId(idx.data(FilesTreeModel::SeriesPartIdRole).toInt());
-    QModelIndex seriesPartIdx = seriesModel->findValue(idx.data(FilesTreeModel::SeriesPartIdRole), seriesIdx, SeriesTreeModel::SeriesPartId);
-	QString retval = QString(tr("<p style=\"text-decoration: underline; font-weight: bold\">%1 %2</p>")).arg(seriesPartIdx.data(SeriesTreeModel::NameRole).toString()).arg(QString::number(seriesPartIdx.data(SeriesTreeModel::SeriesPartRole).toInt()));
+    QModelIndex seriesPartIdx = seriesModel->findValue(idx.data(FilesTreeModel::SeriesPartIdRole), seriesIdx, SeriesTreeModel::SeriesPartId, SeriesTreeModel::Name);
+    QString retval = QString(tr("<p style=\"text-decoration: underline; font-weight: bold\">%1</p>")).arg(seriesPartIdx.data().toString());
 	retval.append(QString(tr("<p style=\"margin-bottom: 0px; padding-bottom: 0px\">Files:</p>")));
 	retval.append(tr("<ul style=\"margin-top: 0px\">"));
 	QHash<QString, QString>::const_iterator it = files.constBegin();
-- 
cgit v1.2.3-70-g09d2