From b92848ed88a0441bf2f91b49943dfb6edc5f4d16 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Fri, 9 Jul 2021 14:12:31 -0700 Subject: [PATCH] Move the show log text to be part of building label. Signed-off-by: AMZN-Phil --- .../Source/ProjectBuilderController.cpp | 4 ++-- .../ProjectManager/Source/ProjectButtonWidget.cpp | 11 +++-------- .../Tools/ProjectManager/Source/ProjectButtonWidget.h | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp index 115bec3d08..007d4a72e3 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp @@ -70,9 +70,9 @@ namespace O3DE::ProjectManager m_lastProgress = progress; if (m_projectButton) { - m_projectButton->SetButtonOverlayText(QString("%1 (%2%)\n\n").arg(tr("Building Project..."), QString::number(progress))); + m_projectButton->SetButtonOverlayText(QString("%1 (%2%)
%3
").arg(tr("Building Project..."), QString::number(progress), tr("Click to view logs."))); m_projectButton->SetProgressBarValue(progress); - m_projectButton->ShowBuildLogsLink(true, m_worker->GetLogFilePath()); + m_projectButton->SetBuildLogsLink(m_worker->GetLogFilePath()); } } diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp index 540305057f..af9a1a7bd9 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp @@ -39,7 +39,9 @@ namespace O3DE::ProjectManager m_overlayLabel->setObjectName("labelButtonOverlay"); m_overlayLabel->setWordWrap(true); m_overlayLabel->setAlignment(Qt::AlignCenter); + m_overlayLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse); m_overlayLabel->setVisible(false); + connect(m_overlayLabel, &QLabel::linkActivated, this, &LabelButton::OnLinkActivated); vLayout->addWidget(m_overlayLabel); m_buildOverlayLayout = new QVBoxLayout(); @@ -266,15 +268,8 @@ namespace O3DE::ProjectManager SetProjectButtonAction(tr("Build Project"), [this]() { emit BuildProject(m_projectInfo); }); } - void ProjectButton::ShowBuildLogsLink(bool show, const QUrl& logUrl) + void ProjectButton::SetBuildLogsLink(const QUrl& logUrl) { - if (!logUrl.isEmpty()) - { - m_projectImageLabel->GetWarningLabel()->setText(tr("Click to view logs.")); - } - - m_projectImageLabel->GetWarningLabel()->setTextInteractionFlags(Qt::LinksAccessibleByMouse); - m_projectImageLabel->GetWarningLabel()->setVisible(show); m_projectImageLabel->SetLogUrl(logUrl); } diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h index 747fd89a31..27559b325e 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h @@ -77,7 +77,7 @@ namespace O3DE::ProjectManager void SetProjectButtonAction(const QString& text, AZStd::function lambda); void SetProjectBuildButtonAction(); - void ShowBuildLogsLink(bool show, const QUrl& logUrl); + void SetBuildLogsLink(const QUrl& logUrl); void ShowBuildFailed(bool show, const QUrl& logUrl); void SetLaunchButtonEnabled(bool enabled);