summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/aboutbox.ui15
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp10
-rw-r--r--rbutil/rbutilqt/rbutilqt.qrc1
3 files changed, 22 insertions, 4 deletions
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 @@
1<?xml version="1.0" encoding="UTF-8"?>
1<ui version="4.0" > 2<ui version="4.0" >
2 <class>aboutBox</class> 3 <class>aboutBox</class>
3 <widget class="QWidget" name="aboutBox" > 4 <widget class="QWidget" name="aboutBox" >
@@ -21,7 +22,7 @@
21 <string/> 22 <string/>
22 </property> 23 </property>
23 <property name="pixmap" > 24 <property name="pixmap" >
24 <pixmap resource="rbutilqt.qrc" >:/icons/rockbox-5.png</pixmap> 25 <pixmap>:/icons/rockbox-5.png</pixmap>
25 </property> 26 </property>
26 </widget> 27 </widget>
27 </item> 28 </item>
@@ -50,7 +51,7 @@
50 <item row="1" column="0" colspan="3" > 51 <item row="1" column="0" colspan="3" >
51 <widget class="QLabel" name="labelText" > 52 <widget class="QLabel" name="labelText" >
52 <property name="text" > 53 <property name="text" >
53 <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> 54 <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>
54 </property> 55 </property>
55 <property name="textFormat" > 56 <property name="textFormat" >
56 <enum>Qt::RichText</enum> 57 <enum>Qt::RichText</enum>
@@ -126,6 +127,16 @@
126 </item> 127 </item>
127 </layout> 128 </layout>
128 </widget> 129 </widget>
130 <widget class="QWidget" name="licenseSpeex">
131 <attribute name="title">
132 <string>&amp;Speex License</string>
133 </attribute>
134 <layout class="QGridLayout" name="gridLayout_2">
135 <item row="0" column="0">
136 <widget class="QTextBrowser" name="browserSpeexLicense"/>
137 </item>
138 </layout>
139 </widget>
129 </widget> 140 </widget>
130 </item> 141 </item>
131 <item row="3" column="0" > 142 <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()
293 QFile licence(":/docs/gpl-2.0.html"); 293 QFile licence(":/docs/gpl-2.0.html");
294 licence.open(QIODevice::ReadOnly); 294 licence.open(QIODevice::ReadOnly);
295 QTextStream c(&licence); 295 QTextStream c(&licence);
296 QString cline = c.readAll(); 296 about.browserLicense->insertHtml(c.readAll());
297 about.browserLicense->insertHtml(cline);
298 about.browserLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); 297 about.browserLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
298
299 QFile speexlicense(":/docs/COPYING.SPEEX");
300 speexlicense.open(QIODevice::ReadOnly);
301 QTextStream s(&speexlicense);
302 about.browserSpeexLicense->insertHtml("<pre>" + s.readAll() + "</pre>");
303 about.browserSpeexLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
304
299 QFile credits(":/docs/CREDITS"); 305 QFile credits(":/docs/CREDITS");
300 credits.open(QIODevice::ReadOnly); 306 credits.open(QIODevice::ReadOnly);
301 QTextStream r(&credits); 307 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 @@
2 <qresource prefix="/"> 2 <qresource prefix="/">
3 <file>../../docs/CREDITS</file> 3 <file>../../docs/CREDITS</file>
4 <file>../../docs/gpl-2.0.html</file> 4 <file>../../docs/gpl-2.0.html</file>
5 <file alias="docs/COPYING.SPEEX">../../apps/codecs/libspeex/COPYING</file>
5 </qresource> 6 </qresource>
6 <qresource> 7 <qresource>
7 <file alias="builtin/VOICE_PAUSE.wav">../../tools/VOICE_PAUSE.wav</file> 8 <file alias="builtin/VOICE_PAUSE.wav">../../tools/VOICE_PAUSE.wav</file>