From 01e1232cf85f09efde780537bbbca40fd6f0c097 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Thu, 2 Aug 2018 15:33:27 +0200
Subject: Added new "loose files overwrite archive" icon and all the flags. The
 logic to show it is still missing until the other issues are fixed.

---
 src/modflagicondelegate.cpp               |   1 +
 src/modinfo.h                             |   1 +
 src/modlist.cpp                           |   7 ++++---
 src/modlistsortproxy.cpp                  |   3 ++-
 src/resources.qrc                         |   3 ++-
 src/resources/conflict-overwrite-blue.png | Bin 0 -> 964 bytes
 6 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 src/resources/conflict-overwrite-blue.png

diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index 4404ce60..f7f85a18 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -45,6 +45,7 @@ QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag) const
     case ModInfo::FLAG_NOTENDORSED: return ":/MO/gui/emblem_notendorsed";
     case ModInfo::FLAG_NOTES: return ":/MO/gui/emblem_notes";
     case ModInfo::FLAG_CONFLICT_OVERWRITE: return ":/MO/gui/emblem_conflict_overwrite";
+    case ModInfo::FLAG_CONFLICT_LOOSE_OVERWRITE_ARCHIVE: return ":/MO/gui/emblem_conflict_loose_overwrite_archive";
     case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return ":/MO/gui/emblem_conflict_overwritten";
     case ModInfo::FLAG_CONFLICT_MIXED: return ":/MO/gui/emblem_conflict_mixed";
     case ModInfo::FLAG_CONFLICT_REDUNDANT: return ":MO/gui/emblem_conflict_redundant";
diff --git a/src/modinfo.h b/src/modinfo.h
index 15876a23..c763e69b 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -69,6 +69,7 @@ public:
     FLAG_NOTENDORSED,
     FLAG_NOTES,
     FLAG_CONFLICT_OVERWRITE,
+	FLAG_CONFLICT_LOOSE_OVERWRITE_ARCHIVE,
     FLAG_CONFLICT_OVERWRITTEN,
     FLAG_CONFLICT_MIXED,
     FLAG_CONFLICT_REDUNDANT,
diff --git a/src/modlist.cpp b/src/modlist.cpp
index e9a12862..876e8958 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -158,9 +158,10 @@ QString ModList::getFlagText(ModInfo::EFlag flag, ModInfo::Ptr modInfo) const
         output << QString("<i>%1</i>").arg(modInfo->notes()).replace("\n", "<br>");
       return output.join("<br>");
     }
-    case ModInfo::FLAG_CONFLICT_OVERWRITE: return tr("Overwrites files");
-    case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return tr("Overwritten files");
-    case ModInfo::FLAG_CONFLICT_MIXED: return tr("Overwrites & Overwritten");
+    case ModInfo::FLAG_CONFLICT_OVERWRITE: return tr("Overwrites loose files");
+    case ModInfo::FLAG_CONFLICT_LOOSE_OVERWRITE_ARCHIVE: return tr("Loose files overwrite another archive");
+    case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return tr("Overwritten loose files");
+    case ModInfo::FLAG_CONFLICT_MIXED: return tr("Loose files Overwrites & Overwritten");
     case ModInfo::FLAG_CONFLICT_REDUNDANT: return tr("Redundant");
     case ModInfo::FLAG_ALTERNATE_GAME: return tr("Alternate game source");
     case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return tr("Overwrites another archive file");
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 6f6983ba..c34985b6 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -243,7 +243,8 @@ bool ModListSortProxy::hasConflictFlag(const std::vector<ModInfo::EFlag> &flags)
         (flag == ModInfo::FLAG_CONFLICT_REDUNDANT) ||
         (flag == ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE) ||
         (flag == ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN) ||
-        (flag == ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED)) {
+        (flag == ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED) ||
+		(flag == ModInfo::FLAG_CONFLICT_LOOSE_OVERWRITE_ARCHIVE)) {
       return true;
     }
   }
diff --git a/src/resources.qrc b/src/resources.qrc
index 1dccce0b..dff1ad72 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -47,7 +47,8 @@
         <file alias="emblem_conflict_mixed">resources/conflict-mixed.png</file>
         <file alias="emblem_conflict_overwrite">resources/conflict-overwrite.png</file>
         <file alias="emblem_conflict_overwritten">resources/conflict-overwritten.png</file>
-        <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file>
+        <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file> 
+        <file alias="emblem_conflict_loose_overwrite_archive">resources/conflict-overwrite-blue.png</file>
         <file alias="emblem_notes">resources/accessories-text-editor.png</file>
         <file alias="version_date">resources/x-office-calendar.png</file>
         <file alias="warning_16">resources/dialog-warning_16.png</file>
diff --git a/src/resources/conflict-overwrite-blue.png b/src/resources/conflict-overwrite-blue.png
new file mode 100644
index 00000000..3247e7b7
Binary files /dev/null and b/src/resources/conflict-overwrite-blue.png differ
-- 
cgit v1.3.1