Move the show log text to be part of building label.

Signed-off-by: AMZN-Phil <pconroy@amazon.com>
main
AMZN-Phil 4 years ago
parent 443e8071e7
commit b92848ed88

@ -70,9 +70,9 @@ namespace O3DE::ProjectManager
m_lastProgress = progress; m_lastProgress = progress;
if (m_projectButton) if (m_projectButton)
{ {
m_projectButton->SetButtonOverlayText(QString("%1 (%2%)\n\n").arg(tr("Building Project..."), QString::number(progress))); m_projectButton->SetButtonOverlayText(QString("%1 (%2%)<br>%3<br>").arg(tr("Building Project..."), QString::number(progress), tr("Click to <a href=\"logs\">view logs</a>.")));
m_projectButton->SetProgressBarValue(progress); m_projectButton->SetProgressBarValue(progress);
m_projectButton->ShowBuildLogsLink(true, m_worker->GetLogFilePath()); m_projectButton->SetBuildLogsLink(m_worker->GetLogFilePath());
} }
} }

@ -39,7 +39,9 @@ namespace O3DE::ProjectManager
m_overlayLabel->setObjectName("labelButtonOverlay"); m_overlayLabel->setObjectName("labelButtonOverlay");
m_overlayLabel->setWordWrap(true); m_overlayLabel->setWordWrap(true);
m_overlayLabel->setAlignment(Qt::AlignCenter); m_overlayLabel->setAlignment(Qt::AlignCenter);
m_overlayLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
m_overlayLabel->setVisible(false); m_overlayLabel->setVisible(false);
connect(m_overlayLabel, &QLabel::linkActivated, this, &LabelButton::OnLinkActivated);
vLayout->addWidget(m_overlayLabel); vLayout->addWidget(m_overlayLabel);
m_buildOverlayLayout = new QVBoxLayout(); m_buildOverlayLayout = new QVBoxLayout();
@ -266,15 +268,8 @@ namespace O3DE::ProjectManager
SetProjectButtonAction(tr("Build Project"), [this]() { emit BuildProject(m_projectInfo); }); 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 <a href=\"logs\">view logs</a>."));
}
m_projectImageLabel->GetWarningLabel()->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
m_projectImageLabel->GetWarningLabel()->setVisible(show);
m_projectImageLabel->SetLogUrl(logUrl); m_projectImageLabel->SetLogUrl(logUrl);
} }

@ -77,7 +77,7 @@ namespace O3DE::ProjectManager
void SetProjectButtonAction(const QString& text, AZStd::function<void()> lambda); void SetProjectButtonAction(const QString& text, AZStd::function<void()> lambda);
void SetProjectBuildButtonAction(); void SetProjectBuildButtonAction();
void ShowBuildLogsLink(bool show, const QUrl& logUrl); void SetBuildLogsLink(const QUrl& logUrl);
void ShowBuildFailed(bool show, const QUrl& logUrl); void ShowBuildFailed(bool show, const QUrl& logUrl);
void SetLaunchButtonEnabled(bool enabled); void SetLaunchButtonEnabled(bool enabled);

Loading…
Cancel
Save