Merge branch 'main' of https://github.com/aws-lumberyard/o3de into prism/LYN-2514
# Conflicts: # Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cppmain
Benjamin Jillich
5 years ago
commit
1b96fc4361
@ -1,113 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>ProjectSettingsClass</class>
|
|
||||||
<widget class="QWidget" name="ProjectSettingsClass">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>782</width>
|
|
||||||
<height>579</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Form</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="projectSettingsButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Settings</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="gemsButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Gems</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>761</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Name</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="lineEdit"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_2">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Location</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="lineEdit_2"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Image Location</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="lineEdit_3"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_4">
|
|
||||||
<property name="text">
|
|
||||||
<string>Project Background Image Location</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="lineEdit_4"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</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>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<resources/>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
@ -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 <UpdateProjectSettingsScreen.h>
|
||||||
|
#include <FormBrowseEditWidget.h>
|
||||||
|
#include <FormLineEditWidget.h>
|
||||||
|
|
||||||
|
#include <QLineEdit>
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
UpdateProjectSettingsScreen::UpdateProjectSettingsScreen(QWidget* parent)
|
||||||
|
: ProjectSettingsScreen(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ProjectManagerScreen UpdateProjectSettingsScreen::GetScreenEnum()
|
||||||
|
{
|
||||||
|
return ProjectManagerScreen::UpdateProjectSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
void UpdateProjectSettingsScreen::SetProjectInfo(const ProjectInfo& projectInfo)
|
||||||
|
{
|
||||||
|
m_projectName->lineEdit()->setText(projectInfo.m_projectName);
|
||||||
|
m_projectPath->lineEdit()->setText(projectInfo.m_path);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool UpdateProjectSettingsScreen::ValidateProjectPath()
|
||||||
|
{
|
||||||
|
bool projectPathIsValid = true;
|
||||||
|
if (m_projectPath->lineEdit()->text().isEmpty())
|
||||||
|
{
|
||||||
|
projectPathIsValid = false;
|
||||||
|
m_projectPath->setErrorLabelText(tr("Please provide a valid location."));
|
||||||
|
}
|
||||||
|
|
||||||
|
m_projectPath->setErrorLabelVisible(!projectPathIsValid);
|
||||||
|
return projectPathIsValid;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* 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 <ProjectSettingsScreen.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace O3DE::ProjectManager
|
||||||
|
{
|
||||||
|
class UpdateProjectSettingsScreen
|
||||||
|
: public ProjectSettingsScreen
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit UpdateProjectSettingsScreen(QWidget* parent = nullptr);
|
||||||
|
~UpdateProjectSettingsScreen() = default;
|
||||||
|
ProjectManagerScreen GetScreenEnum() override;
|
||||||
|
|
||||||
|
void SetProjectInfo(const ProjectInfo& projectInfo);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool ValidateProjectPath() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace O3DE::ProjectManager
|
||||||
Loading…
Reference in New Issue