flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

About info, fix relative files in onAnchorClicked

Browse Source
This commit is contained in:
Klaus Basan
2019-03-25 02:38:22 +01:00
committed by Mat Sutcliffe
parent 072bb34a32
commit 8be1465f24
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackgui/components/abouthtmlcomponent.cpp
View File

@@ -10,9 +10,14 @@
#include "blackmisc/fileutils.h"
#include "blackmisc/directoryutils.h"
#include "abouthtmlcomponent.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/fileutils.h"
#include "ui_abouthtmlcomponent.h"
#include <QFile>
#include <QTimer>
#include <QPointer>
#include <QDesktopServices>
using namespace BlackMisc;
@@ -26,6 +31,8 @@ namespace BlackGui
{
ui->setupUi(this);
const QPointer<CAboutHtmlComponent> myself(this);
connect(ui->tbr_About, &QTextBrowser::anchorClicked, this, &CAboutHtmlComponent::onAnchorClicked, Qt::QueuedConnection);
QTimer::singleShot(2500, this, [ = ]
{
if (!myself) { return; }
@@ -38,6 +45,8 @@ namespace BlackGui
void CAboutHtmlComponent::loadAbout()
{
if (!sGui || sGui->isShuttingDown()) { return; }
// make links absolute
static const QString htmlFixed = [ = ]
{
@@ -45,10 +54,33 @@ namespace BlackGui
// 1) Only reading as HTML gives proper formatting
// 2) Reading the file resource fails (likely because of the style sheet)
const QString html = CFileUtils::readFileToString(CDirectoryUtils::aboutFilePath());
const QString legalDir = sGui->getGlobalSetup().getLegalDirectoryUrl().getFullUrl();
return QString(html).replace(QLatin1String("href=\"./"), "href=\"" + legalDir);
return html;
// no longer replacing the URLs, doing this on anchor clicked
// const QString legalDir = sGui->getGlobalSetup().getLegalDirectoryUrl().getFullUrl();
// return QString(html).replace(QLatin1String("href=\"./"), "href=\"" + legalDir);
}();
ui->tbr_About->setHtml(htmlFixed);
ui->tbr_About->setOpenLinks(false);
// base URL
// ui->tbr_About->document()->setMetaInformation(QTextDocument::DocumentUrl, "https://datastore.swift-project.org/legal");
}
void CAboutHtmlComponent::onAnchorClicked(const QUrl &url)
{
if (!url.isRelative())
{
QDesktopServices::openUrl(url);
return;
}
const QString possibleLegalFile = CFileUtils::appendFilePaths(CDirectoryUtils::legalDirectory(), url.fileName());
QFile f(possibleLegalFile);
if (f.exists())
{
QDesktopServices::openUrl(QUrl::fromLocalFile(possibleLegalFile));
};
}
} // ns
} // ns