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

* Fixed sorting of identical items in Tree- & TrackProxyModel.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-17 03:33:31 +02:00
parent ac3d410559
commit 35a7acd606
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/playlist/trackproxymodel.cpp
View File

@@ -396,6 +396,11 @@ TrackProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) c
return size1 < size2; return size1 < size2;
} }
return QString::localeAwareCompare( sourceModel()->data( left ).toString(),
sourceModel()->data( right ).toString() ) < 0; const QString& lefts = sourceModel()->data( left ).toString();
const QString& rights = sourceModel()->data( right ).toString();
if ( lefts == rights )
return id1 < id2;
return QString::localeAwareCompare( lefts, rights ) < 0;
} }

8
src/libtomahawk/playlist/treeproxymodel.cpp
View File

@@ -133,13 +133,19 @@ TreeProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) co
if ( !p2 ) if ( !p2 )
return false; return false;
const QString& lefts = textForItem( p1 );
const QString& rights = textForItem( p2 );
if ( !p1->result().isNull() ) if ( !p1->result().isNull() )
{ {
if ( p1->result()->albumpos() != p2->result()->albumpos() ) if ( p1->result()->albumpos() != p2->result()->albumpos() )
return p1->result()->albumpos() < p2->result()->albumpos(); return p1->result()->albumpos() < p2->result()->albumpos();
if ( lefts == rights )
return p1->result()->dbid() < p2->result()->dbid();
} }
return QString::localeAwareCompare( textForItem( p1 ), textForItem( p2 ) ) < 0; return QString::localeAwareCompare( lefts, rights ) < 0;
} }

1
src/sourcetree/sourcesproxymodel.cpp
View File

@@ -37,7 +37,6 @@ SourcesProxyModel::SourcesProxyModel( SourcesModel* model, QObject* parent )
setSourceModel( model ); setSourceModel( model );
if ( model && model->metaObject()->indexOfSignal( "expandRequest(QModelIndex)" ) > -1 ) if ( model && model->metaObject()->indexOfSignal( "expandRequest(QModelIndex)" ) > -1 )
connect( model, SIGNAL( expandRequest( QModelIndex ) ), this, SLOT( expandRequested( QModelIndex ) ) ); connect( model, SIGNAL( expandRequest( QModelIndex ) ), this, SLOT( expandRequested( QModelIndex ) ) );
if ( model && model->metaObject()->indexOfSignal( "selectRequest(QModelIndex)" ) > -1 ) if ( model && model->metaObject()->indexOfSignal( "selectRequest(QModelIndex)" ) > -1 )