From 273b2c30b79440fbab2a19b73d47003a5483e8ee Mon Sep 17 00:00:00 2001
From: Terry Michaels <miterenc@amazon.com>
Date: Thu, 24 Jun 2021 15:16:17 -0500
Subject: [PATCH] Updated About dialog to point to the correct EULA page and
 updated text

---
 Code/Sandbox/Editor/AboutDialog.cpp |  9 +--------
 Code/Sandbox/Editor/AboutDialog.h   |  1 -
 Code/Sandbox/Editor/AboutDialog.ui  | 17 ++---------------
 Code/Sandbox/Editor/CryEdit.cpp     |  4 ++--
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/Code/Sandbox/Editor/AboutDialog.cpp b/Code/Sandbox/Editor/AboutDialog.cpp
index 5e2b5c2aa8..e1ec7756c8 100644
--- a/Code/Sandbox/Editor/AboutDialog.cpp
+++ b/Code/Sandbox/Editor/AboutDialog.cpp
@@ -32,7 +32,6 @@ CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice,
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     connect(m_ui->m_transparentAgreement, &QLabel::linkActivated, this, &CAboutDialog::OnCustomerAgreement);
-    connect(m_ui->m_transparentNotice, &QLabel::linkActivated, this, &CAboutDialog::OnPrivacyNotice);
 
     m_ui->m_transparentTrademarks->setText(versionText);
 
@@ -41,7 +40,6 @@ CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice,
     m_ui->m_transparentAllRightReserved->setText(richTextCopyrightNotice);
 
     m_ui->m_transparentAgreement->setObjectName("link");
-    m_ui->m_transparentNotice->setObjectName("link");
 
     setStyleSheet( "CAboutDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; }\
                     CAboutDialog > QLabel#link { text-decoration: underline; color: #00A1C9; }");
@@ -81,12 +79,7 @@ void CAboutDialog::mouseReleaseEvent(QMouseEvent* event)
 
 void CAboutDialog::OnCustomerAgreement()
 {
-    QDesktopServices::openUrl(QUrl(QStringLiteral("https://lfprojects.org/policies/terms-of-use/")));
-}
-
-void CAboutDialog::OnPrivacyNotice()
-{
-    QDesktopServices::openUrl(QUrl(QStringLiteral("https://lfprojects.org/policies/privacy-policy/")));
+    QDesktopServices::openUrl(QUrl(QStringLiteral("https://www.o3debinaries.org/license")));
 }
 
 #include <moc_AboutDialog.cpp>
diff --git a/Code/Sandbox/Editor/AboutDialog.h b/Code/Sandbox/Editor/AboutDialog.h
index fe07f12416..ee31020240 100644
--- a/Code/Sandbox/Editor/AboutDialog.h
+++ b/Code/Sandbox/Editor/AboutDialog.h
@@ -30,7 +30,6 @@ public:
 private:
 
     void OnCustomerAgreement();
-    void OnPrivacyNotice();
 
     void mouseReleaseEvent(QMouseEvent* event) override;
     void paintEvent(QPaintEvent* event) override;
diff --git a/Code/Sandbox/Editor/AboutDialog.ui b/Code/Sandbox/Editor/AboutDialog.ui
index a6f44eea9d..48ec82da5c 100644
--- a/Code/Sandbox/Editor/AboutDialog.ui
+++ b/Code/Sandbox/Editor/AboutDialog.ui
@@ -92,7 +92,7 @@
        <item>
         <widget class="QLabel" name="m_transparentVersion">
          <property name="text">
-          <string>Open 3D Engine Editor</string>
+          <string>O3DE Editor</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -102,7 +102,7 @@
        <item>
         <widget class="QLabel" name="m_transparentDevelopedBy">
          <property name="text">
-          <string>Development version</string>
+          <string>Developer Preview</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -164,19 +164,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="ClickableLabel" name="m_transparentNotice">
-         <property name="text">
-          <string>Privacy Notice</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="showDecoration" stdset="0">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp
index 2002e741a5..de8adb7d1a 100644
--- a/Code/Sandbox/Editor/CryEdit.cpp
+++ b/Code/Sandbox/Editor/CryEdit.cpp
@@ -923,9 +923,9 @@ QString FormatRichTextCopyrightNotice()
 {
     // copyright symbol is HTML Entity = &#xA9;
     QString copyrightHtmlSymbol = "&#xA9;";
-    QString copyrightString = QObject::tr("Open 3D Engine and related materials Copyright %1 %2 Amazon Web Services, Inc., its affiliates or licensors.<br>By accessing or using these materials, you agree to the terms of the AWS Customer Agreement.");
+    QString copyrightString = QObject::tr("Copyright %1 Contributors to the Open 3D Engine Project");
 
-    return copyrightString.arg(copyrightHtmlSymbol).arg(O3DE_COPYRIGHT_YEAR);
+    return copyrightString.arg(copyrightHtmlSymbol);
 }
 
 /////////////////////////////////////////////////////////////////////////////