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

* Fix sorting for real.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-17 00:17:01 +02:00
parent 4d012b156a
commit 08f868c2ce
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sourcetree/items/collectionitem.cpp
View File

@@ -146,7 +146,7 @@ CollectionItem::peerSortValue() const
if( m_source->isLocal() ) if( m_source->isLocal() )
return 0; return 0;
return m_source->id(); return 1;
} }

16
src/sourcetree/sourcesproxymodel.cpp
View File

@@ -91,22 +91,6 @@ SourcesProxyModel::expandRequested( const QModelIndex& idx )
bool bool
SourcesProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const SourcesProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
{ {
CollectionItem* ciL = qobject_cast< CollectionItem* >( m_model->data( left, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
CollectionItem* ciR = qobject_cast< CollectionItem* >( m_model->data( right, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
if ( ciL && ciR )
{
if ( ciL->source().isNull() )
return true;
if ( ciR->source().isNull() )
return false;
if ( ciL->source() == SourceList::instance()->getLocal() )
return true;
if ( ciR->source() == SourceList::instance()->getLocal() )
return false;
}
if ( m_model->data( left, SourcesModel::SortRole ) != m_model->data( right, SourcesModel::SortRole ) ) if ( m_model->data( left, SourcesModel::SortRole ) != m_model->data( right, SourcesModel::SortRole ) )
return ( m_model->data( left, SourcesModel::SortRole ).toInt() < m_model->data( right, SourcesModel::SortRole ).toInt() ); return ( m_model->data( left, SourcesModel::SortRole ).toInt() < m_model->data( right, SourcesModel::SortRole ).toInt() );