Cherry picked from development

2021-06-22 09:41:48 +01:00
parent 759d719a44
commit 2dce6954a1
9 changed files with 455 additions and 568 deletions
@@ -43,7 +43,7 @@ CNewLevelDialog::CNewLevelDialog(QWidget* pParent /*=NULL*/)

    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
    setWindowTitle(tr("New Level"));
-    setMaximumSize(QSize(320, 280));
+    setMaximumSize(QSize(430, 280));
    adjustSize();

    // Default level folder is root (Levels/)
@@ -6,30 +6,30 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>320</width>
+    <width>430</width>
    <height>280</height>
   </rect>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-    <item row="1" column="0" colspan="2">
-      <widget class="QGroupBox" name="PLACEHOLDER_TRN">
-        <layout class="QFormLayout" name="formLayout_2">
-          <property name="fieldGrowthPolicy">
-            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-          </property>
-        </layout>
-      </widget>
-    </item>
-    <item row="0" column="0" colspan="2">
+   <item row="1" column="0" colspan="2">
+    <widget class="QGroupBox" name="PLACEHOLDER_TRN">
+     <layout class="QFormLayout" name="formLayout_2">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+      </property>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
    <widget class="QGroupBox" name="STATIC_GROUP1">
     <property name="title">
-      <string>Level</string>
+      <string>Assign a name and location to the new level.</string>
     </property>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="STATIC2">
        <property name="text">
-         <string>Name:</string>
+         <string>Name</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -48,8 +48,14 @@
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="STATIC1">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
        <property name="text">
-         <string>Folder:</string>
+         <string>Location</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -208,22 +208,9 @@ WelcomeScreenDialog QLabel
    margin: 0;
 }

-WelcomeScreenDialog QLabel#titleLabel
+WelcomeScreenDialog QLabel#currentProjectLabel
 {
-    font-size: 22px;
-    line-height: 32px;
-}
-
-WelcomeScreenDialog QLabel#bodyLabel
-{
-    font-size: 14px;
-    line-height: 20px;
-}
-
-WelcomeScreenDialog QLabel[fontStyle="sectionTitle"], QLabel#titleLabel[fontStyle="sectionTitle"], QLabel#documentationLink
-{
-    font-size: 16px;
-    line-height: 24px;
+    margin-top: 10px;
 }

 WelcomeScreenDialog QPushButton
@@ -232,36 +219,20 @@ WelcomeScreenDialog QPushButton
    line-height: 16px;
 }

-WelcomeScreenDialog QFrame#viewContainer
-{
-    background-color: transparent;
-}
-
-WelcomeScreenDialog QFrame#viewContainer[articleStyle="pinned"]
-{
-    background: rgba(180,139,255,5%);
-    border: 1px solid #B48BFF;
-    box-shadow: 0 0 4px 0 rgba(0,0,0,50%);
-}
-
 WelcomeScreenDialog QWidget#articleViewContainerRoot
 {
-    background: #111111;
+    background: #444444;
 }

-WelcomeScreenDialog QScrollArea#previewArea
+WelcomeScreenDialog QWidget#levelViewFTUEContainer
 {
-    background-color: transparent;
+    background: #282828;
 }

-WelcomeScreenDialog QWidget#articleViewContents
-{
-    background-color: transparent;
-}
-
-WelcomeScreenDialog QFrame#imageFrame
-{
-    background-color: transparent;
+QTableWidget#recentLevelTable::item {
+	background-color: rgb(64,64,64);
+	margin-bottom: 4px;
+	margin-top: 4px;
 }

 /* Particle Editor */
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:263e95489560dac6e5944ef3caba13e598f83ddead324b943ad7735ba015e1a9
+size 70727
@@ -15,7 +15,8 @@
 #include "WelcomeScreenDialog.h"

 // Qt
-#include <QStringListModel>
+#include <QTableWidget>
+#include <QTableWidgetItem>
 #include <QToolTip>
 #include <QMenu>
 #include <QDesktopServices>
