Merge branch 'main' into ly-as-sdk/LYN-2948

# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py

Code/Tools/ProjectManager/Resources/ProjectManager.qrc

@@ -15,5 +15,7 @@
         <file>ArrowDownLine.svg</file>
         <file>ArrowUpLine.svg</file>
         <file>Backgrounds/FirstTimeBackgroundImage.jpg</file>
+        <file>ArrowDownLine.svg</file>
+        <file>ArrowUpLine.svg</file>
     </qresource>
 </RCC>

Code/Tools/ProjectManager/Resources/ProjectManager.qss

@@ -71,3 +71,10 @@ QPushButton:focus {
     margin: 10px 0 10px 30px;
 }
 
+#labelButtonOverlay {
+    background-color: rgba(50,50,50,200);
+    min-width:210px;
+    max-width:210px;;
+    min-height:278px;
+    max-height:278px;
+}

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

@@ -0,0 +1,49 @@
+/*
+* 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 <AzQtComponents/Components/SearchLineEdit.h>
+#include <GemCatalog/GemCatalogHeaderWidget.h>
+#include <QHBoxLayout>
+#include <QLabel>
+
+namespace O3DE::ProjectManager
+{
+    GemCatalogHeaderWidget::GemCatalogHeaderWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent)
+        : QFrame(parent)
+    {
+        QHBoxLayout* hLayout = new QHBoxLayout();
+        hLayout->setAlignment(Qt::AlignLeft);
+        hLayout->setMargin(0);
+        setLayout(hLayout);
+
+        setStyleSheet("background-color: #1E252F;");
+
+        QLabel* titleLabel = new QLabel(tr("Gem Catalog"));
+        titleLabel->setStyleSheet("font-size: 21px;");
+        hLayout->addWidget(titleLabel);
+
+        hLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
+
+        AzQtComponents::SearchLineEdit* filterLineEdit = new AzQtComponents::SearchLineEdit();
+        filterLineEdit->setStyleSheet("background-color: #DDDDDD;");
+        connect(filterLineEdit, &QLineEdit::textChanged, this, [=](const QString& text)
+            {
+                filterProxyModel->SetSearchString(text);
+            });
+        hLayout->addWidget(filterLineEdit);
+
+        hLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
+        hLayout->addSpacerItem(new QSpacerItem(220, 0, QSizePolicy::Fixed));
+        
+        setFixedHeight(60);
+    }
+} // namespace O3DE::ProjectManager

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

@@ -0,0 +1,31 @@
+/*
+* 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/GemSortFilterProxyModel.h>
+#include <QFrame>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemCatalogHeaderWidget
+        : public QFrame
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemCatalogHeaderWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent = nullptr);
+        ~GemCatalogHeaderWidget() = default;
+    };
+} // namespace O3DE::ProjectManager

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

@@ -12,6 +12,8 @@
 
 #include <GemCatalog/GemCatalogScreen.h>
 #include <PythonBindingsInterface.h>
+#include <GemCatalog/GemCatalogHeaderWidget.h>
+#include <GemCatalog/GemListHeaderWidget.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
 #include <GemCatalog/GemFilterWidget.h>
 #include <QVBoxLayout>
@@ -34,6 +36,9 @@ namespace O3DE::ProjectManager
         vLayout->setSpacing(0);
         setLayout(vLayout);
 
+        GemCatalogHeaderWidget* headerWidget = new GemCatalogHeaderWidget(proxyModel);
+        vLayout->addWidget(headerWidget);
+
         QHBoxLayout* hLayout = new QHBoxLayout();
         hLayout->setMargin(0);
         vLayout->addLayout(hLayout);
@@ -64,9 +69,12 @@ namespace O3DE::ProjectManager
         GemFilterWidget* filterWidget = new GemFilterWidget(proxyModel);
         filterWidget->setFixedWidth(250);
 
+        GemListHeaderWidget* listHeaderWidget = new GemListHeaderWidget(proxyModel);
+
         QVBoxLayout* middleVLayout = new QVBoxLayout();
         middleVLayout->setMargin(0);
         middleVLayout->setSpacing(0);
+        middleVLayout->addWidget(listHeaderWidget);
         middleVLayout->addWidget(m_gemListView);
 
         hLayout->addWidget(filterWidget);

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

@@ -124,12 +124,12 @@ namespace O3DE::ProjectManager
     {
         if (m_collapseButton->isChecked())
         {
-            m_collapseButton->setIcon(QIcon(":/Resources/ArrowDownLine.svg"));
+            m_collapseButton->setIcon(QIcon(":/ArrowDownLine.svg"));
             m_mainWidget->hide();
         }
         else
         {
-            m_collapseButton->setIcon(QIcon(":/Resources/ArrowUpLine.svg"));
+            m_collapseButton->setIcon(QIcon(":/ArrowUpLine.svg"));
             m_mainWidget->show();
         }
     }

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

@@ -62,19 +62,19 @@ namespace O3DE::ProjectManager
         bool IsValid() const;
 
         QString m_path;
-        QString m_name;
-        QString m_displayName;
-        QString m_creator;
+        QString m_name = "Unknown Gem Name";
+        QString m_displayName = "Unknown Gem Name";
+        QString m_creator = "Unknown Creator";
         GemOrigin m_gemOrigin = Local;
         bool m_isAdded = false; //! Is the gem currently added and enabled in the project?
-        QString m_summary;
+        QString m_summary = "No summary provided.";
         Platforms m_platforms;
         Types m_types; //! Asset and/or Code and/or Tool
         QStringList m_features;
         QString m_directoryLink;
         QString m_documentationLink;
-        QString m_version;
-        QString m_lastUpdatedDate;
+        QString m_version = "Unknown Version";
+        QString m_lastUpdatedDate = "Unknown Date";
         int m_binarySizeInKB = 0;
         QStringList m_dependingGemUuids;
         QStringList m_conflictingGemUuids;

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

@@ -0,0 +1,78 @@
+/*
+* 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/GemItemDelegate.h>
+#include <GemCatalog/GemListHeaderWidget.h>
+#include <QStandardItemModel>
+#include <QLabel>
+#include <QVBoxLayout>
+
+namespace O3DE::ProjectManager
+{
+    GemListHeaderWidget::GemListHeaderWidget(GemSortFilterProxyModel* proxyModel, QWidget* parent)
+        : QFrame(parent)
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setMargin(0);
+        setLayout(vLayout);
+
+        setStyleSheet("background-color: #333333;");
+
+        vLayout->addSpacing(20);
+
+        // Top section
+        QHBoxLayout* topLayout = new QHBoxLayout();
+        topLayout->setMargin(0);
+        topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
+
+        QLabel* showCountLabel = new QLabel();
+        showCountLabel->setStyleSheet("font-size: 11pt; font: italic;");
+        topLayout->addWidget(showCountLabel);
+        connect(proxyModel, &GemSortFilterProxyModel::OnInvalidated, this, [=]
+            {
+                const int numGemsShown = proxyModel->rowCount();
+                showCountLabel->setText(QString(tr("showing %1 Gems")).arg(numGemsShown));
+            });
+
+        topLayout->addSpacing(GemItemDelegate::s_contentMargins.right() + GemItemDelegate::s_borderWidth);
+
+        vLayout->addLayout(topLayout);
+
+        vLayout->addSpacing(20);
+
+        // Separating line
+        QFrame* hLine = new QFrame();
+        hLine->setFrameShape(QFrame::HLine);
+        hLine->setStyleSheet("color: #666666;");
+        vLayout->addWidget(hLine);
+
+        vLayout->addSpacing(GemItemDelegate::s_contentMargins.top());
+
+        // Bottom section
+        QHBoxLayout* columnHeaderLayout = new QHBoxLayout();
+        columnHeaderLayout->setAlignment(Qt::AlignLeft);
+
+        columnHeaderLayout->addSpacing(31);
+
+        QLabel* gemNameLabel = new QLabel(tr("Gem Name"));
+        gemNameLabel->setStyleSheet("font-size: 11pt;");
+        columnHeaderLayout->addWidget(gemNameLabel);
+
+        columnHeaderLayout->addSpacing(111);
+
+        QLabel* gemSummaryLabel = new QLabel(tr("Gem Summary"));
+        gemSummaryLabel->setStyleSheet("font-size: 11pt;");
+        columnHeaderLayout->addWidget(gemSummaryLabel);
+
+        vLayout->addLayout(columnHeaderLayout);
+    }
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.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 <GemCatalog/GemSortFilterProxyModel.h>
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QFrame>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemListHeaderWidget
+        : public QFrame
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemListHeaderWidget(GemSortFilterProxyModel* proxyModel, QWidget* parent = nullptr);
+        ~GemListHeaderWidget() = default;
+    };
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp

@@ -31,11 +31,30 @@ namespace O3DE::ProjectManager
     LabelButton::LabelButton(QWidget* parent)
         : QLabel(parent)
     {
+        m_overlayLabel = new QLabel("", this);
+        m_overlayLabel->setObjectName("labelButtonOverlay");
+        m_overlayLabel->setWordWrap(true);
+        m_overlayLabel->setAlignment(Qt::AlignCenter);
+        m_overlayLabel->setVisible(false);
     }
 
     void LabelButton::mousePressEvent([[maybe_unused]] QMouseEvent* event)
     {
-        emit triggered();
+        if(m_enabled)
+        {
+            emit triggered();
+        }
+    }
+
+    void LabelButton::SetEnabled(bool enabled)
+    {
+        m_enabled = enabled;
+        m_overlayLabel->setVisible(!enabled);
+    }
+
+    void LabelButton::SetOverlayText(const QString& text)
+    {
+        m_overlayLabel->setText(text);
     }
 
     ProjectButton::ProjectButton(const QString& projectName, QWidget* parent)
@@ -99,4 +118,13 @@ namespace O3DE::ProjectManager
 #endif
     }
 
+    void ProjectButton::SetButtonEnabled(bool enabled)
+    {
+        m_projectImageLabel->SetEnabled(enabled);
+    }
+
+    void ProjectButton::SetButtonOverlayText(const QString& text)
+    {
+        m_projectImageLabel->SetOverlayText(text);
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectButtonWidget.h

@@ -32,11 +32,18 @@ namespace O3DE::ProjectManager
         explicit LabelButton(QWidget* parent = nullptr);
         ~LabelButton() = default;
 
+        void SetEnabled(bool enabled);
+        void SetOverlayText(const QString& text);
+
     signals:
         void triggered();
 
     public slots:
         void mousePressEvent(QMouseEvent* event) override;
+
+    private:
+        QLabel* m_overlayLabel;
+        bool m_enabled = true;
     };
 
     class ProjectButton
@@ -49,6 +56,9 @@ namespace O3DE::ProjectManager
         explicit ProjectButton(const QString& projectName, const QString& projectImage, QWidget* parent = nullptr);
         ~ProjectButton() = default;
 
+        void SetButtonEnabled(bool enabled);
+        void SetButtonOverlayText(const QString& text);
+
     signals:
         void OpenProject(const QString& projectName);
         void EditProject(const QString& projectName);

Code/Tools/ProjectManager/Source/ProjectsHomeScreen.cpp

@@ -14,6 +14,12 @@
 
 #include <ProjectButtonWidget.h>
 #include <PythonBindingsInterface.h>
+#include <AzCore/Platform.h>
+#include <AzCore/IO/SystemFile.h>
+#include <AzFramework/AzFramework_Traits_Platform.h>
+#include <AzFramework/Process/ProcessCommon.h>
+#include <AzFramework/Process/ProcessWatcher.h>
+#include <AzCore/Utils/Utils.h>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -27,6 +33,8 @@
 #include <QListWidgetItem>
 #include <QFileInfo>
 #include <QScrollArea>
+#include <QMessageBox>
+#include <QTimer>
 
 namespace O3DE::ProjectManager
 {
@@ -127,8 +135,48 @@ namespace O3DE::ProjectManager
     }
     void ProjectsHomeScreen::HandleOpenProject(const QString& projectPath)
     {
-        // Open the editor with this project open
-        emit NotifyCurrentProject(projectPath);
+        if (!projectPath.isEmpty())
+        {
+            AZ::IO::FixedMaxPath executableDirectory = AZ::Utils::GetExecutableDirectory();
+            AZStd::string executableFilename = "Editor";
+            AZ::IO::FixedMaxPath editorExecutablePath = executableDirectory / (executableFilename + AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+            auto cmdPath = AZ::IO::FixedMaxPathString::format("%s -regset=\"/Amazon/AzCore/Bootstrap/project_path=%s\"", editorExecutablePath.c_str(), projectPath.toStdString().c_str());
+
+            AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
+            processLaunchInfo.m_commandlineParameters = cmdPath;
+            bool launchSucceeded = AzFramework::ProcessLauncher::LaunchUnwatchedProcess(processLaunchInfo);
+            if (!launchSucceeded)
+            {
+                AZ_Error("ProjectManager", false, "Failed to launch editor");
+                QMessageBox::critical( this, tr("Error"), tr("Failed to launch the Editor, please verify the project settings are valid."));
+            }
+            else
+            {
+                // prevent the user from accidentally pressing the button while the editor is launching
+                // and let them know what's happening
+                ProjectButton* button = qobject_cast<ProjectButton*>(sender());
+                if (button)
+                {
+                    button->SetButtonEnabled(false);
+                    button->SetButtonOverlayText(tr("Opening Editor..."));
+                }
+
+                // enable the button after 3 seconds 
+                constexpr int waitTimeInMs = 3000;
+                QTimer::singleShot(waitTimeInMs, this, [this, button] {
+                        if (button)
+                        {
+                            button->SetButtonEnabled(true);
+                        }
+                    });
+            }
+        }
+        else
+        {
+            AZ_Error("ProjectManager", false, "Cannot open editor because an empty project path was provided");
+            QMessageBox::critical( this, tr("Error"), tr("Failed to launch the Editor because the project path is invalid."));
+        }
+
     }
     void ProjectsHomeScreen::HandleEditProject(const QString& projectPath)
     {

Code/Tools/ProjectManager/project_manager_files.cmake

@@ -58,6 +58,8 @@ set(FILES
     Source/LinkWidget.cpp
     Source/TagWidget.h
     Source/TagWidget.cpp
+    Source/GemCatalog/GemCatalogHeaderWidget.h
+    Source/GemCatalog/GemCatalogHeaderWidget.cpp
     Source/GemCatalog/GemCatalogScreen.h
     Source/GemCatalog/GemCatalogScreen.cpp
     Source/GemCatalog/GemFilterWidget.h
@@ -70,6 +72,8 @@ set(FILES
     Source/GemCatalog/GemItemDelegate.cpp
     Source/GemCatalog/GemListView.h
     Source/GemCatalog/GemListView.cpp
+    Source/GemCatalog/GemListHeaderWidget.h
+    Source/GemCatalog/GemListHeaderWidget.cpp
     Source/GemCatalog/GemModel.h
     Source/GemCatalog/GemModel.cpp
     Source/GemCatalog/GemSortFilterProxyModel.h