From ceba1e81eb42c9871c76f92e4c3cbc2ac4b0aa16 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Thu, 8 Aug 2019 16:24:30 -0700
Subject: [PATCH] Make date in calendar on Daily page format per regional
 settings.

---
 oscar/SleepLib/machine_common.h |  3 ++-
 oscar/daily.cpp                 |  4 ++--
 oscar/docs/release_notes.html   | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h
index cac60064..9043d42c 100644
--- a/oscar/SleepLib/machine_common.h
+++ b/oscar/SleepLib/machine_common.h
@@ -52,6 +52,7 @@ enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_PERC, ST_90P, ST_MIN, ST_
 enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURNAL, MT_POSITION, MT_UNCATEGORIZED = 99};
 //void InitMapsWithoutAwesomeInitializerLists();
 
+/***** NEVER USED ---
 // PAP Device Capabilities
 const quint32 CAP_Fixed               = 0x0000001;  // Constant PAP
 const quint32 CAP_Variable            = 0x0000002;  // Variable Base (EPAP) pressure
@@ -69,7 +70,7 @@ const quint32 PAP_BiLevelAutoVariable     = 0x0010;  // Auto BiLevel with full r
 const quint32 PAP_ASV_Fixed               = 0x0020;  // ASV with fixed EPAP
 const quint32 PAP_ASV_Variable            = 0x0040;  // ASV with full ranging capabilities
 const quint32 PAP_SplitNight              = 0x8000;  // Split night capabilities
-
+*****/
 
 
 /*! \enum CPAPMode
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index 6be789db..ec368fe2 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -583,7 +583,7 @@ void Daily::ReloadGraphs()
     ui->calendar->setSelectedDate(d);
     ui->calendar->blockSignals(false);
     Load(d);
-    ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate));
+    ui->calButton->setText(ui->calendar->selectedDate().toString(MedDateFormat));
     graphView()->redraw();
 //    qDebug() << "Finished ReloadGraphs in Daily object";
 //    sleep(3);
@@ -826,7 +826,7 @@ void Daily::on_ReloadDay()
 
     //GraphView->fadeIn(fadedir);
     GraphView->redraw();
-    ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate));
+    ui->calButton->setText(ui->calendar->selectedDate().toString(MedDateFormat));
     ui->calendar->setFocus(Qt::ActiveWindowFocusReason);
 
     if (p_profile->general->unitSystem()==US_English) {
diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html
index 6dc66e92..6b01d55d 100644
--- a/oscar/docs/release_notes.html
+++ b/oscar/docs/release_notes.html
@@ -6,6 +6,16 @@
 Which was written and copyright 2011-2018 &copy; Mark Watkins
 </p>
 
+<p>
+<b>Changes and fixes in OSCAR <u>AFTER</u> v1.1.0-testing-3</b>
+<ul>
+<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
+<li>[new] </li>
+<li>[fix] </li>
+<li>[fix] Calendar date now formatted per national settings</li>
+</ul>
+</p>
+
 <p>
 <b>Changes and fixes in OSCAR v1.1.0-testing-3</b>
 <br/><b>NOTE: Translations have NOT yet been updated for these changes</b>