Add Project Manager File menu options to Editor

Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp

@@ -14,13 +14,16 @@
 #include <ScreensCtrl.h>
 
 #include <AzQtComponents/Components/StyleManager.h>
+#include <AzCore/IO/FileIO.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzFramework/CommandLine/CommandLine.h>
+#include <AzFramework/Application/Application.h>
 
 #include <QDir>
 
 namespace O3DE::ProjectManager
 {
-    ProjectManagerWindow::ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath)
+    ProjectManagerWindow::ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath, const AZ::IO::PathView& projectPath, ProjectManagerScreen startScreen)
         : QMainWindow(parent)
     {
         m_pythonBindings = AZStd::make_unique<PythonBindings>(engineRootPath);
@@ -50,7 +53,18 @@ namespace O3DE::ProjectManager
         // set stylesheet after creating the screens or their styles won't get updated
         AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("style:ProjectManager.qss"));
 
-        screensCtrl->ForceChangeToScreen(ProjectManagerScreen::Projects, false);
+        // always push the projects screen first so we have something to come back to
+        if (startScreen != ProjectManagerScreen::Projects)
+        {
+            screensCtrl->ForceChangeToScreen(ProjectManagerScreen::Projects);
+        }
+        screensCtrl->ForceChangeToScreen(startScreen);
+
+        if (!projectPath.empty())
+        {
+            const QString path = QString::fromUtf8(projectPath.Native().data(), aznumeric_cast<int>(projectPath.Native().size()));
+            emit screensCtrl->NotifyCurrentProject(path);
+        }
     }
 
     ProjectManagerWindow::~ProjectManagerWindow()

Code/Tools/ProjectManager/Source/ProjectManagerWindow.h

@@ -14,6 +14,7 @@
 #if !defined(Q_MOC_RUN)
 #include <QMainWindow>
 #include <PythonBindings.h>
+#include <ScreenDefs.h>
 #endif
 
 namespace O3DE::ProjectManager
@@ -24,7 +25,8 @@ namespace O3DE::ProjectManager
         Q_OBJECT
 
     public:
-        explicit ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath);
+        explicit ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath, const AZ::IO::PathView& projectPath,
+            ProjectManagerScreen startScreen = ProjectManagerScreen::Projects);
         ~ProjectManagerWindow();
 
     private:

Code/Tools/ProjectManager/Source/ProjectUtils.cpp

@@ -192,5 +192,16 @@ namespace O3DE::ProjectManager
             return true;
         }
 
+        ProjectManagerScreen GetProjectManagerScreen(const QString& screen)
+        {
+            auto iter = s_ProjectManagerStringNames.find(screen);
+            if (iter != s_ProjectManagerStringNames.end())
+            {
+                return iter.value();
+            }
+
+            return ProjectManagerScreen::Invalid;
+        }
+
     } // namespace ProjectUtils
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectUtils.h

@@ -11,6 +11,7 @@
  */
 #pragma once
 
+#include <ScreenDefs.h>
 #include <QWidget>
 
 namespace O3DE::ProjectManager
@@ -24,5 +25,6 @@ namespace O3DE::ProjectManager
         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);
+        ProjectManagerScreen GetProjectManagerScreen(const QString& screen);
     } // namespace ProjectUtils
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ScreenDefs.h

@@ -11,9 +11,13 @@
  */
 #pragma once
 
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/std/string/string.h>
+#include <QHash>
+
 namespace O3DE::ProjectManager
 {
-    enum ProjectManagerScreen
+    enum class ProjectManagerScreen
     {
         Invalid = -1,
         Empty,
@@ -25,4 +29,21 @@ namespace O3DE::ProjectManager
         ProjectSettings,
         EngineSettings
     };
+
+    static QHash<QString, ProjectManagerScreen> s_ProjectManagerStringNames = {
+        { "Empty", ProjectManagerScreen::Empty},
+        { "CreateProject", ProjectManagerScreen::CreateProject},
+        { "NewProjectSettings", ProjectManagerScreen::NewProjectSettings},
+        { "GemCatalog", ProjectManagerScreen::GemCatalog},
+        { "Projects", ProjectManagerScreen::Projects},
+        { "UpdateProject", ProjectManagerScreen::UpdateProject},
+        { "ProjectSettings", ProjectManagerScreen::ProjectSettings},
+        { "EngineSettings", ProjectManagerScreen::EngineSettings}
+    };
+
+    // need to define qHash for ProjectManagerScreen when using scoped enums
+    inline uint qHash(ProjectManagerScreen key, uint seed)
+    {
+        return ::qHash(static_cast<uint>(key), seed);
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/main.cpp

@@ -15,13 +15,17 @@
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzFramework/CommandLine/CommandLine.h>
 
 #include <ProjectManagerWindow.h>
+#include <ProjectUtils.h>
 
 #include <QApplication>
 #include <QCoreApplication>
 #include <QGuiApplication>
 
+using namespace O3DE::ProjectManager;
+
 int main(int argc, char* argv[])
 {
     QApplication::setOrganizationName("O3DE");
@@ -51,7 +55,29 @@ int main(int argc, char* argv[])
         AzQtComponents::StyleManager styleManager(&app);
         styleManager.initialize(&app, engineRootPath);
 
-        O3DE::ProjectManager::ProjectManagerWindow window(nullptr, engineRootPath);
+        // Get the initial start screen if one is provided via command line
+        constexpr char optionPrefix[] = "--";
+        AZ::CommandLine commandLine(optionPrefix);
+        commandLine.Parse(argc, argv);
+
+        ProjectManagerScreen startScreen = ProjectManagerScreen::Projects;
+        if(commandLine.HasSwitch("screen"))
+        {
+            QString screenOption = commandLine.GetSwitchValue("screen", 0).c_str();
+            ProjectManagerScreen screen = ProjectUtils::GetProjectManagerScreen(screenOption);
+            if (screen != ProjectManagerScreen::Invalid)
+            {
+                startScreen = screen;
+            }
+        }
+
+        AZ::IO::FixedMaxPath projectPath;
+        if (commandLine.HasSwitch("project-path"))
+        {
+            projectPath = commandLine.GetSwitchValue("project-path", 0).c_str();
+        }
+
+        ProjectManagerWindow window(nullptr, engineRootPath, projectPath, startScreen);
         window.show();
 
         // somethings is preventing us from moving the window to the center of the