diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-01-24 20:48:38 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-01-24 20:48:38 +0000 |
commit | 0f6bfdb4c37f222ea2833237bc9946d752e211db (patch) | |
tree | 76b3dea10753a6f676a7ce1b7b3972f129de6466 | |
parent | 2910f91804d870e031bed28ad0d94a0d2c419d4c (diff) | |
download | rockbox-0f6bfdb4c37f222ea2833237bc9946d752e211db.tar.gz rockbox-0f6bfdb4c37f222ea2833237bc9946d752e211db.zip |
Merge rbutil CREDITS file with main one and use that.
Similar to removing the separate CREDITS file for the manual remove the
rbutil one as discussed on IRC.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24329 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rwxr-xr-x | rbutil/rbutilqt/deploy-release.py | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/docs/CREDITS | 13 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.qrc | 2 |
5 files changed, 10 insertions, 16 deletions
diff --git a/docs/CREDITS b/docs/CREDITS index 79abd8aab7..be55bb7314 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -521,6 +521,7 @@ Phinitnun Chanasabaeng | |||
521 | Tse-Hsien Chiang | 521 | Tse-Hsien Chiang |
522 | Szymon Dziok | 522 | Szymon Dziok |
523 | Domenico Di Misa | 523 | Domenico Di Misa |
524 | Delyan Kratunov | ||
524 | 525 | ||
525 | The libmad team | 526 | The libmad team |
526 | The wavpack team | 527 | The wavpack team |
diff --git a/rbutil/rbutilqt/deploy-release.py b/rbutil/rbutilqt/deploy-release.py index 2e6063cdf5..c2071a29d7 100755 --- a/rbutil/rbutilqt/deploy-release.py +++ b/rbutil/rbutilqt/deploy-release.py | |||
@@ -89,6 +89,7 @@ svnpaths = [ "rbutil/", | |||
89 | "tools/rbspeex", | 89 | "tools/rbspeex", |
90 | "apps/codecs/libspeex", | 90 | "apps/codecs/libspeex", |
91 | "docs/COPYING", | 91 | "docs/COPYING", |
92 | "docs/CREDITS", | ||
92 | "tools/iriver.c", | 93 | "tools/iriver.c", |
93 | "tools/Makefile", | 94 | "tools/Makefile", |
94 | "tools/mkboot.h", | 95 | "tools/mkboot.h", |
diff --git a/rbutil/rbutilqt/docs/CREDITS b/rbutil/rbutilqt/docs/CREDITS deleted file mode 100644 index 27d1785164..0000000000 --- a/rbutil/rbutilqt/docs/CREDITS +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Christi Alice Scarborough | ||
2 | Dave Chapman | ||
3 | Dominik Wenger | ||
4 | Bryan Childs | ||
5 | Dave Hooper | ||
6 | Dominik Riebeling | ||
7 | Tomer Shalev | ||
8 | Yoshihisa Uchida | ||
9 | Alexander Spyridakis | ||
10 | Rui Araújo | ||
11 | Delyan Kratunov | ||
12 | Adilson Xavier | ||
13 | Pavel Rzehák | ||
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 85d990a775..8997c386bf 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -287,8 +287,13 @@ void RbUtilQt::about() | |||
287 | credits.open(QIODevice::ReadOnly); | 287 | credits.open(QIODevice::ReadOnly); |
288 | QTextStream r(&credits); | 288 | QTextStream r(&credits); |
289 | r.setCodec(QTextCodec::codecForName("UTF-8")); | 289 | r.setCodec(QTextCodec::codecForName("UTF-8")); |
290 | QString rline = r.readAll(); | 290 | while(!r.atEnd()) { |
291 | about.browserCredits->insertPlainText(rline); | 291 | QString line = r.readLine(); |
292 | // filter out header. | ||
293 | line.remove(QRegExp("^[^A-Z]+.*")); | ||
294 | line.remove(QRegExp("^People.*")); | ||
295 | about.browserCredits->append(line); | ||
296 | } | ||
292 | about.browserCredits->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); | 297 | about.browserCredits->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); |
293 | QString title = QString("<b>The Rockbox Utility</b><br/>Version %1").arg(FULLVERSION); | 298 | QString title = QString("<b>The Rockbox Utility</b><br/>Version %1").arg(FULLVERSION); |
294 | about.labelTitle->setText(title); | 299 | about.labelTitle->setText(title); |
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index 60c7538027..ccb1272d63 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc | |||
@@ -1,6 +1,6 @@ | |||
1 | <RCC> | 1 | <RCC> |
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 | </qresource> | 5 | </qresource> |
6 | <qresource> | 6 | <qresource> |