diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp
index bf1b27d1..f10be2c4 100644
--- a/sleepyhead/SleepLib/common.cpp
+++ b/sleepyhead/SleepLib/common.cpp
@@ -23,22 +23,15 @@ const QString getDeveloperName()
const QString getAppName()
{
QString name = STR_AppName;
-#ifdef TEST_BUILD
- name += STR_TestBuild;
-#endif
return name;
}
const QString getDefaultAppRoot()
{
QString approot = STR_AppRoot;
-#ifdef TEST_BUILD
- approot += STR_TestBuild;
-#endif
return approot;
}
-
qint64 timezoneOffset()
{
static bool ok = false;
diff --git a/sleepyhead/SleepLib/preferences.cpp b/sleepyhead/SleepLib/preferences.cpp
index 7686c1d9..b988f13c 100644
--- a/sleepyhead/SleepLib/preferences.cpp
+++ b/sleepyhead/SleepLib/preferences.cpp
@@ -71,6 +71,12 @@ QString GetAppRoot()
if (HomeAppRoot.isEmpty()) {
HomeAppRoot = desktopFolder + "/" + getDefaultAppRoot();
+
+ const QString testing = "-Testing";
+ QDir dir(HomeAppRoot+testing);
+ if (dir.exists()) {
+ HomeAppRoot += testing;
+ }
}
return HomeAppRoot;
diff --git a/sleepyhead/UpdaterWindow.cpp b/sleepyhead/UpdaterWindow.cpp
index 5a5e9054..253208ad 100644
--- a/sleepyhead/UpdaterWindow.cpp
+++ b/sleepyhead/UpdaterWindow.cpp
@@ -218,17 +218,7 @@ int compareVersion(QString version)
}
QStringList patchver = parts[2].split("-");
-
- short revision = patchver[0].toInt(&ok);
- if (!ok) return -1;
-
- if (revision > revision_number) {
- return 1;
- } else if (revision < revision_number) {
- return -1;
- }
-
- short build = patchver[1].toInt(&ok);
+ short build = patchver[0].toInt(&ok);
if (!ok) return -1;
if (build > build_number) {
@@ -237,6 +227,24 @@ int compareVersion(QString version)
return -1;
}
+ if ((patchver[1]=="beta") && (ReleaseStatus!="beta")) {
+ return 1;
+ } else if (patchver[1] == ReleaseStatus) {
+ return 0;
+ } else {
+ return -1;
+ }
+
+// short revision = patchver[0].toInt(&ok);
+// if (!ok) return -1;
+
+// if (revision > revision_number) {
+// return 1;
+// } else if (revision < revision_number) {
+// return -1;
+// }
+
+
// patchver[1] = tag..
// Versions match
diff --git a/sleepyhead/build_number.h b/sleepyhead/build_number.h
index ee0f0939..aaaf5891 100644
--- a/sleepyhead/build_number.h
+++ b/sleepyhead/build_number.h
@@ -1 +1 @@
-const int build_number = 3;
+const int build_number = 0;
diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html
index 8c19826b..1530e92b 100644
--- a/sleepyhead/docs/release_notes.html
+++ b/sleepyhead/docs/release_notes.html
@@ -1,17 +1,21 @@
<html>
<head><meta charset="UTF-8"></head>
<body>
-<h1><image src="qrc:/docs/sheep.png" width=64 height=64>SleepyHead v0.9.8-3 Release Notes</b></h2></p>
+<h1><image src="qrc:/docs/sheep.png" width=64 height=64>SleepyHead v1.0.0 beta Release Notes</b></h2></p>
<h2><p>Greetings!</p></h2>
-<p><h3>It's been a long time coming, but this build brings initial support for Philips Respironics DreamStation.</h3></p>
-<p><h2><font color='red'><b>Important:</b></font> <i>This is a pre-release test build, not all features are complete or will work 100% as intended yet!</i></h2></p>
-<p><h2><i>Back up your data folder manually, by making a copy the SleepyHeadData folder, as attempting to roll back later may break things.</i></h2></p>
+<p><h3>After four years in the making, this build brings SleepyHead into the final beta phase.</h3></p>
+<p><h3>Things are not perfect yet, but the focus from now is putting on the finishing touches.</h3></p>
+<p><h3>This version brings support for the new Philips Respironics DreamStation, and older PRS1 1060P AVAPS models.</h3></p>
+<p><h3><font color='red'><b>Important:</b></font> <i>Back up your data folder manually, by making a copy the SleepyHeadData folder, as attempting to roll back later may break things.</i></h3></p>
<p><b>Sleep Well, and good luck!</b></p>
<p><b><i>JediMark</i></b></p>
<br/>
-<b>Changes and fixes in v0.9.8-3</b>
+<b>Changes and fixes in v1.0.0 beta</b>
<list>
+<li>Tons of other bug fixes</li>
+<li>Fix dodgy PRS1 ASV pressure settings</li>
+<li>Resolve duplicate RX changes issue</li>
<li>PRS1 1060P AVAPS support... (No flow waveform on these, but still pretty good)
<li>Philips Respironics DreamStation support (Thanks for your assistance JediBob and PaleRider, and everyone who shared their data!)
<li>AirCurve pressure reporting glitches</li>
diff --git a/sleepyhead/icons/Jedimark.png b/sleepyhead/icons/Jedimark.png
index c56c0895..2d3a326f 100644
Binary files a/sleepyhead/icons/Jedimark.png and b/sleepyhead/icons/Jedimark.png differ
diff --git a/sleepyhead/icons/aircurve.png b/sleepyhead/icons/aircurve.png
index 647ab24d..144ec97a 100644
Binary files a/sleepyhead/icons/aircurve.png and b/sleepyhead/icons/aircurve.png differ
diff --git a/sleepyhead/icons/airsense10.png b/sleepyhead/icons/airsense10.png
index c89ff1a6..2b1a5631 100644
Binary files a/sleepyhead/icons/airsense10.png and b/sleepyhead/icons/airsense10.png differ
diff --git a/sleepyhead/icons/arrow-end.png b/sleepyhead/icons/arrow-end.png
index 3dae4151..85f4e311 100644
Binary files a/sleepyhead/icons/arrow-end.png and b/sleepyhead/icons/arrow-end.png differ
diff --git a/sleepyhead/icons/arrow-left.png b/sleepyhead/icons/arrow-left.png
index fb8a7b66..ed7611c8 100644
Binary files a/sleepyhead/icons/arrow-left.png and b/sleepyhead/icons/arrow-left.png differ
diff --git a/sleepyhead/icons/arrow-right.png b/sleepyhead/icons/arrow-right.png
index fb6e71f2..f85525a0 100644
Binary files a/sleepyhead/icons/arrow-right.png and b/sleepyhead/icons/arrow-right.png differ
diff --git a/sleepyhead/icons/back.png b/sleepyhead/icons/back.png
index 3b18c042..e8a141d6 100644
Binary files a/sleepyhead/icons/back.png and b/sleepyhead/icons/back.png differ
diff --git a/sleepyhead/icons/bob-v3.0.png b/sleepyhead/icons/bob-v3.0.png
index 17dc4028..f060b452 100644
Binary files a/sleepyhead/icons/bob-v3.0.png and b/sleepyhead/icons/bob-v3.0.png differ
diff --git a/sleepyhead/icons/bookmark.png b/sleepyhead/icons/bookmark.png
index 8233f827..85d762ba 100644
Binary files a/sleepyhead/icons/bookmark.png and b/sleepyhead/icons/bookmark.png differ
diff --git a/sleepyhead/icons/cms50f.png b/sleepyhead/icons/cms50f.png
index 5cc622b9..a866057c 100644
Binary files a/sleepyhead/icons/cms50f.png and b/sleepyhead/icons/cms50f.png differ
diff --git a/sleepyhead/icons/cubeoximeter.png b/sleepyhead/icons/cubeoximeter.png
index c83018df..22f06a4a 100644
Binary files a/sleepyhead/icons/cubeoximeter.png and b/sleepyhead/icons/cubeoximeter.png differ
diff --git a/sleepyhead/icons/dreamstation.png b/sleepyhead/icons/dreamstation.png
index 78262719..f127cf15 100644
Binary files a/sleepyhead/icons/dreamstation.png and b/sleepyhead/icons/dreamstation.png differ
diff --git a/sleepyhead/icons/edit-find.png b/sleepyhead/icons/edit-find.png
index 385c6735..d81c7a8c 100644
Binary files a/sleepyhead/icons/edit-find.png and b/sleepyhead/icons/edit-find.png differ
diff --git a/sleepyhead/icons/eye.png b/sleepyhead/icons/eye.png
index 6871a2d2..be3cb4f1 100644
Binary files a/sleepyhead/icons/eye.png and b/sleepyhead/icons/eye.png differ
diff --git a/sleepyhead/icons/forward.png b/sleepyhead/icons/forward.png
index 9ed87378..cf45956d 100644
Binary files a/sleepyhead/icons/forward.png and b/sleepyhead/icons/forward.png differ
diff --git a/sleepyhead/icons/go-home.png b/sleepyhead/icons/go-home.png
index a14a2e6d..f164d213 100644
Binary files a/sleepyhead/icons/go-home.png and b/sleepyhead/icons/go-home.png differ
diff --git a/sleepyhead/icons/help.png b/sleepyhead/icons/help.png
index 4ce1ae1a..a1028ec1 100644
Binary files a/sleepyhead/icons/help.png and b/sleepyhead/icons/help.png differ
diff --git a/sleepyhead/icons/intellipap.png b/sleepyhead/icons/intellipap.png
index c613b207..ef528737 100644
Binary files a/sleepyhead/icons/intellipap.png and b/sleepyhead/icons/intellipap.png differ
diff --git a/sleepyhead/icons/last.png b/sleepyhead/icons/last.png
index 45cfca29..47443238 100644
Binary files a/sleepyhead/icons/last.png and b/sleepyhead/icons/last.png differ
diff --git a/sleepyhead/icons/mask.png b/sleepyhead/icons/mask.png
index 276fcd23..8ebd0986 100644
Binary files a/sleepyhead/icons/mask.png and b/sleepyhead/icons/mask.png differ
diff --git a/sleepyhead/icons/moon.png b/sleepyhead/icons/moon.png
index c391d07b..e3dcff88 100644
Binary files a/sleepyhead/icons/moon.png and b/sleepyhead/icons/moon.png differ
diff --git a/sleepyhead/icons/overview.png b/sleepyhead/icons/overview.png
index aeda72a0..5badbf9e 100644
Binary files a/sleepyhead/icons/overview.png and b/sleepyhead/icons/overview.png differ
diff --git a/sleepyhead/icons/oximeter.png b/sleepyhead/icons/oximeter.png
index a11a2552..d82344df 100644
Binary files a/sleepyhead/icons/oximeter.png and b/sleepyhead/icons/oximeter.png differ
diff --git a/sleepyhead/icons/preferences.png b/sleepyhead/icons/preferences.png
index 586a52bc..f88191c4 100644
Binary files a/sleepyhead/icons/preferences.png and b/sleepyhead/icons/preferences.png differ
diff --git a/sleepyhead/icons/prs1.png b/sleepyhead/icons/prs1.png
index 11c741a7..831d566f 100644
Binary files a/sleepyhead/icons/prs1.png and b/sleepyhead/icons/prs1.png differ
diff --git a/sleepyhead/icons/prs1_60s.png b/sleepyhead/icons/prs1_60s.png
index 88274aee..34027ef0 100644
Binary files a/sleepyhead/icons/prs1_60s.png and b/sleepyhead/icons/prs1_60s.png differ
diff --git a/sleepyhead/icons/prs1_960.png b/sleepyhead/icons/prs1_960.png
index eb03566b..33b4e7ff 100644
Binary files a/sleepyhead/icons/prs1_960.png and b/sleepyhead/icons/prs1_960.png differ
diff --git a/sleepyhead/icons/pushpin.png b/sleepyhead/icons/pushpin.png
index 623ab1a0..83503b08 100644
Binary files a/sleepyhead/icons/pushpin.png and b/sleepyhead/icons/pushpin.png differ
diff --git a/sleepyhead/icons/refresh.png b/sleepyhead/icons/refresh.png
index e12dd6f9..7a95828a 100644
Binary files a/sleepyhead/icons/refresh.png and b/sleepyhead/icons/refresh.png differ
diff --git a/sleepyhead/icons/rms9.png b/sleepyhead/icons/rms9.png
index bfd31f5b..1429bc25 100644
Binary files a/sleepyhead/icons/rms9.png and b/sleepyhead/icons/rms9.png differ
diff --git a/sleepyhead/icons/sadface.png b/sleepyhead/icons/sadface.png
index 1989bc79..378eb923 100644
Binary files a/sleepyhead/icons/sadface.png and b/sleepyhead/icons/sadface.png differ
diff --git a/sleepyhead/icons/save.png b/sleepyhead/icons/save.png
index 6aa6b13a..c6bea159 100644
Binary files a/sleepyhead/icons/save.png and b/sleepyhead/icons/save.png differ
diff --git a/sleepyhead/icons/sdcard-lock.png b/sleepyhead/icons/sdcard-lock.png
index cb6f906f..2500f636 100644
Binary files a/sleepyhead/icons/sdcard-lock.png and b/sleepyhead/icons/sdcard-lock.png differ
diff --git a/sleepyhead/icons/sdcard.png b/sleepyhead/icons/sdcard.png
index bc99f119..1d6aa778 100644
Binary files a/sleepyhead/icons/sdcard.png and b/sleepyhead/icons/sdcard.png differ
diff --git a/sleepyhead/icons/session-off.png b/sleepyhead/icons/session-off.png
index 106c76ea..3279d6de 100644
Binary files a/sleepyhead/icons/session-off.png and b/sleepyhead/icons/session-off.png differ
diff --git a/sleepyhead/icons/session-on.png b/sleepyhead/icons/session-on.png
index 9e34a137..9c3c335c 100644
Binary files a/sleepyhead/icons/session-on.png and b/sleepyhead/icons/session-on.png differ
diff --git a/sleepyhead/icons/smileyface.png b/sleepyhead/icons/smileyface.png
index b07a8678..b9c73f6c 100644
Binary files a/sleepyhead/icons/smileyface.png and b/sleepyhead/icons/smileyface.png differ
diff --git a/sleepyhead/icons/statistics.png b/sleepyhead/icons/statistics.png
index fc6cfa1c..49390942 100644
Binary files a/sleepyhead/icons/statistics.png and b/sleepyhead/icons/statistics.png differ
diff --git a/sleepyhead/icons/trophy.png b/sleepyhead/icons/trophy.png
index 3def81dd..00775855 100644
Binary files a/sleepyhead/icons/trophy.png and b/sleepyhead/icons/trophy.png differ
diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp
index bf8d999e..4c025da9 100644
--- a/sleepyhead/main.cpp
+++ b/sleepyhead/main.cpp
@@ -230,8 +230,10 @@ int main(int argc, char *argv[])
if (!havefolder && !force_data_dir) {
if (QMessageBox::question(nullptr, STR_MessageBox_Question,
- QObject::tr("No SleepyHead data folder was found.")+"\n\n"+QObject::tr("Would you like SleepyHead to use the default location for storing its data?")+"\n\n"+
- QDir::toNativeSeparators(GetAppRoot()), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
+ QObject::tr("Would you like SleepyHead to use this location for storing its data?")+"\n\n"+
+ QDir::toNativeSeparators(GetAppRoot())+"\n\n"+
+ QObject::tr("If you are upgrading, don't panic, you just need to make sure this is pointed at your old SleepyHead data folder.")+"\n\n"+
+ QObject::tr("(If you have no idea what to do here, just click yes.)"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
settings.setValue("Settings/AppRoot", GetAppRoot());
change_data_dir = false;
}
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index bb6fb791..daef6f69 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -143,7 +143,7 @@ MainWindow::MainWindow(QWidget *parent) :
connect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString)));
}
- QString version = VersionString + "-" + QString(GIT_REVISION) + "-" + getGraphicsEngine();
+ QString version = FullVersionString +"-" +QString(GIT_REVISION) +"-" +getGraphicsEngine();
#ifndef TEST_BUILD
ui->warningLabel->hide();
@@ -1397,7 +1397,7 @@ void MainWindow::on_action_About_triggered()
tr("Graphics Engine: %1").arg(getGraphicsEngine())+
"<br/>" +
(tr("Data Folder Location: <a href=\"file://%1\">%2</a>").arg(GetAppRoot()).arg(QDir::toNativeSeparators(GetAppRoot())) +
- "<hr/>"+tr("Copyright") + " ©2011-2014 Mark Watkins (jedimark) <br/> \n" +
+ "<hr/>"+tr("Copyright") + " ©2011-2016 Mark Watkins (jedimark) <br/> \n" +
tr("This software is released under the GNU Public License v3.0<br/>") +
"<hr>"
diff --git a/sleepyhead/newprofile.cpp b/sleepyhead/newprofile.cpp
index 2976219d..5f34f46a 100644
--- a/sleepyhead/newprofile.cpp
+++ b/sleepyhead/newprofile.cpp
@@ -129,7 +129,7 @@ QString NewProfile::getIntroHTML()
"<p><b><font size=+1>" + tr("Use of this software is entirely at your own risk.") +
"</font></b></p>"
- "<p><i>" + tr("SleepyHead is copyright ©2011-2014 Mark Watkins") + "<i></p>"
+ "<p><i>" + tr("SleepyHead is copyright ©2011-2016 Mark Watkins") + "<i></p>"
"</div>"
"</body>"
"</html>";
diff --git a/sleepyhead/scripts/build_number b/sleepyhead/scripts/build_number
index 00750edc..573541ac 100644
--- a/sleepyhead/scripts/build_number
+++ b/sleepyhead/scripts/build_number
@@ -1 +1 @@
-3
+0
diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
index da460760..e9c08d2f 100644
--- a/sleepyhead/sleepyhead.pro
+++ b/sleepyhead/sleepyhead.pro
@@ -66,7 +66,7 @@ exists(../.git):{
}
#Comment out for official builds
-DEFINES += TEST_BUILD
+DEFINES += BETA_BUILD
unix:!macx:!haiku {
diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp
index 69a7aae5..cf2c6e97 100644
--- a/sleepyhead/statistics.cpp
+++ b/sleepyhead/statistics.cpp
@@ -639,7 +639,7 @@ QString htmlFooter(bool showinfo=true)
if (showinfo) {
html += "<hr/><div align=center><font size='-1'><i>";
- html += QString(QObject::tr("This report was generated by a pre-release version of SleepyHead (%1), <b>and has not been approved in any way for compliance or medical diagnostic purposes</b>.")).
+ html += QString(QObject::tr("This report was generated by SleepyHead (%1), <b>and has not been approved in any way for compliance or medical diagnostic purposes</b>.")).
arg(FullVersionString) + "<br/><br/>" +
QObject::tr("SleepyHead is free open-source software available from http://sourceforge.net/projects/SleepyHead");
html += "</i></font></div>";
diff --git a/sleepyhead/version.h b/sleepyhead/version.h
index 60a164b6..b41c55e7 100644
--- a/sleepyhead/version.h
+++ b/sleepyhead/version.h
@@ -15,18 +15,21 @@
#include <qglobal.h>
#include "build_number.h"
-const int major_version = 0; // incompatible API changes
-const int minor_version = 9; // new features that don't break things
-const int revision_number = 8; // bugfixes, revisions
+const int major_version = 1; // incompatible API changes
+const int minor_version = 0; // new features that don't break things
+const int revision_number = 0; // bugfixes, revisions
#ifdef TEST_BUILD
const QString ReleaseStatus = "testing";
-#else
+#elif BETA_BUILD
const QString ReleaseStatus = "beta";
+#else
+const QString ReleaseStatus = "";
#endif
-const QString VersionString = QString().sprintf("%i.%i.%i-%i", major_version, minor_version, revision_number, build_number);
-const QString FullVersionString = QString().sprintf("%i.%i.%i-%i", major_version, minor_version, revision_number, build_number)+"-"+ReleaseStatus;
+
+const QString VersionString = QString().sprintf("%i.%i.%i", major_version, minor_version, build_number); // )+VersionStatus+QString().sprintf("%i",
+const QString FullVersionString = VersionString+"-"+ReleaseStatus;
#ifdef Q_OS_MAC
const QString PlatformString = "MacOSX";