diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-12 22:54:22 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-12 22:54:22 +0100 |
commit | 0372a52e39634fae60fd72dc3323647d7e06c630 (patch) | |
tree | 918b7bc4156523b1ebdf3a4b56ca6e228703e31f /rbutil | |
parent | 17a781d8b25c371b5a723f139b95380eefad85b1 (diff) | |
download | rockbox-0372a52e39634fae60fd72dc3323647d7e06c630.tar.gz rockbox-0372a52e39634fae60fd72dc3323647d7e06c630.zip |
Add missing entry to changelog.
Add a missing entry and treat changelog file always as UTF-8.
Change-Id: I847c399ddf6d8aacf155864fbd9109121a761bc5
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/changelog.txt | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/changelog.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/changelog.txt b/rbutil/rbutilqt/changelog.txt index 94082d2212..756cc3dcee 100644 --- a/rbutil/rbutilqt/changelog.txt +++ b/rbutil/rbutilqt/changelog.txt @@ -16,5 +16,6 @@ Version 1.4 * Add support for Creative Zen X-Fi3 (G#419). * Add Changelog window. * Rework System Trace functionality. +* Add support for H300 v1.31K firmware. diff --git a/rbutil/rbutilqt/gui/changelog.cpp b/rbutil/rbutilqt/gui/changelog.cpp index 4ef1ae9266..1de272315d 100644 --- a/rbutil/rbutilqt/gui/changelog.cpp +++ b/rbutil/rbutilqt/gui/changelog.cpp @@ -24,6 +24,7 @@ Changelog::Changelog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); ui.browserChangelog->setOpenExternalLinks(true); + // FIXME: support translated changelog file (changelog.de.txt etc) ui.browserChangelog->setHtml(parseChangelogFile(":/docs/changelog.txt")); ui.browserChangelog->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); ui.checkBoxShowAlways->setChecked(RbSettings::value(RbSettings::ShowChangelog).toBool()); @@ -44,6 +45,7 @@ QString Changelog::parseChangelogFile(QString filename) QFile changelog(filename); changelog.open(QIODevice::ReadOnly); QTextStream c(&changelog); + c.setCodec(QTextCodec::codecForName("UTF-8")); QString text; while(!c.atEnd()) { QString line = c.readLine(); |