Merge branch 'stabilization/2106' into Helios_FixCacheCopyFailure

Code/Tools/ProjectManager/Resources/ProjectManager.qrc

@@ -31,5 +31,6 @@
         <file>CarrotArrowDown.svg</file>
         <file>Summary.svg</file>
         <file>WindowClose.svg</file>
+        <file>Warning.svg</file>
     </qresource>
 </RCC>

Code/Tools/ProjectManager/Resources/Warning.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#444444"/>
+<rect x="10" y="6" width="4" height="15" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2L22 22H2L12 2ZM13 20V18H11V20H13ZM13 7H11V16.0862H13V7Z" fill="#F0C32D"/>
+</svg>

Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp

@@ -206,7 +206,11 @@ namespace O3DE::ProjectManager
                 PythonBindingsInterface::Get()->AddProject(projectInfo.m_path);
 
 #ifdef TEMPLATE_GEM_CONFIGURATION_ENABLED
-                m_gemCatalogScreen->EnableDisableGemsForProject(projectInfo.m_path);
+                if (!m_gemCatalogScreen->EnableDisableGemsForProject(projectInfo.m_path))
+                {
+                    QMessageBox::critical(this, tr("Failed to configure gems"), tr("Failed to configure gems for template."));
+                    return;
+                }
 #endif // TEMPLATE_GEM_CONFIGURATION_ENABLED
 
                 projectInfo.m_needsBuild = true;

Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp

@@ -16,7 +16,7 @@
 #include <QLineEdit>
 #include <QMessageBox>
 #include <FormLineEditWidget.h>
-#include <FormBrowseEditWidget.h>
+#include <FormFolderBrowseEditWidget.h>
 #include <PythonBindingsInterface.h>
 #include <PathValidator.h>
 
@@ -46,28 +46,28 @@ namespace O3DE::ProjectManager
         m_engineVersion->lineEdit()->setReadOnly(true);
         layout->addWidget(m_engineVersion);
 
-        m_thirdParty = new FormBrowseEditWidget(tr("3rd Party Software Folder"), engineInfo.m_thirdPartyPath, this);
+        m_thirdParty = new FormFolderBrowseEditWidget(tr("3rd Party Software Folder"), engineInfo.m_thirdPartyPath, this);
         m_thirdParty->lineEdit()->setValidator(new PathValidator(PathValidator::PathMode::ExistingFolder, this));
         m_thirdParty->lineEdit()->setReadOnly(true);
         m_thirdParty->setErrorLabelText(tr("Please provide a valid path to a folder that exists"));
         connect(m_thirdParty->lineEdit(), &QLineEdit::textChanged, this, &EngineSettingsScreen::OnTextChanged);
         layout->addWidget(m_thirdParty);
 
-        m_defaultProjects = new FormBrowseEditWidget(tr("Default Projects Folder"), engineInfo.m_defaultProjectsFolder, this);
+        m_defaultProjects = new FormFolderBrowseEditWidget(tr("Default Projects Folder"), engineInfo.m_defaultProjectsFolder, this);
         m_defaultProjects->lineEdit()->setValidator(new PathValidator(PathValidator::PathMode::ExistingFolder, this));
         m_defaultProjects->lineEdit()->setReadOnly(true);
         m_defaultProjects->setErrorLabelText(tr("Please provide a valid path to a folder that exists"));
         connect(m_defaultProjects->lineEdit(), &QLineEdit::textChanged, this, &EngineSettingsScreen::OnTextChanged);
         layout->addWidget(m_defaultProjects);
 
-        m_defaultGems = new FormBrowseEditWidget(tr("Default Gems Folder"), engineInfo.m_defaultGemsFolder, this);
+        m_defaultGems = new FormFolderBrowseEditWidget(tr("Default Gems Folder"), engineInfo.m_defaultGemsFolder, this);
         m_defaultGems->lineEdit()->setValidator(new PathValidator(PathValidator::PathMode::ExistingFolder, this));
         m_defaultGems->lineEdit()->setReadOnly(true);
         m_defaultGems->setErrorLabelText(tr("Please provide a valid path to a folder that exists"));
         connect(m_defaultGems->lineEdit(), &QLineEdit::textChanged, this, &EngineSettingsScreen::OnTextChanged);
         layout->addWidget(m_defaultGems);
 
-        m_defaultProjectTemplates = new FormBrowseEditWidget(tr("Default Project Templates Folder"), engineInfo.m_defaultTemplatesFolder, this);
+        m_defaultProjectTemplates = new FormFolderBrowseEditWidget(tr("Default Project Templates Folder"), engineInfo.m_defaultTemplatesFolder, this);
         m_defaultProjectTemplates->lineEdit()->setValidator(new PathValidator(PathValidator::PathMode::ExistingFolder, this));
         m_defaultProjectTemplates->lineEdit()->setReadOnly(true);
         m_defaultProjectTemplates->setErrorLabelText(tr("Please provide a valid path to a folder that exists"));

Code/Tools/ProjectManager/Source/FormBrowseEditWidget.cpp

@@ -11,13 +11,9 @@
 */
 
 #include <FormBrowseEditWidget.h>
-#include <AzQtComponents/Components/StyledLineEdit.h>
+
 #include <QPushButton>
 #include <QHBoxLayout>
-#include <QFileDialog>
-#include <QLineEdit>
-#include <QStandardPaths>
-#include <QIcon>
 
 namespace O3DE::ProjectManager
 {
@@ -30,20 +26,4 @@ namespace O3DE::ProjectManager
         connect(browseButton, &QPushButton::pressed, this, &FormBrowseEditWidget::HandleBrowseButton);
         m_frameLayout->addWidget(browseButton); 
     }
-
-    void FormBrowseEditWidget::HandleBrowseButton()
-    {
-        QString defaultPath = m_lineEdit->text();
-        if (defaultPath.isEmpty())
-        {
-            defaultPath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-        }
-
-        QString directory = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(this, tr("Browse"), defaultPath));
-        if (!directory.isEmpty())
-        {
-            m_lineEdit->setText(directory);
-        }
-
-    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormBrowseEditWidget.h

@@ -27,7 +27,7 @@ namespace O3DE::ProjectManager
         explicit FormBrowseEditWidget(const QString& labelText, const QString& valueText = "", QWidget* parent = nullptr);
         ~FormBrowseEditWidget() = default;
 
-    private slots:
-        void HandleBrowseButton();
+    protected slots:
+        virtual void HandleBrowseButton() = 0;
     };
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.cpp

@@ -0,0 +1,42 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <FormFolderBrowseEditWidget.h>
+#include <AzQtComponents/Components/StyledLineEdit.h>
+
+#include <QFileDialog>
+#include <QLineEdit>
+#include <QStandardPaths>
+
+namespace O3DE::ProjectManager
+{
+    FormFolderBrowseEditWidget::FormFolderBrowseEditWidget(const QString& labelText, const QString& valueText, QWidget* parent)
+        : FormBrowseEditWidget(labelText, valueText, parent)
+    {
+    }
+
+    void FormFolderBrowseEditWidget::HandleBrowseButton()
+    {
+        QString defaultPath = m_lineEdit->text();
+        if (defaultPath.isEmpty())
+        {
+            defaultPath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+        }
+
+        QString directory = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(this, tr("Browse"), defaultPath));
+        if (!directory.isEmpty())
+        {
+            m_lineEdit->setText(directory);
+        }
+
+    }
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.h

@@ -0,0 +1,33 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <FormBrowseEditWidget.h> 
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class FormFolderBrowseEditWidget
+        : public FormBrowseEditWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit FormFolderBrowseEditWidget(const QString& labelText, const QString& valueText = "", QWidget* parent = nullptr);
+        ~FormFolderBrowseEditWidget() = default;
+
+    protected:
+        void HandleBrowseButton() override;
+    };
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.cpp

@@ -0,0 +1,35 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <FormImageBrowseEditWidget.h>
+#include <AzQtComponents/Components/StyledLineEdit.h>
+
+#include <QFileDialog>
+#include <QLineEdit>
+
+namespace O3DE::ProjectManager
+{
+    FormImageBrowseEditWidget::FormImageBrowseEditWidget(const QString& labelText, const QString& valueText, QWidget* parent)
+        : FormBrowseEditWidget(labelText, valueText, parent)
+    {
+    }
+
+    void FormImageBrowseEditWidget::HandleBrowseButton()
+    {
+        QString file = QDir::toNativeSeparators(QFileDialog::getOpenFileName(
+            this, tr("Select Image"), m_lineEdit->text(), tr("PNG (*.png)")));
+        if (!file.isEmpty())
+        {
+            m_lineEdit->setText(file);
+        }
+    }
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormImageBrowseEditWidget.h

@@ -0,0 +1,33 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <FormBrowseEditWidget.h>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class FormImageBrowseEditWidget
+        : public FormBrowseEditWidget
+    {
+        Q_OBJECT
+
+    public:
+        explicit FormImageBrowseEditWidget(const QString& labelText, const QString& valueText = "", QWidget* parent = nullptr);
+        ~FormImageBrowseEditWidget() = default;
+
+    protected:
+        void HandleBrowseButton() override;
+    };
+} // namespace O3DE::ProjectManager

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

@@ -14,6 +14,7 @@
 #include <PythonBindingsInterface.h>
 #include <GemCatalog/GemListHeaderWidget.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
+#include <GemCatalog/GemRequirementDialog.h>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
@@ -144,12 +145,23 @@ namespace O3DE::ProjectManager
         }
     }
 
