summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/changelog.txt1
-rw-r--r--rbutil/rbutilqt/gui/changelog.cpp2
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
16* Add support for Creative Zen X-Fi3 (G#419). 16* Add support for Creative Zen X-Fi3 (G#419).
17* Add Changelog window. 17* Add Changelog window.
18* Rework System Trace functionality. 18* Rework System Trace functionality.
19* Add support for H300 v1.31K firmware.
19 20
20 21
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)
24{ 24{
25 ui.setupUi(this); 25 ui.setupUi(this);
26 ui.browserChangelog->setOpenExternalLinks(true); 26 ui.browserChangelog->setOpenExternalLinks(true);
27 // FIXME: support translated changelog file (changelog.de.txt etc)
27 ui.browserChangelog->setHtml(parseChangelogFile(":/docs/changelog.txt")); 28 ui.browserChangelog->setHtml(parseChangelogFile(":/docs/changelog.txt"));
28 ui.browserChangelog->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); 29 ui.browserChangelog->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
29 ui.checkBoxShowAlways->setChecked(RbSettings::value(RbSettings::ShowChangelog).toBool()); 30 ui.checkBoxShowAlways->setChecked(RbSettings::value(RbSettings::ShowChangelog).toBool());
@@ -44,6 +45,7 @@ QString Changelog::parseChangelogFile(QString filename)
44 QFile changelog(filename); 45 QFile changelog(filename);
45 changelog.open(QIODevice::ReadOnly); 46 changelog.open(QIODevice::ReadOnly);
46 QTextStream c(&changelog); 47 QTextStream c(&changelog);
48 c.setCodec(QTextCodec::codecForName("UTF-8"));
47 QString text; 49 QString text;
48 while(!c.atEnd()) { 50 while(!c.atEnd()) {
49 QString line = c.readLine(); 51 QString line = c.readLine();