@@ -24,6 +25,7 @@
 #include <QScreen>
 #include <QDesktopWidget>
 #include <QTimer>
+#include <QDateTime>

 #include <AzCore/Utils/Utils.h>

@@ -74,65 +76,39 @@ static int GetSmallestScreenHeight()
 WelcomeScreenDialog::WelcomeScreenDialog(QWidget* pParent)
    : QDialog(new WindowDecorationWrapper(WindowDecorationWrapper::OptionAutoAttach | WindowDecorationWrapper::OptionAutoTitleBarButtons, pParent), Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint | Qt::WindowTitleHint)
    , ui(new Ui::WelcomeScreenDialog)
-    , m_pRecentListModel(new QStringListModel(this))
    , m_pRecentList(nullptr)
 {
    ui->setupUi(this);

-    // Make our welcome screen checkboxes appear as toggle switches
-    AzQtComponents::CheckBox::applyToggleSwitchStyle(ui->autoLoadLevel);
-    AzQtComponents::CheckBox::applyToggleSwitchStyle(ui->showOnStartup);
+    ui->recentLevelTable->setColumnCount(3);
+    ui->recentLevelTable->setMouseTracking(true);
+    ui->recentLevelTable->setContextMenuPolicy(Qt::CustomContextMenu);
+    ui->recentLevelTable->horizontalHeader()->hide();
+    ui->recentLevelTable->verticalHeader()->hide();
+    ui->recentLevelTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    ui->recentLevelTable->setSelectionMode(QAbstractItemView::SingleSelection);
+    ui->recentLevelTable->setIconSize(QSize(20, 20));
+    installEventFilter(this);

-    ui->autoLoadLevel->setChecked(gSettings.bAutoloadLastLevelAtStartup);
-    ui->showOnStartup->setChecked(!gSettings.bShowDashboardAtStartup);
-
-    ui->recentLevelList->setModel(m_pRecentListModel);
-    ui->recentLevelList->setMouseTracking(true);
-    ui->recentLevelList->setContextMenuPolicy(Qt::CustomContextMenu);
-
-    auto currentProjectButtonMenu = new QMenu();
-
-    ui->currentProjectButton->setMenu(currentProjectButtonMenu);
    auto projectName = AZ::Utils::GetProjectName();
-    ui->currentProjectButton->setText(projectName.c_str());
-    ui->currentProjectButton->adjustSize();
-    ui->currentProjectButton->setMinimumWidth(ui->currentProjectButton->width() + 40);
+    ui->currentProjectName->setText(projectName.c_str());

-    ui->documentationLink->setCursor(Qt::PointingHandCursor);
-    ui->documentationLink->installEventFilter(this);
+    ui->newLevelButton->setDefault(true);

-    connect(ui->recentLevelList, &QWidget::customContextMenuRequested, this, &WelcomeScreenDialog::OnShowContextMenu);
+    // Hide these buttons until the new functionality is added
+    ui->gridButton->hide();
+    ui->objectListButton->hide();
+    ui->switchProjectButton->hide();

-    connect(ui->recentLevelList, &QListView::entered, this, &WelcomeScreenDialog::OnShowToolTip);
-    connect(ui->recentLevelList, &QListView::clicked, this, &WelcomeScreenDialog::OnRecentLevelListItemClicked);
+    connect(ui->recentLevelTable, &QWidget::customContextMenuRequested, this, &WelcomeScreenDialog::OnShowContextMenu);
+
+    connect(ui->recentLevelTable, &QTableWidget::entered, this, &WelcomeScreenDialog::OnShowToolTip);
+    connect(ui->recentLevelTable, &QTableWidget::clicked, this, &WelcomeScreenDialog::OnRecentLevelTableItemClicked);

    connect(ui->newLevelButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnNewLevelBtnClicked);
+    connect(ui->levelFileLabel, &QLabel::linkActivated, this, &WelcomeScreenDialog::OnNewLevelLabelClicked);
    connect(ui->openLevelButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnOpenLevelBtnClicked);

-    connect(ui->newSliceButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnNewSliceBtnClicked);
-    connect(ui->openSliceButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnOpenSliceBtnClicked);
-
-    connect(ui->documentationButton, &QPushButton::clicked, this, &WelcomeScreenDialog::OnDocumentationBtnClicked);
-    connect(ui->showOnStartup, &QCheckBox::clicked, this, &WelcomeScreenDialog::OnShowOnStartupBtnClicked);
-    connect(ui->autoLoadLevel, &QCheckBox::clicked, this, &WelcomeScreenDialog::OnAutoLoadLevelBtnClicked);
-
-    m_manifest = new News::ResourceManifest(
-            std::bind(&WelcomeScreenDialog::SyncSuccess, this),
-            std::bind(&WelcomeScreenDialog::SyncFail, this, std::placeholders::_1),
-            std::bind(&WelcomeScreenDialog::SyncUpdate, this, std::placeholders::_1, std::placeholders::_2));
-    
-    m_articleViewContainer = new News::ArticleViewContainer(this, *m_manifest);
-    connect(m_articleViewContainer, &News::ArticleViewContainer::scrolled,
-        this, &WelcomeScreenDialog::previewAreaScrolled);
-    ui->articleViewContainerRoot->layout()->addWidget(m_articleViewContainer);
-
-    m_manifest->Sync();
-
-#ifndef ENABLE_SLICE_EDITOR
-    ui->newSliceButton->hide();
-    ui->openSliceButton->hide();
-#endif
-
    // Adjust the height, if need be
    // Do it in the constructor so that the WindowDecoratorWrapper handles it correctly
    int smallestHeight = GetSmallestScreenHeight();
@@ -153,16 +129,10 @@ WelcomeScreenDialog::WelcomeScreenDialog(QWidget* pParent)
 WelcomeScreenDialog::~WelcomeScreenDialog()
 {
    delete ui;
-    delete m_manifest;
 }

 void WelcomeScreenDialog::done(int result)
 {
-    if (m_waitingOnAsync)
-    {
-        m_manifest->Abort();
-    }
-
    QDialog::done(result);
 }

@@ -173,13 +143,11 @@ const QString& WelcomeScreenDialog::GetLevelPath()

 bool WelcomeScreenDialog::eventFilter(QObject *watched, QEvent *event)
 {
-    if (watched == ui->documentationLink)
+    if (event->type() == QEvent::Show)
    {
-        if (event->type() == QEvent::MouseButtonRelease)
-        {
-            OnDocumentationBtnClicked(false);
-            return true;
-        }
+        ui->recentLevelTable->horizontalHeader()->resizeSection(0, ui->nameLabel->width());
+        ui->recentLevelTable->horizontalHeader()->resizeSection(1, ui->modifiedLabel->width());
+        ui->recentLevelTable->horizontalHeader()->resizeSection(2, ui->typeLabel->width());
    }

    return QDialog::eventFilter(watched, event);
@@ -207,7 +175,9 @@ void WelcomeScreenDialog::SetRecentFileList(RecentFileList* pList)
    int nCurDir = sCurDir.length();

    int recentListSize = pList->GetSize();
-    for (int i = 0; i < recentListSize; ++i)
+    int currentRow = 0;
+    ui->recentLevelTable->setRowCount(recentListSize);
+     for (int i = 0; i < recentListSize; ++i)
    {
        const QString& recentFile = pList->m_arrNames[i];
        if (recentFile.endsWith(m_levelExtension))
@@ -218,7 +188,7 @@ void WelcomeScreenDialog::SetRecentFileList(RecentFileList* pList)
                if (sCurEntryDir.compare(sCurDir, Qt::CaseInsensitive) == 0)
                {
                    QString fullPath = recentFile;
-                    QString name = Path::GetFileName(fullPath);
+                    const QString name = Path::GetFile(fullPath);

                    Path::ConvertSlashToBackSlash(fullPath);
                    fullPath = Path::ToUnixPath(fullPath.toLower());
@@ -226,18 +196,34 @@ void WelcomeScreenDialog::SetRecentFileList(RecentFileList* pList)

                    if (fullPath.contains(gamePath))
                    {
-                        m_pRecentListModel->setStringList(m_pRecentListModel->stringList() << QString(name));
+                        if (gSettings.prefabSystem)
+                        {
+                            QIcon icon;
+                            icon.addFile(QString::fromUtf8(":/Level/level.svg"), QSize(), QIcon::Normal, QIcon::Off);
+                            ui->recentLevelTable->setItem(currentRow, 0, new QTableWidgetItem(icon, name));
+                        }
+                        else
+                        {
+                            ui->recentLevelTable->setItem(currentRow, 0, new QTableWidgetItem(name));
+                        }
+                        QFileInfo file(recentFile);
+                        QDateTime dateTime = file.lastModified();
+                        QString date = QLocale::system().toString(dateTime.date(), QLocale::ShortFormat) + " " +
+                            QLocale::system().toString(dateTime.time(), QLocale::LongFormat);
+                        ui->recentLevelTable->setItem(currentRow, 1, new QTableWidgetItem(date));
+                        ui->recentLevelTable->setItem(currentRow++, 2, new QTableWidgetItem(tr("Level")));
                        m_levels.push_back(std::make_pair(name, recentFile));
                    }
                }
            }
        }
    }
