mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 06:36:55 +02:00
Code Issues Releases Wiki Activity

* Fixed sorting views by year.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-10 08:25:11 +01:00
parent 50988cbd97
commit 9d580d16ef
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/playlist/PlayableProxyModel.cpp
View File

@@ -289,6 +289,7 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
unsigned int bitrate1 = 0, bitrate2 = 0; unsigned int bitrate1 = 0, bitrate2 = 0;
unsigned int mtime1 = 0, mtime2 = 0; unsigned int mtime1 = 0, mtime2 = 0;
unsigned int size1 = 0, size2 = 0; unsigned int size1 = 0, size2 = 0;
unsigned int year1 = 0, year2 = 0;
float score1 = 0, score2 = 0; float score1 = 0, score2 = 0;
QString origin1; QString origin1;
QString origin2; QString origin2;
@@ -301,6 +302,7 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
duration1 = r->duration(); duration1 = r->duration();
mtime1 = r->modificationTime(); mtime1 = r->modificationTime();
size1 = r->size(); size1 = r->size();
year1 = r->year();
score1 = r->score(); score1 = r->score();
origin1 = r->friendlySource().toLower(); origin1 = r->friendlySource().toLower();
id1 = (qint64)&r; id1 = (qint64)&r;
@@ -312,6 +314,7 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
duration2 = r->duration(); duration2 = r->duration();
mtime2 = r->modificationTime(); mtime2 = r->modificationTime();
size2 = r->size(); size2 = r->size();
year2 = r->year();
score2 = r->score(); score2 = r->score();
origin2 = r->friendlySource().toLower(); origin2 = r->friendlySource().toLower();
id2 = (qint64)&r; id2 = (qint64)&r;
@@ -406,6 +409,13 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
return mtime1 < mtime2; return mtime1 < mtime2;
} }
else if ( column == PlayableModel::Year ) // sort by release year
{
if ( year1 == year2 )
return id1 < id2;
return year1 < year2;
}
else if ( column == PlayableModel::Filesize ) // sort by file size else if ( column == PlayableModel::Filesize ) // sort by file size
{ {
if ( size1 == size2 ) if ( size1 == size2 )