Project Manager Projects Screen Dynamically Shows Projects Loaded from O3DE (#873)

* Projects Home Screen Dynamically displays Projects from O3DE and can open Project settings editor

* Seperated out CreateProjectCtrl and UpdateProjectCtrl

* Moved source level statics back into class headers

* Updated background image location

Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp

@@ -10,7 +10,7 @@
  *
  */
 
-#include <ProjectSettingsCtrl.h>
+#include <CreateProjectCtrl.h>
 #include <ScreensCtrl.h>
 #include <PythonBindingsInterface.h>
 #include <NewProjectSettingsScreen.h>
@@ -22,7 +22,7 @@
 
 namespace O3DE::ProjectManager
 {
-    ProjectSettingsCtrl::ProjectSettingsCtrl(QWidget* parent)
+    CreateProjectCtrl::CreateProjectCtrl(QWidget* parent)
         : ScreenWidget(parent)
     {
         QVBoxLayout* vLayout = new QVBoxLayout();
@@ -34,11 +34,11 @@ namespace O3DE::ProjectManager
         QDialogButtonBox* backNextButtons = new QDialogButtonBox();
         vLayout->addWidget(backNextButtons);
 
-        m_backButton = backNextButtons->addButton("Back", QDialogButtonBox::RejectRole);
-        m_nextButton = backNextButtons->addButton("Next", QDialogButtonBox::ApplyRole);
+        m_backButton = backNextButtons->addButton(tr("Back"), QDialogButtonBox::RejectRole);
+        m_nextButton = backNextButtons->addButton(tr("Next"), QDialogButtonBox::ApplyRole);
 
-        connect(m_backButton, &QPushButton::pressed, this, &ProjectSettingsCtrl::HandleBackButton);
-        connect(m_nextButton, &QPushButton::pressed, this, &ProjectSettingsCtrl::HandleNextButton);
+        connect(m_backButton, &QPushButton::pressed, this, &CreateProjectCtrl::HandleBackButton);
+        connect(m_nextButton, &QPushButton::pressed, this, &CreateProjectCtrl::HandleNextButton);
 
         m_screensOrder =
         {
@@ -47,15 +47,16 @@ namespace O3DE::ProjectManager
         };
         m_screensCtrl->BuildScreens(m_screensOrder);
         m_screensCtrl->ForceChangeToScreen(ProjectManagerScreen::NewProjectSettings, false);
+
         UpdateNextButtonText();
     }
 
-    ProjectManagerScreen ProjectSettingsCtrl::GetScreenEnum()
+    ProjectManagerScreen CreateProjectCtrl::GetScreenEnum()
     {
-        return ProjectManagerScreen::NewProjectSettingsCore;
+        return ProjectManagerScreen::CreateProject;
     }
 
-    void ProjectSettingsCtrl::HandleBackButton()
+    void CreateProjectCtrl::HandleBackButton()
     {
         if (!m_screensCtrl->GotoPreviousScreen())
         {
@@ -66,7 +67,7 @@ namespace O3DE::ProjectManager
             UpdateNextButtonText();
         }
     }
-    void ProjectSettingsCtrl::HandleNextButton()
+    void CreateProjectCtrl::HandleNextButton()
     {
         ScreenWidget* currentScreen = m_screensCtrl->GetCurrentScreen();
         ProjectManagerScreen screenEnum = currentScreen->GetScreenEnum();
@@ -116,9 +117,14 @@ namespace O3DE::ProjectManager
         }
     }
 
-    void ProjectSettingsCtrl::UpdateNextButtonText()
+    void CreateProjectCtrl::UpdateNextButtonText()
     {
-        m_nextButton->setText(m_screensCtrl->GetCurrentScreen()->GetNextButtonText());
+        QString nextButtonText = tr("Next");
+        if (m_screensCtrl->GetCurrentScreen()->GetScreenEnum() == ProjectManagerScreen::GemCatalog)
+        {
+            nextButtonText = tr("Create Project");
+        }
+        m_nextButton->setText(nextButtonText);
     }
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/CreateProjectCtrl.h

@@ -21,12 +21,12 @@
 
 namespace O3DE::ProjectManager
 {
-    class ProjectSettingsCtrl
+    class CreateProjectCtrl
         : public ScreenWidget
     {
     public:
-        explicit ProjectSettingsCtrl(QWidget* parent = nullptr);
-        ~ProjectSettingsCtrl() = default;
+        explicit CreateProjectCtrl(QWidget* parent = nullptr);
+        ~CreateProjectCtrl() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
     protected slots:

Code/Tools/ProjectManager/Source/FirstTimeUseScreen.cpp

@@ -21,13 +21,6 @@
 
 namespace O3DE::ProjectManager
 {
-    inline constexpr static int s_contentMargins = 80;
-    inline constexpr static int s_buttonSpacing = 30;
-    inline constexpr static int s_iconSize = 24;
-    inline constexpr static int s_spacerSize = 20;
-    inline constexpr static int s_boxButtonWidth = 210;
-    inline constexpr static int s_boxButtonHeight = 280;
-
     FirstTimeUseScreen::FirstTimeUseScreen(QWidget* parent)
         : ScreenWidget(parent)
     {
@@ -79,8 +72,8 @@ namespace O3DE::ProjectManager
 
     void FirstTimeUseScreen::HandleNewProjectButton()
     {
-        emit ResetScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
-        emit ChangeScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
+        emit ResetScreenRequest(ProjectManagerScreen::CreateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::CreateProject);
     }
     void FirstTimeUseScreen::HandleAddProjectButton()
     {

Code/Tools/ProjectManager/Source/FirstTimeUseScreen.h

@@ -37,6 +37,13 @@ namespace O3DE::ProjectManager
 
         QPushButton* m_createProjectButton;
         QPushButton* m_addProjectButton;
+
+        inline constexpr static int s_contentMargins = 80;
+        inline constexpr static int s_buttonSpacing = 30;
+        inline constexpr static int s_iconSize = 24;
+        inline constexpr static int s_spacerSize = 20;
+        inline constexpr static int s_boxButtonWidth = 210;
+        inline constexpr static int s_boxButtonHeight = 280;
     };
 
 } // namespace O3DE::ProjectManager

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

@@ -170,9 +170,4 @@ namespace O3DE::ProjectManager
     {
         return ProjectManagerScreen::GemCatalog;
     }
-
-    QString GemCatalogScreen::GetNextButtonText()
-    {
-        return "Create Project";
-    }
 } // namespace O3DE::ProjectManager

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

@@ -28,7 +28,6 @@ namespace O3DE::ProjectManager
         explicit GemCatalogScreen(QWidget* parent = nullptr);
         ~GemCatalogScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
-        QString GetNextButtonText() override;
 
     private:
         QVector<GemInfo> GenerateTestData();

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp

@@ -96,11 +96,6 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::NewProjectSettings;
     }
 
-    QString NewProjectSettingsScreen::GetNextButtonText()
-    {
-        return tr("Next");
-    }
-
     void NewProjectSettingsScreen::HandleBrowseButton()
     {
         QString defaultPath = m_projectPathLineEdit->text();

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h

@@ -28,7 +28,6 @@ namespace O3DE::ProjectManager
         explicit NewProjectSettingsScreen(QWidget* parent = nullptr);
         ~NewProjectSettingsScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
-        QString GetNextButtonText() override;
 
         ProjectInfo GetProjectInfo();
         QString GetProjectTemplatePath();

Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp

@@ -0,0 +1,102 @@
+/*
+ * 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 <ProjectButtonWidget.h>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QResizeEvent>
+#include <QLabel>
+#include <QPushButton>
+#include <QPixmap>
+#include <QMenu>
+#include <QSpacerItem>
+
+//#define SHOW_ALL_PROJECT_ACTIONS
+
+namespace O3DE::ProjectManager
+{
+    inline constexpr static int s_projectImageWidth = 210;
+    inline constexpr static int s_projectImageHeight = 280;
+
+    LabelButton::LabelButton(QWidget* parent)
+        : QLabel(parent)
+    {
+    }
+
+    void LabelButton::mousePressEvent([[maybe_unused]] QMouseEvent* event)
+    {
+        emit triggered();
+    }
+
+    ProjectButton::ProjectButton(const QString& projectName, QWidget* parent)
+        : QFrame(parent)
+        , m_projectName(projectName)
+        , m_projectImagePath(":/Resources/DefaultProjectImage.png")
+    {
+        Setup();
+    }
+
+    ProjectButton::ProjectButton(const QString& projectName, const QString& projectImage, QWidget* parent)
+        : QFrame(parent)
+        , m_projectName(projectName)
+        , m_projectImagePath(projectImage)
+    {
+        Setup();
+    }
+
+    void ProjectButton::Setup()
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setSpacing(0);
+        vLayout->setContentsMargins(0, 0, 0, 0);
+        setLayout(vLayout);
+
+        m_projectImageLabel = new LabelButton(this);
+        m_projectImageLabel->setFixedSize(s_projectImageWidth, s_projectImageHeight);
+        vLayout->addWidget(m_projectImageLabel);
+
+        m_projectImageLabel->setPixmap(QPixmap(m_projectImagePath).scaled(m_projectImageLabel->size(), Qt::KeepAspectRatioByExpanding));
+
+        QMenu* newProjectMenu = new QMenu(this);
+        m_editProjectAction = newProjectMenu->addAction(tr("Edit Project Settings..."));
+
+#ifdef SHOW_ALL_PROJECT_ACTIONS
+        m_editProjectGemsAction = newProjectMenu->addAction(tr("Cutomize Gems..."));
+        newProjectMenu->addSeparator();
+        m_copyProjectAction = newProjectMenu->addAction(tr("Duplicate"));
+        newProjectMenu->addSeparator();
+        m_removeProjectAction = newProjectMenu->addAction(tr("Remove from O3DE"));
+        m_deleteProjectAction = newProjectMenu->addAction(tr("Delete the Project"));
+#endif
+
+        m_projectSettingsMenuButton = new QPushButton(this);
+        m_projectSettingsMenuButton->setText(m_projectName);
+        m_projectSettingsMenuButton->setMenu(newProjectMenu);
+        m_projectSettingsMenuButton->setFocusPolicy(Qt::FocusPolicy::NoFocus);
+        m_projectSettingsMenuButton->setStyleSheet("font-size: 14px; text-align:left;");
+        vLayout->addWidget(m_projectSettingsMenuButton);
+
+        setFixedSize(s_projectImageWidth, s_projectImageHeight + m_projectSettingsMenuButton->height());
+
+        connect(m_projectImageLabel, &LabelButton::triggered, [this]() { emit OpenProject(m_projectName); });
+        connect(m_editProjectAction, &QAction::triggered, [this]() { emit EditProject(m_projectName); });
+
+#ifdef SHOW_ALL_PROJECT_ACTIONS
+        connect(m_editProjectGemsAction, &QAction::triggered, [this]() { emit EditProjectGems(m_projectName); });
+        connect(m_copyProjectAction, &QAction::triggered, [this]() { emit CopyProject(m_projectName); });
+        connect(m_removeProjectAction, &QAction::triggered, [this]() { emit RemoveProject(m_projectName); });
+        connect(m_deleteProjectAction, &QAction::triggered, [this]() { emit DeleteProject(m_projectName); });
+#endif
+    }
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectButtonWidget.h

@@ -0,0 +1,73 @@
+/*
+ * 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 <QFrame>
+#include <QLabel>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QPixmap)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QAction)
+
+namespace O3DE::ProjectManager
+{
+    class LabelButton
+        : public QLabel
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit LabelButton(QWidget* parent = nullptr);
+        ~LabelButton() = default;
+
+    signals:
+        void triggered();
+
+    public slots:
+        void mousePressEvent(QMouseEvent* event) override;
+    };
+
+    class ProjectButton
+        : public QFrame
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit ProjectButton(const QString& projectName, QWidget* parent = nullptr);
+        explicit ProjectButton(const QString& projectName, const QString& projectImage, QWidget* parent = nullptr);
+        ~ProjectButton() = default;
+
+    signals:
+        void OpenProject(const QString& projectName);
+        void EditProject(const QString& projectName);
+        void EditProjectGems(const QString& projectName);
+        void CopyProject(const QString& projectName);
+        void RemoveProject(const QString& projectName);
+        void DeleteProject(const QString& projectName);
+
+    private:
+        void Setup();
+
+        QString m_projectName;
+        QString m_projectImagePath;
+        LabelButton* m_projectImageLabel;
+        QPushButton* m_projectSettingsMenuButton;
+        QAction* m_editProjectAction;
+        QAction* m_editProjectGemsAction;
+        QAction* m_copyProjectAction;
+        QAction* m_removeProjectAction;
+        QAction* m_deleteProjectAction;
+    };
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp

@@ -50,9 +50,9 @@ namespace O3DE::ProjectManager
         QVector<ProjectManagerScreen> screenEnums =
         {
             ProjectManagerScreen::FirstTimeUse,
-            ProjectManagerScreen::NewProjectSettingsCore,
+            ProjectManagerScreen::CreateProject,
             ProjectManagerScreen::ProjectsHome,
-            ProjectManagerScreen::ProjectSettings,
+            ProjectManagerScreen::UpdateProject,
             ProjectManagerScreen::EngineSettings
         };
         m_screensCtrl->BuildScreens(screenEnums);

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp

@@ -30,6 +30,23 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::ProjectSettings;
     }
 
+    ProjectInfo ProjectSettingsScreen::GetProjectInfo()
+    {
+        // Impl pending next PR
+        return ProjectInfo();
+    }
+
+    void ProjectSettingsScreen::SetProjectInfo()
+    {
+        // Impl pending next PR
+    }
+
+    bool ProjectSettingsScreen::Validate()
+    {
+        // Impl pending next PR
+        return true;
+    }
+
     void ProjectSettingsScreen::HandleGemsButton()
     {
         emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog);

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h

@@ -13,6 +13,7 @@
 
 #if !defined(Q_MOC_RUN)
 #include <ScreenWidget.h>
+#include <ProjectInfo.h>
 #endif
 
 namespace Ui
@@ -30,6 +31,11 @@ namespace O3DE::ProjectManager
         ~ProjectSettingsScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
+        ProjectInfo GetProjectInfo();
+        void SetProjectInfo();
+
+        bool Validate();
+
     protected slots:
         void HandleGemsButton();
 

Code/Tools/ProjectManager/Source/ProjectsHomeScreen.cpp

@@ -12,21 +12,103 @@
 
 #include <ProjectsHomeScreen.h>
 
-#include <Source/ui_ProjectsHomeScreen.h>
-
+#include <ProjectButtonWidget.h>
 #include <PythonBindingsInterface.h>
 
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QMenu>
+#include <QListView>
+#include <QSpacerItem>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QFileInfo>
+#include <QScrollArea>
+
 namespace O3DE::ProjectManager
 {
     ProjectsHomeScreen::ProjectsHomeScreen(QWidget* parent)
         : ScreenWidget(parent)
-        , m_ui(new Ui::ProjectsHomeClass())
     {
-        m_ui->setupUi(this);
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        setLayout(vLayout);
+        vLayout->setContentsMargins(s_contentMargins, s_contentMargins, s_contentMargins, s_contentMargins);
 
-        connect(m_ui->newProjectButton, &QPushButton::pressed, this, &ProjectsHomeScreen::HandleNewProjectButton);
-        connect(m_ui->addProjectButton, &QPushButton::pressed, this, &ProjectsHomeScreen::HandleAddProjectButton);
-        connect(m_ui->editProjectButton, &QPushButton::pressed, this, &ProjectsHomeScreen::HandleEditProjectButton);
+        QHBoxLayout* topLayout = new QHBoxLayout();
+
+        QLabel* titleLabel = new QLabel(this);
+        titleLabel->setText("My Projects");
+        titleLabel->setStyleSheet("font-size: 24px");
+        topLayout->addWidget(titleLabel);
+
+        QSpacerItem* topSpacer = new QSpacerItem(s_spacerSize, s_spacerSize, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        topLayout->addItem(topSpacer);
+
+        QMenu* newProjectMenu = new QMenu(this);
+        m_createNewProjectAction = newProjectMenu->addAction("Create New Project");
+        m_addExistingProjectAction = newProjectMenu->addAction("Add Existing Project");
+
+        QPushButton* newProjectMenuButton = new QPushButton(this);
+        newProjectMenuButton->setText("New Project...");
+        newProjectMenuButton->setMenu(newProjectMenu);
+        newProjectMenuButton->setFixedWidth(s_newProjectButtonWidth);
+        newProjectMenuButton->setStyleSheet("font-size: 14px;");
+        topLayout->addWidget(newProjectMenuButton);
+
+        vLayout->addLayout(topLayout);
+
+        // Get all projects and create a horizontal scrolling list of them
+        auto projectsResult = PythonBindingsInterface::Get()->GetProjects();
+        if (projectsResult.IsSuccess() && !projectsResult.GetValue().isEmpty())
+        {
+            QScrollArea* projectsScrollArea = new QScrollArea(this);
+            QWidget* scrollWidget = new QWidget();
+            QGridLayout* projectGridLayout = new QGridLayout();
+            scrollWidget->setLayout(projectGridLayout);
+            projectsScrollArea->setWidget(scrollWidget);
+            projectsScrollArea->setWidgetResizable(true);
+
+            int gridIndex = 0;
+            for (auto project : projectsResult.GetValue())
+            {
+                ProjectButton* projectButton;
+                QString projectPreviewPath = project.m_path + m_projectPreviewImagePath;
+                QFileInfo doesPreviewExist(projectPreviewPath);
+                if (doesPreviewExist.exists() && doesPreviewExist.isFile())
+                {
+                    projectButton = new ProjectButton(project.m_projectName, projectPreviewPath, this);
+                }
+                else
+                {
+                    projectButton = new ProjectButton(project.m_projectName, this);
+                }
+
+                // Create rows of projects buttons s_projectButtonRowCount buttons wide
+                projectGridLayout->addWidget(projectButton, gridIndex / s_projectButtonRowCount, gridIndex % s_projectButtonRowCount);
+
+                connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsHomeScreen::HandleOpenProject);
+                connect(projectButton, &ProjectButton::EditProject, this, &ProjectsHomeScreen::HandleEditProject);
+
+#ifdef SHOW_ALL_PROJECT_ACTIONS
+                connect(projectButton, &ProjectButton::EditProjectGems, this, &ProjectsHomeScreen::HandleEditProjectGems);
+                connect(projectButton, &ProjectButton::CopyProject, this, &ProjectsHomeScreen::HandleCopyProject);
+                connect(projectButton, &ProjectButton::RemoveProject, this, &ProjectsHomeScreen::HandleRemoveProject);
+                connect(projectButton, &ProjectButton::DeleteProject, this, &ProjectsHomeScreen::HandleDeleteProject);
+#endif
+                ++gridIndex;
+            }
+
+            vLayout->addWidget(projectsScrollArea);
+        }
+
+        // Using border-image allows for scaling options background-image does not support
+        setStyleSheet("O3DE--ProjectManager--ScreenWidget { border-image: url(:/Backgrounds/FirstTimeBackgroundImage.jpg) repeat repeat; }");
+
+        connect(m_createNewProjectAction, &QAction::triggered, this, &ProjectsHomeScreen::HandleNewProjectButton);
+        connect(m_addExistingProjectAction, &QAction::triggered, this, &ProjectsHomeScreen::HandleAddProjectButton);
     }
 
     ProjectManagerScreen ProjectsHomeScreen::GetScreenEnum()
@@ -36,16 +118,41 @@ namespace O3DE::ProjectManager
 
     void ProjectsHomeScreen::HandleNewProjectButton()
     {
-        emit ResetScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
-        emit ChangeScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
+        emit ResetScreenRequest(ProjectManagerScreen::CreateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::CreateProject);
     }
     void ProjectsHomeScreen::HandleAddProjectButton()
     {
         // Do nothing for now
     }
-    void ProjectsHomeScreen::HandleEditProjectButton()
+    void ProjectsHomeScreen::HandleOpenProject(const QString& projectPath)
     {
-        emit ChangeScreenRequest(ProjectManagerScreen::ProjectSettings);
+        // Open the editor with this project open
+        emit NotifyCurrentProject(projectPath);
+    }
+    void ProjectsHomeScreen::HandleEditProject(const QString& projectPath)
+    {
+        emit NotifyCurrentProject(projectPath);
+        emit ResetScreenRequest(ProjectManagerScreen::UpdateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::UpdateProject);
+    }
+    void ProjectsHomeScreen::HandleEditProjectGems(const QString& projectPath)
+    {
+        emit NotifyCurrentProject(projectPath);
+        emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog);
+    }
+    void ProjectsHomeScreen::HandleCopyProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Open file dialog and choose location for copied project then register copy with O3DE
+    }
+    void ProjectsHomeScreen::HandleRemoveProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Unregister Project from O3DE 
+    }
+    void ProjectsHomeScreen::HandleDeleteProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Remove project from 03DE and delete from disk
+        ProjectsHomeScreen::HandleRemoveProject(projectPath);
     }
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectsHomeScreen.h

@@ -15,11 +15,6 @@
 #include <ScreenWidget.h>
 #endif
 
-namespace Ui
-{
-    class ProjectsHomeClass;
-}
-
 namespace O3DE::ProjectManager
 {
     class ProjectsHomeScreen
@@ -34,10 +29,23 @@ namespace O3DE::ProjectManager
     protected slots:
         void HandleNewProjectButton();
         void HandleAddProjectButton();
-        void HandleEditProjectButton();
+        void HandleOpenProject(const QString& projectPath);
+        void HandleEditProject(const QString& projectPath);
+        void HandleEditProjectGems(const QString& projectPath);
+        void HandleCopyProject(const QString& projectPath);
+        void HandleRemoveProject(const QString& projectPath);
+        void HandleDeleteProject(const QString& projectPath);
 
     private:
-        QScopedPointer<Ui::ProjectsHomeClass> m_ui;
+        QAction* m_createNewProjectAction;
+        QAction* m_addExistingProjectAction;
+
+        const QString m_projectPreviewImagePath = "/preview.png";
+        inline constexpr static int s_contentMargins = 80;
+        inline constexpr static int s_spacerSize = 20;
+        inline constexpr static int s_projectButtonRowCount = 4;
+        inline constexpr static int s_newProjectButtonWidth = 156;
+
     };
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectsHomeScreen.ui

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProjectsHomeClass</class>
- <widget class="QWidget" name="ProjectsHomeClass">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>826</width>
-    <height>585</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>My Projects</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="currentProjectButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="newProjectButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../Resources/ProjectManager.qrc">
-         <normaloff>:/Add.svg</normaloff>:/Add.svg</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addProjectButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../Resources/ProjectManager.qrc">
-         <normaloff>:/Select_Folder.svg</normaloff>:/Select_Folder.svg</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QToolButton" name="editProjectButton">
-     <property name="text">
-      <string>Edit Project</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Open a Project</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../Resources/ProjectManager.qrc"/>
- </resources>
- <connections/>
-</ui>

Code/Tools/ProjectManager/Source/PythonBindings.cpp

@@ -540,7 +540,8 @@ namespace O3DE::ProjectManager
     ProjectInfo PythonBindings::ProjectInfoFromPath(pybind11::handle path)
     {
         ProjectInfo projectInfo;
-        projectInfo.m_path = Py_To_String(path); 
+        projectInfo.m_path = Py_To_String(path);
+        projectInfo.m_isNew = false;
 
         auto projectData = m_registration.attr("get_project_data")(pybind11::none(), path);
         if (pybind11::isinstance<pybind11::dict>(projectData))

Code/Tools/ProjectManager/Source/ScreenDefs.h

@@ -18,10 +18,11 @@ namespace O3DE::ProjectManager
         Invalid = -1,
         Empty,
         FirstTimeUse,
-        NewProjectSettingsCore,
+        CreateProject,
         NewProjectSettings,
         GemCatalog,
         ProjectsHome,
+        UpdateProject,
         ProjectSettings,
         EngineSettings
     };

Code/Tools/ProjectManager/Source/ScreenFactory.cpp

@@ -12,7 +12,8 @@
 #include <ScreenFactory.h>
 
 #include <FirstTimeUseScreen.h>
-#include <ProjectSettingsCtrl.h>
+#include <CreateProjectCtrl.h>
+#include <UpdateProjectCtrl.h>
 #include <NewProjectSettingsScreen.h>
 #include <GemCatalog/GemCatalogScreen.h>
 #include <ProjectsHomeScreen.h>
@@ -30,8 +31,8 @@ namespace O3DE::ProjectManager
         case (ProjectManagerScreen::FirstTimeUse):
             newScreen = new FirstTimeUseScreen(parent);
             break;
-        case (ProjectManagerScreen::NewProjectSettingsCore):
-            newScreen = new ProjectSettingsCtrl(parent);
+        case (ProjectManagerScreen::CreateProject):
+            newScreen = new CreateProjectCtrl(parent);
             break;
         case (ProjectManagerScreen::NewProjectSettings):
             newScreen = new NewProjectSettingsScreen(parent);
@@ -42,6 +43,9 @@ namespace O3DE::ProjectManager
         case (ProjectManagerScreen::ProjectsHome):
             newScreen = new ProjectsHomeScreen(parent);
             break;
+        case (ProjectManagerScreen::UpdateProject):
+            newScreen = new UpdateProjectCtrl(parent);
+            break;
         case (ProjectManagerScreen::ProjectSettings):
             newScreen = new ProjectSettingsScreen(parent);
             break;

Code/Tools/ProjectManager/Source/ScreenWidget.h

@@ -41,15 +41,12 @@ namespace O3DE::ProjectManager
         {
             return true;
         }
-        virtual QString GetNextButtonText()
-        {
-            return "Next";
-        }
 
     signals:
         void ChangeScreenRequest(ProjectManagerScreen screen);
         void GotoPreviousScreenRequest();
         void ResetScreenRequest(ProjectManagerScreen screen);
+        void NotifyCurrentProject(const QString& projectPath);
     };
 
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ScreensCtrl.cpp

@@ -117,6 +117,7 @@ namespace O3DE::ProjectManager
         connect(newScreen, &ScreenWidget::ChangeScreenRequest, this, &ScreensCtrl::ChangeToScreen);
         connect(newScreen, &ScreenWidget::GotoPreviousScreenRequest, this, &ScreensCtrl::GotoPreviousScreen);
         connect(newScreen, &ScreenWidget::ResetScreenRequest, this, &ScreensCtrl::ResetScreen);
+        connect(newScreen, &ScreenWidget::NotifyCurrentProject, this, &ScreensCtrl::NotifyCurrentProject);
     }
 
     void ScreensCtrl::ResetAllScreens()

Code/Tools/ProjectManager/Source/ScreensCtrl.h

@@ -35,6 +35,9 @@ namespace O3DE::ProjectManager
         ScreenWidget* FindScreen(ProjectManagerScreen screen);
         ScreenWidget* GetCurrentScreen();
 
+    signals:
+        void NotifyCurrentProject(const QString& projectPath);
+
     public slots:
         bool ChangeToScreen(ProjectManagerScreen screen);
         bool ForceChangeToScreen(ProjectManagerScreen screen, bool addVisit = true);

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp

@@ -0,0 +1,139 @@
+/*
+ * 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 <UpdateProjectCtrl.h>
+#include <ScreensCtrl.h>
+#include <PythonBindingsInterface.h>
+#include <ProjectSettingsScreen.h>
+
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QMessageBox>
+
+namespace O3DE::ProjectManager
+{
+    UpdateProjectCtrl::UpdateProjectCtrl(QWidget* parent)
+        : ScreenWidget(parent)
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        setLayout(vLayout);
+
+        m_screensCtrl = new ScreensCtrl();
+        vLayout->addWidget(m_screensCtrl);
+
+        QDialogButtonBox* backNextButtons = new QDialogButtonBox();
+        vLayout->addWidget(backNextButtons);
+
+        m_backButton = backNextButtons->addButton(tr("Back"), QDialogButtonBox::RejectRole);
+        m_nextButton = backNextButtons->addButton(tr("Next"), QDialogButtonBox::ApplyRole);
+
+        connect(m_backButton, &QPushButton::pressed, this, &UpdateProjectCtrl::HandleBackButton);
+        connect(m_nextButton, &QPushButton::pressed, this, &UpdateProjectCtrl::HandleNextButton);
+        connect(reinterpret_cast<ScreensCtrl*>(parent), &ScreensCtrl::NotifyCurrentProject, this, &UpdateProjectCtrl::UpdateCurrentProject);
+
+        m_screensOrder =
+        {
+            ProjectManagerScreen::ProjectSettings,
+            ProjectManagerScreen::GemCatalog
+        };
+        m_screensCtrl->BuildScreens(m_screensOrder);
+        m_screensCtrl->ForceChangeToScreen(ProjectManagerScreen::ProjectSettings, false);
+
+        UpdateNextButtonText();
+
+    }
+
+    ProjectManagerScreen UpdateProjectCtrl::GetScreenEnum()
+    {
+        return ProjectManagerScreen::UpdateProject;
+    }
+
+    void UpdateProjectCtrl::HandleBackButton()
+    {
+        if (!m_screensCtrl->GotoPreviousScreen())
+        {
+            emit GotoPreviousScreenRequest();
+        }
+        else
+        {
+            UpdateNextButtonText();
+        }
+    }
+    void UpdateProjectCtrl::HandleNextButton()
+    {
+        ScreenWidget* currentScreen = m_screensCtrl->GetCurrentScreen();
+        ProjectManagerScreen screenEnum = currentScreen->GetScreenEnum();
+        auto screenOrderIter = m_screensOrder.begin();
+        for (; screenOrderIter != m_screensOrder.end(); ++screenOrderIter)
+        {
+            if (*screenOrderIter == screenEnum)
+            {
+                ++screenOrderIter;
+                break;
+            }
+        }
+
+        if (screenEnum == ProjectManagerScreen::ProjectSettings)
+        {
+            auto projectScreen = reinterpret_cast<ProjectSettingsScreen*>(currentScreen);
+            if (projectScreen)
+            {
+                if (!projectScreen->Validate())
+                {
+                    QMessageBox::critical(this, tr("Invalid project settings"), tr("Invalid project settings"));
+                    return;
+                }
+
+                m_projectInfo = projectScreen->GetProjectInfo();
+            }
+        }
+
+        if (screenOrderIter != m_screensOrder.end())
+        {
+            m_screensCtrl->ChangeToScreen(*screenOrderIter);
+            UpdateNextButtonText();
+        }
+        else
+        {
+            auto result = PythonBindingsInterface::Get()->UpdateProject(m_projectInfo);
+            if (result)
+            {
+                emit ChangeScreenRequest(ProjectManagerScreen::ProjectsHome);
+            }
+            else
+            {
+                QMessageBox::critical(this, tr("Project update failed"), tr("Failed to update project."));
+            }
+        }
+    }
+
+    void UpdateProjectCtrl::UpdateCurrentProject(const QString& projectPath)
+    {
+        auto projectResult = PythonBindingsInterface::Get()->GetProject(projectPath);
+        if (projectResult.IsSuccess())
+        {
+            m_projectInfo = projectResult.GetValue();
+        }
+    }
+
+    void UpdateProjectCtrl::UpdateNextButtonText()
+    {
+        QString nextButtonText = tr("Continue");
+        if (m_screensCtrl->GetCurrentScreen()->GetScreenEnum() == ProjectManagerScreen::GemCatalog)
+        {
+            nextButtonText = tr("Update Project");
+        }
+        m_nextButton->setText(nextButtonText);
+    }
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h

@@ -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.
+ *
+ */
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include "ProjectInfo.h"
+#include <ScreenWidget.h>
+#include <ScreensCtrl.h>
+#include <QPushButton>
+#endif
+
+
+namespace O3DE::ProjectManager
+{
+    class UpdateProjectCtrl
+        : public ScreenWidget
+    {
+    public:
+        explicit UpdateProjectCtrl(QWidget* parent = nullptr);
+        ~UpdateProjectCtrl() = default;
+        ProjectManagerScreen GetScreenEnum() override;
+
+
+    protected slots:
+        void HandleBackButton();
+        void HandleNextButton();
+        void UpdateCurrentProject(const QString& projectPath);
+
+    private:
+        void UpdateNextButtonText();
+
+        ScreensCtrl* m_screensCtrl;
+        QPushButton* m_backButton;
+        QPushButton* m_nextButton;
+        QVector<ProjectManagerScreen> m_screensOrder;
+
+        ProjectInfo m_projectInfo;
+
+        ProjectManagerScreen m_screenEnum;
+    };
+
+} // namespace O3DE::ProjectManager