diff --git a/Code/Sandbox/Editor/AboutDialog.cpp b/Code/Sandbox/Editor/AboutDialog.cpp index e1ec7756c8..a3f76abeb0 100644 --- a/Code/Sandbox/Editor/AboutDialog.cpp +++ b/Code/Sandbox/Editor/AboutDialog.cpp @@ -45,7 +45,7 @@ CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice, CAboutDialog > QLabel#link { text-decoration: underline; color: #00A1C9; }"); // Prepare background image - QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png")); + QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg")); m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); // Draw the Open 3D Engine logo from svg diff --git a/Code/Sandbox/Editor/AboutDialog.h b/Code/Sandbox/Editor/AboutDialog.h index ee31020240..74b4c491f2 100644 --- a/Code/Sandbox/Editor/AboutDialog.h +++ b/Code/Sandbox/Editor/AboutDialog.h @@ -38,6 +38,6 @@ private: QPixmap m_backgroundImage; int m_enforcedWidth = 600; - int m_enforcedHeight = 360; + int m_enforcedHeight = 400; }; diff --git a/Code/Sandbox/Editor/AboutDialog.ui b/Code/Sandbox/Editor/AboutDialog.ui index 48ec82da5c..9341a00d48 100644 --- a/Code/Sandbox/Editor/AboutDialog.ui +++ b/Code/Sandbox/Editor/AboutDialog.ui @@ -55,21 +55,24 @@ 0 - 22 + 4 + + + 10 - 5 + 10 - 4 + 11 12 - 9 + 12 @@ -90,126 +93,154 @@ - - - O3DE Editor + + + 0 - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + QLayout::SetNoConstraint - - - - - - Developer Preview + + 20 - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - 0 - 0 - 180 - 0 - - - - - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 16 - - - - - - - - Terms of Use - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 8 - - - - - - - - - 0 - 0 - - - - - 260 - 0 - - - - - 260 - 16777215 - - - - Specified in AboutDialog.cpp - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - + + + + + 16777215 + 16 + + + + O3DE Editor + + + + + + + + 16777215 + 18 + + + + Developer Preview + + + Qt::AutoText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + 0 + 0 + 180 + 0 + + + + + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + + + + + + 16777215 + 18 + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Terms of Use + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 16 + + + + + + + + + 0 + 0 + + + + + 260 + 24 + + + + + 260 + 24 + + + + Specified in AboutDialog.cpp + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + diff --git a/Code/Sandbox/Editor/StartupLogoDialog.cpp b/Code/Sandbox/Editor/StartupLogoDialog.cpp index da7d3308c5..8faeee2531 100644 --- a/Code/Sandbox/Editor/StartupLogoDialog.cpp +++ b/Code/Sandbox/Editor/StartupLogoDialog.cpp @@ -36,11 +36,11 @@ CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopy s_pLogoWindow = this; - m_backgroundImage = QPixmap(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png")); + m_backgroundImage = QPixmap(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg")); setFixedSize(QSize(600, 300)); // Prepare background image - QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_1_27.png")); + QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg")); m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); // Draw the Open 3D Engine logo from svg @@ -55,7 +55,7 @@ CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopy setStyleSheet( "CStartupLogoDialog > QLabel { background: transparent; color: 'white' }\ CStartupLogoDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; } "); - m_ui->m_TransparentVersion->setText(QString("BETA - ") + versionText); + m_ui->m_TransparentVersion->setText(versionText); } CStartupLogoDialog::~CStartupLogoDialog() diff --git a/Code/Sandbox/Editor/StartupLogoDialog.qrc b/Code/Sandbox/Editor/StartupLogoDialog.qrc index 29730ef9c7..2493810ad8 100644 --- a/Code/Sandbox/Editor/StartupLogoDialog.qrc +++ b/Code/Sandbox/Editor/StartupLogoDialog.qrc @@ -1,6 +1,6 @@ o3de_logo.svg - splashscreen_1_27.png + splashscreen_background_gradient.jpg diff --git a/Code/Sandbox/Editor/StartupLogoDialog.ui b/Code/Sandbox/Editor/StartupLogoDialog.ui index 0815fa8b18..60969f7f7f 100644 --- a/Code/Sandbox/Editor/StartupLogoDialog.ui +++ b/Code/Sandbox/Editor/StartupLogoDialog.ui @@ -17,6 +17,26 @@ 10 + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 250 + 20 + + + + + + @@ -25,15 +45,15 @@ - 2 + 0 - 3 + 1 - 21 + 28 24 @@ -57,177 +77,174 @@ - - - - 0 - 0 - + + + 0 - - - 290 - 0 - + + 10 - - - 290 - 16777215 - - - - Development version - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - - 0 - 0 - - - - - 290 - 0 - - - - - 290 - 16777215 - - - - Starting Editor... - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 36 - - - - - - - - Artwork from New World - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - - 0 - 0 - - - - - 240 - 0 - - - - - 240 - 16777215 - - - - - 128 - 0 - - - - Specified in the StartupLogoDialog constructor. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true - - + + + + O3DE Editor + + + + + + + Developer Preview + + + + + + + + 0 + 0 + + + + + 290 + 0 + + + + + 290 + 16777215 + + + + Version + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + + 0 + 0 + + + + + 290 + 0 + + + + + 290 + 16777215 + + + + Starting Editor... + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 36 + + + + + + + + + 0 + 0 + + + + + 240 + 0 + + + + + 240 + 16777215 + + + + + 128 + 0 + + + + Specified in the StartupLogoDialog constructor. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 260 - 20 - - - - - - diff --git a/Code/Sandbox/Editor/splashscreen_1_27.png b/Code/Sandbox/Editor/splashscreen_1_27.png deleted file mode 100644 index 698861250a..0000000000 --- a/Code/Sandbox/Editor/splashscreen_1_27.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c48b708abfe9e77e7bd1418812373637c57a77980ab6943168e25f075b1ef55a -size 846775 diff --git a/Code/Sandbox/Editor/splashscreen_background_gradient.jpg b/Code/Sandbox/Editor/splashscreen_background_gradient.jpg new file mode 100644 index 0000000000..e4894dd3be --- /dev/null +++ b/Code/Sandbox/Editor/splashscreen_background_gradient.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2f54f31e63dc9f0c9ed7847745a929ba501ed21841f7ee6a5de9e25768fd05e +size 53310