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

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Arie Klerk 2020-09-18 20:32:56 +02:00
commit f85fa6d596
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Htmldocs/release_notes.html
View File

@ -11,7 +11,7 @@
<b>For other languages, go to:</b> <b>For other languages, go to:</b>
<br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p> <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
<p> <p>
<b>Changes and fixes in OSCAR v1.2.0-beta-XXX</b> <b>Changes and fixes in OSCAR v1.2.0-beta-3</b>
<br>Portions of OSCAR are © 2019-2020 by <br>Portions of OSCAR are © 2019-2020 by
<i>The OSCAR Team</i></p> <i>The OSCAR Team</i></p>
<ul> <ul>
@ -22,6 +22,9 @@
</ul> </ul>
</li> </li>
<li>[fix] Improve support of rare Philips Respironics 1030X events and update warnings.</li> <li>[fix] Improve support of rare Philips Respironics 1030X events and update warnings.</li>
<li>[fix] Profile page and Daily records block now shows most recently used machine when a profile has multiple machines.</li>
<li>[fix] Corrected error in beta-1and 2 where date last imported was lost.</li>
<li>[fix] Translations updated.</li>
</ul></p> </ul></p>
<p> <p>
<b>Changes and fixes in OSCAR v1.2.0-beta-2</b> <b>Changes and fixes in OSCAR v1.2.0-beta-2</b>

2
oscar/VERSION
View File

@ -1,5 +1,5 @@
// Update the string below to set OSCAR's version and release status. // Update the string below to set OSCAR's version and release status.
// See https://semver.org/spec/v2.0.0.html for details on format. // See https://semver.org/spec/v2.0.0.html for details on format.
#define VERSION "1.2.0-beta-2" #define VERSION "1.2.0-beta-3"

15
oscar/checkupdates.cpp
View File

@ -252,8 +252,19 @@ void CheckUpdates::checkForUpdates(bool showWhenCurrent)
void CheckUpdates::replyFinished(QNetworkReply *reply) void CheckUpdates::replyFinished(QNetworkReply *reply)
{ {
if (showIfCurrent) {
if (checkingBox != nullptr)
checkingBox->reset();
}
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
qWarning() << "Update Check Error: "+reply->errorString(); qWarning() << "Update Check Error:" << reply->errorString();
reply->deleteLater();
if (!showIfCurrent) { // for automatic checks, don't show anything
return;
}
msg = QObject::tr("Unable to check for updates. Please try again later.");
msgIsReady = true;
} else { } else {
// qDebug() << reply->header(QNetworkRequest::ContentTypeHeader).toString(); // qDebug() << reply->header(QNetworkRequest::ContentTypeHeader).toString();
// qDebug() << reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toString(); // qDebug() << reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toString();
@ -272,9 +283,9 @@ void CheckUpdates::replyFinished(QNetworkReply *reply)
} }
else else
elapsedTime = 0; elapsedTime = 0;
}
compareVersions(); compareVersions();
}
if (showIfCurrent) if (showIfCurrent)
showMessage(); showMessage();