diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp
index 1166ddd3..4448104d 100644
--- a/oscar/SleepLib/common.cpp
+++ b/oscar/SleepLib/common.cpp
@@ -80,36 +80,14 @@ const QString getDeveloperDomain()
const QString getAppName()
{
QString name = STR_AppName;
-
- // Append branch if there is a branch specified
- if (gitBranch() != "master") {
- name += "-"+gitBranch();
-// qDebug() << "getAppName, not master, name is" << name << "branch is" << gitBranch();
- }
-
- // Append "-test" if not release
- else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
- (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) {
- name += "-test";
-// qDebug() << "getAppName, not release, name is" << name << "release type is" << ReleaseStatus;
- }
-
+ name += getPrereleaseSuffix();
return name;
}
const QString getModifiedAppData()
{
QString appdata = STR_AppData;
-
- // Append branch if there is a branch specified
- if (gitBranch() != "master")
- appdata += "-"+gitBranch();
-
- // Append "-test" if not release
- else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
- (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) {
- appdata += "-test";
- }
+ appdata += getPrereleaseSuffix();
return appdata;
}
diff --git a/oscar/aboutdialog.cpp b/oscar/aboutdialog.cpp
index 0ad4499c..3b189821 100644
--- a/oscar/aboutdialog.cpp
+++ b/oscar/aboutdialog.cpp
@@ -125,7 +125,7 @@ QString AboutDialog::getRelnotes()
""+tr("Release Notes")+"
"
""+tr("OSCAR v%1").arg(VersionString)+""
"
";
- if (ReleaseStatus != "r") {
+ if (isReleaseVersion() == false) {
text += ""+tr("Important:")+" "
""+tr("As this is a pre-release version, it is recommended that you back up your data folder manually before proceeding, because attempting to roll back later may break things.")+"
";
}
diff --git a/oscar/newprofile.cpp b/oscar/newprofile.cpp
index 46ec01ae..e83794a0 100644
--- a/oscar/newprofile.cpp
+++ b/oscar/newprofile.cpp
@@ -1,4 +1,4 @@
-/* Create New Profile Implementation
+/* Create New Profile Implementation
*
* Copyright (c) 2011-2018 Mark Watkins
*
@@ -91,7 +91,7 @@ NewProfile::NewProfile(QWidget *parent, const QString *user) :
f.close();
}
- ui->releaseStatus->setText("v" + VersionString);
+ ui->versionLabel->setText(VersionString);
ui->textBrowser->setHtml(getIntroHTML());
}
diff --git a/oscar/newprofile.ui b/oscar/newprofile.ui
index bcb3990a..75e76bea 100644
--- a/oscar/newprofile.ui
+++ b/oscar/newprofile.ui
@@ -882,7 +882,7 @@
-
-
+
true
diff --git a/oscar/reports.cpp b/oscar/reports.cpp
index 98d12eac..6992bc3e 100644
--- a/oscar/reports.cpp
+++ b/oscar/reports.cpp
@@ -558,7 +558,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
if (first) {
QDateTime timestamp = QDateTime::currentDateTime();
QString footer = QObject::tr("%1 OSCAR v%2").arg(timestamp.toString(MedDateFormat+" hh:mm"))
- .arg(ReleaseStatus == "r" ? ShortVersionString : VersionString+" (" + gitRevision() + ")");
+ .arg(VersionString+" (" + gitRevision() + ")");
QRectF bounds = painter.boundingRect(QRectF(0, virt_height, virt_width, normal_height), footer,
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 2a50e984..275bd4d3 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -719,7 +719,7 @@ QString Statistics::generateFooter(bool showinfo)
html += "
";
QDateTime timestamp = QDateTime::currentDateTime();
html += tr("This report was prepared on %1 by OSCAR v%2").arg(timestamp.toString(MedDateFormat + " hh:mm"))
- .arg(ReleaseStatus == "r" ? ShortVersionString : VersionString + " (" + gitRevision() + ")")
+ .arg(VersionString + " (" + gitRevision() + ")")
+ "
"
+ tr("OSCAR is free open-source CPAP report software");
html += "
";
diff --git a/oscar/version.cpp b/oscar/version.cpp
index 720c5a2c..979a318f 100644
--- a/oscar/version.cpp
+++ b/oscar/version.cpp
@@ -60,6 +60,25 @@ QString getBranchVersion()
}
+QString getPrereleaseSuffix()
+{
+ QString suffix;
+
+ // Append branch if there is a branch specified
+ if (gitBranch() != "master") {
+ suffix += "-"+gitBranch();
+ }
+
+ // Append "-test" if not release
+ else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
+ (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) {
+ suffix += "-test";
+ }
+
+ return suffix;
+}
+
+
int checkVersionStatus(QString statusstr)
{
bool ok;
@@ -201,3 +220,7 @@ int compareVersion(const QString & version)
return 0;
}
+bool isReleaseVersion()
+{
+ return (ReleaseStatus == "r");
+}
diff --git a/oscar/version.h b/oscar/version.h
index b226dc37..354c1b9b 100644
--- a/oscar/version.h
+++ b/oscar/version.h
@@ -12,21 +12,15 @@
#include
-extern const int major_version;
-extern const int minor_version;
-extern const int revision_number;
-extern const QString ReleaseStatus;
-extern const int build_number;
-
extern const QString VersionString;
-extern const QString ShortVersionString;
-
-extern const QString PlatformString;
int compareVersion(const QString & version);
QString getBranchVersion();
+QString getPrereleaseSuffix();
const QString & gitRevision();
const QString & gitBranch();
+bool isReleaseVersion();
+
#endif // VERSION_H