Tweak the version number system, and why not step it up a notch?

2025-04-08 20:20:44 +00:00 · 2016-03-03 23:26:08 +10:00 · 2016-03-03 23:26:08 +10:00 · c91c1af0ba
commit c91c1af0ba
parent 4e90213536
51 changed files with 54 additions and 38 deletions
--- 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;
--- 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;
--- a/sleepyhead/UpdaterWindow.cpp
+++ b/sleepyhead/UpdaterWindow.cpp
@ -218,17 +218,7 @@ int compareVersion(QString version)
    }
    QStringList patchver = parts[2].split("-");
-
+    short build = patchver[0].toInt(&ok);
    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);
    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
--- a/sleepyhead/build_number.h
+++ b/sleepyhead/build_number.h
@ -1 +1 @@
-const int build_number = 3;
+const int build_number = 0;
--- 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><h3>After four years in the making, this build brings SleepyHead into the final beta phase.</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><h3>Things are not perfect yet, but the focus from now is putting on the finishing touches.</h3></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>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>
--- a/sleepyhead/icons/Jedimark.png
+++ b/sleepyhead/icons/Jedimark.png
--- a/sleepyhead/icons/aircurve.png
+++ b/sleepyhead/icons/aircurve.png
--- a/sleepyhead/icons/airsense10.png
+++ b/sleepyhead/icons/airsense10.png
--- a/sleepyhead/icons/arrow-end.png
+++ b/sleepyhead/icons/arrow-end.png
--- a/sleepyhead/icons/arrow-left.png
+++ b/sleepyhead/icons/arrow-left.png
--- a/sleepyhead/icons/arrow-right.png
+++ b/sleepyhead/icons/arrow-right.png
--- a/sleepyhead/icons/back.png
+++ b/sleepyhead/icons/back.png
--- a/sleepyhead/icons/bob-v3.0.png
+++ b/sleepyhead/icons/bob-v3.0.png
--- a/sleepyhead/icons/bookmark.png
+++ b/sleepyhead/icons/bookmark.png
--- a/sleepyhead/icons/cms50f.png
+++ b/sleepyhead/icons/cms50f.png
--- a/sleepyhead/icons/cubeoximeter.png
+++ b/sleepyhead/icons/cubeoximeter.png
--- a/sleepyhead/icons/dreamstation.png
+++ b/sleepyhead/icons/dreamstation.png
--- a/sleepyhead/icons/edit-find.png
+++ b/sleepyhead/icons/edit-find.png
--- a/sleepyhead/icons/eye.png
+++ b/sleepyhead/icons/eye.png
--- a/sleepyhead/icons/forward.png
+++ b/sleepyhead/icons/forward.png
--- a/sleepyhead/icons/go-home.png
+++ b/sleepyhead/icons/go-home.png
--- a/sleepyhead/icons/help.png
+++ b/sleepyhead/icons/help.png
--- a/sleepyhead/icons/intellipap.png
+++ b/sleepyhead/icons/intellipap.png
--- a/sleepyhead/icons/last.png
+++ b/sleepyhead/icons/last.png
--- a/sleepyhead/icons/mask.png
+++ b/sleepyhead/icons/mask.png
--- a/sleepyhead/icons/moon.png
+++ b/sleepyhead/icons/moon.png
--- a/sleepyhead/icons/overview.png
+++ b/sleepyhead/icons/overview.png
--- a/sleepyhead/icons/oximeter.png
+++ b/sleepyhead/icons/oximeter.png
--- a/sleepyhead/icons/preferences.png
+++ b/sleepyhead/icons/preferences.png
--- a/sleepyhead/icons/prs1.png
+++ b/sleepyhead/icons/prs1.png
--- a/sleepyhead/icons/prs1_60s.png
+++ b/sleepyhead/icons/prs1_60s.png
--- a/sleepyhead/icons/prs1_960.png
+++ b/sleepyhead/icons/prs1_960.png
--- a/sleepyhead/icons/pushpin.png
+++ b/sleepyhead/icons/pushpin.png
--- a/sleepyhead/icons/refresh.png
+++ b/sleepyhead/icons/refresh.png
--- a/sleepyhead/icons/rms9.png
+++ b/sleepyhead/icons/rms9.png
--- a/sleepyhead/icons/sadface.png
+++ b/sleepyhead/icons/sadface.png
--- a/sleepyhead/icons/save.png
+++ b/sleepyhead/icons/save.png
--- a/sleepyhead/icons/sdcard-lock.png
+++ b/sleepyhead/icons/sdcard-lock.png
--- a/sleepyhead/icons/sdcard.png
+++ b/sleepyhead/icons/sdcard.png
--- a/sleepyhead/icons/session-off.png
+++ b/sleepyhead/icons/session-off.png
--- a/sleepyhead/icons/session-on.png
+++ b/sleepyhead/icons/session-on.png
--- a/sleepyhead/icons/smileyface.png
+++ b/sleepyhead/icons/smileyface.png
--- a/sleepyhead/icons/statistics.png
+++ b/sleepyhead/icons/statistics.png
--- a/sleepyhead/icons/trophy.png
+++ b/sleepyhead/icons/trophy.png
--- 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"+
+                QObject::tr("Would you like SleepyHead to use this location for storing its data?")+"\n\n"+
-                                  QDir::toNativeSeparators(GetAppRoot()), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
+                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;
        }
--- 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") + " &copy;2011-2014 Mark Watkins (jedimark) <br/> \n" +
+                "<hr/>"+tr("Copyright") + " &copy;2011-2016 Mark Watkins (jedimark) <br/> \n" +
                tr("This software is released under the GNU Public License v3.0<br/>") +
                "<hr>"
--- 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 &copy;2011-2014 Mark Watkins") + "<i></p>"
+           "<p><i>" + tr("SleepyHead is copyright &copy;2011-2016 Mark Watkins") + "<i></p>"
           "</div>"
           "</body>"
           "</html>";
--- a/sleepyhead/scripts/build_number
+++ b/sleepyhead/scripts/build_number
@ -1 +1 @@
-3
+0
--- 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 {
--- 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>";
--- 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 major_version = 1;   // incompatible API changes
-const int minor_version = 9;   // new features that don't break things
+const int minor_version = 0;   // new features that don't break things
-const int revision_number = 8;    // bugfixes, revisions
+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";
`@ -1 +1 @@`
	`const int build_number = 3;`	`const int build_number = 0;`