From 90b6db3b3fe781ace42d00561649df231e551ba5 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Fri, 3 May 2019 17:26:08 -0700
Subject: [PATCH 1/2] Make titlebar show active graphics engine (Open GL,
 ANGLE, or LegacyGFX).

---
 oscar/SleepLib/common.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp
index 66c4f0fc..fdfcaa9c 100644
--- a/oscar/SleepLib/common.cpp
+++ b/oscar/SleepLib/common.cpp
@@ -151,6 +151,11 @@ float getOpenGLVersion()
 #endif
 }
 
+// Obtains graphic engine as a string, for use in title bar
+// This is a bad approach as it depends on the exact version
+// id strings to distinguish engines.
+// (But too much work to find an alternate solution today)
+// This works on Windows.  Don't know about other platforms.
 QString getGraphicsEngine()
 {
     QString gfxEngine = QString();
@@ -158,8 +163,11 @@ QString getGraphicsEngine()
     gfxEngine = CSTR_GFX_BrokenGL;
 #else
     QString glversion = getOpenGLVersionString();
+    qDebug() << glversion << glversion;
     if (glversion.contains(CSTR_GFX_ANGLE)) {
         gfxEngine = CSTR_GFX_ANGLE;
+    } else if (glversion.contains("Mesa")) {
+        gfxEngine = CSTR_GFX_BrokenGL;
     } else {
         gfxEngine = CSTR_GFX_OpenGL;
     }

From 3ada6741d9d0cf91f216ae368d0bcc79224cc851 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Fri, 3 May 2019 19:12:07 -0700
Subject: [PATCH 2/2] Preliminary release notes for OSCAR 1.0.2 and version id
 changes to beta-1.

---
 oscar/docs/release_notes.html | 14 ++++++++++++++
 oscar/version.h               |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html
index e94138bc..7e51ed2e 100644
--- a/oscar/docs/release_notes.html
+++ b/oscar/docs/release_notes.html
@@ -6,6 +6,20 @@
 Which was written and copyright 2011-2018 &copy; Mark Watkins
 </p>
 
+<p>
+<b>Changes and fixes in OSCAR v1.0.2-beta-1</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>
+</ul>
+</p>
+
 <p>
 <b>Changes and fixes in OSCAR v1.0.1-r-1</b>
 <ul>
diff --git a/oscar/version.h b/oscar/version.h
index 1deee65f..943c4110 100644
--- a/oscar/version.h
+++ b/oscar/version.h
@@ -14,8 +14,8 @@
 
 const int major_version = 1;   // incompatible API changes
 const int minor_version = 0;   // new features that don't break things
-const int revision_number = 1; // bugfixes, revisions
-const QString ReleaseStatus = "r"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
+const int revision_number = 2; // bugfixes, revisions
+const QString ReleaseStatus = "beta"; // 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);