From 55fc6a1d0f914d3d61eb5884443eed7554b8599a Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 6 Feb 2023 16:45:48 +0100 Subject: [PATCH] Place all sorts of sync file item status errors near the top Signed-off-by: Claudio Cambra --- src/gui/tray/sortedactivitylistmodel.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gui/tray/sortedactivitylistmodel.cpp b/src/gui/tray/sortedactivitylistmodel.cpp index 8a5bf5440..d62ad4985 100644 --- a/src/gui/tray/sortedactivitylistmodel.cpp +++ b/src/gui/tray/sortedactivitylistmodel.cpp @@ -64,29 +64,26 @@ bool SortedActivityListModel::lessThan(const QModelIndex &sourceLeft, const QMod // Then sync file item status errors const auto leftSyncFileItemStatus = leftActivity._syncFileItemStatus; const auto rightSyncFileItemStatus = rightActivity._syncFileItemStatus; - const bool leftIsErrorFileItemStatus = leftSyncFileItemStatus == SyncFileItem::FatalError || - leftSyncFileItemStatus == SyncFileItem::SoftError || - leftSyncFileItemStatus == SyncFileItem::NormalError; + const bool leftIsErrorFileItemStatus = leftSyncFileItemStatus != SyncFileItem::NoStatus && + leftSyncFileItemStatus != SyncFileItem::Success; - const bool rightIsErrorFileItemStatus = rightSyncFileItemStatus == SyncFileItem::FatalError || - rightSyncFileItemStatus == SyncFileItem::SoftError || - rightSyncFileItemStatus == SyncFileItem::NormalError; + const bool rightIsErrorFileItemStatus = rightSyncFileItemStatus != SyncFileItem::NoStatus && + rightSyncFileItemStatus != SyncFileItem::Success; if (leftIsErrorFileItemStatus != rightIsErrorFileItemStatus) { return leftIsErrorFileItemStatus; } + // Let's go back to more broadly comparing by type if (const auto rightType = rightActivity._type; leftType != rightType) { return leftType < rightType; } if (leftSyncResultStatus != rightSyncResultStatus) { - return leftSyncResultStatus != SyncResult::Undefined && - leftSyncResultStatus != SyncResult::Success; + return leftSyncResultStatus < rightSyncResultStatus; } if (leftSyncFileItemStatus != rightSyncFileItemStatus) { - // We want to shove erors towards the top. return leftSyncFileItemStatus < rightSyncFileItemStatus; } -- 2.30.2