diff --git a/src/blackgui/components/aboutdialog.cpp b/src/blackgui/components/aboutdialog.cpp index a3dd89143..2861a9a57 100644 --- a/src/blackgui/components/aboutdialog.cpp +++ b/src/blackgui/components/aboutdialog.cpp @@ -6,14 +6,26 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" +#include "blackmisc/fileutils.h" namespace BlackGui::Components { CAboutDialog::CAboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::CAboutDialog) { ui->setupUi(this); + const QPointer myself(this); this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); this->init(); + + QTimer::singleShot(0, this, [=] { + if (!myself) { return; } + myself->loadSwiftLicense(); + }); + + QTimer::singleShot(0, this, [=] { + if (!myself) { return; } + myself->loadThirdPartyLicenses(); + }); } CAboutDialog::~CAboutDialog() @@ -29,4 +41,16 @@ namespace BlackGui::Components ui->pte_Info->appendPlainText("\nScreen info follows:\n----"); ui->pte_Info->appendPlainText(CGuiUtility::screenInformation("\n")); } + + void CAboutDialog::loadSwiftLicense() + { + const QString html = BlackMisc::CFileUtils::readFileToString(BlackMisc::CSwiftDirectories::legalDirectory() + "/LicenseRef-swift-pilot-client-1.html"); + ui->tbr_swiftLicense->setHtml(html); + } + + void CAboutDialog::loadThirdPartyLicenses() + { + const QString html = BlackMisc::CFileUtils::readFileToString(BlackMisc::CSwiftDirectories::legalDirectory() + "/3rdparty.html"); + ui->tbr_ThirdPartyLicenses->setHtml(html); + } } // ns diff --git a/src/blackgui/components/aboutdialog.h b/src/blackgui/components/aboutdialog.h index 2cb739ad3..a6c9a67d1 100644 --- a/src/blackgui/components/aboutdialog.h +++ b/src/blackgui/components/aboutdialog.h @@ -33,6 +33,9 @@ namespace BlackGui::Components //! Init values void init(); + void loadSwiftLicense(); + void loadThirdPartyLicenses(); + QScopedPointer ui; }; } // ns diff --git a/src/blackgui/components/aboutdialog.ui b/src/blackgui/components/aboutdialog.ui index 441bc7291..9a674c202 100644 --- a/src/blackgui/components/aboutdialog.ui +++ b/src/blackgui/components/aboutdialog.ui @@ -6,8 +6,8 @@ 0 0 - 320 - 258 + 666 + 748 @@ -61,6 +61,30 @@ + + + + swift license + + + + + + + + + + + + Third-Party licenses + + + + + + + +