From 9fcdb44e55b5bee585e4906e93d055d230ee01d9 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 7 Nov 2020 21:31:44 +0100 Subject: rbutil: Show the license of all libraries included. Replace the Speex license tab in the about dialog with one that lists all used libraries and their respective licenses, including Speex. Previously only Speex required including the license in binary distribution; the recently added bspatch also wants this. Show the license for all used libraries so we can more easily add new ones in the future. Change-Id: Ic8b403f8a2a05d0f1734ddf092782b85ddfa5ed9 --- rbutil/rbutilqt/aboutbox.ui | 14 +++++++------- rbutil/rbutilqt/rbutilqt.cpp | 38 ++++++++++++++++++++++++++++++++------ rbutil/rbutilqt/rbutilqt.qrc | 9 +++++++-- 3 files changed, 46 insertions(+), 15 deletions(-) (limited to 'rbutil/rbutilqt') diff --git a/rbutil/rbutilqt/aboutbox.ui b/rbutil/rbutilqt/aboutbox.ui index e73fccde79..e13f06a15a 100644 --- a/rbutil/rbutilqt/aboutbox.ui +++ b/rbutil/rbutilqt/aboutbox.ui @@ -6,7 +6,7 @@ 0 0 - 500 + 640 500 @@ -127,13 +127,13 @@ - - - &Speex License + + + L&ibraries - - - + + + diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 60f517825d..1c00ef9a07 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -282,12 +282,37 @@ void RbUtilQt::about() QTextStream c(&licence); about.browserLicense->insertHtml(c.readAll()); about.browserLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); - - QFile speexlicense(":/docs/COPYING.SPEEX"); - speexlicense.open(QIODevice::ReadOnly); - QTextStream s(&speexlicense); - about.browserSpeexLicense->insertHtml("
" + s.readAll() + "
"); - about.browserSpeexLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); + licence.close(); + + QString html = "

" + tr("Libraries used") + "

"; + html += ""; + about.browserLicenses->insertHtml(html); + + QMap licenses; + licenses[":/docs/COPYING.SPEEX"] = "Speex License"; + licenses[":/docs/lgpl-2.1.txt"] = "LGPL v2.1"; + licenses[":/docs/LICENSE.TOMCRYPT"] = "Tomcrypt License"; + licenses[":/docs/LICENSE.BZIP2"] = "bzip2 License"; + licenses[":/docs/LICENSE.BSPATCH"] = "bspatch License"; + + for (int i = 0; i < licenses.size(); i++) { + QString key = licenses.keys().at(i); + QFile license(key); + license.open(QIODevice::ReadOnly); + QTextStream s(&license); + about.browserLicenses->insertHtml("

" + licenses[key] + "


\n"); + about.browserLicenses->insertHtml("
" + s.readAll() + "
"); + license.close(); + } + about.browserLicenses->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); QFile credits(":/docs/CREDITS"); credits.open(QIODevice::ReadOnly); @@ -304,6 +329,7 @@ void RbUtilQt::about() line.remove(QRegExp("^People.*")); about.browserCredits->append(line); } + credits.close(); about.browserCredits->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); QString title = QString("The Rockbox Utility
Version %1").arg(FULLVERSION); about.labelTitle->setText(title); diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index 3ce83f33c6..b1427b118f 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc @@ -1,8 +1,12 @@ - ../../docs/CREDITS - ../../docs/gpl-2.0.html + ../../docs/CREDITS + ../../docs/gpl-2.0.html + logger/LICENSE.LGPL ../../lib/rbcodec/codecs/libspeex/COPYING + ../../utils/tomcrypt/LICENSE + ../bzip2/LICENSE + ../bspatch/LICENSE changelog.txt @@ -41,6 +45,7 @@ icons/view-refresh.svg icons/wizard.jpg ../../docs/logo/rockbox-clef.svg + ../../docs/logo/rockbox-logo.svg icons/players/archosfmrecorder-small.png -- cgit v1.2.3