Rearchitecture Project Manager Screens Workflow and Create Project Settings Ctrl
* Renamed UX screen files and classes to include screen in the name * Changed screens to emit a screen change request a controller can connect to * Made ScreensCtrl that owns and manages screens and their changing and history * Made Project Settings Control managing back and next buttons * Add Project Setting Model and moved New Project Settings Ui into Screen file * Goto previous screen always works * Removed unnecessary QObject namespace from connect calls * Merged ProjectSettingsModel into ProjectInfomain
parent
67a1e4dc4f
commit
7ecd1b1761
@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 <FirstTimeUse.h>
|
|
||||||
|
|
||||||
#include <Source/ui_FirstTimeUse.h>
|
|
||||||
|
|
||||||
namespace O3DE::ProjectManager
|
|
||||||
{
|
|
||||||
FirstTimeUse::FirstTimeUse(ProjectManagerWindow* window)
|
|
||||||
: ScreenWidget(window)
|
|
||||||
, m_ui(new Ui::FirstTimeUseClass())
|
|
||||||
{
|
|
||||||
m_ui->setupUi(this);
|
|
||||||
|
|
||||||
ConnectSlotsAndSignals();
|
|
||||||
}
|
|
||||||
|
|
||||||
FirstTimeUse::~FirstTimeUse()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void FirstTimeUse::ConnectSlotsAndSignals()
|
|
||||||
{
|
|
||||||
QObject::connect(m_ui->createProjectButton, &QPushButton::pressed, this, &FirstTimeUse::HandleNewProjectButton);
|
|
||||||
QObject::connect(m_ui->openProjectButton, &QPushButton::pressed, this, &FirstTimeUse::HandleOpenProjectButton);
|
|
||||||
}
|
|
||||||
|
|
||||||
void FirstTimeUse::HandleNewProjectButton()
|
|
||||||
{
|
|
||||||
m_projectManagerWindow->ChangeToScreen(ProjectManagerScreen::NewProjectSettings);
|
|
||||||
}
|
|
||||||
void FirstTimeUse::HandleOpenProjectButton()
|
|
||||||
{
|
|
||||||
m_projectManagerWindow->ChangeToScreen(ProjectManagerScreen::ProjectsHome);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace O3DE::ProjectManager
|
|
||||||
@ -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.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <FirstTimeUseScreen.h>
|
||||||
|
|
||||||
|
#include <Source/ui_FirstTimeUseScreen.h>
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
FirstTimeUseScreen::FirstTimeUseScreen(QWidget* parent)
|
||||||
|
: ScreenWidget(parent)
|
||||||
|
, m_ui(new Ui::FirstTimeUseClass())
|
||||||
|
{
|
||||||
|
m_ui->setupUi(this);
|
||||||
|
|
||||||
|
connect(m_ui->createProjectButton, &QPushButton::pressed, this, &FirstTimeUseScreen::HandleNewProjectButton);
|
||||||
|
connect(m_ui->openProjectButton, &QPushButton::pressed, this, &FirstTimeUseScreen::HandleOpenProjectButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
ProjectManagerScreen FirstTimeUseScreen::GetScreenEnum()
|
||||||
|
{
|
||||||
|
return ProjectManagerScreen::FirstTimeUse;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FirstTimeUseScreen::HandleNewProjectButton()
|
||||||
|
{
|
||||||
|
emit ResetScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
|
||||||
|
emit ChangeScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
|
||||||
|
}
|
||||||
|
void FirstTimeUseScreen::HandleOpenProjectButton()
|
||||||
|
{
|
||||||
|
emit ChangeScreenRequest(ProjectManagerScreen::ProjectsHome);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 <NewProjectSettings.h>
|
|
||||||
|
|
||||||
#include <Source/ui_NewProjectSettings.h>
|
|
||||||
|
|
||||||
namespace O3DE::ProjectManager
|
|
||||||
{
|
|
||||||
NewProjectSettings::NewProjectSettings(ProjectManagerWindow* window)
|
|
||||||
: ScreenWidget(window)
|
|
||||||
, m_ui(new Ui::NewProjectSettingsClass())
|
|
||||||
{
|
|
||||||
m_ui->setupUi(this);
|
|
||||||
|
|
||||||
ConnectSlotsAndSignals();
|
|
||||||
}
|
|
||||||
|
|
||||||
NewProjectSettings::~NewProjectSettings()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NewProjectSettings::ConnectSlotsAndSignals()
|
|
||||||
{
|
|
||||||
QObject::connect(m_ui->backButton, &QPushButton::pressed, this, &NewProjectSettings::HandleBackButton);
|
|
||||||
QObject::connect(m_ui->nextButton, &QPushButton::pressed, this, &NewProjectSettings::HandleNextButton);
|
|
||||||
}
|
|
||||||
|
|
||||||
void NewProjectSettings::HandleBackButton()
|
|
||||||
{
|
|
||||||
m_projectManagerWindow->ChangeToScreen(ProjectManagerScreen::FirstTimeUse);
|
|
||||||
}
|
|
||||||
void NewProjectSettings::HandleNextButton()
|
|
||||||
{
|
|
||||||
m_projectManagerWindow->ChangeToScreen(ProjectManagerScreen::GemCatalog);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace O3DE::ProjectManager
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>NewProjectSettingsClass</class>
|
|
||||||
<widget class="QWidget" name="NewProjectSettingsClass">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>880</width>
|
|
||||||
<height>546</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Form</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="projectNameLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Name</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="projectNameLineEdit"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="projectPathLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Path</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="projectPathLineEdit"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="projectTemplateLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Template</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QRadioButton" name="projectTemplateStandardRadioButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Standard (Recommened)</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QRadioButton" name="projectTemplateStandardEmptyButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Empty</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<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>
|
|
||||||
<widget class="QPushButton" name="backButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Back</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="nextButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Next</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<resources/>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
@ -0,0 +1,82 @@
|
|||||||
|
/*
|
||||||
|
* 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 <NewProjectSettingsScreen.h>
|
||||||
|
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <QHBoxLayout>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QLineEdit>
|
||||||
|
#include <QRadioButton>
|
||||||
|
#include <QSpacerItem>
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
NewProjectSettingsScreen::NewProjectSettingsScreen(QWidget* parent)
|
||||||
|
: ScreenWidget(parent)
|
||||||
|
{
|
||||||
|
QHBoxLayout* hLayout = new QHBoxLayout();
|
||||||
|
this->setLayout(hLayout);
|
||||||
|
|
||||||
|
QVBoxLayout* vLayout = new QVBoxLayout(this);
|
||||||
|
|
||||||
|
QLabel* projectNameLabel = new QLabel(this);
|
||||||
|
projectNameLabel->setText("Project Name");
|
||||||
|
vLayout->addWidget(projectNameLabel);
|
||||||
|
|
||||||
|
QLineEdit* projectNameLineEdit = new QLineEdit(this);
|
||||||
|
vLayout->addWidget(projectNameLineEdit);
|
||||||
|
|
||||||
|
QLabel* projectPathLabel = new QLabel(this);
|
||||||
|
projectPathLabel->setText("Project Location");
|
||||||
|
vLayout->addWidget(projectPathLabel);
|
||||||
|
|
||||||
|
QLineEdit* projectPathLineEdit = new QLineEdit(this);
|
||||||
|
vLayout->addWidget(projectPathLineEdit);
|
||||||
|
|
||||||
|
QLabel* projectTemplateLabel = new QLabel(this);
|
||||||
|
projectTemplateLabel->setText("Project Template");
|
||||||
|
vLayout->addWidget(projectTemplateLabel);
|
||||||
|
|
||||||
|
QHBoxLayout* templateLayout = new QHBoxLayout(this);
|
||||||
|
vLayout->addItem(templateLayout);
|
||||||
|
|
||||||
|
QRadioButton* projectTemplateStandardRadioButton = new QRadioButton(this);
|
||||||
|
projectTemplateStandardRadioButton->setText("Standard (Recommened)");
|
||||||
|
projectTemplateStandardRadioButton->setChecked(true);
|
||||||
|
templateLayout->addWidget(projectTemplateStandardRadioButton);
|
||||||
|
|
||||||
|
QRadioButton* projectTemplateEmptyRadioButton = new QRadioButton(this);
|
||||||
|
projectTemplateEmptyRadioButton->setText("Empty");
|
||||||
|
templateLayout->addWidget(projectTemplateEmptyRadioButton);
|
||||||
|
|
||||||
|
QSpacerItem* verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
||||||
|
vLayout->addItem(verticalSpacer);
|
||||||
|
|
||||||
|
hLayout->addItem(vLayout);
|
||||||
|
|
||||||
|
QWidget* gemsListPlaceholder = new QWidget(this);
|
||||||
|
gemsListPlaceholder->setFixedWidth(250);
|
||||||
|
hLayout->addWidget(gemsListPlaceholder);
|
||||||
|
}
|
||||||
|
|
||||||
|
ProjectManagerScreen NewProjectSettingsScreen::GetScreenEnum()
|
||||||
|
{
|
||||||
|
return ProjectManagerScreen::NewProjectSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString NewProjectSettingsScreen::GetNextButtonText()
|
||||||
|
{
|
||||||
|
return "Create Project";
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
@ -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.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if !defined(Q_MOC_RUN)
|
||||||
|
#include <ScreenWidget.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
class NewProjectSettingsScreen
|
||||||
|
: public ScreenWidget
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit NewProjectSettingsScreen(QWidget* parent = nullptr);
|
||||||
|
~NewProjectSettingsScreen() = default;
|
||||||
|
ProjectManagerScreen GetScreenEnum() override;
|
||||||
|
QString GetNextButtonText() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
@ -0,0 +1,95 @@
|
|||||||
|
/*
|
||||||
|
* 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 <ProjectSettingsCtrl.h>
|
||||||
|
#include <ScreensCtrl.h>
|
||||||
|
|
||||||
|
#include <QDialogButtonBox>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <QPushButton>
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
ProjectSettingsCtrl::ProjectSettingsCtrl(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("Back", QDialogButtonBox::RejectRole);
|
||||||
|
m_nextButton = backNextButtons->addButton("Next", QDialogButtonBox::ApplyRole);
|
||||||
|
|
||||||
|
connect(m_backButton, &QPushButton::pressed, this, &ProjectSettingsCtrl::HandleBackButton);
|
||||||
|
connect(m_nextButton, &QPushButton::pressed, this, &ProjectSettingsCtrl::HandleNextButton);
|
||||||
|
|
||||||
|
m_screensOrder =
|
||||||
|
{
|
||||||
|
ProjectManagerScreen::NewProjectSettings,
|
||||||
|
ProjectManagerScreen::GemCatalog
|
||||||
|
};
|
||||||
|
m_screensCtrl->BuildScreens(m_screensOrder);
|
||||||
|
m_screensCtrl->ForceChangeToScreen(ProjectManagerScreen::NewProjectSettings, false);
|
||||||
|
UpdateNextButtonText();
|
||||||
|
}
|
||||||
|
|
||||||
|
ProjectManagerScreen ProjectSettingsCtrl::GetScreenEnum()
|
||||||
|
{
|
||||||
|
return ProjectManagerScreen::NewProjectSettingsCore;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ProjectSettingsCtrl::HandleBackButton()
|
||||||
|
{
|
||||||
|
if (!m_screensCtrl->GotoPreviousScreen())
|
||||||
|
{
|
||||||
|
emit GotoPreviousScreenRequest();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UpdateNextButtonText();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void ProjectSettingsCtrl::HandleNextButton()
|
||||||
|
{
|
||||||
|
ProjectManagerScreen screenEnum = m_screensCtrl->GetCurrentScreen()->GetScreenEnum();
|
||||||
|
auto screenOrderIter = m_screensOrder.begin();
|
||||||
|
for (; screenOrderIter != m_screensOrder.end(); ++screenOrderIter)
|
||||||
|
{
|
||||||
|
if (*screenOrderIter == screenEnum)
|
||||||
|
{
|
||||||
|
++screenOrderIter;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (screenOrderIter != m_screensOrder.end())
|
||||||
|
{
|
||||||
|
m_screensCtrl->ChangeToScreen(*screenOrderIter);
|
||||||
|
UpdateNextButtonText();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
emit ChangeScreenRequest(ProjectManagerScreen::ProjectsHome);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ProjectSettingsCtrl::UpdateNextButtonText()
|
||||||
|
{
|
||||||
|
m_nextButton->setText(m_screensCtrl->GetCurrentScreen()->GetNextButtonText());
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 <ProjectsHome.h>
|
|
||||||
|
|
||||||
#include <Source/ui_ProjectsHome.h>
|
|
||||||
|
|
||||||
#include <PythonBindingsInterface.h>
|
|
||||||
|
|
||||||
namespace O3DE::ProjectManager
|
|
||||||
{
|
|
||||||
ProjectsHome::ProjectsHome(ProjectManagerWindow* window)
|
|
||||||
: ScreenWidget(window)
|
|
||||||
, m_ui(new Ui::ProjectsHomeClass())
|
|
||||||
{
|
|
||||||
m_ui->setupUi(this);
|
|
||||||
|
|
||||||
ConnectSlotsAndSignals();
|
|
||||||
|
|
||||||
// example of how to get the current project name
|
|
||||||
ProjectInfo currentProject = PythonBindingsInterface::Get()->GetCurrentProject();
|
|
||||||
}
|
|
||||||
|
|
||||||
ProjectsHome::~ProjectsHome()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ProjectsHome::ConnectSlotsAndSignals()
|
|
||||||
{
|
|
||||||
QObject::connect(m_ui->newProjectButton, &QPushButton::pressed, this, &ProjectsHome::HandleNewProjectButton);
|
|
||||||
QObject::connect(m_ui->addProjectButton, &QPushButton::pressed, this, &ProjectsHome::HandleAddProjectButton);
|
|
||||||
QObject::connect(m_ui->editProjectButton, &QPushButton::pressed, this, &ProjectsHome::HandleEditProjectButton);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ProjectsHome::HandleNewProjectButton()
|
|
||||||
{
|
|
||||||
m_projectManagerWindow->ChangeToScreen(ProjectManagerScreen::NewProjectSettings);
|
|
||||||
}
|
|
||||||
void ProjectsHome::HandleAddProjectButton()
|
|
||||||
{
|
|
||||||
//Do nothing for now
|
|
||||||
}
|
|
||||||
void ProjectsHome::HandleEditProjectButton()
|
|
||||||
{
|
|
||||||
m_projectManagerWindow->ChangeToScreen(ProjectManagerScreen::ProjectSettings);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace O3DE::ProjectManager
|
|
||||||
@ -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 <ProjectsHomeScreen.h>
|
||||||
|
|
||||||
|
#include <Source/ui_ProjectsHomeScreen.h>
|
||||||
|
|
||||||
|
#include <PythonBindingsInterface.h>
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
ProjectsHomeScreen::ProjectsHomeScreen(QWidget* parent)
|
||||||
|
: ScreenWidget(parent)
|
||||||
|
, m_ui(new Ui::ProjectsHomeClass())
|
||||||
|
{
|
||||||
|
m_ui->setupUi(this);
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
ProjectManagerScreen ProjectsHomeScreen::GetScreenEnum()
|
||||||
|
{
|
||||||
|
return ProjectManagerScreen::ProjectsHome;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ProjectsHomeScreen::HandleNewProjectButton()
|
||||||
|
{
|
||||||
|
emit ResetScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
|
||||||
|
emit ChangeScreenRequest(ProjectManagerScreen::NewProjectSettingsCore);
|
||||||
|
}
|
||||||
|
void ProjectsHomeScreen::HandleAddProjectButton()
|
||||||
|
{
|
||||||
|
// Do nothing for now
|
||||||
|
}
|
||||||
|
void ProjectsHomeScreen::HandleEditProjectButton()
|
||||||
|
{
|
||||||
|
emit ChangeScreenRequest(ProjectManagerScreen::ProjectSettings);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
@ -0,0 +1,149 @@
|
|||||||
|
/*
|
||||||
|
* 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 <ScreensCtrl.h>
|
||||||
|
#include <ScreenFactory.h>
|
||||||
|
#include <ScreenWidget.h>
|
||||||
|
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
ScreensCtrl::ScreensCtrl(QWidget* parent)
|
||||||
|
: QWidget(parent)
|
||||||
|
{
|
||||||
|
QVBoxLayout* vLayout = new QVBoxLayout();
|
||||||
|
setLayout(vLayout);
|
||||||
|
|
||||||
|
m_screenStack = new QStackedWidget();
|
||||||
|
vLayout->addWidget(m_screenStack);
|
||||||
|
|
||||||
|
//Track the bottom of the stack
|
||||||
|
m_screenVisitOrder.push(ProjectManagerScreen::Invalid);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScreensCtrl::BuildScreens(QVector<ProjectManagerScreen> screens)
|
||||||
|
{
|
||||||
|
for (ProjectManagerScreen screen : screens)
|
||||||
|
{
|
||||||
|
ResetScreen(screen);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScreenWidget* ScreensCtrl::FindScreen(ProjectManagerScreen screen)
|
||||||
|
{
|
||||||
|
const auto iterator = m_screenMap.find(screen);
|
||||||
|
if (iterator != m_screenMap.end())
|
||||||
|
{
|
||||||
|
return iterator.value();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScreenWidget* ScreensCtrl::GetCurrentScreen()
|
||||||
|
{
|
||||||
|
return reinterpret_cast<ScreenWidget*>(m_screenStack->currentWidget());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ScreensCtrl::ChangeToScreen(ProjectManagerScreen screen)
|
||||||
|
{
|
||||||
|
if (m_screenStack->currentWidget())
|
||||||
|
{
|
||||||
|
ScreenWidget* currentScreenWidget = GetCurrentScreen();
|
||||||
|
if (currentScreenWidget->IsReadyForNextScreen())
|
||||||
|
{
|
||||||
|
return ForceChangeToScreen(screen);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ScreensCtrl::ForceChangeToScreen(ProjectManagerScreen screen, bool addVisit)
|
||||||
|
{
|
||||||
|
const auto iterator = m_screenMap.find(screen);
|
||||||
|
if (iterator != m_screenMap.end())
|
||||||
|
{
|
||||||
|
ScreenWidget* currentScreen = GetCurrentScreen();
|
||||||
|
if (currentScreen != iterator.value())
|
||||||
|
{
|
||||||
|
if (addVisit)
|
||||||
|
{
|
||||||
|
m_screenVisitOrder.push(currentScreen->GetScreenEnum());
|
||||||
|
}
|
||||||
|
m_screenStack->setCurrentWidget(iterator.value());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ScreensCtrl::GotoPreviousScreen()
|
||||||
|
{
|
||||||
|
// Don't go back if we are on the first set screen
|
||||||
|
if (m_screenVisitOrder.top() != ProjectManagerScreen::Invalid)
|
||||||
|
{
|
||||||
|
// We do not check with screen if we can go back, we should always be able to go back
|
||||||
|
return ForceChangeToScreen(m_screenVisitOrder.pop(), false);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScreensCtrl::ResetScreen(ProjectManagerScreen screen)
|
||||||
|
{
|
||||||
|
// Delete old screen if it exists to start fresh
|
||||||
|
DeleteScreen(screen);
|
||||||
|
|
||||||
|
// Add new screen
|
||||||
|
ScreenWidget* newScreen = BuildScreen(this, screen);
|
||||||
|
m_screenStack->addWidget(newScreen);
|
||||||
|
m_screenMap.insert(screen, newScreen);
|
||||||
|
|
||||||
|
connect(newScreen, &ScreenWidget::ChangeScreenRequest, this, &ScreensCtrl::ChangeToScreen);
|
||||||
|
connect(newScreen, &ScreenWidget::GotoPreviousScreenRequest, this, &ScreensCtrl::GotoPreviousScreen);
|
||||||
|
connect(newScreen, &ScreenWidget::ResetScreenRequest, this, &ScreensCtrl::ResetScreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScreensCtrl::ResetAllScreens()
|
||||||
|
{
|
||||||
|
for (auto iter = m_screenMap.begin(); iter != m_screenMap.end(); ++iter)
|
||||||
|
{
|
||||||
|
ResetScreen(iter.key());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScreensCtrl::DeleteScreen(ProjectManagerScreen screen)
|
||||||
|
{
|
||||||
|
// Find the old screen if it exists and get rid of it
|
||||||
|
const auto iter = m_screenMap.find(screen);
|
||||||
|
if (iter != m_screenMap.end())
|
||||||
|
{
|
||||||
|
m_screenStack->removeWidget(iter.value());
|
||||||
|
iter.value()->deleteLater();
|
||||||
|
|
||||||
|
// Erase does not cause a rehash so interators remain valid
|
||||||
|
m_screenMap.erase(iter);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScreensCtrl::DeleteAllScreens()
|
||||||
|
{
|
||||||
|
for (auto iter = m_screenMap.begin(); iter != m_screenMap.end(); ++iter)
|
||||||
|
{
|
||||||
|
DeleteScreen(iter.key());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* 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 <ScreenDefs.h>
|
||||||
|
|
||||||
|
#include <QStackedWidget>
|
||||||
|
#include <QStack>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
class ScreenWidget;
|
||||||
|
|
||||||
|
class ScreensCtrl
|
||||||
|
: public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit ScreensCtrl(QWidget* parent = nullptr);
|
||||||
|
~ScreensCtrl() = default;
|
||||||
|
|
||||||
|
void BuildScreens(QVector<ProjectManagerScreen> screens);
|
||||||
|
ScreenWidget* FindScreen(ProjectManagerScreen screen);
|
||||||
|
ScreenWidget* GetCurrentScreen();
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
bool ChangeToScreen(ProjectManagerScreen screen);
|
||||||
|
bool ForceChangeToScreen(ProjectManagerScreen screen, bool addVisit = true);
|
||||||
|
bool GotoPreviousScreen();
|
||||||
|
void ResetScreen(ProjectManagerScreen screen);
|
||||||
|
void ResetAllScreens();
|
||||||
|
void DeleteScreen(ProjectManagerScreen screen);
|
||||||
|
void DeleteAllScreens();
|
||||||
|
|
||||||
|
private:
|
||||||
|
QStackedWidget* m_screenStack;
|
||||||
|
QHash<ProjectManagerScreen, ScreenWidget*> m_screenMap;
|
||||||
|
QStack<ProjectManagerScreen> m_screenVisitOrder;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
Loading…
Reference in New Issue