diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index c6363798e..eca5a2c53 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -116,7 +116,7 @@ void CSwiftLauncher::ps_displayLatestNews(QNetworkReply *reply) { const QString html = nwReply->readAll().trimmed(); if (html.isEmpty()) { return; } - ui->te_LatestNews->setHtml(html); + ui->tbr_LatestNews->setHtml(html); constexpr qint64 newNews = 72 * 3600 * 1000; const qint64 deltaT = CNetworkUtils::lastModifiedSinceNow(nwReply.data()); if (deltaT > 0 && deltaT < newNews) @@ -175,6 +175,19 @@ void CSwiftLauncher::loadLatestNews() sGui->getFromNetwork(newsUrl, { this, &CSwiftLauncher::ps_displayLatestNews}); } +void CSwiftLauncher::loadAbout() +{ + // workaround: + // 1) Only reading as HTML gives proper formatting + // 2) Reading the file resource fails (likely because of the style sheet) + static const QString html = CFileUtils::readFileToString(CBuildConfig::getAboutFileLocation()); + static const QString legalDir = sGui->getGlobalSetup().getLegalDirectoryUrl().getFullUrl(); + // make links absolute + static const QString htmlFixed = QString(html). + replace(QLatin1Literal("href=\"./"), "href=\"" + legalDir); + ui->tbr_About->setHtml(htmlFixed); +} + void CSwiftLauncher::initDBusGui() { ui->cb_DBusServerAddress->addItem("127.0.0.1"); @@ -348,6 +361,7 @@ void CSwiftLauncher::ps_loadedUpdateInfo(bool success) } this->loadLatestNews(); + this->loadAbout(); } void CSwiftLauncher::ps_changedUpdateInfoCache() diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h index b120a9e15..bb0c8df28 100644 --- a/src/swiftlauncher/swiftlauncher.h +++ b/src/swiftlauncher/swiftlauncher.h @@ -73,6 +73,7 @@ protected: void mouseMoveEvent(QMouseEvent *event) override; private slots: + //! Display latest news void ps_displayLatestNews(QNetworkReply *reply); private: @@ -110,9 +111,13 @@ private: //! Log display void initLogDisplay(); - //! latest news + //! Latest news + //! \sa CSwiftLauncher::ps_displayLatestNews void loadLatestNews(); + //! Load credits and legal info + void loadAbout(); + //! Start the core void startSwiftCore(); diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui index 2de9ea7fd..c7a52ea91 100644 --- a/src/swiftlauncher/swiftlauncher.ui +++ b/src/swiftlauncher/swiftlauncher.ui @@ -78,7 +78,7 @@ - 2 + 4 6 @@ -93,11 +93,11 @@ - Latest news + Latest &news - + Latest news @@ -107,6 +107,9 @@ Latest news will go here + + true + @@ -121,7 +124,7 @@ - Window type + &Window type @@ -186,7 +189,7 @@ - Core mode + &Core mode @@ -430,7 +433,7 @@ - Check for updates + Check for &updates @@ -591,7 +594,7 @@ - + 0 @@ -601,21 +604,27 @@ - Credits and License + &About (credits and license) - + + + About swift + true <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +<html><head><meta name="qrichtext" content="1" /><title>About swift</title><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.875pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8.25pt;">Credits will go here</span></p></body></html> + + true +