From 188d53b3ed85fd044ca244053bbb0320c6539cd0 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 15 Jan 2013 17:24:00 +1000
Subject: [PATCH] Fixed bug in displaying release notes

---
 docs/release_notes.html |  8 ++++----
 main.cpp                | 28 ++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/docs/release_notes.html b/docs/release_notes.html
index ad4871da..78c73bb7 100644
--- a/docs/release_notes.html
+++ b/docs/release_notes.html
@@ -6,19 +6,19 @@
 <p>Hi There!</p>
 <p>Thanks for bearing with us this year - it has been a crazy year for some of us, and we're thankful for a few who have stepped up to help out.  Anyone who wants to contribue to SleepyHead (whether with code, documentation, or just helping those with questions), please contact us or post one one of the lists/forums on our website.</p>
 <b>New features & bugs fixes in this Update:</b></br>
+
 <list>
-<li>Impproved Auto-Updater previously released in a test release.</li>
+<li>Improved Auto-Updater previously released in a test release.</li>
 <li>Support for the PRS1 Series 60, in large part due to a patch from Keary Griffin.</li>
 <li>A bunch of small PRS1 fixes, especially for the AutoSV.</li>
 <li>Added Flow Limit to the summary and overview screens.  This can be a useful indicator in certain types of apnea.</li>
 <li>Some 64-bit fixes, and some other bugfixes mainly useful to those building from source, especially on linux.</li>
 <li>Added Melbourne as a timezone option.</li>
 <li>Fixed some issues with the prescription changes table with certain machines.</li>
-
 </list>
 
 <p><b>Sleep Well, and have fun!</b></p>
-<p>Mark Watkins (JediMark)</p>
-<p>Richard Freeman (rich0)</p>
+<p>Mark Watkins (JediMark)<br/>
+Richard Freeman (rich0)</p>
 </body>
 </html>
diff --git a/main.cpp b/main.cpp
index a3fec468..d70c2262 100644
--- a/main.cpp
+++ b/main.cpp
@@ -66,11 +66,23 @@ void initialize()
 void release_notes()
 {
     QDialog relnotes;
+    relnotes.setWindowTitle(QObject::tr("SleepyHead Release Notes"));
     QVBoxLayout layout(&relnotes);
     QWebView web(&relnotes);
+
     // Language???
 
-    web.load(QUrl("qrc:/docs/release_notes.html"));
+    QFile f(":/docs/release_notes.html");
+    if (!f.open(QIODevice::ReadOnly)) {
+        qWarning() << "Could not access release notes";
+        return;
+    }
+    QTextStream ts(&f);
+
+    QString html=ts.readAll();
+    web.setHtml(html);
+
+    //web.load(QUrl("qrc:/docs/release_notes.html"));
     //web.page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOn);
     relnotes.setLayout(&layout);
     layout.insertWidget(0,&web,1);
@@ -83,13 +95,25 @@ void release_notes()
 void build_notes()
 {
     QDialog relnotes;
+    relnotes.setWindowTitle(QObject::tr("SleepyHead Update Notes"));
     QVBoxLayout layout(&relnotes);
     QWebView web(&relnotes);
     relnotes.setWindowTitle("SleepyHead v"+FullVersionString+" Update");
     // Language???
 
-    web.load(QUrl("qrc:/docs/update_notes.html"));
+    QFile f(":/docs/update_notes.html");
+    if (!f.open(QIODevice::ReadOnly)) {
+        qWarning() << "Could not access update notes";
+        return;
+    }
+    QTextStream ts(&f);
+
+    QString html=ts.readAll();
+    web.setHtml(html);
+
+    //web.load(QUrl("qrc:/docs/update_notes.html"));
     //web.page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOn);
+
     relnotes.setLayout(&layout);
     layout.insertWidget(0,&web,1);
     QPushButton okbtn(QObject::tr("&Ok, get on with it.."),&relnotes);