diff options
| author | Silarn <jrim@rimpo.org> | 2018-04-11 17:46:59 -0500 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:15:55 -0600 |
| commit | 8d6c715672023577dca5a6528ff49081dede1052 (patch) | |
| tree | 19640a69058b966e70ff2173def1a3e238aa9793 /src/modflagicondelegate.cpp | |
| parent | 20008e17b71f3b23f94893554b3623b2d4f732d6 (diff) | |
Initial archive conflict parsing
Squashed commit:
Basic archive conflict parsing - pass 1
Merge fixes for archive parsing
Basic archive conflict parsing - pass 1
Merge fixes for archive parsing
Should fix conflict detection for archive files
Diffstat (limited to 'src/modflagicondelegate.cpp')
| -rw-r--r-- | src/modflagicondelegate.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp index 1995964b..4404ce60 100644 --- a/src/modflagicondelegate.cpp +++ b/src/modflagicondelegate.cpp @@ -49,6 +49,9 @@ QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag) const case ModInfo::FLAG_CONFLICT_MIXED: return ":/MO/gui/emblem_conflict_mixed";
case ModInfo::FLAG_CONFLICT_REDUNDANT: return ":MO/gui/emblem_conflict_redundant";
case ModInfo::FLAG_ALTERNATE_GAME: return ":MO/gui/alternate_game";
+ case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return ":/MO/gui/archive_conflict_mixed";
+ case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return ":/MO/gui/archive_conflict_winner";
+ case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return ":/MO/gui/archive_conflict_loser";
default: return QString();
}
}
|