From 9d25359138a6883783acfe7668468349221b1d93 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Thu, 18 Jul 2019 22:37:53 -0700
Subject: [PATCH] Version code and release notes for Oscar-1.1.0-testing-1

---
 oscar/docs/release_notes.html | 45 ++++++++++++++++++++++++++++-------
 oscar/version.h               |  6 ++---
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html
index 7e51ed2e..2c20c306 100644
--- a/oscar/docs/release_notes.html
+++ b/oscar/docs/release_notes.html
@@ -7,16 +7,45 @@ Which was written and copyright 2011-2018 &copy; Mark Watkins
 </p>
 
 <p>
-<b>Changes and fixes in OSCAR v1.0.2-beta-1</b>
+<b>Changes and fixes in OSCAR v1.1.0-testing-1</b>
+<br/><b>NOTE: Translations have NOT yet been updated for these changes</b>
 <ul>
 <li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
-<li>Offer migration to non-default directory on first use</li>
-<li>Add "Use Legacy Graphics.reg" to ask OSCAR to use simpler graphics for older systems</li>
-<li>Change Preferences measurement units choice to Metric or English</li>
-<li>Improve display of cmH2O numbers</li>
-<li>Re-organize build instructions and other cleanup</li>
-<li>Show graphics engine in title bar correctly</li>
-<li>Adjust size of Preferences dialog to fit smaller screens</li>
+<li>[new] Offer migration if non-default directory is selected on first use</li>
+<li>[new] Press SHIFT key when starting OSCAR to use Software Graphics Engine</li>
+<li>[new] Support for DreamStation BiPAP autoSV (900X) should now be complete</li>
+<li>[new] Improved Dreamstation support</li>
+<li>[new] Improve oximeter import for CM550D+</li>
+<li>[new] Disable Dark Mode on Mac</li>
+<li>[new] Show hours/day constituting compliance on Statistics page</li>
+<li>[new] Better order of graphs on Daily page for newly created profiles</li>
+<li>[new] Help/System Information shows info about OSCAR, OS, and data location</li>
+<li>[new] Move pie chart option from Preferences dialog to View menu</li>
+<li>[new] Hide pie chart when capturing screen</li>
+<li>[new] --datadir option now allows fully qualified name on Windows</li>
+<li>[fix] Fix some oximeter import issues</li>
+<li>[fix] Use local time rather than UTC time in oximeter import</li>
+<li>[fix] Improve screen capture on Mac</li>
+<li>[fix] Fix crashes in CPAP data rebuild, purging of a machine</li>
+<li>[fix] Prevent crash if taking screen shot before profile is opened</li>
+<li>[fix] Increase mask vent ranges</li>
+<li>[fix] Correct session bar if no sessions are present</li>
+<li>[fix] Correct months shown on Statistics page monthly view</li>
+<li>[fix] Compute compliance on Statistics page based on total days not days used</li>
+<li>[fix] Paginate statistics report when printing</li>
+<li>[fix] Fix "phantom date" (12/31/1969) on some ResMed imports</li>
+<li>[fix] Default font substituted when a specified font is not valid</li>
+<li>[fix] Change Preferences measurement units choice to Metric or English</li>
+<li>[fix] Improve display of cmH2O numbers</li>
+<li>[fix] Show graphics engine in title bar correctly</li>
+<li>[fix] Adjust size of Preferences dialog to fit smaller screens</li>
+<li>[fix] Label climate control as manual or auto correctly on ResMed import</li>
+<li>[fix] Move less useful information from titlebar to Help/System Information</li>
+<li>[fix] Change "Prescription Settings" to "Machine Settings" message</li>
+<li>[fix] Improve icons, especially smaller ones</li>
+<li>[fix] Correct Mac menu issues</li>
+<li>[fix] Improve messages in debug pane</li>
+<li>[fix] Re-organize build instructions and other cleanup</li>
 </ul>
 </p>
 
diff --git a/oscar/version.h b/oscar/version.h
index 943c4110..d23b5769 100644
--- a/oscar/version.h
+++ b/oscar/version.h
@@ -13,9 +13,9 @@
 #include "build_number.h"
 
 const int major_version = 1;   // incompatible API changes
-const int minor_version = 0;   // new features that don't break things
-const int revision_number = 2; // bugfixes, revisions
-const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
+const int minor_version = 1;   // new features that don't break things
+const int revision_number = 0; // bugfixes, revisions
+const QString ReleaseStatus = "testing"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
 
 const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
 const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);