-    void GemCatalogScreen::EnableDisableGemsForProject(const QString& projectPath)
+    bool GemCatalogScreen::EnableDisableGemsForProject(const QString& projectPath)
     {
         IPythonBindings* pythonBindings = PythonBindingsInterface::Get();
         QVector<QModelIndex> toBeAdded = m_gemModel->GatherGemsToBeAdded();
         QVector<QModelIndex> toBeRemoved = m_gemModel->GatherGemsToBeRemoved();
 
+        if (m_gemModel->DoGemsToBeAddedHaveRequirements())
+        {
+            GemRequirementDialog* confirmRequirementsDialog = new GemRequirementDialog(m_gemModel, toBeAdded, this);
+            confirmRequirementsDialog->exec();
+
+            if (confirmRequirementsDialog->GetButtonResult() != QDialogButtonBox::ApplyRole)
+            {
+                return false;
+            }
+        }
+
         for (const QModelIndex& modelIndex : toBeAdded)
         {
             const QString gemPath = GemModel::GetPath(modelIndex);
@@ -158,6 +170,8 @@ namespace O3DE::ProjectManager
             {
                 QMessageBox::critical(nullptr, "Operation failed",
                     QString("Cannot add gem %1 to project.\n\nError:\n%2").arg(GemModel::GetName(modelIndex), result.GetError().c_str()));
+
+                return false;
             }
         }
 
@@ -169,8 +183,12 @@ namespace O3DE::ProjectManager
             {
                 QMessageBox::critical(nullptr, "Operation failed",
                     QString("Cannot remove gem %1 from project.\n\nError:\n%2").arg(GemModel::GetName(modelIndex), result.GetError().c_str()));
+
+                return false;
             }
         }
+
+        return true;
     }
 
     ProjectManagerScreen GemCatalogScreen::GetScreenEnum()

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

@@ -33,7 +33,7 @@ namespace O3DE::ProjectManager
         ProjectManagerScreen GetScreenEnum() override;
 
         void ReinitForProject(const QString& projectPath, bool isNewProject);
-        void EnableDisableGemsForProject(const QString& projectPath);
+        bool EnableDisableGemsForProject(const QString& projectPath);
 
     private:
         void FillModel(const QString& projectPath, bool isNewProject);

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

@@ -73,6 +73,7 @@ namespace O3DE::ProjectManager
         Platforms m_platforms;
         Types m_types; //! Asset and/or Code and/or Tool
         QStringList m_features;
+        QString m_requirement;
         QString m_directoryLink;
         QString m_documentationLink;
         QString m_version = "Unknown Version";

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

@@ -16,6 +16,7 @@
 #include <QLabel>
 #include <QSpacerItem>
 #include <QVBoxLayout>
+#include <QIcon>
 
 namespace O3DE::ProjectManager
 {
@@ -70,6 +71,22 @@ namespace O3DE::ProjectManager
         m_directoryLinkLabel->SetUrl(m_model->GetDirectoryLink(modelIndex));
         m_documentationLinkLabel->SetUrl(m_model->GetDocLink(modelIndex));
 
+        if (m_model->HasRequirement(modelIndex))
+        {
+            m_reqirementsIconLabel->show();
+            m_reqirementsTitleLabel->show();
+            m_reqirementsTextLabel->show();
+
+            m_reqirementsTitleLabel->setText("Requirement");
+            m_reqirementsTextLabel->setText(m_model->GetRequirement(modelIndex));
+        }
+        else
+        {
+            m_reqirementsIconLabel->hide();
+            m_reqirementsTitleLabel->hide();
+            m_reqirementsTextLabel->hide();
+        }
+
         // Depending and conflicting gems
         m_dependingGems->Update("Depending Gems", "The following Gems will be automatically enabled with this Gem.", m_model->GetDependingGemNames(modelIndex));
         m_conflictingGems->Update("Conflicting Gems", "The following Gems will be automatically disabled with this Gem.", m_model->GetConflictingGemNames(modelIndex));
@@ -134,6 +151,28 @@ namespace O3DE::ProjectManager
 
         m_mainLayout->addSpacing(10);
 
+        // Requirements
+        m_reqirementsTitleLabel = GemInspector::CreateStyledLabel(m_mainLayout, 16, s_headerColor);
+
+        QHBoxLayout* requrementsLayout = new QHBoxLayout();
+        requrementsLayout->setAlignment(Qt::AlignTop);
+        requrementsLayout->setMargin(0);
+        requrementsLayout->setSpacing(0);
+
+        m_reqirementsIconLabel = new QLabel();
+        m_reqirementsIconLabel->setPixmap(QIcon(":/Warning.svg").pixmap(24, 24));
+        requrementsLayout->addWidget(m_reqirementsIconLabel);
+
+        m_reqirementsTextLabel = GemInspector::CreateStyledLabel(requrementsLayout, 10, s_textColor);
+        m_reqirementsTextLabel->setWordWrap(true);
+
+        QSpacerItem* reqirementsSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding);
+        requrementsLayout->addSpacerItem(reqirementsSpacer);
+
+        m_mainLayout->addLayout(requrementsLayout);
+
+        m_mainLayout->addSpacing(20);
+
         // Depending and conflicting gems
         m_dependingGems = new GemsSubWidget();
         m_mainLayout->addWidget(m_dependingGems);

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

@@ -76,6 +76,11 @@ namespace O3DE::ProjectManager
         LinkLabel* m_directoryLinkLabel = nullptr;
         LinkLabel* m_documentationLinkLabel = nullptr;
 
+        // Requirements
+        QLabel* m_reqirementsTitleLabel = nullptr;
+        QLabel* m_reqirementsIconLabel = nullptr;
+        QLabel* m_reqirementsTextLabel = nullptr;
+
         // Depending and conflicting gems
         GemsSubWidget* m_dependingGems = nullptr;
         GemsSubWidget* m_conflictingGems = nullptr;

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

@@ -11,7 +11,7 @@
 */
 
 #include <GemCatalog/GemItemDelegate.h>
-#include "GemModel.h"
+#include <GemCatalog/GemModel.h>
 #include <QEvent>
 #include <QPainter>
 #include <QMouseEvent>

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

@@ -62,7 +62,7 @@ namespace O3DE::ProjectManager
         inline constexpr static int s_buttonCircleRadius = s_buttonBorderRadius - 2;
         inline constexpr static qreal s_buttonFontSize = 10.0;
 
-    private:
+    protected:
         void CalcRects(const QStyleOptionViewItem& option, QRect& outFullRect, QRect& outItemRect, QRect& outContentRect) const;
         QRect GetTextRect(QFont& font, const QString& text, qreal fontSize) const;
         QRect CalcButtonRect(const QRect& contentRect) const;
@@ -71,6 +71,7 @@ namespace O3DE::ProjectManager
 
         QAbstractItemModel* m_model = nullptr;
 
+    private:
         // Platform icons
         void AddPlatformIcon(GemInfo::Platform platform, const QString& iconPath);
         inline constexpr static int s_platformIconSize = 12;

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

@@ -10,11 +10,9 @@
 *
 */
 
-#include "GemListView.h"
-#include "GemItemDelegate.h"
+#include <GemCatalog/GemListView.h>
+#include <GemCatalog/GemItemDelegate.h>
 #include <QStandardItemModel>
-#include <QDateTime>
-#include <QPalette>
 
 namespace O3DE::ProjectManager
 {

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

@@ -13,7 +13,6 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include "GemInfo.h"
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
 #include <QListView>

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

@@ -49,6 +49,7 @@ namespace O3DE::ProjectManager
         item->setData(gemInfo.m_binarySizeInKB, RoleBinarySize);
         item->setData(gemInfo.m_features, RoleFeatures);
         item->setData(gemInfo.m_path, RolePath);
+        item->setData(gemInfo.m_requirement, RoleRequirement);
 
         appendRow(item);
 
@@ -183,6 +184,11 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RolePath).toString();
     }
 
+    QString GemModel::GetRequirement(const QModelIndex& modelIndex)
+    {
+        return modelIndex.data(RoleRequirement).toString();
+    }
+
     bool GemModel::IsAdded(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleIsAdded).toBool();
@@ -208,6 +214,24 @@ namespace O3DE::ProjectManager
         return (modelIndex.data(RoleWasPreviouslyAdded).toBool() && !modelIndex.data(RoleIsAdded).toBool());
     }
 
