From 11081aeddd95360825eaeafe486ea4feda93b55c Mon Sep 17 00:00:00 2001
From: jjjoness <82226755+jjjoness@users.noreply.github.com>
Date: Thu, 15 Apr 2021 11:01:08 +0100
Subject: [PATCH] Changed logo to O3DE
---
Code/Sandbox/Editor/AboutDialog.cpp | 2 +-
Code/Sandbox/Editor/AboutDialog.ui | 63 ++++++++++++-----------
Code/Sandbox/Editor/StartupLogoDialog.cpp | 2 +-
Code/Sandbox/Editor/StartupLogoDialog.qrc | 2 +-
Code/Sandbox/Editor/StartupLogoDialog.ui | 8 +--
Code/Sandbox/Editor/lumberyard_logo.svg | 41 ---------------
Code/Sandbox/Editor/o3de_logo.svg | 22 ++++++++
7 files changed, 63 insertions(+), 77 deletions(-)
delete mode 100644 Code/Sandbox/Editor/lumberyard_logo.svg
create mode 100644 Code/Sandbox/Editor/o3de_logo.svg
diff --git a/Code/Sandbox/Editor/AboutDialog.cpp b/Code/Sandbox/Editor/AboutDialog.cpp
index e1cd4c7bb0..d9cf722d1f 100644
--- a/Code/Sandbox/Editor/AboutDialog.cpp
+++ b/Code/Sandbox/Editor/AboutDialog.cpp
@@ -56,7 +56,7 @@ CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice,
m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
// Draw the Open 3D Engine logo from svg
- m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/lumberyard_logo.svg"));
+ m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/o3de_logo.svg"));
// Prevent re-sizing
setFixedSize(m_enforcedWidth, m_enforcedHeight);
diff --git a/Code/Sandbox/Editor/AboutDialog.ui b/Code/Sandbox/Editor/AboutDialog.ui
index 0eb2881600..67767c0de1 100644
--- a/Code/Sandbox/Editor/AboutDialog.ui
+++ b/Code/Sandbox/Editor/AboutDialog.ui
@@ -60,35 +60,35 @@
5
- -
-
-
- 4
-
-
- 12
-
-
- 9
-
-
-
-
-
-
- 250
- 60
-
-
-
-
- 250
- 60
-
-
-
-
-
-
+ -
+
+
+ 4
+
+
+ 12
+
+
+ 9
+
+
-
+
+
+
+ 161
+ 49
+
+
+
+
+ 161
+ 49
+
+
+
+
+
+
-
@@ -251,6 +251,11 @@
+
+ QSvgWidget
+ QWidget
+
+
ClickableLabel
QLabel
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.cpp b/Code/Sandbox/Editor/StartupLogoDialog.cpp
index 38cf1bc5f6..c3d584b030 100644
--- a/Code/Sandbox/Editor/StartupLogoDialog.cpp
+++ b/Code/Sandbox/Editor/StartupLogoDialog.cpp
@@ -49,7 +49,7 @@ CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopy
m_backgroundImage = QPixmap::fromImage(backgroundImage.scaled(m_enforcedWidth, m_enforcedHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
// Draw the Open 3D Engine logo from svg
- m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/lumberyard_logo.svg"));
+ m_ui->m_logo->load(QStringLiteral(":/StartupLogoDialog/o3de_logo.svg"));
m_ui->m_TransparentConfidential->setObjectName("copyrightNotice");
m_ui->m_TransparentConfidential->setTextFormat(Qt::RichText);
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.qrc b/Code/Sandbox/Editor/StartupLogoDialog.qrc
index 55c93b427c..29730ef9c7 100644
--- a/Code/Sandbox/Editor/StartupLogoDialog.qrc
+++ b/Code/Sandbox/Editor/StartupLogoDialog.qrc
@@ -1,6 +1,6 @@
- lumberyard_logo.svg
+ o3de_logo.svg
splashscreen_1_27.png
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.ui b/Code/Sandbox/Editor/StartupLogoDialog.ui
index f14355de8c..6e01808a84 100644
--- a/Code/Sandbox/Editor/StartupLogoDialog.ui
+++ b/Code/Sandbox/Editor/StartupLogoDialog.ui
@@ -42,14 +42,14 @@
- 250
- 60
+ 161
+ 49
- 250
- 60
+ 161
+ 50
diff --git a/Code/Sandbox/Editor/lumberyard_logo.svg b/Code/Sandbox/Editor/lumberyard_logo.svg
deleted file mode 100644
index fe5f2fbdcd..0000000000
--- a/Code/Sandbox/Editor/lumberyard_logo.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
\ No newline at end of file
diff --git a/Code/Sandbox/Editor/o3de_logo.svg b/Code/Sandbox/Editor/o3de_logo.svg
new file mode 100644
index 0000000000..ac746c07a5
--- /dev/null
+++ b/Code/Sandbox/Editor/o3de_logo.svg
@@ -0,0 +1,22 @@
+
+
\ No newline at end of file