Merge pull request #695 from ModOrganizer2/Develop

Stage for Release 2.2.0

1 files changed, 84 insertions, 15 deletions

diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index 1995964b..c3142962 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -1,4 +1,4 @@
-    #include "modflagicondelegate.h"

+#include "modflagicondelegate.h"

 #include <QList>

 

 

@@ -7,9 +7,26 @@ ModInfo::EFlag ModFlagIconDelegate::m_ConflictFlags[4] = { ModInfo::FLAG_CONFLIC
                                                          , ModInfo::FLAG_CONFLICT_OVERWRITTEN

                                                          , ModInfo::FLAG_CONFLICT_REDUNDANT };

 

-ModFlagIconDelegate::ModFlagIconDelegate(QObject *parent)

+ModInfo::EFlag ModFlagIconDelegate::m_ArchiveLooseConflictFlags[2] = { ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE

+                                                                     , ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN };

+

+ModInfo::EFlag ModFlagIconDelegate::m_ArchiveConflictFlags[3] = { ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED

+                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE

+                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN };

+

+ModFlagIconDelegate::ModFlagIconDelegate(QObject *parent, int logicalIndex, int compactSize)

   : IconDelegate(parent)

+  , m_LogicalIndex(logicalIndex)

+  , m_CompactSize(compactSize)

+  , m_Compact(false)

+{

+}

+

+void ModFlagIconDelegate::columnResized(int logicalIndex, int, int newSize)

 {

+  if (logicalIndex == m_LogicalIndex) {

+    m_Compact = newSize < m_CompactSize;

+  }

 }

 

 QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const {

@@ -19,19 +36,59 @@ QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const {
     ModInfo::Ptr info = ModInfo::getByIndex(modid.toInt());

     std::vector<ModInfo::EFlag> flags = info->getFlags();

 

-    { // insert conflict icon first to provide nicer alignment

+    // 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 {

+      } 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 (!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 (!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 (!m_Compact) {

         result.append(QString());

       }

     }

 

     for (auto iter = flags.begin(); iter != flags.end(); ++iter) {

-      result.append(getFlagIcon(*iter));

+      auto iconPath = getFlagIcon(*iter);

+      if (!iconPath.isEmpty())

+        result.append(iconPath);

     }

   }

   return result;

@@ -40,16 +97,28 @@ QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const {
 QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag) const

 {

   switch (flag) {

-    case ModInfo::FLAG_BACKUP: return ":/MO/gui/emblem_backup";

-    case ModInfo::FLAG_INVALID: return ":/MO/gui/problem";

-    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_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";

-    case ModInfo::FLAG_ALTERNATE_GAME: return ":MO/gui/alternate_game";

-    default: return QString();

+    case ModInfo::FLAG_BACKUP: return QStringLiteral(":/MO/gui/emblem_backup");

+    case ModInfo::FLAG_INVALID: return QStringLiteral(":/MO/gui/problem");

+    case ModInfo::FLAG_NOTENDORSED: return QStringLiteral(":/MO/gui/emblem_notendorsed");

+    case ModInfo::FLAG_NOTES: return QStringLiteral(":/MO/gui/emblem_notes");

+    case ModInfo::FLAG_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/emblem_conflict_mixed");

+    case ModInfo::FLAG_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/emblem_conflict_overwrite");

+    case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/emblem_conflict_overwritten");

+    case ModInfo::FLAG_CONFLICT_REDUNDANT: return QStringLiteral(":/MO/gui/emblem_conflict_redundant");

+    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwrite");

+    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwritten");

+    case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/archive_conflict_mixed");

+    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_conflict_winner");

+    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_conflict_loser");

+    case ModInfo::FLAG_ALTERNATE_GAME: return QStringLiteral(":/MO/gui/alternate_game");

+    case ModInfo::FLAG_FOREIGN: return QString();

+    case ModInfo::FLAG_SEPARATOR: return QString();

+    case ModInfo::FLAG_OVERWRITE: return QString();

+    case ModInfo::FLAG_PLUGIN_SELECTED: return QString();

+    case ModInfo::FLAG_TRACKED: return QStringLiteral(":/MO/gui/tracked");

+    default:

+      qWarning("ModInfo flag %d has no defined icon", flag);

+      return QString();

   }

 }