Check for Updates no longer shows unwanted early releases

Change option and messages for showing early releases.
Update Release Notes to correct an error re: zombie reports and include a section for beta 2+ fixes.

Htmldocs/release_notes.html

@@ -11,7 +11,15 @@
     <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>
     <p>
-    <b>Changes and fixes in OSCAR v1.3.0 Beta 1</b>
+    <b>Changes and fixes in OSCAR v1.3.0 Beta ***</b>
+    <br>Portions of OSCAR are © 2019-2021 by
+    <i>The OSCAR Team</i></p>
+    <ul>
+      <li>[fix] Check for Updates no longer shows test versions for release users.</li>
+      <li>[fix] Available Rx pressures shown correctly in Profile dialog.</li>
+    </ul>
+    <p>
+    <b>Changes and fixes in OSCAR v1.3.0 Beta 2/b>
     <br>Portions of OSCAR are © 2019-2021 by
     <i>The OSCAR Team</i></p>
     <ul>
@@ -32,7 +40,7 @@
       <li>[new] Improve Somnopose import options.</li>
       <li>[new] Purge Current Selected Day allows purge of each machine type separately</li>
       <li>[new] Multi-file import for non-CPAP loaders (Somnopose, Viatom, Zeo, Dreem)</li>
-      <li>[new] Weight, BMI and Zombie history appear in statistics</li>
+      <li>[new] Weight, BMI and Zombie history appear in Overview page</li>
       <li>[new] Add Turkish signal names to RedMed loader.</li>
       <li>[new] Add Traditional Chinese to languages available.</li>
       <li>[fix] Correct calculation of average leak rate on Welcome page.</li>

oscar/Graphs/gGraph.cpp

@@ -1300,6 +1300,7 @@ EventDataType gGraph::MinY()
     }
 
     return rmin_y = val;
+//    return rmin_y = val * 0.9;
 }
 EventDataType gGraph::MaxY()
 {

oscar/checkupdates.cpp

@@ -162,25 +162,30 @@ void CheckUpdates::compareVersions () {
     VersionInfo testVersion = getVersionInfo ("test", platformStr());
 
     msg = "";
+    if (!showTestVersion)
+        testVersion.version = "";
 
     if (testVersion.version.length() == 0 && releaseVersion.version.length() == 0) {
-        if (showIfCurrent)
+        if (showIfCurrent) {
-            msg = QObject::tr("You are running the latest release of OSCAR");
+            QString txt = getVersion().IsReleaseVersion()?QObject::tr("release"):QObject::tr("test version");
+            QString txt2 = QObject::tr("You are running the latest %1 of OSCAR").arg(txt);
+            msg = txt2 + "<p>" + QObject::tr("You are running OSCAR %1").arg(getVersion()) + "</p>";
+        }
     } else {
         msg = QObject::tr("A more recent version of OSCAR is available");
-        msg += "<p>" + QObject::tr("You are running version %1").arg(getVersion()) + "</p>";
+        msg += "<p>" + QObject::tr("You are running OSCAR %1").arg(getVersion()) + "</p>";
         if (releaseVersion.version.length() > 0) {
             msg += "<p>" + QObject::tr("OSCAR %1 is available <a href='%2'>here</a>.").arg(releaseVersion.version).arg(releaseVersion.urlInstaller) + "</p>";
         }
-        if (testVersion.version.length() > 0) {
+        if (showTestVersion && (testVersion.version.length() > 0)) {
             msg += "<p>" + QObject::tr("Information about more recent test version %1 is available at <a href='%2'>%2</a>").arg(testVersion.version).arg(testVersion.urlInstaller) + "</p>";
         }
     }
 
     if (msg.length() > 0) {
         // Add elapsed time in test versions only
-        if (elapsedTime > 0 && !getVersion().IsReleaseVersion())
+//        if (elapsedTime > 0 && !getVersion().IsReleaseVersion())
-            msg += "<font size='-1'><p>" + QString(QObject::tr("(Reading %1 took %2 seconds)")).arg("versions.xml").arg(elapsedTime) + "</p></font>";
+//            msg += "<font size='-1'><p>" + QString(QObject::tr("(Reading %1 took %2 seconds)")).arg("versions.xml").arg(elapsedTime) + "</p></font>";
         msgIsReady = true;
     }
 
@@ -212,9 +217,12 @@ void CheckUpdates::showMessage()
 void CheckUpdates::checkForUpdates(bool showWhenCurrent)
 {
     showIfCurrent = showWhenCurrent;
+    showTestVersion = false;
 
     // If running a test version of OSCAR, try reading versions.xml from OSCAR_Data directory
+    // and force display of any new test version
     if (!getVersion().IsReleaseVersion()) {
+        showTestVersion = true;
         versionXML = readLocalVersions();
         if (versionXML.length() > 0) {
             compareVersions();
@@ -223,6 +231,8 @@ void CheckUpdates::checkForUpdates(bool showWhenCurrent)
             showMessage();
             return;
         }
+    } else {
+        showTestVersion = AppSetting->allowEarlyUpdates();
     }
 
     readTimer.start();

oscar/checkupdates.h

@@ -50,6 +50,7 @@ class CheckUpdates : public QMainWindow
     QString msg;                // Message to show to user
     bool msgIsReady = false;    // Message is ready to be displayed
     bool showIfCurrent = false; // show a message if running current release
+    bool showTestVersion = false; // Show message if test version is available
     QProgressDialog * checkingBox;// Looking for updates message
 
     QNetworkReply *reply;

oscar/newprofile.cpp

@@ -363,6 +363,8 @@ void NewProfile::edit(const QString name)
     ui->untreatedAHIEdit->setValue(profile->cpap->untreatedAHI());
     ui->cpapModeCombo->setCurrentIndex((int)profile->cpap->mode());
 
+    on_cpapModeCombo_activated(profile->cpap->mode());
+
     ui->doctorNameEdit->setText(profile->doctor->name());
     ui->doctorPracticeEdit->setText(profile->doctor->practiceName());
     ui->doctorPhoneEdit->setText(profile->doctor->phone());

oscar/preferencesdialog.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>942</width>
-    <height>651</height>
+    <height>655</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -2210,7 +2210,7 @@ Mainly affects the importer.</string>
                 <string>If you are interested in helping test new features and bugfixes early, click here.</string>
                </property>
                <property name="text">
-                <string>I want to try experimental and test builds. (Advanced users only please.)</string>
+                <string>I want to be notified of test versions. (Advanced users only please.)</string>
                </property>
               </widget>
              </item>