chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace VersionString with getVersion() everywhere.

Browse Source
This commit is contained in:
sawinglogz 2020-01-15 19:45:46 -05:00
parent f7f1ddfcbd
commit 88957aeb7f
14 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/appsettings.cpp
View File

@ -53,7 +53,7 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref)
initPref(STR_PREF_AllowEarlyUpdates, false); initPref(STR_PREF_AllowEarlyUpdates, false);
initPref(STR_GEN_UpdatesLastChecked, QDateTime()); initPref(STR_GEN_UpdatesLastChecked, QDateTime());
#endif #endif
initPref(STR_PREF_VersionString, VersionString); initPref(STR_PREF_VersionString, getVersion().toString());
m_language = initPref(STR_GEN_Language, "en_US").toString(); m_language = initPref(STR_GEN_Language, "en_US").toString();
initPref(STR_GEN_ShowAboutDialog, 0); // default to about screen, set to -1 afterwards initPref(STR_GEN_ShowAboutDialog, 0); // default to about screen, set to -1 afterwards
} }

4
oscar/SleepLib/common.cpp
View File

@ -186,7 +186,7 @@ QString getGraphicsEngine()
QStringList buildInfo; QStringList buildInfo;
QStringList makeBuildInfo (QString relinfo, QString forcedEngine){ QStringList makeBuildInfo (QString relinfo, QString forcedEngine){
buildInfo << (STR_AppName + " " + VersionString + " " + relinfo); buildInfo << (STR_AppName + " " + getVersion() + " " + relinfo);
buildInfo << (QObject::tr("Built with Qt") + " " + QT_VERSION_STR + " on " + __DATE__ + " " + __TIME__); buildInfo << (QObject::tr("Built with Qt") + " " + QT_VERSION_STR + " on " + __DATE__ + " " + __TIME__);
QString branch = ""; QString branch = "";
if (gitBranch() != "master") { if (gitBranch() != "master") {
@ -761,7 +761,7 @@ void initializeStrings()
STR_TR_Bookmarks = QObject::tr("Bookmarks"); STR_TR_Bookmarks = QObject::tr("Bookmarks");
STR_TR_OSCAR = QObject::tr("OSCAR"); STR_TR_OSCAR = QObject::tr("OSCAR");
STR_TR_AppVersion = QObject::tr("v%1").arg(VersionString); STR_TR_AppVersion = QObject::tr("v%1").arg(getVersion());
STR_TR_Mode = QObject::tr("Mode"); STR_TR_Mode = QObject::tr("Mode");
STR_TR_Model = QObject::tr("Model"); STR_TR_Model = QObject::tr("Model");

12
oscar/SleepLib/profiles.cpp
View File

@ -63,11 +63,11 @@ Profile::Profile(QString path)
Set(STR_GEN_DataFolder, QString("{home}/Profiles/{UserName}")); Set(STR_GEN_DataFolder, QString("{home}/Profiles/{UserName}"));
// Reset import warnings when running a new version of OSCAR // Reset import warnings when running a new version of OSCAR
init(STR_PREF_VersionString, VersionString); init(STR_PREF_VersionString, getVersion().toString());
QString prefVersion = (*this)[STR_PREF_VersionString].toString(); Version prefVersion = Version((*this)[STR_PREF_VersionString].toString());
if (prefVersion != VersionString) { if (prefVersion != getVersion()) {
qDebug() << " Resetting import warnings: version" << prefVersion << "to" << VersionString; qDebug() << " Resetting import warnings: version" << prefVersion << "to" << getVersion();
Set(STR_PREF_VersionString, VersionString); Set(STR_PREF_VersionString, getVersion().toString());
this->Erase(STR_IS_WarnOnUntestedMachine); this->Erase(STR_IS_WarnOnUntestedMachine);
this->Erase(STR_IS_WarnOnUnexpectedData); this->Erase(STR_IS_WarnOnUnexpectedData);
} }
@ -506,7 +506,7 @@ void Profile::DataFormatError(Machine *m)
QString msg; QString msg;
msg = "<font size=+1>"+QObject::tr("OSCAR (%1) needs to upgrade its database for %2 %3 %4"). msg = "<font size=+1>"+QObject::tr("OSCAR (%1) needs to upgrade its database for %2 %3 %4").
arg(VersionString). arg(getVersion()).
arg(m->brand()).arg(m->model()).arg(m->serial()) arg(m->brand()).arg(m->model()).arg(m->serial())
+ "</font><br/><br/>"; + "</font><br/><br/>";

4
oscar/UpdaterWindow.cpp
View File

@ -329,9 +329,9 @@ void UpdaterWindow::ParseUpdatesXML(QIODevice *dev)
qDebug() << " XML update structure parsed cleanly"; qDebug() << " XML update structure parsed cleanly";
QHash<QString, QString> CurrentVersion; QHash<QString, QString> CurrentVersion;
CurrentVersion[UPDATE_OSCAR] = VersionString; CurrentVersion[UPDATE_OSCAR] = getVersion();
CurrentVersion[UPDATE_QT] = QT_VERSION_STR; CurrentVersion[UPDATE_QT] = QT_VERSION_STR;
CurrentVersion[UPDATE_Translations] = VersionString; CurrentVersion[UPDATE_Translations] = getVersion();
QList<PackageUpdate> updateList; QList<PackageUpdate> updateList;

6
oscar/aboutdialog.cpp
View File

@ -28,7 +28,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui->creditsText->setHtml(getCredits()); ui->creditsText->setHtml(getCredits());
ui->licenseText->setHtml(getLicense()); ui->licenseText->setHtml(getLicense());
ui->relnotesText->setHtml(getRelnotes()); ui->relnotesText->setHtml(getRelnotes());
ui->versionLabel->setText(VersionString); ui->versionLabel->setText(getVersion());
// QString gitrev = gitRevision(); // QString gitrev = gitRevision();
// //
@ -123,9 +123,9 @@ QString AboutDialog::getRelnotes()
QString text = "<html>" QString text = "<html>"
"<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>" "<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>"
"<body><span style=\" font-size:20pt;\">"+tr("Release Notes")+"</span><br/>" "<body><span style=\" font-size:20pt;\">"+tr("Release Notes")+"</span><br/>"
"<span style=\" font-size:14pt;\">"+tr("OSCAR v%1").arg(VersionString)+"</span>" "<span style=\" font-size:14pt;\">"+tr("OSCAR v%1").arg(getVersion())+"</span>"
"<hr/>"; "<hr/>";
if (isReleaseVersion() == false) { if (getVersion().IsReleaseVersion() == false) {
text += "<p><font color='red' size=+1><b>"+tr("Important:")+"</b></font> " text += "<p><font color='red' size=+1><b>"+tr("Important:")+"</b></font> "
"<font size=+1><i>"+tr("As this is a pre-release version, it is recommended that you <b>back up your data folder manually</b> before proceeding, because attempting to roll back later may break things.")+"</i></font></p><hr/>"; "<font size=+1><i>"+tr("As this is a pre-release version, it is recommended that you <b>back up your data folder manually</b> before proceeding, because attempting to roll back later may break things.")+"</i></font></p><hr/>";
} }

4
oscar/main.cpp
View File

@ -347,7 +347,7 @@ int main(int argc, char *argv[]) {
#endif #endif
relinfo = "("+QSysInfo::kernelType()+" "+QSysInfo::currentCpuArchitecture()+relinfo+")"; relinfo = "("+QSysInfo::kernelType()+" "+QSysInfo::currentCpuArchitecture()+relinfo+")";
qDebug() << "OSCAR starting" << QDateTime::currentDateTime(); qDebug() << "OSCAR starting" << QDateTime::currentDateTime();
qDebug().noquote() << STR_AppName << VersionString << relinfo << "Built with Qt" << QT_VERSION_STR << __DATE__ << __TIME__; qDebug().noquote() << STR_AppName << getVersion() << relinfo << "Built with Qt" << QT_VERSION_STR << __DATE__ << __TIME__;
SetDateFormat(); SetDateFormat();
@ -557,7 +557,7 @@ int main(int argc, char *argv[]) {
} }
} }
AppSetting->setVersionString(VersionString); AppSetting->setVersionString(getVersion());
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
// Register Importer Modules for autoscanner // Register Importer Modules for autoscanner

4
oscar/mainwindow.cpp
View File

@ -94,7 +94,7 @@ MainWindow::MainWindow(QWidget *parent) :
// seems to need the systray menu for notifications to work // seems to need the systray menu for notifications to work
systraymenu = new QMenu(this); systraymenu = new QMenu(this);
systray->setContextMenu(systraymenu); systray->setContextMenu(systraymenu);
QAction *a = systraymenu->addAction(STR_TR_OSCAR + " v" + VersionString); QAction *a = systraymenu->addAction(STR_TR_OSCAR + " v" + getVersion());
a->setEnabled(false); a->setEnabled(false);
systraymenu->addSeparator(); systraymenu->addSeparator();
systraymenu->addAction(tr("&About"), this, SLOT(on_action_About_triggered())); systraymenu->addAction(tr("&About"), this, SLOT(on_action_About_triggered()));
@ -2560,7 +2560,7 @@ void MainWindow::on_actionReport_a_Bug_triggered()
// QSettings settings; // QSettings settings;
// QString language = settings.value(LangSetting).toString(); // QString language = settings.value(LangSetting).toString();
// //
// QDesktopServices::openUrl(QUrl(QString("https://sleepyhead.jedimark.net/report_bugs.php?lang=%1&version=%2&platform=%3").arg(language).arg(VersionString).arg(PlatformString))); // QDesktopServices::openUrl(QUrl(QString("https://sleepyhead.jedimark.net/report_bugs.php?lang=%1&version=%2&platform=%3").arg(language).arg(getVersion()).arg(PlatformString)));
QMessageBox::information(nullptr, STR_MessageBox_Error, tr("Reporting issues is not yet implemented")); QMessageBox::information(nullptr, STR_MessageBox_Error, tr("Reporting issues is not yet implemented"));
} }

