From 0372a52e39634fae60fd72dc3323647d7e06c630 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Tue, 12 Nov 2013 22:54:22 +0100 Subject: Add missing entry to changelog. Add a missing entry and treat changelog file always as UTF-8. Change-Id: I847c399ddf6d8aacf155864fbd9109121a761bc5 --- rbutil/rbutilqt/changelog.txt | 1 + rbutil/rbutilqt/gui/changelog.cpp | 2 ++ 2 files changed, 3 insertions(+) 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(); -- cgit v1.2.3