From 51d664d76ce6b611e7a7585b209bad9d68fe65d7 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 27 Sep 2019 15:20:02 -0400
Subject: moved color stuff to ColorTable, now shows sample text and icons

---
 src/modflagicondelegate.cpp | 114 ++++++++++++++++++++++++--------------------
 1 file changed, 62 insertions(+), 52 deletions(-)

(limited to 'src/modflagicondelegate.cpp')

diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index 7110a590..a5e9aa22 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -31,72 +31,82 @@ void ModFlagIconDelegate::columnResized(int logicalIndex, int, int newSize)
   }
 }
 
-QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const {
+QList<QString> ModFlagIconDelegate::getIconsForFlags(
+  std::vector<ModInfo::EFlag> flags, bool compact)
+{
   QList<QString> result;
-  QVariant modid = index.data(Qt::UserRole + 1);
-  if (modid.isValid()) {
-    ModInfo::Ptr info = ModInfo::getByIndex(modid.toInt());
-    std::vector<ModInfo::EFlag> flags = info->getFlags();
 
-    // Don't do flags for overwrite
-    if (std::find(flags.begin(), flags.end(),ModInfo::FLAG_OVERWRITE) != flags.end())
-      return result;
-
-    // insert conflict icons to provide nicer alignment
-    { // insert loose file conflicts first
-      auto iter = std::find_first_of(flags.begin(), flags.end(),
-                                     m_ConflictFlags, m_ConflictFlags + 4);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  // Don't do flags for overwrite
+  if (std::find(flags.begin(), flags.end(),ModInfo::FLAG_OVERWRITE) != flags.end())
+    return result;
+
+  // insert conflict icons to provide nicer alignment
+  { // insert loose file conflicts first
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+                                    m_ConflictFlags, m_ConflictFlags + 4);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    { // insert loose vs archive overwrite second
-      auto iter = std::find(flags.begin(), flags.end(),
-        ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  { // insert loose vs archive overwrite second
+    auto iter = std::find(flags.begin(), flags.end(),
+      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    { // insert loose vs archive overwritten third
-      auto iter = std::find_first_of(flags.begin(), flags.end(),
-        m_ArchiveLooseConflictFlags + 1, m_ArchiveLooseConflictFlags + 2);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  { // insert loose vs archive overwritten third
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+      m_ArchiveLooseConflictFlags + 1, m_ArchiveLooseConflictFlags + 2);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    { // insert archive conflicts last
-      auto iter = std::find_first_of(flags.begin(), flags.end(),
-        m_ArchiveConflictFlags, m_ArchiveConflictFlags + 3);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  { // insert archive conflicts last
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+      m_ArchiveConflictFlags, m_ArchiveConflictFlags + 3);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
-      auto iconPath = getFlagIcon(*iter);
-      if (!iconPath.isEmpty())
-        result.append(iconPath);
-    }
+  for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
+    auto iconPath = getFlagIcon(*iter);
+    if (!iconPath.isEmpty())
+      result.append(iconPath);
   }
+
   return result;
 }
 
-QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag) const
+QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const
+{
+  QVariant modid = index.data(Qt::UserRole + 1);
+
+  if (modid.isValid()) {
+    ModInfo::Ptr info = ModInfo::getByIndex(modid.toInt());
+    return getIconsForFlags(info->getFlags(), m_Compact);
+  }
+
+  return {};
+}
+
+QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag)
 {
   switch (flag) {
     case ModInfo::FLAG_BACKUP: return QStringLiteral(":/MO/gui/emblem_backup");
-- 
cgit v1.3.1