4
oscar/mainwindow.h
View File

@ -1,4 +1,4 @@
/* OSCAR MainWindow Headers /* OSCAR MainWindow Headers
* *
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -113,7 +113,7 @@ class MainWindow : public QMainWindow
void CloseProfile(); void CloseProfile();
bool OpenProfile(QString name, bool skippassword = false); bool OpenProfile(QString name, bool skippassword = false);
/*! \fn Notify(QString s,int ms=5000, QString title="OSCAR v"+VersionString()); /*! \fn Notify(QString s,int ms=5000, QString title="OSCAR v"+getVersion());
\brief Pops up a message box near the system tray \brief Pops up a message box near the system tray
\param QString string \param QString string
\param title \param title

2
oscar/newprofile.cpp
View File

@ -93,7 +93,7 @@ NewProfile::NewProfile(QWidget *parent, const QString *user) :
f.close(); f.close();
} }
ui->versionLabel->setText(VersionString); ui->versionLabel->setText(getVersion());
ui->textBrowser->setHtml(getIntroHTML()); ui->textBrowser->setHtml(getIntroHTML());
} }

2
oscar/profileselector.cpp
View File

@ -56,7 +56,7 @@ ProfileSelector::ProfileSelector(QWidget *parent) :
showDiskUsage = false; // in case I want to preference it later showDiskUsage = false; // in case I want to preference it later
on_diskSpaceInfo_linkActivated(showDiskUsage ? "show" : "hide"); on_diskSpaceInfo_linkActivated(showDiskUsage ? "show" : "hide");
ui->versionLabel->setText(VersionString); ui->versionLabel->setText(getVersion());
ui->diskSpaceInfo->setVisible(false); ui->diskSpaceInfo->setVisible(false);
QItemSelectionModel * sm = ui->profileView->selectionModel(); QItemSelectionModel * sm = ui->profileView->selectionModel();

2
oscar/reports.cpp
View File

@ -559,7 +559,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
if (first) { if (first) {
QDateTime timestamp = QDateTime::currentDateTime(); QDateTime timestamp = QDateTime::currentDateTime();
QString footer = QObject::tr("%1 OSCAR v%2").arg(timestamp.toString(MedDateFormat+" hh:mm")) QString footer = QObject::tr("%1 OSCAR v%2").arg(timestamp.toString(MedDateFormat+" hh:mm"))
.arg(VersionString+" (" + gitRevision() + ")"); .arg(getVersion()+" (" + gitRevision() + ")");
QRectF bounds = painter.boundingRect(QRectF(0, virt_height, virt_width, normal_height), footer, QRectF bounds = painter.boundingRect(QRectF(0, virt_height, virt_width, normal_height), footer,

2
oscar/statistics.cpp
View File

@ -720,7 +720,7 @@ QString Statistics::generateFooter(bool showinfo)
html += "<hr><div align=center><font size='-1'><i>"; html += "<hr><div align=center><font size='-1'><i>";
QDateTime timestamp = QDateTime::currentDateTime(); QDateTime timestamp = QDateTime::currentDateTime();
html += tr("This report was prepared on %1 by OSCAR v%2").arg(timestamp.toString(MedDateFormat + " hh:mm")) html += tr("This report was prepared on %1 by OSCAR v%2").arg(timestamp.toString(MedDateFormat + " hh:mm"))
.arg(VersionString + " (" + gitRevision() + ")") .arg(getVersion() + " (" + gitRevision() + ")")
+ "<br/>" + "<br/>"
+ tr("OSCAR is free open-source CPAP report software"); + tr("OSCAR is free open-source CPAP report software");
html += "</i></font></div>"; html += "</i></font></div>";

11
oscar/version.cpp
View File

@ -74,12 +74,6 @@ QString getPrereleaseSuffix()
} }
bool isReleaseVersion()
{
return getVersion().IsReleaseVersion();
}
static const Version s_Version(VERSION); static const Version s_Version(VERSION);
const Version & getVersion() const Version & getVersion()
{ {
@ -93,6 +87,11 @@ Version::Version(const QString & version_string) : mString(version_string), mIsV
} }
Version::operator const QString &() const Version::operator const QString &() const
{
return toString();
}
const QString & Version::toString() const
{ {
return mString; return mString;
} }

11
oscar/version.h
View File

@ -10,7 +10,7 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
#include <QString> #include <QVariant>
class Version class Version
{ {
@ -18,10 +18,12 @@ class Version
public: public:
Version(const QString & version_string); Version(const QString & version_string);
operator const QString &() const; operator const QString &() const;
const QString & toString() const;
const QString PrereleaseType() const; const QString PrereleaseType() const;
bool IsReleaseVersion() const { return mPrerelease.isEmpty(); } bool IsReleaseVersion() const { return mPrerelease.isEmpty(); }
bool IsValid() const { return mIsValid; } bool IsValid() const { return mIsValid; }
bool operator==(const Version & b) const { return Compare(*this, b) == 0; } bool operator==(const Version & b) const { return Compare(*this, b) == 0; }
bool operator!=(const Version & b) const { return Compare(*this, b) != 0; }
bool operator<(const Version & b) const { return Compare(*this, b) < 0; } bool operator<(const Version & b) const { return Compare(*this, b) < 0; }
bool operator>(const Version & b) const { return Compare(*this, b) > 0; } bool operator>(const Version & b) const { return Compare(*this, b) > 0; }
@ -37,17 +39,12 @@ protected:
static int Compare(const Version & a, const Version & b); static int Compare(const Version & a, const Version & b);
}; };
//!brief Get the current version of the application //!brief Get the current version of the application.
const Version & getVersion(); const Version & getVersion();
extern const QString VersionString;
QString getBranchVersion(); QString getBranchVersion();
QString getPrereleaseSuffix(); QString getPrereleaseSuffix();
const QString & gitRevision(); const QString & gitRevision();
const QString & gitBranch(); const QString & gitBranch();
bool isReleaseVersion();
#endif // VERSION_H #endif // VERSION_H