birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated About dialog to point to the correct EULA page and updated text

Browse Source
This commit is contained in:
Terry Michaels
2021-06-24 15:16:17 -05:00
committed by GitHub
parent b4641b0b5d
commit 273b2c30b7
4 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/AboutDialog.cpp
+1 -8
View File
@@ -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>
Code/Sandbox/Editor/AboutDialog.h
-1
View File
@@ -30,7 +30,6 @@ public:
private:
void OnCustomerAgreement();
void OnPrivacyNotice();
void mouseReleaseEvent(QMouseEvent* event) override;
void paintEvent(QPaintEvent* event) override;
Code/Sandbox/Editor/AboutDialog.ui
+2 -15
View File
@@ -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">
Code/Sandbox/Editor/CryEdit.cpp
+2 -2
View File
@@ -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);
}
/////////////////////////////////////////////////////////////////////////////