From a8fc46f186911ba4ab79231f24e6e4f940eb7cde Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Fri, 13 Aug 2010 16:47:16 +0200
Subject: Fixed sorting of Display name

Fixed sorting of DisplayName column in FilesTreeModel. Now it's sorted
by SeriesName and SeriesPart separately instead of taking the whole
DisplayName as a string.
---
 filestreemodel.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'filestreemodel.cpp')

diff --git a/filestreemodel.cpp b/filestreemodel.cpp
index fd42802..6d1be0f 100644
--- a/filestreemodel.cpp
+++ b/filestreemodel.cpp
@@ -212,6 +212,15 @@ QVariant FilesTreeModel::data(const QModelIndex &index, int role) const{
 	if(role == FilesIdRole){
 		return item->data(FilesId);
 	}
+	if(role == SeriesPartRole){
+		return item->data(SeriesPart);
+	}
+	if(role == DisplayNameRole){
+		return item->data(DisplayName);
+	}
+	if(role == SeriesNameRole){
+		return item->data(SeriesName);
+	}
 	return QVariant();
 }
 
@@ -452,11 +461,11 @@ void FilesTreeModel::writeCache(){
 }
 
 void FilesTreeModel::populate(QSqlQuery &filesQuery){
-	SmTreeItem *root = new SmTreeItem(14);
-	SmTreeItem *files = new SmTreeItem(14, root);
+	SmTreeItem *root = new SmTreeItem(15);
+	SmTreeItem *files = new SmTreeItem(15, root);
 	files->setData(FileName, tr("Movies"));
 	root->appendChild(files);
-	SmTreeItem *covers = new SmTreeItem(14, root);
+	SmTreeItem *covers = new SmTreeItem(15, root);
 	covers->setData(FileName, tr("Covers"));
 	root->appendChild(covers);
 	QLocale l;
@@ -478,6 +487,7 @@ void FilesTreeModel::populate(QSqlQuery &filesQuery){
 		QString displayName = QString("%1 %2").arg(filesQuery.value(9).toString()).arg(filesQuery.value(10).toString());
 		data << displayName;
 		data << tr("N/A"); // duration or size
+		data << filesQuery.value(9).toString(); // series name
 		QString fullPath = data.at(FullPath).toString();
 		QFileInfo fi(fullPath);
 		switch(filesQuery.value(5).toInt()){
-- 
cgit v1.2.3-70-g09d2