+    bool GemModel::HasRequirement(const QModelIndex& modelIndex)
+    {
+        return !modelIndex.data(RoleRequirement).toString().isEmpty();
+    }
+
+    bool GemModel::DoGemsToBeAddedHaveRequirements() const
+    {
+        for (int row = 0; row < rowCount(); ++row)
+        {
+            const QModelIndex modelIndex = index(row, 0);
+            if (NeedsToBeAdded(modelIndex) && HasRequirement(modelIndex))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     QVector<QModelIndex> GemModel::GatherGemsToBeAdded() const
     {
         QVector<QModelIndex> result;

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

@@ -53,12 +53,16 @@ namespace O3DE::ProjectManager
         static int GetBinarySizeInKB(const QModelIndex& modelIndex);
         static QStringList GetFeatures(const QModelIndex& modelIndex);
         static QString GetPath(const QModelIndex& modelIndex);
+        static QString GetRequirement(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);
+        static bool HasRequirement(const QModelIndex& modelIndex);
+
+        bool DoGemsToBeAddedHaveRequirements() const;
 
         QVector<QModelIndex> GatherGemsToBeAdded() const;
         QVector<QModelIndex> GatherGemsToBeRemoved() const;
@@ -84,7 +88,8 @@ namespace O3DE::ProjectManager
             RoleBinarySize,
             RoleFeatures,
             RoleTypes,
-            RolePath
+            RolePath,
+            RoleRequirement
         };
 
         QHash<QString, QModelIndex> m_nameToIndexMap;

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

@@ -0,0 +1,93 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <GemCatalog/GemRequirementDelegate.h>
+#include <GemCatalog/GemModel.h>
+
+#include <QPainter>
+
+namespace O3DE::ProjectManager
+{
+    GemRequirementDelegate::GemRequirementDelegate(QAbstractItemModel* model, QObject* parent)
+        : GemItemDelegate(model, parent)
+    {
+    }
+
+    void GemRequirementDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const
+    {
+        if (!modelIndex.isValid())
+        {
+            return;
+        }
+
+        QStyleOptionViewItem options(option);
+        initStyleOption(&options, modelIndex);
+
+        painter->save();
+        painter->setRenderHint(QPainter::Antialiasing);
+
+        QRect fullRect, itemRect, contentRect;
+        CalcRects(options, fullRect, itemRect, contentRect);
+
+        QFont standardFont(options.font);
+        standardFont.setPixelSize(s_fontSize);
+        QFontMetrics standardFontMetrics(standardFont);
+
+        painter->save();
+        painter->setClipping(true);
+        painter->setClipRect(fullRect);
+        painter->setFont(options.font);
+
+        // Draw background
+        painter->fillRect(fullRect, m_backgroundColor);
+
+        // Draw item background
+        const QColor itemBackgroundColor = m_itemBackgroundColor;
+        painter->fillRect(itemRect, itemBackgroundColor);
+
+        // Gem name
+        QString gemName = GemModel::GetName(modelIndex);
+        QFont gemNameFont(options.font);
+        const int firstColumnMaxTextWidth = s_summaryStartX - 30;
+        gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
+        gemNameFont.setPixelSize(s_gemNameFontSize);
+        gemNameFont.setBold(true);
+        QRect gemNameRect = GetTextRect(gemNameFont, gemName, s_gemNameFontSize);
+        gemNameRect.moveTo(contentRect.left(), contentRect.center().y() - s_gemNameFontSize);
+
+        painter->setFont(gemNameFont);
+        painter->setPen(m_textColor);
+        painter->drawText(gemNameRect, Qt::TextSingleLine, gemName);
+
+        // Gem requirement
+        const QSize requirementSize = QSize(contentRect.width() - s_summaryStartX - s_itemMargins.right(), contentRect.height());
+        const QRect requirementRect = QRect(QPoint(contentRect.left() + s_summaryStartX, contentRect.top()), requirementSize);
+
+        painter->setFont(standardFont);
+        painter->setPen(m_textColor);
+
+        const QString requirement = GemModel::GetRequirement(modelIndex);
+        painter->drawText(requirementRect, Qt::AlignLeft | Qt::TextWordWrap, requirement);
+
+        painter->restore();
+    }
+
+    bool GemRequirementDelegate::editorEvent(
+        [[maybe_unused]] QEvent* event,
+        [[maybe_unused]] QAbstractItemModel* model,
+        [[maybe_unused]] const QStyleOptionViewItem& option,
+        [[maybe_unused]] const QModelIndex& modelIndex)
+    {
+        // Do nothing here
+        return false;
+    }
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,37 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <GemCatalog/GemItemDelegate.h>
+#endif
+
+
+namespace O3DE::ProjectManager
+{
+    class GemRequirementDelegate
+        : public GemItemDelegate
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemRequirementDelegate(QAbstractItemModel* model, QObject* parent = nullptr);
+        ~GemRequirementDelegate() = default;
+
+        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const override;
+        bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) override;
+
+        const QColor m_backgroundColor = QColor("#444444"); // Outside of the actual gem item
+        const QColor m_itemBackgroundColor = QColor("#393939"); // Background color of the gem item
+    };
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,92 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <GemCatalog/GemRequirementDialog.h>
+#include <GemCatalog/GemRequirementListView.h>
+#include <GemCatalog/GemRequirementFilterProxyModel.h>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QDialogButtonBox>
+#include <QSpacerItem>
+
+namespace O3DE::ProjectManager
+{
+    GemRequirementDialog::GemRequirementDialog(GemModel* model, const QVector<QModelIndex>& gemsToAdd, QWidget* parent)
+        : QDialog(parent)
+    {
+        setWindowTitle(tr("Manual setup is required"));
+        setModal(true);
+
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setMargin(0);
+        vLayout->setContentsMargins(25, 10, 25, 10);
+        vLayout->setSizeConstraint(QLayout::SetFixedSize);
+        setLayout(vLayout);
+
+        QHBoxLayout* instructionLayout = new QHBoxLayout();
+        instructionLayout->setMargin(0);
+
+        QLabel* instructionIconLabel = new QLabel();
+        instructionIconLabel->setPixmap(QIcon(":/Warning.svg").pixmap(32, 32));
+        instructionLayout->addWidget(instructionIconLabel);
+
+        instructionLayout->addSpacing(10);
+
+        QLabel* instructionLabel = new QLabel(tr("The following Gem(s) require manual setup before the project can be built successfully."));
+        instructionLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+        instructionLayout->addWidget(instructionLabel);
+
+        QSpacerItem* instructionSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        instructionLayout->addSpacerItem(instructionSpacer);
+
+        vLayout->addLayout(instructionLayout);
+
+        vLayout->addSpacing(20);
+
+        GemRequirementFilterProxyModel* proxModel = new GemRequirementFilterProxyModel(model, gemsToAdd, this);
+
+        GemRequirementListView* m_gemListView = new GemRequirementListView(proxModel, proxModel->GetSelectionModel(), this);
+        vLayout->addWidget(m_gemListView);
+
+        QDialogButtonBox* dialogButtons = new QDialogButtonBox();
+        dialogButtons->setObjectName("footer");
+        vLayout->addWidget(dialogButtons);
+
+        QPushButton* cancelButton = dialogButtons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
+        cancelButton->setProperty("secondary", true);
+        QPushButton* continueButton = dialogButtons->addButton(tr("Continue"), QDialogButtonBox::ApplyRole);
+
+        connect(cancelButton, &QPushButton::clicked, this, &GemRequirementDialog::CancelButtonPressed);
+        connect(continueButton, &QPushButton::clicked, this, &GemRequirementDialog::ContinueButtonPressed);
+    }
+
+    QDialogButtonBox::ButtonRole GemRequirementDialog::GetButtonResult()
+    {
+        return m_buttonResult;
+    }
+
+    void GemRequirementDialog::CancelButtonPressed()
+    {
+        m_buttonResult = QDialogButtonBox::RejectRole;
+        close();
+    }
+
+    void GemRequirementDialog::ContinueButtonPressed()
+    {
+        m_buttonResult = QDialogButtonBox::ApplyRole;
+        close();
+    }
+
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,41 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QDialog>
+
+#include <QDialogButtonBox>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    QT_FORWARD_DECLARE_CLASS(GemModel)
+
+    class GemRequirementDialog
+        : public QDialog
+    {
+        Q_OBJECT // AUTOMOC
+    public:
+        explicit GemRequirementDialog(GemModel* model, const QVector<QModelIndex>& gemsToAdd, QWidget *parent = nullptr);
+        ~GemRequirementDialog() = default;
+
+        QDialogButtonBox::ButtonRole GetButtonResult();
+
+    private:
+        void CancelButtonPressed();
+        void ContinueButtonPressed();
+
+        QDialogButtonBox::ButtonRole m_buttonResult = QDialogButtonBox::RejectRole;
+    };
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,51 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <GemCatalog/GemRequirementFilterProxyModel.h>
+#include <GemCatalog/GemModel.h>
+
+#include <QItemSelectionModel>
+
+namespace O3DE::ProjectManager
+{
+    GemRequirementFilterProxyModel::GemRequirementFilterProxyModel(GemModel* sourceModel, const QVector<QModelIndex>& addedGems, QObject* parent)
+        : QSortFilterProxyModel(parent)
+        , m_sourceModel(sourceModel)
+        , m_addedGems(addedGems)
+    {
+        setSourceModel(sourceModel);
+        m_selectionProxyModel = new AzQtComponents::SelectionProxyModel(sourceModel->GetSelectionModel(), this, parent);
+    }
+
+    bool GemRequirementFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const
+    {
+        // Do not use sourceParent->child because an invalid parent does not produce valid children (which our index function does)
+        QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+        if (!sourceIndex.isValid())
+        {
+            return false;
+        }
+
+        if (!m_addedGems.contains(sourceIndex))
+        {
+            return false;
+        }
+
+        if (!m_sourceModel->HasRequirement(sourceIndex))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,44 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AzQtComponents/Utilities/SelectionProxyModel.h>
+#include <QtCore/QSortFilterProxyModel>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QItemSelectionModel)
+
+namespace O3DE::ProjectManager
+{
+    QT_FORWARD_DECLARE_CLASS(GemModel)
+
+    class GemRequirementFilterProxyModel
+        : public QSortFilterProxyModel
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        GemRequirementFilterProxyModel(GemModel* sourceModel, const QVector<QModelIndex>& addedGems, QObject* parent = nullptr);
+
+        AzQtComponents::SelectionProxyModel* GetSelectionModel() const { return m_selectionProxyModel; }
+
+        bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
+
+    private:
+        GemModel* m_sourceModel = nullptr;
+        AzQtComponents::SelectionProxyModel* m_selectionProxyModel = nullptr;
+
+        QVector<QModelIndex> m_addedGems;
+    };
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,30 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <GemCatalog/GemRequirementListView.h>
+#include <GemCatalog/GemRequirementDelegate.h>
+#include <QStandardItemModel>
+
+namespace O3DE::ProjectManager
+{
+    GemRequirementListView::GemRequirementListView(QAbstractItemModel* model, QItemSelectionModel* selectionModel, QWidget* parent)
+        : QListView(parent)
+    {
+        setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+
+        setStyleSheet("background-color: #444444;");
+
+        setModel(model);
+        setSelectionModel(selectionModel);
+        setItemDelegate(new GemRequirementDelegate(model, this));
+    }
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,32 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QListView>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemRequirementListView
+        : public QListView
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemRequirementListView(QAbstractItemModel* model, QItemSelectionModel* selectionModel, QWidget* parent = nullptr);
+        ~GemRequirementListView() = default;
+    };
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp

@@ -12,8 +12,8 @@
 
 #include <NewProjectSettingsScreen.h>
 #include <PythonBindingsInterface.h>
-#include <FormLineEditWidget.h>
 #include <FormBrowseEditWidget.h>
+#include <FormLineEditWidget.h>
 #include <TemplateButtonWidget.h>
 #include <PathValidator.h>
 #include <EngineInfo.h>

Code/Tools/ProjectManager/Source/ProjectBuilder.cpp

@@ -11,6 +11,7 @@
  */
 
 #include <ProjectBuilder.h>
+#include <ProjectManagerDefs.h>
 #include <ProjectButtonWidget.h>
 #include <PythonBindingsInterface.h>
 
@@ -30,8 +31,6 @@ namespace O3DE::ProjectManager
 {
     // 10 Minutes
     constexpr int MaxBuildTimeMSecs = 600000;
-    static const QString BuildPathPostfix = "windows_vs2019";
-    static const QString ErrorLogPathPostfix = "CMakeFiles/CMakeProjectBuildError.log";
 
     ProjectBuilderWorker::ProjectBuilderWorker(const ProjectInfo& projectInfo)
         : QObject()
@@ -83,7 +82,7 @@ namespace O3DE::ProjectManager
             QStringList
             {
                 "-B",
-                QDir(m_projectInfo.m_path).filePath(BuildPathPostfix),
+                QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix),
                 "-S",
                 m_projectInfo.m_path,
                 "-G",
@@ -123,7 +122,7 @@ namespace O3DE::ProjectManager
             QStringList
             {
                 "--build",
-                QDir(m_projectInfo.m_path).filePath(BuildPathPostfix),
+                QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix),
                 "--target",
                 m_projectInfo.m_projectName + ".GameLauncher",
                 "Editor",
@@ -159,8 +158,8 @@ namespace O3DE::ProjectManager
     QString ProjectBuilderWorker::LogFilePath() const
     {
         QDir logFilePath(m_projectInfo.m_path);
-        logFilePath.cd(BuildPathPostfix);
-        return logFilePath.filePath(ErrorLogPathPostfix);
+        logFilePath.cd(ProjectBuildPathPostfix);
+        return logFilePath.filePath(ProjectBuildErrorLogPathPostfix);
     }
 
     void ProjectBuilderWorker::WriteErrorLog(const QString& log)

Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp

@@ -11,6 +11,7 @@
  */
 
 #include <ProjectButtonWidget.h>
+#include <ProjectManagerDefs.h>
 #include <AzQtComponents/Utilities/DesktopUtilities.h>
 
 #include <QVBoxLayout>
@@ -22,12 +23,11 @@
 #include <QMenu>
 #include <QSpacerItem>
 #include <QProgressBar>
+#include <QDir>
+#include <QFileInfo>
 
 namespace O3DE::ProjectManager
 {
-    inline constexpr static int s_projectImageWidth = 210;
-    inline constexpr static int s_projectImageHeight = 280;
-
     LabelButton::LabelButton(QWidget* parent)
         : QLabel(parent)
     {
@@ -92,11 +92,6 @@ namespace O3DE::ProjectManager
         : QFrame(parent)
         , m_projectInfo(projectInfo)
     {
-        if (m_projectInfo.m_imagePath.isEmpty())
-        {
-            m_projectInfo.m_imagePath = ":/DefaultProjectImage.png";
-        }
-
         BaseSetup();
         if (processing)
         {
@@ -118,20 +113,25 @@ namespace O3DE::ProjectManager
         setLayout(vLayout);
 
         m_projectImageLabel = new LabelButton(this);
-        m_projectImageLabel->setFixedSize(s_projectImageWidth, s_projectImageHeight);
+        m_projectImageLabel->setFixedSize(ProjectPreviewImageWidth, ProjectPreviewImageHeight);
         m_projectImageLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
         connect(m_projectImageLabel, &LabelButton::triggered, [this]() { emit OpenProject(m_projectInfo.m_path); });
         vLayout->addWidget(m_projectImageLabel);
 
-        m_projectImageLabel->setPixmap(
-            QPixmap(m_projectInfo.m_imagePath).scaled(m_projectImageLabel->size(), Qt::KeepAspectRatioByExpanding));
+        QString projectPreviewPath = QDir(m_projectInfo.m_path).filePath(m_projectInfo.m_iconPath);
+        QFileInfo doesPreviewExist(projectPreviewPath);
+        if (!doesPreviewExist.exists() || !doesPreviewExist.isFile())
+        {
+            projectPreviewPath = ":/DefaultProjectImage.png";
+        }
+        m_projectImageLabel->setPixmap(QPixmap(projectPreviewPath).scaled(m_projectImageLabel->size(), Qt::KeepAspectRatioByExpanding));
 
         m_projectFooter = new QFrame(this);
         QHBoxLayout* hLayout = new QHBoxLayout();
         hLayout->setContentsMargins(0, 0, 0, 0);
         m_projectFooter->setLayout(hLayout);
         {
-            QLabel* projectNameLabel = new QLabel(m_projectInfo.m_displayName, this);
+            QLabel* projectNameLabel = new QLabel(m_projectInfo.GetProjectDisplayName(), this);
             hLayout->addWidget(projectNameLabel);
         }
 

Code/Tools/ProjectManager/Source/ProjectInfo.cpp

@@ -10,33 +10,74 @@
 *
 */
 
-#include "ProjectInfo.h"
+#include <ProjectInfo.h>
+#include <ProjectManagerDefs.h>
+
+#include <QDir>
 
 namespace O3DE::ProjectManager
 {
-    ProjectInfo::ProjectInfo(const QString& path, const QString& projectName, const QString& displayName,
-        const QString& origin, const QString& summary, const QString& imagePath, const QString& backgroundImagePath,
+    ProjectInfo::ProjectInfo(
+        const QString& path,
+        const QString& projectName,
+        const QString& displayName,
+        const QString& origin,
+        const QString& summary,
+        const QString& iconPath,
+        const QString& newPreviewImagePath,
+        const QString& newBackgroundImagePath,
         bool needsBuild)
         : m_path(path)
         , m_projectName(projectName)
         , m_displayName(displayName)
         , m_origin(origin)
         , m_summary(summary)
-        , m_imagePath(imagePath)
-        , m_backgroundImagePath(backgroundImagePath)
+        , m_iconPath(iconPath)
+        , m_newPreviewImagePath(newPreviewImagePath)
+        , m_newBackgroundImagePath(newBackgroundImagePath)
         , m_needsBuild(needsBuild)
     {
     }
 
-    bool ProjectInfo::operator==(const ProjectInfo& rhs)
+    bool ProjectInfo::operator==(const ProjectInfo& rhs) const
     {
-        return m_path == rhs.m_path
-            && m_projectName == rhs.m_projectName
-            && m_imagePath == rhs.m_imagePath
-            && m_backgroundImagePath == rhs.m_backgroundImagePath;
+        if (m_path != rhs.m_path)
+        {
+            return false;
+        }
+        if (m_projectName != rhs.m_projectName)
+        {
+            return false;
+        }
+        if (m_displayName != rhs.m_displayName)
+        {
+            return false;
+        }
+        if (m_origin != rhs.m_origin)
+        {
+            return false;
+        }
+        if (m_summary != rhs.m_summary)
+        {
+            return false;
+        }
+        if (m_iconPath != rhs.m_iconPath)
+        {
+            return false;
+        }
+        if (m_newPreviewImagePath != rhs.m_newPreviewImagePath)
+        {
+            return false;
+        }
+        if (m_newBackgroundImagePath != rhs.m_newBackgroundImagePath)
+        {
+            return false;
+        }
+
+        return true;
     }
 
-    bool ProjectInfo::operator!=(const ProjectInfo& rhs)
+    bool ProjectInfo::operator!=(const ProjectInfo& rhs) const
     {
         return !operator==(rhs);
     }
@@ -45,4 +86,16 @@ namespace O3DE::ProjectManager
     {
         return !m_path.isEmpty() && !m_projectName.isEmpty();
     }
+
+    const QString& ProjectInfo::GetProjectDisplayName() const
+    {
+        if (!m_displayName.isEmpty())
+        {
+            return m_displayName;
+        }
+        else
+        {
+            return m_projectName;
+        }
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectInfo.h

@@ -31,14 +31,16 @@ namespace O3DE::ProjectManager
             const QString& displayName,
             const QString& origin,
             const QString& summary,
-            const QString& imagePath,
-            const QString& backgroundImagePath,
+            const QString& iconPath,
+            const QString& newPreviewImagePath,
+            const QString& newBackgroundImagePath,
             bool needsBuild);
                     
-        bool operator==(const ProjectInfo& rhs);
-        bool operator!=(const ProjectInfo& rhs);
+        bool operator==(const ProjectInfo& rhs) const;
+        bool operator!=(const ProjectInfo& rhs) const;
 
         bool IsValid() const;
+        const QString& GetProjectDisplayName() const; 
 
         // from o3de_manifest.json and o3de_projects.json
         QString m_path;
@@ -48,14 +50,14 @@ namespace O3DE::ProjectManager
         QString m_displayName;
         QString m_origin;
         QString m_summary;
+        QString m_iconPath;
         QStringList m_userTags;
 
-        // Used on projects home screen
-        QString m_imagePath;
-        QString m_backgroundImagePath;
+        // Used as temp variable for replace images
+        QString m_newPreviewImagePath;
+        QString m_newBackgroundImagePath;
 
         // Used in project creation
-
         bool m_needsBuild = false; //! Does this project need to be built
     };
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectManagerDefs.h

@@ -0,0 +1,24 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#include <QString>
+
+namespace O3DE::ProjectManager
+{
+    inline constexpr static int ProjectPreviewImageWidth = 210;
+    inline constexpr static int ProjectPreviewImageHeight = 280;
+
+    static const QString ProjectBuildPathPostfix = "Windows_VS2019";
+    static const QString ProjectBuildErrorLogPathPostfix = "CMakeFiles/CMakeProjectBuildError.log";
+    static const QString ProjectPreviewImagePath = "preview.png";
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp

@@ -11,7 +11,7 @@
  */
 
 #include <ProjectSettingsScreen.h>
-#include <FormBrowseEditWidget.h>
+#include <FormFolderBrowseEditWidget.h>
 #include <FormLineEditWidget.h>
 #include <PathValidator.h>
 #include <PythonBindingsInterface.h>
@@ -47,7 +47,7 @@ namespace O3DE::ProjectManager
         connect(m_projectName->lineEdit(), &QLineEdit::textChanged, this, &ProjectSettingsScreen::ValidateProjectName);
         m_verticalLayout->addWidget(m_projectName);
 
-        m_projectPath = new FormBrowseEditWidget(tr("Project Location"), "", this);
+        m_projectPath = new FormFolderBrowseEditWidget(tr("Project Location"), "", this);
         m_projectPath->lineEdit()->setReadOnly(true);
         connect(m_projectPath->lineEdit(), &QLineEdit::textChanged, this, &ProjectSettingsScreen::Validate);
         m_verticalLayout->addWidget(m_projectPath);

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h

@@ -32,9 +32,9 @@ namespace O3DE::ProjectManager
         ~ProjectSettingsScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
-        ProjectInfo GetProjectInfo();
+        virtual ProjectInfo GetProjectInfo();
 
-        bool Validate();
+        virtual bool Validate();
 
     protected slots:
         virtual bool ValidateProjectName();

Code/Tools/ProjectManager/Source/ProjectUtils.cpp

@@ -29,11 +29,8 @@ namespace O3DE::ProjectManager
             if (!QDir(path).isEmpty())
             {
                 QMessageBox::StandardButton warningResult = QMessageBox::warning(
-                    parent,
-                    QObject::tr("Overwrite Directory"),
-                    QObject::tr("Directory is not empty! Are you sure you want to overwrite it?"),
-                    QMessageBox::No | QMessageBox::Yes
-                );
+                    parent, QObject::tr("Overwrite Directory"),
+                    QObject::tr("Directory is not empty! Are you sure you want to overwrite it?"), QMessageBox::No | QMessageBox::Yes);
 
                 if (warningResult != QMessageBox::Yes)
                 {
@@ -53,14 +50,13 @@ namespace O3DE::ProjectManager
             {
                 if (ancestor == descendent)
                 {
-                    return false;
+                    return true;
                 }
 
                 descendent.cdUp();
-            }
-            while (!descendent.isRoot());
+            } while (!descendent.isRoot());
 
-            return true;
+            return false;
         }
 
         static bool CopyDirectory(const QString& origPath, const QString& newPath)
@@ -138,7 +134,7 @@ namespace O3DE::ProjectManager
         bool CopyProject(const QString& origPath, const QString& newPath)
         {
             // Disallow copying from or into subdirectory
-            if (!IsDirectoryDescedent(origPath, newPath) || !IsDirectoryDescedent(newPath, origPath))
+            if (IsDirectoryDescedent(origPath, newPath) || IsDirectoryDescedent(newPath, origPath))
             {
                 return false;
             }
@@ -173,20 +169,66 @@ namespace O3DE::ProjectManager
             return false;
         }
 
-        bool MoveProject(const QString& origPath, const QString& newPath, QWidget* parent)
+        bool MoveProject(QString origPath, QString newPath, QWidget* parent, bool ignoreRegister)
         {
-            if (!WarnDirectoryOverwrite(newPath, parent) || !UnregisterProject(origPath))
+            origPath = QDir::toNativeSeparators(origPath);
+            newPath = QDir::toNativeSeparators(newPath);
+
+            if (!WarnDirectoryOverwrite(newPath, parent) || (!ignoreRegister && !UnregisterProject(origPath)))
             {
                 return false;
             }
 
-            QDir directory;
-            if (directory.rename(origPath, newPath))
+            QDir newDirectory(newPath);
+            if (!newDirectory.removeRecursively())
             {
-                return directory.rename(origPath, newPath);
+                return false;
+            }
+            if (!newDirectory.rename(origPath, newPath))
+            {
+                // Likely failed because trying to move to another partition, try copying
+                if (!CopyProject(origPath, newPath))
+                {
+                    return false;
+                }
+
+                DeleteProjectFiles(origPath, true);
             }
 
-            if (!RegisterProject(newPath))
+            if (!ignoreRegister && !RegisterProject(newPath))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        bool ReplaceFile(const QString& origFile, const QString& newFile, QWidget* parent, bool interactive)
+        {
+            QFileInfo original(origFile);
+            if (original.exists())
+            {
+                if (interactive)
+                {
+                    QMessageBox::StandardButton warningResult = QMessageBox::warning(
+                        parent,
+                        QObject::tr("Overwrite File?"),
+                        QObject::tr("Replacing this will overwrite the current file on disk. Are you sure?"),
+                        QMessageBox::No | QMessageBox::Yes);
+
+                    if (warningResult == QMessageBox::No)
+                    {
+                        return false;
+                    }
+                }
+
+                if (!QFile::remove(origFile))
+                {
+                    return false;
+                }
+            }
+
+            if (!QFile::copy(newFile, origFile))
             {
                 return false;
             }

Code/Tools/ProjectManager/Source/ProjectUtils.h

@@ -24,7 +24,9 @@ namespace O3DE::ProjectManager
         bool CopyProjectDialog(const QString& origPath, QWidget* parent = nullptr);
         bool CopyProject(const QString& origPath, const QString& newPath);
         bool DeleteProjectFiles(const QString& path, bool force = false);
-        bool MoveProject(const QString& origPath, const QString& newPath, QWidget* parent = nullptr);
+        bool MoveProject(QString origPath, QString newPath, QWidget* parent = nullptr, bool ignoreRegister = false);
+
+        bool ReplaceFile(const QString& origFile, const QString& newFile, QWidget* parent = nullptr, bool interactive = true);
 
         bool IsVS2019Installed();
 

Code/Tools/ProjectManager/Source/ProjectsScreen.cpp

@@ -12,6 +12,7 @@
 
 #include <ProjectsScreen.h>
 
+#include <ProjectManagerDefs.h>
 #include <ProjectButtonWidget.h>
 #include <PythonBindingsInterface.h>
 #include <ProjectUtils.h>
@@ -35,7 +36,6 @@
 #include <QSpacerItem>
 #include <QListWidget>
 #include <QListWidgetItem>
-#include <QFileInfo>
 #include <QScrollArea>
 #include <QStackedWidget>
 #include <QFrame>
@@ -218,16 +218,7 @@ namespace O3DE::ProjectManager
 
     ProjectButton* ProjectsScreen::CreateProjectButton(ProjectInfo& project, QLayout* flowLayout, bool processing)
     {
-        ProjectButton* projectButton;
-
-        QString projectPreviewPath = project.m_path + m_projectPreviewImagePath;
-        QFileInfo doesPreviewExist(projectPreviewPath);
-        if (doesPreviewExist.exists() && doesPreviewExist.isFile())
-        {
-            project.m_imagePath = projectPreviewPath;
-        }
-
-        projectButton = new ProjectButton(project, this, processing);
+        ProjectButton* projectButton = new ProjectButton(project, this, processing);
 
         flowLayout->addWidget(projectButton);
 
@@ -438,7 +429,7 @@ namespace O3DE::ProjectManager
         {
             QMessageBox::information(this,
                 tr("Project Should be rebuilt."),
-                projectInfo.m_projectName + tr(" project likely needs to be rebuilt."));
+                projectInfo.GetProjectDisplayName() + tr(" project likely needs to be rebuilt."));
         }
     }
 
@@ -499,8 +490,8 @@ namespace O3DE::ProjectManager
         {
             QMessageBox::StandardButton buildProject = QMessageBox::information(
                 this,
-                tr("Building \"%1\"").arg(projectInfo.m_projectName),
-                tr("Ready to build \"%1\"?").arg(projectInfo.m_projectName),
+                tr("Building \"%1\"").arg(projectInfo.GetProjectDisplayName()),
+                tr("Ready to build \"%1\"?").arg(projectInfo.GetProjectDisplayName()),
                 QMessageBox::No | QMessageBox::Yes);
 
             if (buildProject == QMessageBox::Yes)

Code/Tools/ProjectManager/Source/ProjectsScreen.h

@@ -80,8 +80,6 @@ namespace O3DE::ProjectManager
         QQueue<ProjectInfo> m_buildQueue;
         ProjectBuilderController* m_currentBuilder = nullptr;
 
-        const QString m_projectPreviewImagePath = "/preview.png";
-
         inline constexpr static int s_contentMargins = 80;
         inline constexpr static int s_spacerSize = 20;
     };

Code/Tools/ProjectManager/Source/PythonBindings.cpp

@@ -12,6 +12,7 @@
 
 #include <PythonBindings.h>
 
+#include <ProjectManagerDefs.h>
 
 // Qt defines slots, which interferes with the use here.
 #pragma push_macro("slots")
@@ -660,6 +661,7 @@ namespace O3DE::ProjectManager
                 gemInfo.m_displayName = Py_To_String_Optional(data, "DisplayName", gemInfo.m_name);
                 gemInfo.m_summary = Py_To_String_Optional(data, "Summary", "");
                 gemInfo.m_version = Py_To_String_Optional(data, "Version", "");
+                gemInfo.m_requirement = Py_To_String_Optional(data, "Requirements", "");
 
                 if (data.contains("Tags"))
                 {
@@ -693,6 +695,7 @@ namespace O3DE::ProjectManager
                 projectInfo.m_displayName = Py_To_String_Optional(projectData, "display_name", projectInfo.m_projectName);
                 projectInfo.m_origin = Py_To_String_Optional(projectData, "origin", projectInfo.m_origin);
                 projectInfo.m_summary = Py_To_String_Optional(projectData, "summary", projectInfo.m_summary);
+                projectInfo.m_iconPath = Py_To_String_Optional(projectData, "icon", ProjectPreviewImagePath);
                 if (projectData.contains("user_tags"))
                 {
                     for (auto tag : projectData["user_tags"])
@@ -786,7 +789,7 @@ namespace O3DE::ProjectManager
                     pybind11::str(projectInfo.m_origin.toStdString()), // new_origin
                     pybind11::str(projectInfo.m_displayName.toStdString()), // new_display
                     pybind11::str(projectInfo.m_summary.toStdString()), // new_summary
-                    pybind11::str(projectInfo.m_imagePath.toStdString()), // new_icon
+                    pybind11::str(projectInfo.m_iconPath.toStdString()), // new_icon
                     pybind11::none(), // add_tags not used
                     pybind11::none(), // remove_tags not used
                     pybind11::list(pybind11::cast(newTags))); // replace_tags

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp

@@ -11,6 +11,7 @@
  */
 
 #include <GemCatalog/GemCatalogScreen.h>
+#include <ProjectManagerDefs.h>
 #include <PythonBindingsInterface.h>
 #include <ScreenHeaderWidget.h>
 #include <ScreensCtrl.h>
@@ -24,6 +25,7 @@
 #include <QStackedWidget>
 #include <QTabWidget>
 #include <QVBoxLayout>
+#include <QDir>
 
 namespace O3DE::ProjectManager
 {
@@ -101,8 +103,11 @@ namespace O3DE::ProjectManager
 
     void UpdateProjectCtrl::HandleGemsButton()
     {
-        m_stack->setCurrentWidget(m_gemCatalogScreen);
-        Update();
+        if (UpdateProjectSettings(true))
+        {
+            m_stack->setCurrentWidget(m_gemCatalogScreen);
+            Update();
+        }
     }
 
     void UpdateProjectCtrl::HandleBackButton()
@@ -114,7 +119,10 @@ namespace O3DE::ProjectManager
         }
         else
         {
-            emit GotoPreviousScreenRequest();
+            if (UpdateProjectSettings(true))
+            {
+                emit GotoPreviousScreenRequest();
+            }
         }
     }
 
@@ -124,44 +132,19 @@ namespace O3DE::ProjectManager
 
         if (m_stack->currentIndex() == ScreenOrder::Settings && m_updateSettingsScreen)
         {
-            if (m_updateSettingsScreen)
+            if (!UpdateProjectSettings())
             {
-                if (!m_updateSettingsScreen->Validate())
-                {
-                    QMessageBox::critical(this, tr("Invalid project settings"), tr("Invalid project settings"));
-                    return;
-                }
-
-                ProjectInfo newProjectSettings = m_updateSettingsScreen->GetProjectInfo();
-
-                // Update project if settings changed
-                if (m_projectInfo != newProjectSettings)
-                {
-                    auto result = PythonBindingsInterface::Get()->UpdateProject(newProjectSettings);
-                    if (!result.IsSuccess())
-                    {
-                        QMessageBox::critical(this, tr("Project update failed"), tr(result.GetError().c_str()));
-                        return;
-                    }
-                }
-
-                // Check if project path has changed and move it
-                if (newProjectSettings.m_path != m_projectInfo.m_path)
-                {
-                    if (!ProjectUtils::MoveProject(m_projectInfo.m_path, newProjectSettings.m_path))
-                    {
-                        QMessageBox::critical(this, tr("Project move failed"), tr("Failed to move project."));
-                        return;
-                    }
-                }
-
-                m_projectInfo = newProjectSettings;
+                return;
             }
         }
         else if (m_stack->currentIndex() == ScreenOrder::Gems && m_gemCatalogScreen)
         {
             // Enable or disable the gems that got adjusted in the gem catalog and apply them to the given project.
-            m_gemCatalogScreen->EnableDisableGemsForProject(m_projectInfo.m_path);
+            if (!m_gemCatalogScreen->EnableDisableGemsForProject(m_projectInfo.m_path))
+            {
+                QMessageBox::critical(this, tr("Failed to configure gems"), tr("Failed to configure gems for project."));
+                return;
+            }
 
             shouldRebuild = true;
         }
@@ -190,14 +173,15 @@ namespace O3DE::ProjectManager
     {
         if (m_stack->currentIndex() == ScreenOrder::Gems)
         {
-            m_header->setTitle(QString(tr("Edit Project Settings: \"%1\"")).arg(m_projectInfo.m_projectName));
+
+            m_header->setTitle(QString(tr("Edit Project Settings: \"%1\"")).arg(m_projectInfo.GetProjectDisplayName()));
             m_header->setSubTitle(QString(tr("Configure Gems")));
-            m_nextButton->setText(tr("Finalize"));
+            m_nextButton->setText(tr("Save"));
         }
         else
         {
             m_header->setTitle("");
-            m_header->setSubTitle(QString(tr("Edit Project Settings: \"%1\"")).arg(m_projectInfo.m_projectName));
+            m_header->setSubTitle(QString(tr("Edit Project Settings: \"%1\"")).arg(m_projectInfo.GetProjectDisplayName()));
             m_nextButton->setText(tr("Save"));
         }
     }
@@ -207,4 +191,70 @@ namespace O3DE::ProjectManager
         m_updateSettingsScreen->SetProjectInfo(m_projectInfo);
     }
 
+    bool UpdateProjectCtrl::UpdateProjectSettings(bool shouldConfirm)
+    {
+        AZ_Assert(m_updateSettingsScreen, "Update settings screen is nullptr.")
+
+        ProjectInfo newProjectSettings = m_updateSettingsScreen->GetProjectInfo();
+
+        if (m_projectInfo != newProjectSettings)
+        {
+            if (shouldConfirm)
+            {
+                QMessageBox::StandardButton warningResult = QMessageBox::warning(
+                    this,
+                    QObject::tr("Unsaved Changes!"),
+                    QObject::tr("Would you like to save your changes to project settings?"),
+                    QMessageBox::No | QMessageBox::Yes
+                );
+
+                if (warningResult == QMessageBox::No)
+                {
+                    return true;
+                }
+            }
+
+            if (!m_updateSettingsScreen->Validate())
+            {
+                QMessageBox::critical(this, tr("Invalid project settings"), tr("Invalid project settings"));
+                return false;
+            }
+
+            // Update project if settings changed
+            {
+                auto result = PythonBindingsInterface::Get()->UpdateProject(newProjectSettings);
+                if (!result.IsSuccess())
+                {
+                    QMessageBox::critical(this, tr("Project update failed"), tr(result.GetError().c_str()));
+                    return false;
+                }
+            }
+
+            // Check if project path has changed and move it
+            if (newProjectSettings.m_path != m_projectInfo.m_path)
+            {
+                if (!ProjectUtils::MoveProject(m_projectInfo.m_path, newProjectSettings.m_path))
+                {
+                    QMessageBox::critical(this, tr("Project move failed"), tr("Failed to move project."));
+                    return false;
+                }
+            }
+
+            if (!newProjectSettings.m_newPreviewImagePath.isEmpty())
+            {
+                if (!ProjectUtils::ReplaceFile(
+                        QDir(newProjectSettings.m_path).filePath(newProjectSettings.m_iconPath), newProjectSettings.m_newPreviewImagePath))
+                {
+                    QMessageBox::critical(this, tr("File replace failed"), tr("Failed to replace project preview image."));
+                    return false;
+                }
+                m_updateSettingsScreen->ResetProjectPreviewPath();
+            }
+
+            m_projectInfo = newProjectSettings;
+        }
+
+        return true;
+    }
+
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h

@@ -46,6 +46,7 @@ namespace O3DE::ProjectManager
     private:
         void Update();
         void UpdateSettingsScreen();
+        bool UpdateProjectSettings(bool shouldConfirm = false);
 
         enum ScreenOrder
         {

Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp

@@ -11,17 +11,43 @@
  */
 
 #include <UpdateProjectSettingsScreen.h>
-#include <FormBrowseEditWidget.h>
+#include <ProjectManagerDefs.h>
+#include <FormImageBrowseEditWidget.h>
 #include <FormLineEditWidget.h>
 
+#include <QVBoxLayout>
 #include <QLineEdit>
 #include <QDir>
+#include <QLabel>
+#include <QFileInfo>
 
 namespace O3DE::ProjectManager
 {
     UpdateProjectSettingsScreen::UpdateProjectSettingsScreen(QWidget* parent)
         : ProjectSettingsScreen(parent)
+        , m_userChangedPreview(false)
     {
+        m_projectPreview = new FormImageBrowseEditWidget(tr("Project Preview"), "", this);
+        m_projectPreview->lineEdit()->setReadOnly(true);
+        connect(m_projectPreview->lineEdit(), &QLineEdit::textChanged, this, &ProjectSettingsScreen::Validate);
+        connect(m_projectPreview->lineEdit(), &QLineEdit::textChanged, this, &UpdateProjectSettingsScreen::PreviewPathChanged);
+        connect(m_projectPath->lineEdit(), &QLineEdit::textChanged, this, &UpdateProjectSettingsScreen::UpdateProjectPreviewPath);
+        m_verticalLayout->addWidget(m_projectPreview);
+
+        QVBoxLayout* previewExtrasLayout = new QVBoxLayout(this);
+        previewExtrasLayout->setAlignment(Qt::AlignLeft);
+        previewExtrasLayout->setContentsMargins(50, 0, 0, 0);
+
+        QLabel* projectPreviewLabel = new QLabel(tr("Select an image (PNG). Minimum %1 x %2 pixels.")
+                           .arg(QString::number(ProjectPreviewImageWidth), QString::number(ProjectPreviewImageHeight)));
+        previewExtrasLayout->addWidget(projectPreviewLabel);
+
+        m_projectPreviewImage = new QLabel(this);
+        m_projectPreviewImage->setFixedSize(ProjectPreviewImageWidth, ProjectPreviewImageHeight);
+        m_projectPreviewImage->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+        previewExtrasLayout->addWidget(m_projectPreviewImage);
+
+        m_verticalLayout->addLayout(previewExtrasLayout);
     }
 
     ProjectManagerScreen UpdateProjectSettingsScreen::GetScreenEnum()
@@ -29,10 +55,58 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::UpdateProjectSettings;
     }
 
+    ProjectInfo UpdateProjectSettingsScreen::GetProjectInfo()
+    {
+        m_projectInfo.m_displayName = m_projectName->lineEdit()->text();
+        m_projectInfo.m_path = m_projectPath->lineEdit()->text();
+
+        if (m_userChangedPreview)
+        {
+            m_projectInfo.m_iconPath = ProjectPreviewImagePath;
+            m_projectInfo.m_newPreviewImagePath = m_projectPreview->lineEdit()->text();
+        }
+        return m_projectInfo;
+    }
+
     void UpdateProjectSettingsScreen::SetProjectInfo(const ProjectInfo& projectInfo)
     {
-        m_projectName->lineEdit()->setText(projectInfo.m_projectName);
+        m_projectInfo = projectInfo;
+
+        m_projectName->lineEdit()->setText(projectInfo.GetProjectDisplayName());
+
         m_projectPath->lineEdit()->setText(projectInfo.m_path);
+        UpdateProjectPreviewPath();
+    }
+
+    void UpdateProjectSettingsScreen::UpdateProjectPreviewPath()
+    {
+        if (!m_userChangedPreview)
+        {
+            m_projectPreview->lineEdit()->setText(QDir(m_projectPath->lineEdit()->text()).filePath(m_projectInfo.m_iconPath));
+            // Setting the text sets m_userChangedPreview to true
+            // Set it back to false because it should only be true when changed by user
+            m_userChangedPreview = false;
+        }
+    }
+
+    bool UpdateProjectSettingsScreen::Validate()
+    {
+        return ProjectSettingsScreen::Validate() && ValidateProjectPreview();
+    }
+
+    void UpdateProjectSettingsScreen::ResetProjectPreviewPath()
+    {
+        m_userChangedPreview = false;
+        UpdateProjectPreviewPath();
+    }
+
+    void UpdateProjectSettingsScreen::PreviewPathChanged()
+    {
+        m_userChangedPreview = true;
+
+        // Update with latest image
+        m_projectPreviewImage->setPixmap(
+            QPixmap(m_projectPreview->lineEdit()->text()).scaled(m_projectPreviewImage->size(), Qt::KeepAspectRatioByExpanding));
     }
 
     bool UpdateProjectSettingsScreen::ValidateProjectPath()
@@ -48,4 +122,39 @@ namespace O3DE::ProjectManager
         return projectPathIsValid;
     }
 
+    bool UpdateProjectSettingsScreen::ValidateProjectPreview()
+    {
+        bool projectPreviewIsValid = true;
+
+        if (m_projectPreview->lineEdit()->text().isEmpty())
+        {
+            projectPreviewIsValid = false;
+            m_projectPreview->setErrorLabelText(tr("Please select a file."));
+        }
+        else
+        {
+            if (m_userChangedPreview)
+            {
+                QFileInfo previewFile(m_projectPreview->lineEdit()->text());
+                if (!previewFile.exists() || !previewFile.isFile())
+                {
+                    projectPreviewIsValid = false;
+                    m_projectPreview->setErrorLabelText(tr("Please select a valid png file."));
+                }
+                else
+                {
+                    QString fileType = previewFile.completeSuffix().toLower();
+                    if (fileType != "png")
+                    {
+                        projectPreviewIsValid = false;
+                        m_projectPreview->setErrorLabelText(tr("Please select a png image."));
+                    }
+                }
+            }
+        }
+
+        m_projectPreview->setErrorLabelVisible(!projectPreviewIsValid);
+        return projectPreviewIsValid;
+    }
+
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h

@@ -15,6 +15,8 @@
 #include <ProjectSettingsScreen.h>
 #endif
 
+QT_FORWARD_DECLARE_CLASS(QLabel)
+
 namespace O3DE::ProjectManager
 {
     class UpdateProjectSettingsScreen
@@ -25,10 +27,26 @@ namespace O3DE::ProjectManager
         ~UpdateProjectSettingsScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
+        ProjectInfo GetProjectInfo() override;
         void SetProjectInfo(const ProjectInfo& projectInfo);
 
+        bool Validate() override;
+
+        void ResetProjectPreviewPath();
+
+    public slots:
+        void UpdateProjectPreviewPath();
+        void PreviewPathChanged();
+
     protected:
         bool ValidateProjectPath() override;
+        virtual bool ValidateProjectPreview();
+
+        FormBrowseEditWidget* m_projectPreview;
+        QLabel* m_projectPreviewImage;
+
+        ProjectInfo m_projectInfo;
+        bool m_userChangedPreview; //! Did the user change the project preview path
     };
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/project_manager_files.cmake

@@ -13,6 +13,7 @@
 set(FILES
     Source/Application.h
     Source/Application.cpp
+    Source/ProjectManagerDefs.h
     Source/ScreenDefs.h
     Source/ScreenFactory.h
     Source/ScreenFactory.cpp
@@ -25,6 +26,10 @@ set(FILES
     Source/FormLineEditWidget.cpp
     Source/FormBrowseEditWidget.h
     Source/FormBrowseEditWidget.cpp
+    Source/FormFolderBrowseEditWidget.h
+    Source/FormFolderBrowseEditWidget.cpp
+    Source/FormImageBrowseEditWidget.h
+    Source/FormImageBrowseEditWidget.cpp
     Source/PathValidator.h
     Source/PathValidator.cpp
     Source/ProjectManagerWindow.h
@@ -82,6 +87,14 @@ set(FILES
     Source/GemCatalog/GemListHeaderWidget.cpp
     Source/GemCatalog/GemModel.h
     Source/GemCatalog/GemModel.cpp
+    Source/GemCatalog/GemRequirementDialog.h
+    Source/GemCatalog/GemRequirementDialog.cpp
+    Source/GemCatalog/GemRequirementDelegate.h
+    Source/GemCatalog/GemRequirementDelegate.cpp
+    Source/GemCatalog/GemRequirementFilterProxyModel.h
+    Source/GemCatalog/GemRequirementFilterProxyModel.cpp
+    Source/GemCatalog/GemRequirementListView.h
+    Source/GemCatalog/GemRequirementListView.cpp
     Source/GemCatalog/GemSortFilterProxyModel.h
     Source/GemCatalog/GemSortFilterProxyModel.cpp
 )

Code/Tools/ProjectManager/project_manager_tests_files.cmake

@@ -14,4 +14,5 @@ set(FILES
     Resources/ProjectManager.qss
     tests/ApplicationTests.cpp
     tests/main.cpp
+    tests/UtilsTests.cpp
 )

Code/Tools/ProjectManager/tests/UtilsTests.cpp

@@ -0,0 +1,120 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AzCore/UnitTest/TestTypes.h>
+#include <Application.h>
+#include <ProjectUtils.h>
+#include <ProjectManager_Test_Traits_Platform.h>
+
+#include <QFile>
+#include <QTextStream>
+#include <QTimer>
+#include <QApplication>
+#include <QKeyEvent>
+#include <QDir>
+
+namespace O3DE::ProjectManager
+{
+    namespace ProjectUtils
+    {
+        class ProjectManagerUtilsTests
+            : public ::UnitTest::ScopedAllocatorSetupFixture
+        {
+        public:
+            ProjectManagerUtilsTests()
+            {
+                m_application = AZStd::make_unique<ProjectManager::Application>();
+                m_application->Init(false);
+
+                QDir dir;
+                dir.mkdir("ProjectA");
+                dir.mkdir("ProjectB");
+
+                QFile origFile("ProjectA/origFile.txt");
+                if (origFile.open(QIODevice::ReadWrite))
+                {
+                    QTextStream stream(&origFile);
+                    stream << "orig" << Qt::endl;
+                    origFile.close();
+                }
+
+                QFile replaceFile("ProjectA/replaceFile.txt");
+                if (replaceFile.open(QIODevice::ReadWrite))
+                {
+                    QTextStream stream(&replaceFile);
+                    stream << "replace" << Qt::endl;
+                    replaceFile.close();
+                }
+            }
+
+            ~ProjectManagerUtilsTests()
+            {
+                QDir dirA("ProjectA");
+                dirA.removeRecursively();
+
+                QDir dirB("ProjectB");
+                dirB.removeRecursively();
+
+                m_application.reset();
+            }
+
+            AZStd::unique_ptr<ProjectManager::Application> m_application;
+        };
+
+#if AZ_TRAIT_DISABLE_FAILED_PROJECT_MANAGER_TESTS
+        TEST_F(ProjectManagerUtilsTests, DISABLED_MoveProject_Succeeds)
+#else
+        TEST_F(ProjectManagerUtilsTests, MoveProject_Succeeds)
+#endif // !AZ_TRAIT_DISABLE_FAILED_PROJECT_MANAGER_TESTS
+        {
+            EXPECT_TRUE(MoveProject(
+                QDir::currentPath() + QDir::separator() + "ProjectA",
+                QDir::currentPath() + QDir::separator() + "ProjectB",
+                nullptr, true));
+
+            QFileInfo origFile("ProjectA/origFile.txt");
+            EXPECT_TRUE(!origFile.exists());
+
+            QFileInfo replaceFile("ProjectA/replaceFile.txt");
+            EXPECT_TRUE(!replaceFile.exists());
+
+            QFileInfo origFileMoved("ProjectB/origFile.txt");
+            EXPECT_TRUE(origFileMoved.exists() && origFileMoved.isFile());
+
+            QFileInfo replaceFileMoved("ProjectB/replaceFile.txt");
+            EXPECT_TRUE(replaceFileMoved.exists() && replaceFileMoved.isFile());
+        }
+
+#if AZ_TRAIT_DISABLE_FAILED_PROJECT_MANAGER_TESTS
+        TEST_F(ProjectManagerUtilsTests, DISABLED_ReplaceFile_Succeeds)
+#else
+        TEST_F(ProjectManagerUtilsTests, ReplaceFile_Succeeds)
+#endif // !AZ_TRAIT_DISABLE_FAILED_PROJECT_MANAGER_TESTS
+        {
+            EXPECT_TRUE(ReplaceFile("ProjectA/origFile.txt", "ProjectA/replaceFile.txt", nullptr, false));
+
+            QFile origFile("ProjectA/origFile.txt");
+            if (origFile.open(QIODevice::ReadOnly))
+            {
+                QTextStream stream(&origFile);
+                QString line = stream.readLine();
+                EXPECT_EQ(line, "replace");
+
+                origFile.close();
+            }
+            else
+            {
+                FAIL();
+            }
+        }
+    } // namespace ProjectUtils
+} // namespace O3DE::ProjectManager

Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp

@@ -255,7 +255,6 @@ namespace AZ
             {
                 return AZStd::make_pair(animation, anim);
             }
-
             Events::ProcessingResult AssImpAnimationImporter::ImportAnimation(AssImpSceneNodeAppendedContext& context)
             {
                 AZ_TraceContext("Importer", "Animation");
@@ -447,7 +446,22 @@ namespace AZ
                     
                     return combinedAnimationResult.GetResult();
                 }
-                decltype(boneAnimations) parentFillerAnimations;
+
+                AZStd::unordered_set<AZStd::string> boneList;
+
+                for (int meshIndex = 0; meshIndex < scene->mNumMeshes; ++meshIndex)
+                {
+                    aiMesh* mesh = scene->mMeshes[meshIndex];
+
+                    for (int boneIndex = 0; boneIndex < mesh->mNumBones; ++boneIndex)
+                    {
+                        aiBone* bone = mesh->mBones[boneIndex];
+
+                        boneList.insert(bone->mName.C_Str());
+                    }
+                }
+
+                decltype(boneAnimations) fillerAnimations;
 
                 // Go through all the animations and make sure we create animations for bones who's parents don't have an animation
                 for (auto&& anim : boneAnimations)
@@ -459,8 +473,8 @@ namespace AZ
                     {
                         if (!IsPivotNode(parent->mName))
                         {
-                            if (boneAnimations.find(parent->mName.C_Str()) == boneAnimations.end() &&
-                                parentFillerAnimations.find(parent->mName.C_Str()) == parentFillerAnimations.end())
+                            if (!boneAnimations.contains(parent->mName.C_Str()) &&
+                                !fillerAnimations.contains(parent->mName.C_Str()))
                             {
                                 // Create 1 key for each type that just copies the current transform
                                 ConsolidatedNodeAnim emptyAnimation;
@@ -472,7 +486,7 @@ namespace AZ
                                 globalTransform.Decompose(scale, rotation, position);
 
                                 emptyAnimation.mNumRotationKeys = emptyAnimation.mNumPositionKeys = emptyAnimation.mNumScalingKeys = 1;
-                                
+
                                 emptyAnimation.m_ownedPositionKeys.emplace_back(0, position);
                                 emptyAnimation.mPositionKeys = emptyAnimation.m_ownedPositionKeys.data();
 
@@ -481,9 +495,9 @@ namespace AZ
 
                                 emptyAnimation.m_ownedScalingKeys.emplace_back(0, scale);
                                 emptyAnimation.mScalingKeys = emptyAnimation.m_ownedScalingKeys.data();
-                                
-                                parentFillerAnimations.insert(
-                                    AZStd::make_pair(parent->mName.C_Str(), AZStd::make_pair(anim.second.first, AZStd::move(emptyAnimation))));
+
+                                fillerAnimations.insert(AZStd::make_pair(
+                                    parent->mName.C_Str(), AZStd::make_pair(anim.second.first, AZStd::move(emptyAnimation))));
                             }
                         }
 
@@ -491,7 +505,7 @@ namespace AZ
                     }
                 }
 
-                boneAnimations.insert(AZStd::make_move_iterator(parentFillerAnimations.begin()), AZStd::make_move_iterator(parentFillerAnimations.end()));
+                boneAnimations.insert(AZStd::make_move_iterator(fillerAnimations.begin()), AZStd::make_move_iterator(fillerAnimations.end()));
 
                 auto animItr = boneAnimations.equal_range(currentNode->mName.C_Str());
 

Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.cpp

@@ -98,6 +98,20 @@ namespace AZ
                 }
             }
 
+            aiMatrix4x4 CalculateWorldTransform(const aiNode* currentNode)
+            {
+                aiMatrix4x4 transform = {};
+                const aiNode* iteratingNode = currentNode;
+                
+                while (iteratingNode)
+                {
+                    transform = iteratingNode->mTransformation * transform;
+                    iteratingNode = iteratingNode->mParent;
+                }
+
+                return transform;
+            }
+
             Events::ProcessingResult AssImpBoneImporter::ImportBone(AssImpNodeEncounteredContext& context)
             {
                 AZ_TraceContext("Importer", "Bone");
@@ -111,12 +125,7 @@ namespace AZ
                 }
 
                 bool isBone = false;
-
-                if (NodeParentIsOfType(context.m_scene.GetGraph(), context.m_currentGraphPosition, DataTypes::IBoneData::TYPEINFO_Uuid()))
-                {
-                    isBone = true;
-                }
-                else
+                
                 {
                     AZStd::unordered_map<AZStd::string, const aiNode*> mainBoneList;
                     AZStd::unordered_map<AZStd::string, const aiBone*> boneLookup;
@@ -170,15 +179,8 @@ namespace AZ
                 {
                     createdBoneData = AZStd::make_shared<SceneData::GraphData::RootBoneData>();
                 }
-
-                aiMatrix4x4 transform = currentNode->mTransformation;
-                const aiNode* parent = currentNode->mParent;
                 
-                while (parent)
-                {
-                    transform = parent->mTransformation * transform;
-                    parent = parent->mParent;
-                }
+                aiMatrix4x4 transform = CalculateWorldTransform(currentNode);
                 
                 SceneAPI::DataTypes::MatrixType globalTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(transform);
 

Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h

@@ -31,7 +31,7 @@ namespace AZ
                 ~AssImpBoneImporter() override = default;
 
                 static void Reflect(ReflectContext* context);
-
+                
                 Events::ProcessingResult ImportBone(AssImpNodeEncounteredContext& context);
             };
         } // namespace FbxSceneBuilder

Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp

@@ -46,8 +46,9 @@ namespace AZ
                     serializeContext->Class<AssImpTransformImporter, SceneCore::LoadingComponent>()->Version(1);
                 }
             }
-
-            void GetAllBones(const aiScene* scene, AZStd::unordered_map<AZStd::string, const aiBone*>& boneLookup)
+            
+            void GetAllBones(
+                const aiScene* scene, AZStd::unordered_multimap<AZStd::string, const aiBone*>& boneLookup)
             {
                 for (unsigned meshIndex = 0; meshIndex < scene->mNumMeshes; ++meshIndex)
                 {
@@ -57,7 +58,7 @@ namespace AZ
                     {
                         const aiBone* bone = mesh->mBones[boneIndex];
 
-                        boneLookup[bone->mName.C_Str()] = bone;
+                        boneLookup.emplace(bone->mName.C_Str(), bone);
                     }
                 }
             }
@@ -73,41 +74,53 @@ namespace AZ
                     return Events::ProcessingResult::Ignored;
                 }
 
-                AZStd::unordered_map<AZStd::string, const aiBone*> boneLookup;
+                AZStd::unordered_multimap<AZStd::string, const aiBone*> boneLookup;
                 GetAllBones(scene, boneLookup);
 
                 auto boneIterator = boneLookup.find(currentNode->mName.C_Str());
                 const bool isBone = boneIterator != boneLookup.end();
-
-                aiMatrix4x4 combinedTransform;
+                
+                DataTypes::MatrixType localTransform;
 
                 if (isBone)
                 {
-                    auto parentNode = currentNode->mParent;
+                    AZStd::vector<DataTypes::MatrixType> offsets, inverseOffsets;
+                    auto iteratingNode = currentNode;
 
-                    aiMatrix4x4 offsetMatrix = boneIterator->second->mOffsetMatrix;
-                    aiMatrix4x4 parentOffset {};
-
-                    auto parentBoneIterator = boneLookup.find(parentNode->mName.C_Str());
-
-                    if (parentNode && parentBoneIterator != boneLookup.end())
+                    while (iteratingNode && boneLookup.count(iteratingNode->mName.C_Str()))
                     {
-                        const auto& parentBone = parentBoneIterator->second;
+                        AZStd::string name = iteratingNode->mName.C_Str();
 
-                        parentOffset = parentBone->mOffsetMatrix;
+                        auto range = boneLookup.equal_range(name);
+
+                        if (range.first != range.second)
+                        {
+                            // There can be multiple offsetMatrices for a given bone, we're only interested in grabbing the first one
+                            auto boneFirstOffsetMatrix = range.first->second->mOffsetMatrix;
+                            auto azMat = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(boneFirstOffsetMatrix);
+                            offsets.push_back(azMat);
+                            inverseOffsets.push_back(azMat.GetInverseFull());
+                        }
+
+                        iteratingNode = iteratingNode->mParent;
                     }
-
-                    auto inverseOffset = offsetMatrix;
-                    inverseOffset.Inverse();
-
-                    combinedTransform = parentOffset * inverseOffset;
+                    
+                    localTransform =
+                        offsets.at(AZ::GetMin(offsets.size()-1, static_cast<decltype(offsets.size())>(1)))  // parent bone offset, or if there is no parent, then current node offset
+                        * inverseOffsets.at(inverseOffsets.size() - 1) // Inverse of root bone offset
+                        * offsets.at(offsets.size() - 1) // Root bone offset
+                        * inverseOffsets.at(0); // Inverse of current node offset
                 }
                 else
                 {
-                    combinedTransform = GetConcatenatedLocalTransform(currentNode);
+                    localTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(GetConcatenatedLocalTransform(currentNode));
                 }
 
-                DataTypes::MatrixType localTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(combinedTransform);
+                // Don't bother adding a node with the identity matrix
+                if (localTransform == DataTypes::MatrixType::Identity())
+                {
+                    return Events::ProcessingResult::Ignored;
+                }
 
                 context.m_sourceSceneSystem.SwapTransformForUpAxis(localTransform);
                 context.m_sourceSceneSystem.ConvertUnit(localTransform);

Code/Tools/Standalone/Source/LUA/LUAEditorMainWindow.cpp

@@ -1765,16 +1765,8 @@ namespace LUAEditor
             return false;
         }
 
-        //name has the full path in it, we need to convert it to an asset name
-        AZStd::string projectRoot, databaseRoot, databasePath, databaseFile, fileExtension;
-        if (!AzFramework::StringFunc::AssetDatabasePath::Split(name.toUtf8().data(), &projectRoot, &databaseRoot, &databasePath, &databaseFile, &fileExtension))
-        {
-            AZ_Warning("LUAEditorMainWindow", false, AZStd::string::format("<span severity=\"err\">Path is invalid: '%s'</span>", name.toUtf8().data()).c_str());
-            return false;
-        }
-
         AzFramework::StringFunc::Path::Split(name.toUtf8().data(), nullptr, &m_lastOpenFilePath);
-        AzFramework::StringFunc::AssetDatabasePath::Join(databasePath.c_str(), databaseFile.c_str(), newAssetName);
+        newAssetName = name.toUtf8().data();
 
         return true;
     }