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

Removed seperate UpdateNotes. just keeping ReleaseNotes from now on

Browse Source
This commit is contained in:
Mark Watkins 2014-05-14 16:49:37 +10:00
parent 62af95fbbb
commit 76a0a6cb8d
5 changed files with 30 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sleepyhead/Resources.qrc
View File

@ -39,7 +39,6 @@
<file>docs/script.js</file> <file>docs/script.js</file>
<file>icons/nographs.png</file> <file>icons/nographs.png</file>
<file>icons/sheep.png</file> <file>icons/sheep.png</file>
<file>docs/update_notes.html</file>
<file>docs/sheep.png</file> <file>docs/sheep.png</file>
<file>icons/Bob Strikes Back.png</file> <file>icons/Bob Strikes Back.png</file>
<file>icons/Jedimark.png</file> <file>icons/Jedimark.png</file>

9
sleepyhead/UpdaterWindow.cpp
View File

@ -209,9 +209,6 @@ int compareVersion(QString version)
short minor = parts[1].toInt(&ok); short minor = parts[1].toInt(&ok);
if (!ok) return -1; if (!ok) return -1;
short patch = parts[2].toInt(&ok);
if (!ok) return -1;
if (major > major_version) { if (major > major_version) {
return 1; return 1;
} else if (major < major_version) { } else if (major < major_version) {
@ -224,6 +221,10 @@ int compareVersion(QString version)
return -1; return -1;
} }
QStringList patchver = parts[2].split("-");
short patch = patchver[0].toInt(&ok);
if (!ok) return -1;
// Still here.. check patch version // Still here.. check patch version
if (patch > patch_number) { if (patch > patch_number) {
return 1; return 1;
@ -231,6 +232,8 @@ int compareVersion(QString version)
return -1; return -1;
} }
// patchver[1] = tag..
// Versions match // Versions match
return 0; return 0;
} }

23
sleepyhead/docs/release_notes.html
View File

@ -4,10 +4,22 @@
<p><h2><b>Release Notes</b></h2></p> <p><h2><b>Release Notes</b></h2></p>
<p>Greetings!</p> <p>Greetings!</p>
<p>A long time in the making, but better late than never, here is a new and hopefully improved SleepyHead build.</p> <p>Here is a new and hopefully improved SleepyHead build.</p>
<p>This build features rework to the graphing code which should hopefully increase compatability a little, at the cost of a little performance.</p>
<b>New features & bugs fixes in this Update:</b><br/>
<b>New features & bugs fixes in v0.9.6</b><br/>
<list>
<li>Switched from OpenGL to Qt QPainter backend</li>
<li>Switched to Qt's pixmap caching engine</li>
<li>Fix ResMed session grouping bug that caused session double-ups</li>
<li>Fix EDF importer glitch on windows builds that led to faulty graph displays</li>
<li>Fixed CPAP card autoscanner on Windows platform</li>
<li>Added timeout dialog to CPAP card autoscanner</li>
<li>Microsoft compiler fixes</li>
<li>Fisher & Paykel Icon timestamp fix</li>
</list>
<br/>
<b>New features & bugs fixes since v0.9.5</b><br/>
<list> <list>
<li>Added ability to pin graphs to keep them on screen</li> <li>Added ability to pin graphs to keep them on screen</li>
<li>Fixed tranlation loading on Mac</li> <li>Fixed tranlation loading on Mac</li>
@ -18,6 +30,11 @@
<li>Added user information to Statistics page</li> <li>Added user information to Statistics page</li>
<li>Datacard autodetection ability</li> <li>Datacard autodetection ability</li>
<li>Philips Respironics 60 series fixes</li> <li>Philips Respironics 60 series fixes</li>
</list>
<br/>
<b>New features & bugs fixes since v0.9.3</b><br/>
<list>
<li>Retina display fixes for Mac platform</li> <li>Retina display fixes for Mac platform</li>
<li>Introduced yAxis Scaling modes</li> <li>Introduced yAxis Scaling modes</li>
<li>Cleaned up mouse handling underneath</li> <li>Cleaned up mouse handling underneath</li>

23
sleepyhead/docs/update_notes.html
View File

@ -1,23 +0,0 @@
<html>
<body>
<div align=center>
<h2><image src='qrc:/docs/sheep.png' width=64 height=64>SleepyHead <b>BETA</b></h2>
<h3><b>Update Notes for v0.9.6</b></h3>
</div>
<b>Changes in this version</b><br/>
<list>
<li>Switched from OpenGL to Qt QPainter backend</li>
<li>Switched to Qt's pixmap caching engine</li>
<li>Fix ResMed session grouping bug that caused session double-ups</li>
<li>Fix EDF importer glitch on windows builds that led to faulty graph displays</li>
<li>Fixed CPAP card autoscanner on Windows platform</li>
<li>Added timeout dialog to CPAP card autoscanner</li>
<li>Microsoft compiler fixes</li>
</list>
<p>Sleep Well!</p>
<p>Mark Watkins (JediMark)</p>
</body>
</html>

36
sleepyhead/main.cpp
View File

@ -129,30 +129,6 @@ void release_notes()
relnotes.exec(); relnotes.exec();
} }
void build_notes()
{
QDialog relnotes;
relnotes.setWindowTitle(STR_TR_SleepyHead + " " + QObject::tr("SleepyHead Update Notes"));
QVBoxLayout layout(&relnotes);
QWebView web(&relnotes);
relnotes.setWindowTitle(STR_TR_SleepyHead + " v" + FullVersionString + QObject::tr(" Update"));
// Language???
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);
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();
}
void sDelay(int s) void sDelay(int s)
{ {
// QThread::msleep() is exposed in Qt5 // QThread::msleep() is exposed in Qt5
@ -163,6 +139,8 @@ void sDelay(int s)
#endif #endif
} }
int compareVersion(QString version);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef Q_WS_X11 #ifdef Q_WS_X11
@ -326,17 +304,9 @@ retry_directory:
release_notes(); release_notes();
} else { } else {
if (PREF.contains(STR_PREF_VersionString)) { if (PREF.contains(STR_PREF_VersionString)) {
QString V = PREF[STR_PREF_VersionString].toString();
if (FullVersionString > V) { if (compareVersion(PREF[STR_PREF_VersionString].toString()) < 0) {
QString V2 = V.section("-", 0, 0);
if (VersionString > V2) {
release_notes(); release_notes();
//QMessageBox::warning(0,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the "+AppRoot+" folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok);
} else {
build_notes();
}
check_updates = false; check_updates = false;
} }