Skip to content

Commit

Permalink
Folders: Use "Problem" icon for unresolved conflicts #6277
Browse files Browse the repository at this point in the history
ckamm authored and rullzer committed Jun 5, 2018
1 parent f9f1f8b commit 63c2474
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/gui/folderstatusmodel.cpp
Original file line number Diff line number Diff line change
@@ -248,9 +248,15 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
} else if (status == SyncResult::Undefined) {
return theme->syncStateIcon(SyncResult::SyncRunning);
} else {
// keep the previous icon for the prepare phase.
if (status == SyncResult::Problem) {
return theme->syncStateIcon(SyncResult::Success);
// The "Problem" *result* just means some files weren't
// synced, so we show "Success" in these cases. But we
// do use the "Problem" *icon* for unresolved conflicts.
if (status == SyncResult::Success || status == SyncResult::Problem) {
if (f->syncResult().hasUnresolvedConflicts()) {
return theme->syncStateIcon(SyncResult::Problem);
} else {
return theme->syncStateIcon(SyncResult::Success);
}
} else {
return theme->syncStateIcon(status);
}

0 comments on commit 63c2474

Please sign in to comment.