- &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);
+ licence.close();
- QFile speexlicense(":/docs/COPYING.SPEEX");
- speexlicense.open(QIODevice::ReadOnly);
- QTextStream s(&speexlicense);
- about.browserSpeexLicense->insertHtml("" + s.readAll() + "
");
- about.browserSpeexLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
+ 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