FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix sorting

This commit is contained in:
Martin Rotter 2022-03-08 09:21:09 +01:00
parent 741c6ef682
commit 8902594059
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/sql/db_update_sqlite_1_2.sql
View File

@ -20,8 +20,8 @@ CREATE TABLE Feeds (
FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE
); );
-- ! -- !
INSERT INTO Feeds (id, ordr, title, description, date_created, icon, category, source, update_type, update_interval, account_id, custom_id, custom_data) INSERT INTO Feeds (id, title, description, date_created, icon, category, source, update_type, update_interval, account_id, custom_id, custom_data)
SELECT id, id, title, description, date_created, icon, category, source, update_type, update_interval, account_id, custom_id, custom_data SELECT id, title, description, date_created, icon, category, source, update_type, update_interval, account_id, custom_id, custom_data
FROM backup_Feeds; FROM backup_Feeds;
-- ! -- !
DROP TABLE backup_Feeds; DROP TABLE backup_Feeds;

14
src/librssguard/core/feedsproxymodel.cpp
View File

@ -164,7 +164,6 @@ bool FeedsProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right
// feeds are queued one after another too. // feeds are queued one after another too.
// Moreover, sort everything alphabetically or // Moreover, sort everything alphabetically or
// by item counts, depending on the sort column. // by item counts, depending on the sort column.
if (left_item->keepOnTop()) { if (left_item->keepOnTop()) {
return sortOrder() == Qt::SortOrder::AscendingOrder; return sortOrder() == Qt::SortOrder::AscendingOrder;
} }
@ -172,10 +171,15 @@ bool FeedsProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right
return sortOrder() == Qt::SortOrder::DescendingOrder; return sortOrder() == Qt::SortOrder::DescendingOrder;
} }
else if (left_item->kind() == right_item->kind()) { else if (left_item->kind() == right_item->kind()) {
// We sort items alphabetically. // Both items are of the same type.
return sortOrder() == Qt::SortOrder::AscendingOrder if (left.column() == FDS_MODEL_COUNTS_INDEX) {
? QString::localeAwareCompare(left_item->title().toLower(), right_item->title().toLower()) < 0 // User wants to sort according to counts.
: QString::localeAwareCompare(left_item->title().toLower(), right_item->title().toLower()) > 0; return left_item->countOfUnreadMessages() < right_item->countOfUnreadMessages();
}
else {
// In other cases, sort by title.
return QString::localeAwareCompare(left_item->title().toLower(), right_item->title().toLower()) < 0;
}
} }
else { else {
// We sort using priorities. // We sort using priorities.