From 580f45429fca07a4d3cd8daae83b6963ce5de54a Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Sun, 30 Dec 2018 18:52:15 -0600
Subject: Fix conflict colors and make archive conflict colors configurable

---
 src/modlist.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'src/modlist.cpp')

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 0b66a663..44ca6eaf 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -411,21 +411,26 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
     bool archiveOverwritten = m_ArchiveOverwritten.find(modIndex) != m_ArchiveOverwritten.end();
     bool archiveLooseOverwritten = m_ArchiveLooseOverwritten.find(modIndex) != m_ArchiveLooseOverwritten.end();
     if (modInfo->getHighlight() & ModInfo::HIGHLIGHT_PLUGIN) {
+
       return Settings::instance().modlistContainsPluginColor();
-    } else if ((overwrite && (archiveOverwritten || archiveLooseOverwritten)) ||
-      (overwritten && (archiveOverwrite || archiveLooseOverwrite)) ||
-      (archiveOverwrite && (overwritten || archiveLooseOverwritten)) ||
-      (archiveOverwritten && (overwrite || archiveLooseOverwrite)) ||
-      (archiveLooseOverwrite && (overwritten || archiveOverwritten)) ||
-      (archiveLooseOverwritten && (overwrite || archiveLooseOverwrite))
-      ) {
+
+    } else if (overwritten || archiveLooseOverwritten) {
+
       return Settings::instance().modlistOverwrittenLooseColor();
-    }
-    else if (overwrite || archiveOverwrite || archiveLooseOverwrite) {
+
+    } else if (overwrite || archiveLooseOverwrite) {
+
       return Settings::instance().modlistOverwritingLooseColor();
-    } else if (overwritten || archiveOverwritten || archiveLooseOverwritten) {
-      return QColor(255, 0, 0, 64); //TODO: Make configurable
-    }  else if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR)
+
+    } else if (archiveOverwritten) {
+
+      return Settings::instance().modlistOverwrittenArchiveColor();
+
+    } else if (archiveOverwrite) {
+
+      return Settings::instance().modlistOverwritingArchiveColor();
+
+    } else if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR)
                && modInfo->getColor().isValid()
                && ((role != ViewMarkingScrollBar::DEFAULT_ROLE)
                     || Settings::instance().colorSeparatorScrollbar())) {
-- 
cgit v1.3.1