+    ui->recentLevelTable->setRowCount(currentRow);
+    ui->recentLevelTable->setMinimumHeight(currentRow * ui->recentLevelTable->verticalHeader()->defaultSectionSize());
+    ui->recentLevelTable->setMaximumHeight(currentRow * ui->recentLevelTable->verticalHeader()->defaultSectionSize());
+    ui->levelFileLabel->setVisible(currentRow ? false : true);

-    ui->recentLevelList->setCurrentIndex(QModelIndex());
-    int rowSize = ui->recentLevelList->sizeHintForRow(0) + ui->recentLevelList->spacing() * 2;
-    ui->recentLevelList->setMinimumHeight(m_pRecentListModel->rowCount() * rowSize);
-    ui->recentLevelList->setMaximumHeight(m_pRecentListModel->rowCount() * rowSize);
+    ui->recentLevelTable->setCurrentIndex(QModelIndex());
 }


@@ -245,7 +231,7 @@ void WelcomeScreenDialog::RemoveLevelEntry(int index)
 {
    TNamePathPair levelPath = m_levels[index];

-    m_pRecentListModel->removeRow(index);
+    ui->recentLevelTable->removeRow(index);
    m_levels.erase(m_levels.begin() + index);


@@ -284,21 +270,18 @@ void WelcomeScreenDialog::OnShowToolTip(const QModelIndex& index)
 {
    const QString& fullPath = m_levels[index.row()].second;

-    //TEMPORARY:Begin This can be put back once the main window is in Qt
-    //QRect itemRect = ui->recentLevelList->visualRect(index);
-    QToolTip::showText(QCursor::pos(), QString("Open level: %1").arg(fullPath) /*, ui->recentLevelList, itemRect*/);
-    //TEMPORARY:END
+    QToolTip::showText(QCursor::pos(), QString("Open level: %1").arg(fullPath));
 }


 void WelcomeScreenDialog::OnShowContextMenu(const QPoint& pos)
 {
-    QModelIndex index = ui->recentLevelList->indexAt(pos);
+    QModelIndex index = ui->recentLevelTable->indexAt(pos);
    if (index.isValid())
    {
-        QString level = m_pRecentListModel->data(index, 0).toString();
+        QString level = ui->recentLevelTable->itemAt(pos)->text();

-        QPoint globalPos = ui->recentLevelList->viewport()->mapToGlobal(pos);
+        QPoint globalPos = ui->recentLevelTable->viewport()->mapToGlobal(pos);

        QMenu contextMenu;
        contextMenu.addAction(QString("Remove " + level + " from recent list"));
@@ -310,13 +293,16 @@ void WelcomeScreenDialog::OnShowContextMenu(const QPoint& pos)
    }
 }

-
 void WelcomeScreenDialog::OnNewLevelBtnClicked([[maybe_unused]] bool checked)
 {
    m_levelPath = "new";
    accept();
 }

+void WelcomeScreenDialog::OnNewLevelLabelClicked([[maybe_unused]] const QString& path)
+{
+    OnNewLevelBtnClicked(true);
+}

 void WelcomeScreenDialog::OnOpenLevelBtnClicked([[maybe_unused]] bool checked)
 {
@@ -329,27 +315,7 @@ void WelcomeScreenDialog::OnOpenLevelBtnClicked([[maybe_unused]] bool checked)
    }
 }

