chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverted that last change, original code just needed a little help to refresh on mac

Browse Source
This commit is contained in:
Mark Watkins 2013-01-15 19:13:21 +10:00
parent 188d53b3ed
commit 2c430c705f
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Resources.qrc
View File

@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
<file>docs/sheep.png</file>
<file>docs/index.html</file>
<file>icons/sdcard.png</file>
<file>icons/preferences.png</file>
@ -43,5 +42,7 @@
<file>icons/nographs.png</file>
<file>icons/sheep.png</file>
<file>docs/update_notes.html</file>
<file>docs/sheep.png</file>
<file>docs/sheep.jpg</file>
</qresource>
</RCC>

2
docs/release_notes.html
View File

@ -1,6 +1,6 @@
<html>
<body>
<h1><image src='qrc:/docs/sheep.png' width=64 height=64>SleepyHead v0.9.3 <b>BETA</b></h1>
<h1><image src="qrc:/docs/sheep.png" width=64 height=64>SleepyHead v0.9.3 <b>BETA</b></h1>
<p><h2><b>Release Notes</b></h2></p>
<p>Hi There!</p>

27
main.cpp
View File

@ -72,23 +72,16 @@ void release_notes()
// Language???
QFile f(":/docs/release_notes.html");
if (!f.open(QIODevice::ReadOnly)) {
qWarning() << "Could not access release notes";
return;
}
QTextStream ts(&f);
web.load(QUrl("qrc:/docs/release_notes.html"));
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);
QPushButton okbtn(QObject::tr("&Ok, get on with it.."),&relnotes);
relnotes.connect(&okbtn,SIGNAL(clicked()),SLOT(accept()));
layout.insertWidget(1,&okbtn,1);
QApplication::processEvents(); // MW: Needed on Mac, as the html has to finish loading
relnotes.exec();
}
@ -101,17 +94,7 @@ void build_notes()
relnotes.setWindowTitle("SleepyHead v"+FullVersionString+" Update");
// Language???
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.load(QUrl("qrc:/docs/update_notes.html"));
//web.page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOn);
relnotes.setLayout(&layout);
@ -120,6 +103,8 @@ void build_notes()
relnotes.connect(&okbtn,SIGNAL(clicked()),SLOT(accept()));
layout.insertWidget(1,&okbtn,1);
layout.setMargin(0);
QApplication::processEvents(); // MW: Needed on Mac, as the html has to finish loading
relnotes.setFixedSize(500,400);
relnotes.exec();
}