diff --git a/src/blackgui/components/legalinfocomponent.cpp b/src/blackgui/components/legalinfocomponent.cpp index d64f8d7f6..1763cb082 100644 --- a/src/blackgui/components/legalinfocomponent.cpp +++ b/src/blackgui/components/legalinfocomponent.cpp @@ -7,14 +7,20 @@ * contained in the LICENSE file. */ -#include "blackmisc/crashsettings.h" -#include "blackmisc/statusmessage.h" -#include "blackconfig/buildconfig.h" #include "legalinfocomponent.h" #include "ui_legalinfocomponent.h" +#include "blackgui/guiapplication.h" +#include "blackcore/data/globalsetup.h" +#include "blackmisc/network/url.h" +#include "blackmisc/crashsettings.h" +#include "blackmisc/statusmessage.h" +#include "blackconfig/buildconfig.h" + using namespace BlackMisc; +using namespace BlackMisc::Network; using namespace BlackMisc::Settings; +using namespace BlackCore::Data; using namespace BlackConfig; namespace BlackGui @@ -26,8 +32,10 @@ namespace BlackGui ui(new Ui::CLegalInfoComponent) { ui->setupUi(this); + this->setChecklistInfo(); const CCrashSettings settings = m_crashDumpSettings.get(); + ui->cb_CrashDumps->setChecked(settings.isEnabled()); ui->cb_Agree->setChecked(CBuildConfig::isLocalDeveloperDebugBuild()); connect(ui->cb_CrashDumps, &QCheckBox::toggled, this, &CLegalInfoComponent::onAllowCrashDumps); @@ -56,6 +64,17 @@ namespace BlackGui m_crashDumpSettings.setAndSave(settings); } + void CLegalInfoComponent::setChecklistInfo() + { + if (!sGui) { return; } + const CGlobalSetup gs = sGui->getGlobalSetup(); + const CUrl url = gs.getHelpPageUrl("checklist"); + ui->lbl_Tip->setText(QStringLiteral("Please read the checklist before your 1st flight").arg(url.getFullUrl())); + ui->lbl_Tip->setTextFormat(Qt::RichText); + ui->lbl_Tip->setTextInteractionFlags(Qt::TextBrowserInteraction); + ui->lbl_Tip->setOpenExternalLinks(true); + } + bool CLegalInfoWizardPage::validatePage() { return m_legalInfo && m_legalInfo->validateAgreement(); diff --git a/src/blackgui/components/legalinfocomponent.h b/src/blackgui/components/legalinfocomponent.h index 5179ccf51..ad3408e1e 100644 --- a/src/blackgui/components/legalinfocomponent.h +++ b/src/blackgui/components/legalinfocomponent.h @@ -47,6 +47,9 @@ namespace BlackGui //! Allow crash dumps void onAllowCrashDumps(bool checked); + //! Set the checklist info + void setChecklistInfo(); + QScopedPointer ui; BlackMisc::CSetting m_crashDumpSettings { this }; }; diff --git a/src/blackgui/components/legalinfocomponent.ui b/src/blackgui/components/legalinfocomponent.ui index abe03698b..6571888f5 100644 --- a/src/blackgui/components/legalinfocomponent.ui +++ b/src/blackgui/components/legalinfocomponent.ui @@ -7,13 +7,36 @@ 0 0 542 - 252 + 285 swift legal information + + + + + + + + + + :/pastel/icons/pastel/32/exclamation.png + + + + + + + HINT: Read the checklist before the first flight + + + + + + @@ -26,13 +49,7 @@ - - QFrame::StyledPanel - - - QFrame::Raised - - + @@ -60,6 +77,8 @@ 1 - + + +