Merge pull request #1058 [LYN-2514] Extending gem model & Item delegate changes enabled/disabled state in the gem model

Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp

@@ -131,6 +131,22 @@ namespace O3DE::ProjectManager
             return false;
         }
 
+        if (event->type() == QEvent::MouseButtonPress)
+        {
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+
+            QRect fullRect, itemRect, contentRect;
+            CalcRects(option, fullRect, itemRect, contentRect);
+            const QRect buttonRect = CalcButtonRect(contentRect);
+
+            if (buttonRect.contains(mouseEvent->pos()))
+            {
+                const bool isAdded = GemModel::IsAdded(modelIndex);
+                GemModel::SetIsAdded(*model, modelIndex, !isAdded);
+                return true;
+            }
+        }
+
         return QStyledItemDelegate::editorEvent(event, model, option, modelIndex);
     }
 

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp

@@ -38,6 +38,7 @@ namespace O3DE::ProjectManager
         item->setData(aznumeric_cast<int>(gemInfo.m_platforms), RolePlatforms);
         item->setData(aznumeric_cast<int>(gemInfo.m_types), RoleTypes);
         item->setData(gemInfo.m_summary, RoleSummary);
+        item->setData(false, RoleWasPreviouslyAdded);
         item->setData(gemInfo.m_isAdded, RoleIsAdded);
         item->setData(gemInfo.m_directoryLink, RoleDirectoryLink);
         item->setData(gemInfo.m_documentationLink, RoleDocLink);
@@ -47,6 +48,7 @@ namespace O3DE::ProjectManager
         item->setData(gemInfo.m_lastUpdatedDate, RoleLastUpdated);
         item->setData(gemInfo.m_binarySizeInKB, RoleBinarySize);
         item->setData(gemInfo.m_features, RoleFeatures);
+        item->setData(gemInfo.m_path, RolePath);
 
         appendRow(item);
 
@@ -89,11 +91,6 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RoleSummary).toString();
     }
 
-    bool GemModel::IsAdded(const QModelIndex& modelIndex)
-    {
-        return modelIndex.data(RoleIsAdded).toBool();
-    }
-
     QString GemModel::GetDirectoryLink(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleDirectoryLink).toString();
@@ -180,4 +177,62 @@ namespace O3DE::ProjectManager
     {
         return modelIndex.data(RoleFeatures).toStringList();
     }
+
+    QString GemModel::GetPath(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RolePath).toString();
+    }
+
+    bool GemModel::IsAdded(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleIsAdded).toBool();
+    }
+
+    void GemModel::SetIsAdded(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isAdded)
+    {
+        model.setData(modelIndex, isAdded, RoleIsAdded);
+    }
+
+    void GemModel::SetWasPreviouslyAdded(QAbstractItemModel& model, const QModelIndex& modelIndex, bool wasAdded)
+    {
+        model.setData(modelIndex, wasAdded, RoleWasPreviouslyAdded);
+    }
+
+    bool GemModel::NeedsToBeAdded(const QModelIndex& modelIndex)
+    {
+        return (!modelIndex.data(RoleWasPreviouslyAdded).toBool() && modelIndex.data(RoleIsAdded).toBool());
+    }
+
+    bool GemModel::NeedsToBeRemoved(const QModelIndex& modelIndex)
+    {
+        return (modelIndex.data(RoleWasPreviouslyAdded).toBool() && !modelIndex.data(RoleIsAdded).toBool());
+    }
+
+    QVector<QModelIndex> GemModel::GatherGemsToBeAdded() const
+    {
+        QVector<QModelIndex> result;
+        for (int row = 0; row < rowCount(); ++row)
+        {
+            const QModelIndex modelIndex = index(row, 0);
+            if (NeedsToBeAdded(modelIndex))
+            {
+                result.push_back(modelIndex);
+            }
+        }
+        return result;
+    }
+
+    QVector<QModelIndex> GemModel::GatherGemsToBeRemoved() const
+    {
+        QVector<QModelIndex> result;
+        for (int row = 0; row < rowCount(); ++row)
+        {
+            const QModelIndex modelIndex = index(row, 0);
+            if (NeedsToBeRemoved(modelIndex))
+            {
+                result.push_back(modelIndex);
+            }
+        }
+        return result;
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h

@@ -46,13 +46,22 @@ namespace O3DE::ProjectManager
         static GemInfo::Platforms GetPlatforms(const QModelIndex& modelIndex);
         static GemInfo::Types GetTypes(const QModelIndex& modelIndex);
         static QString GetSummary(const QModelIndex& modelIndex);
-        static bool IsAdded(const QModelIndex& modelIndex);
         static QString GetDirectoryLink(const QModelIndex& modelIndex);
         static QString GetDocLink(const QModelIndex& modelIndex);
         static QString GetVersion(const QModelIndex& modelIndex);
         static QString GetLastUpdated(const QModelIndex& modelIndex);
         static int GetBinarySizeInKB(const QModelIndex& modelIndex);
         static QStringList GetFeatures(const QModelIndex& modelIndex);
+        static QString GetPath(const QModelIndex& modelIndex);
+
+        static bool IsAdded(const QModelIndex& modelIndex);
+        static void SetIsAdded(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isAdded);
+        static void SetWasPreviouslyAdded(QAbstractItemModel& model, const QModelIndex& modelIndex, bool wasAdded);
+        static bool NeedsToBeAdded(const QModelIndex& modelIndex);
+        static bool NeedsToBeRemoved(const QModelIndex& modelIndex);
+
+        QVector<QModelIndex> GatherGemsToBeAdded() const;
+        QVector<QModelIndex> GatherGemsToBeRemoved() const;
 
     private:
         enum UserRole
@@ -62,6 +71,7 @@ namespace O3DE::ProjectManager
             RoleGemOrigin,
             RolePlatforms,
             RoleSummary,
+            RoleWasPreviouslyAdded,
             RoleIsAdded,
             RoleDirectoryLink,
             RoleDocLink,
@@ -71,7 +81,8 @@ namespace O3DE::ProjectManager
             RoleLastUpdated,
             RoleBinarySize,
             RoleFeatures,
-            RoleTypes
+            RoleTypes,
+            RolePath
         };
 
         QHash<QString, QModelIndex> m_nameToIndexMap;