-void WelcomeScreenDialog::OnNewSliceBtnClicked([[maybe_unused]] bool checked)
-{
-    m_levelPath = "new slice";
-    accept();
-}
-
-void WelcomeScreenDialog::OnOpenSliceBtnClicked(bool)
-{
-    QString fileName = QFileDialog::getOpenFileName(MainWindow::instance(),
-        tr("Open Slice"),
-        Path::GetEditingGameDataFolder().c_str(),
-        tr("Slice (*.slice)"));
-
-    if (!fileName.isEmpty())
-    {
-        m_levelPath = fileName;
-        accept();
-    }
-}
-
-void WelcomeScreenDialog::OnRecentLevelListItemClicked(const QModelIndex& modelIndex)
+void WelcomeScreenDialog::OnRecentLevelTableItemClicked(const QModelIndex& modelIndex)
 {
    int index = modelIndex.row();

@@ -365,45 +331,6 @@ void WelcomeScreenDialog::OnCloseBtnClicked([[maybe_unused]] bool checked)
    accept();
 }

-void WelcomeScreenDialog::OnAutoLoadLevelBtnClicked(bool checked)
-{
-    gSettings.bAutoloadLastLevelAtStartup = checked;
-    gSettings.Save();
-}
-
-
-void WelcomeScreenDialog::OnShowOnStartupBtnClicked(bool checked)
-{
-    gSettings.bShowDashboardAtStartup = !checked;
-    gSettings.Save();
-
-    if (gSettings.bShowDashboardAtStartup == false)
-    {
-        QMessageBox msgBox(AzToolsFramework::GetActiveWindow());
-        msgBox.setWindowTitle(QObject::tr("Skip the Welcome dialog on startup"));
-        msgBox.setText(QObject::tr("You may re-enable the Welcome dialog at any time by going to Edit > Editor Settings > Global Preferences in the menu bar."));
-        msgBox.exec();
-    }
-}
-
-void WelcomeScreenDialog::OnDocumentationBtnClicked([[maybe_unused]] bool checked)
-{
-    QString webLink = tr("https://aws.amazon.com/lumberyard/support/");
-    QDesktopServices::openUrl(QUrl(webLink));
-}
-
-void WelcomeScreenDialog::SyncFail([[maybe_unused]] News::ErrorCode error)
-{
-    m_articleViewContainer->AddErrorMessage();
-    m_waitingOnAsync = false;
-}
-
-void WelcomeScreenDialog::SyncSuccess()
-{
-    m_articleViewContainer->PopulateArticles();
-    m_waitingOnAsync = false;
-}
-
 void WelcomeScreenDialog::previewAreaScrolled()
 {
    //this should only be reported once per session
@@ -52,13 +52,9 @@ private:
    Ui::WelcomeScreenDialog* ui;

    QString m_levelPath;
-    QStringListModel* m_pRecentListModel;
    TNameFullPathArray m_levels;
    RecentFileList* m_pRecentList;
-    News::ResourceManifest* m_manifest = nullptr;
-    News::ArticleViewContainer* m_articleViewContainer = nullptr;
    const char* m_levelExtension = nullptr;
-    bool m_waitingOnAsync = true;
    bool m_messageScrollReported = false;

    void RemoveLevelEntry(int index);
@@ -66,19 +62,11 @@ private:
    void OnShowToolTip(const QModelIndex& index);
    void OnShowContextMenu(const QPoint& point);
    void OnNewLevelBtnClicked(bool checked);
+    void OnNewLevelLabelClicked(const QString& checked);
    void OnOpenLevelBtnClicked(bool checked);
-    void OnNewSliceBtnClicked(bool checked);
-    void OnOpenSliceBtnClicked(bool checked);
-    void OnRecentLevelListItemClicked(const QModelIndex& index);
-    void OnGettingStartedBtnClicked(bool checked);
-    void OnTutorialsBtnClicked(bool checked);
-    void OnDocumentationBtnClicked(bool checked);
-    void OnForumsBtnClicked(bool checked);
-    void OnAutoLoadLevelBtnClicked(bool checked);
-    void OnShowOnStartupBtnClicked(bool checked);
+    void OnRecentLevelTableItemClicked(const QModelIndex& index);
    void OnCloseBtnClicked(bool checked);

-    void SyncUpdate(const QString& /* message */, News::LogType /* logType */) {}
    void SyncFail(News::ErrorCode error);
    void SyncSuccess();

@@ -1,5 +1,5 @@
 <RCC>
  <qresource prefix="WelcomeScreenDialog">
-    <file>WelcomeScreenDialogHeader.png</file>
+    <file>DefaultActiveProject.png</file>
  </qresource>
 </RCC>
@@ -2,12 +2,15 @@
 <ui version="4.0">
 <class>WelcomeScreenDialog</class>
 <widget class="QWidget" name="WelcomeScreenDialog">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
  <property name="geometry">
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>945</width>
+    <height>639</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -18,21 +21,21 @@
  </property>
  <property name="minimumSize">
   <size>
-    <width>800</width>
-    <height>600</height>
+    <width>945</width>
+    <height>639</height>
   </size>
  </property>
  <property name="maximumSize">
   <size>
-    <width>800</width>
-    <height>16777215</height>
+    <width>945</width>
+    <height>639</height>
   </size>
  </property>
  <property name="focusPolicy">
   <enum>Qt::TabFocus</enum>
  </property>
  <property name="windowTitle">
-   <string>Welcome to Open 3D Engine</string>
+   <string>Welcome to O3DE</string>
  </property>
  <property name="styleSheet">
   <string notr="true"/>
@@ -53,100 +56,6 @@
   <property name="bottomMargin">
    <number>0</number>
   </property>
-   <item>
-    <widget class="QWidget" name="projectViewContainer" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>36</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>36</height>
-      </size>
-     </property>
-     <layout class="QHBoxLayout" name="projectViewContainer_layout" stretch="0,0,1,0,0">
-      <property name="spacing">
-       <number>10</number>
-      </property>
-      <property name="leftMargin">
-       <number>16</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>12</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="currentProjectLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Current project:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="currentProjectButton">
-        <property name="text">
-         <string>Current Project Name</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="Line" name="line_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>1</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">color: &quot;black&quot;</string>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
   <item>
    <layout class="QHBoxLayout" name="bodyContainer">
     <property name="spacing">
@@ -165,20 +74,26 @@
      <number>0</number>
     </property>
     <item>
-      <widget class="QWidget" name="levelViewFTUEContainer" native="true">
+      <widget class="QWidget" name="articleViewContainerRoot" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       <property name="minimumSize">
        <size>
-         <width>0</width>
+         <width>183</width>
         <height>0</height>
        </size>
       </property>
       <property name="maximumSize">
        <size>
-         <width>320</width>
+         <width>183</width>
         <height>16777215</height>
        </size>
       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_12">
+       <layout class="QVBoxLayout" name="newsContainerLayout">
        <property name="spacing">
         <number>0</number>
        </property>
@@ -191,6 +106,143 @@
        <property name="rightMargin">
         <number>0</number>
        </property>
+        <property name="bottomMargin">
+         <number>10</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="leftMargin">
+           <number>15</number>
+          </property>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <property name="spacing">
+             <number>10</number>
+            </property>
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="currentProjectLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Active project</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="activeProjectIcon">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>126</width>
+                <height>167</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>126</width>
+                <height>167</height>
+               </size>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="WelcomeScreenDialog.qrc">:/WelcomeScreenDialog/DefaultActiveProject.png</pixmap>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="currentProjectName">
+              <property name="text">
+               <string>MyGame</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="leftMargin">
+           <number>15</number>
+          </property>
+          <property name="rightMargin">
+           <number>15</number>
+          </property>
+          <item>
+           <widget class="QPushButton" name="switchProjectButton">
+            <property name="text">
+             <string>Switch project...</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="levelViewFTUEContainer" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>762</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>762</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_12">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="leftMargin">
+         <number>20</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>20</number>
+        </property>
        <property name="bottomMargin">
         <number>0</number>
        </property>
@@ -227,7 +279,7 @@
              </size>
             </property>
             <property name="text">
-              <string>Open or create a level</string>
+              <string>Recent Files</string>
             </property>
             <property name="indent">
              <number>-1</number>
@@ -255,16 +307,6 @@
              <property name="bottomMargin">
               <number>0</number>
              </property>
-              <item>
-               <widget class="QListView" name="recentLevelList">
-                <property name="horizontalScrollBarPolicy">
-                 <enum>Qt::ScrollBarAlwaysOff</enum>
-                </property>
-                <property name="spacing">
-                 <number>4</number>
-                </property>
-               </widget>
-              </item>
             </layout>
            </widget>
           </item>
@@ -310,8 +352,26 @@
              </property>
              <item>
               <widget class="QPushButton" name="newLevelButton">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>156</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>156</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
                <property name="text">
-                 <string>New level...</string>
+                 <string>Create new...</string>
                </property>
               </widget>
              </item>
@@ -333,8 +393,67 @@
              </item>
              <item>
               <widget class="QPushButton" name="openLevelButton">
+                <property name="minimumSize">
+                 <size>
+                  <width>156</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>156</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
                <property name="text">
-                 <string>Open level...</string>
+                 <string>Open...</string>
+                </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>
+               <widget class="QToolButton" name="objectListButton">
+                <property name="text">
+                 <string>...</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc">
+                  <normaloff>:/stylesheet/img/UI20/toolbar/Object_list.svg</normaloff>:/stylesheet/img/UI20/toolbar/Object_list.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QToolButton" name="gridButton">
+                <property name="text">
+                 <string>...</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc">
+                  <normaloff>:/stylesheet/img/UI20/toolbar/Grid.svg</normaloff>:/stylesheet/img/UI20/toolbar/Grid.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
                </property>
               </widget>
              </item>
@@ -358,65 +477,130 @@
            </spacer>
           </item>
           <item>
-            <widget class="QWidget" name="horizontalWidget_2" native="true">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
+            <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="2,2,1">
+             <property name="leftMargin">
+              <number>6</number>
             </property>
-             <layout class="QHBoxLayout" name="sliceControlContainer">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <property name="leftMargin">
-               <number>0</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QPushButton" name="newSliceButton">
-                <property name="text">
-                 <string>New slice...</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::Fixed</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>24</width>
-                  <height>0</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QPushButton" name="openSliceButton">
-                <property name="text">
-                 <string>Open slice...</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
+             <item>
+              <widget class="QLabel" name="nameLabel">
+               <property name="text">
+                <string>Name</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="modifiedLabel">
+               <property name="text">
+                <string>Last modified</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="typeLabel">
+               <property name="text">
+                <string>Type</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
           </item>
          </layout>
         </widget>
        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0,0">
+          <property name="leftMargin">
+           <number>16</number>
+          </property>
+          <property name="topMargin">
+           <number>16</number>
+          </property>
+          <property name="rightMargin">
+           <number>16</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="levelFileLabel">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>No level file created yet for this project. &lt;a href=&quot;#&quot;&gt;Create one&lt;/a&gt; now.</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::RichText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QTableWidget" name="recentLevelTable">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="styleSheet">
+             <string notr="true"/>
+            </property>
+            <property name="horizontalScrollBarPolicy">
+             <enum>Qt::ScrollBarAlwaysOff</enum>
+            </property>
+            <property name="columnCount">
+             <number>3</number>
+            </property>
+            <attribute name="horizontalHeaderVisible">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="horizontalHeaderStretchLastSection">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="verticalHeaderVisible">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="verticalHeaderMinimumSectionSize">
+             <number>1</number>
+            </attribute>
+            <attribute name="verticalHeaderDefaultSectionSize">
+             <number>48</number>
+            </attribute>
+            <attribute name="verticalHeaderHighlightSections">
+             <bool>false</bool>
+            </attribute>
+            <attribute name="verticalHeaderStretchLastSection">
+             <bool>false</bool>
+            </attribute>
+            <column/>
+            <column/>
+            <column/>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_4">
+            <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>
        <item>
         <widget class="Line" name="line_4">
          <property name="maximumSize">
@@ -439,205 +623,16 @@
          </property>
         </widget>
        </item>
-        <item alignment="Qt::AlignHCenter">
-         <widget class="QWidget" name="documentationLinkContainer" native="true">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>48</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>48</height>
-           </size>
-          </property>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <property name="spacing">
-            <number>10</number>
-           </property>
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QToolButton" name="documentationButton">
-             <property name="maximumSize">
-              <size>
-               <width>24</width>
-               <height>24</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>info</string>
-             </property>
-             <property name="icon">
-              <iconset>
-               <normaloff>:/stylesheet/img/UI20/Info.svg</normaloff>:/stylesheet/img/UI20/Info.svg</iconset>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="documentationLink">
-             <property name="text">
-              <string>Documentation and tutorials</string>
-             </property>
-             <property name="class" stdset="0">
-              <string>link</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="Line" name="line_3">
-       <property name="maximumSize">
-        <size>
-         <width>1</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">color: &quot;black&quot;</string>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Plain</enum>
-       </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QWidget" name="articleViewContainerRoot" native="true">
-       <property name="minimumSize">
-        <size>
-         <width>480</width>
-         <height>0</height>
-        </size>
-       </property>
-       <layout class="QVBoxLayout" name="newsContainerLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
       </layout>
      </widget>
     </item>
    </layout>
   </item>
-   <item>
-    <widget class="Line" name="line">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>1</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">color: &quot;black&quot;</string>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item alignment="Qt::AlignRight">
-    <widget class="QWidget" name="optionsViewContainer" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>36</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>36</height>
-      </size>
-     </property>
-     <layout class="QHBoxLayout" name="optionsViewContainer_layout">
-      <property name="spacing">
-       <number>30</number>
-      </property>
-      <property name="leftMargin">
-       <number>16</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>16</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="autoLoadLevel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Auto-load last opened level on startup</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="showOnStartup">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Skip this dialog on startup</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
  </layout>
 </widget>
 <resources>
  <include location="WelcomeScreenDialog.qrc"/>
+  <include location="../../../Framework/AzQtComponents/AzQtComponents/Components/resources.qrc"/>
 </resources>
 <connections/>
 </ui>
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53b846352880d940621b14b1ea9514e0a4c95aa6ead4d00234a98684c061c04f
-size 29505