From e28f8225f5ba270f840b6eb5c0253a0ec50de4b7 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Fri, 21 Oct 2011 19:46:36 +0000
Subject: Rockbox Utility: add Speex license to About dialog.

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
---
 rbutil/rbutilqt/aboutbox.ui  | 15 +++++++++++++--
 rbutil/rbutilqt/rbutilqt.cpp | 10 ++++++++--
 rbutil/rbutilqt/rbutilqt.qrc |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'rbutil/rbutilqt')

diff --git a/rbutil/rbutilqt/aboutbox.ui b/rbutil/rbutilqt/aboutbox.ui
index 8689b844ed..d688a2f413 100644
--- a/rbutil/rbutilqt/aboutbox.ui
+++ b/rbutil/rbutilqt/aboutbox.ui
@@ -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" >
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 47955c93fc..70b7e5fa47 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -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);
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index 5a361c3cb3..e7eff5212f 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -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>
-- 
cgit