squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-09 09:02:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2057 from pmzqla/sort-content

Browse Source 
Put directories first when sorting torrent content by name
This commit is contained in:
sledgehammer999
2014-11-02 16:28:25 +02:00
parent 6d5c9ff7d4 bdf27451ad
commit 73a05a67a4
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/torrentcontentfiltermodel.cpp
View File

@@ -90,12 +90,20 @@ bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIn
Q_ASSERT(vL.isValid()); Q_ASSERT(vL.isValid());
Q_ASSERT(vR.isValid()); Q_ASSERT(vR.isValid());
TorrentContentModelItem::ItemType leftType, rightType;
leftType = m_model->itemType(m_model->index(left.row(), 0, left.parent()));
rightType = m_model->itemType(m_model->index(right.row(), 0, right.parent()));
if (leftType == rightType) {
bool res = false; bool res = false;
if (misc::naturalSort(vL.toString(), vR.toString(), res)) if (misc::naturalSort(vL.toString(), vR.toString(), res))
return res; return res;
return QSortFilterProxyModel::lessThan(left, right); return QSortFilterProxyModel::lessThan(left, right);
} }
else if (leftType == TorrentContentModelItem::FolderType && sortOrder() == Qt::AscendingOrder)
return true;
else
return false;
}
return QSortFilterProxyModel::lessThan(left, right); return QSortFilterProxyModel::lessThan(left, right);
} }