Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rockbox Utility: add Speex license to About dialog.

Browse source 
The Speex codec has a special license requiring it to be reproduced with any
distribution.  Add the license as a separate tab in the About dialog to satisfy
this.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30816 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2011-10-21 19:46:36 +00:00
parent eb97426c76
commit e28f8225f5
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rbutil/rbutilqt/aboutbox.ui
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0" >
<class>aboutBox</class>
<widget class="QWidget" name="aboutBox" >
@ -21,7 +22,7 @@
<string/>
</property>
<property name="pixmap" >
<pixmap resource="rbutilqt.qrc" >:/icons/rockbox-5.png</pixmap>
<pixmap>:/icons/rockbox-5.png</pixmap>
</property>
</widget>
</item>
@ -50,7 +51,7 @@
<item row="1" column="0" colspan="3" >
<widget class="QLabel" name="labelText" >
<property name="text" >
<string>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/>© 2005 - 2011 The Rockbox Team.&lt;br/>Released under the GNU General Public License v2.&lt;br/>Uses icons by the &lt;a href="http://tango.freedesktop.org/">Tango Project&lt;/a>.&lt;br/>&lt;center>&lt;a href="http://www.rockbox.org">http://www.rockbox.org&lt;/a>&lt;/center></string>
<string>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/&gt;© 2005 - 2011 The Rockbox Team.&lt;br/&gt;Released under the GNU General Public License v2.&lt;br/&gt;Uses icons by the &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;http://www.rockbox.org&quot;&gt;http://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</string>
</property>
<property name="textFormat" >
<enum>Qt::RichText</enum>
@ -126,6 +127,16 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="licenseSpeex">
<attribute name="title">
<string>&amp;Speex License</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QTextBrowser" name="browserSpeexLicense"/>
</item>
</layout>
</widget>
</widget>
</item>
<item row="3" column="0" >

10
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -293,9 +293,15 @@ void RbUtilQt::about()
QFile licence(":/docs/gpl-2.0.html");
licence.open(QIODevice::ReadOnly);
QTextStream c(&licence);
QString cline = c.readAll();
about.browserLicense->insertHtml(cline);
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("<pre>" + s.readAll() + "</pre>");
about.browserSpeexLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
QFile credits(":/docs/CREDITS");
credits.open(QIODevice::ReadOnly);
QTextStream r(&credits);

1
rbutil/rbutilqt/rbutilqt.qrc
View file

@ -2,6 +2,7 @@
<qresource prefix="/">
<file>../../docs/CREDITS</file>
<file>../../docs/gpl-2.0.html</file>
<file alias="docs/COPYING.SPEEX">../../apps/codecs/libspeex/COPYING</file>
</qresource>
<qresource>
<file alias="builtin/VOICE_PAUSE.wav">../../tools/VOICE_PAUSE.wav</file>