d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 21:14:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14540 from jagannatharjun/remember

Browse Source 
Remember sub sort column of transfer list
This commit is contained in:
Mike Tzou 2021-03-19 13:24:24 +08:00 committed by GitHub
commit f6ab1d63e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/transferlistsortmodel.cpp
View File

@ -61,10 +61,17 @@ namespace
return 0; return 0;
return isLeftValid ? -1 : 1; return isLeftValid ? -1 : 1;
} }
int adjustSubSortColumn(const int column)
{
return ((column >= 0) && (column < TransferListModel::NB_COLUMNS))
? column : TransferListModel::TR_NAME;
}
} }
TransferListSortModel::TransferListSortModel(QObject *parent) TransferListSortModel::TransferListSortModel(QObject *parent)
: QSortFilterProxyModel {parent} : QSortFilterProxyModel {parent}
, m_subSortColumn {"TransferList/SubSortColumn", TransferListModel::TR_NAME, adjustSubSortColumn}
{ {
setSortRole(TransferListModel::UnderlyingDataRole); setSortRole(TransferListModel::UnderlyingDataRole);
} }
@ -186,14 +193,15 @@ bool TransferListSortModel::lessThan(const QModelIndex &left, const QModelIndex
{ {
Q_ASSERT(left.column() == right.column()); Q_ASSERT(left.column() == right.column());
if (m_sortColumn != left.column()) if (m_lastSortColumn != left.column())
{ {
m_subSortColumn = m_sortColumn; if (m_lastSortColumn != -1)
m_sortColumn = left.column(); m_subSortColumn = m_lastSortColumn;
m_lastSortColumn = left.column();
} }
const int result = compare(left, right); const int result = compare(left, right);
if ((result == 0) && (m_subSortColumn != -1)) if (result == 0)
return compare(left.sibling(left.row(), m_subSortColumn), right.sibling(right.row(), m_subSortColumn)) < 0; return compare(left.sibling(left.row(), m_subSortColumn), right.sibling(right.row(), m_subSortColumn)) < 0;
return result < 0; return result < 0;

5
src/gui/transferlistsortmodel.h
View File

@ -30,6 +30,7 @@
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include "base/settingvalue.h"
#include "base/torrentfilter.h" #include "base/torrentfilter.h"
namespace BitTorrent namespace BitTorrent
@ -61,6 +62,6 @@ private:
bool matchFilter(int sourceRow, const QModelIndex &sourceParent) const; bool matchFilter(int sourceRow, const QModelIndex &sourceParent) const;
TorrentFilter m_filter; TorrentFilter m_filter;
mutable int m_subSortColumn = -1; mutable CachedSettingValue<int> m_subSortColumn;
mutable int m_sortColumn = -1; mutable int m_lastSortColumn = -1;
}; };