diff --git a/oscar/SleepLib/appsettings.cpp b/oscar/SleepLib/appsettings.cpp index 101c06cc..39e5a48e 100644 --- a/oscar/SleepLib/appsettings.cpp +++ b/oscar/SleepLib/appsettings.cpp @@ -49,9 +49,9 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref) m_profileName = initPref(STR_GEN_Profile, "").toString(); initPref(STR_GEN_AutoOpenLastUsed, true); -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES initPref(STR_GEN_UpdatesAutoCheck, true); - initPref(STR_GEN_UpdateCheckFrequency, 7); + initPref(STR_GEN_UpdateCheckFrequency, 14); initPref(STR_PREF_AllowEarlyUpdates, false); initPref(STR_GEN_UpdatesLastChecked, QDateTime()); #endif diff --git a/oscar/SleepLib/appsettings.h b/oscar/SleepLib/appsettings.h index 3d9d3373..f89e84b5 100644 --- a/oscar/SleepLib/appsettings.h +++ b/oscar/SleepLib/appsettings.h @@ -59,11 +59,13 @@ const QString STR_GEN_AutoOpenLastUsed = "AutoOpenLastUsed"; const QString STR_GEN_Language = "Language"; const QString STR_PREF_VersionString = "VersionString"; const QString STR_GEN_ShowAboutDialog = "ShowAboutDialog"; -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES const QString STR_GEN_UpdatesLastChecked = "UpdatesLastChecked"; const QString STR_GEN_UpdatesAutoCheck = "Updates_AutoCheck"; const QString STR_GEN_UpdateCheckFrequency = "Updates_CheckFrequency"; const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates"; +const QString STR_GEN_SkippedReleaseVersion = "SkippedReleaseVersion"; +const QString STR_GEN_SkippedTestVersion = "SkippedTestVersion"; #endif @@ -83,7 +85,7 @@ public: QString m_profileName, m_language; QString versionString() const { return getPref(STR_PREF_VersionString).toString(); } -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES bool updatesAutoCheck() const { return getPref(STR_GEN_UpdatesAutoCheck).toBool(); } bool allowEarlyUpdates() const { return getPref(STR_PREF_AllowEarlyUpdates).toBool(); } QDateTime updatesLastChecked() const { return getPref(STR_GEN_UpdatesLastChecked).toDateTime(); } @@ -196,7 +198,7 @@ public: void setShowPersonalData(bool b) { setPref(STR_US_ShowPersonalData, b); } void setVersionString(QString version) { setPref(STR_PREF_VersionString, version); } -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES void setUpdatesAutoCheck(bool b) { setPref(STR_GEN_UpdatesAutoCheck, b); } void setAllowEarlyUpdates(bool b) { setPref(STR_PREF_AllowEarlyUpdates, b); } void setUpdatesLastChecked(QDateTime datetime) { setPref(STR_GEN_UpdatesLastChecked, datetime); } diff --git a/oscar/UpdaterWindow.cpp b/oscar/UpdaterWindow.cpp deleted file mode 100644 index 5f7e81f5..00000000 --- a/oscar/UpdaterWindow.cpp +++ /dev/null @@ -1,834 +0,0 @@ -/* UpdaterWindow - * - * Copyright (c) 2011-2018 Mark Watkins - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the source code - * for more details. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "SleepLib/profiles.h" -//#include -//#include -#include "UpdaterWindow.h" -#include "ui_UpdaterWindow.h" -#include "version.h" -#include "mainwindow.h" - -extern MainWindow *mainwin; - -UpdaterWindow::UpdaterWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::UpdaterWindow) -{ - ui->setupUi(this); - - - QDesktopWidget *desktop = QApplication::desktop(); - - int screenWidth = desktop->width(); // get width of screen - int screenHeight = desktop->height(); // get height of screen - - QSize windowSize = size(); // size of our application window - int width = windowSize.width(); - int height = windowSize.height(); - - // little computations - int x = (screenWidth - width) / 2; - int y = (screenHeight - height) / 2; - y -= 50; - - // move window to desired coordinates - move(x, y); - - - - requestmode = RM_None; - netmanager = new QNetworkAccessManager(this); - update = nullptr; - ui->stackedWidget->setCurrentIndex(0); -} - -UpdaterWindow::~UpdaterWindow() -{ - disconnect(netmanager, SIGNAL(finished(QNetworkReply *)), this, SLOT(replyFinished(QNetworkReply *))); - delete ui; -} - -QString platformStr() -{ - static QString platform; - -#if defined(Q_OS_WIN) - platform="win32"; -#elif defined(Q_OS_MAC) - platform="mac"; -#elif defined(Q_OS_LINUX) - platform="ubuntu"; -#else - platform="unknown"; -#endif - - return platform; -} - -void UpdaterWindow::checkForUpdates() -{ -#ifdef NO_UPDATER - QMessageBox::information(nullptr,STR_MessageBox_Information, tr("Updates are not yet implemented")); - return; -#else - - QString platform=platformStr(); - -#ifdef Q_OS_WIN - QString filename = QApplication::applicationDirPath() + "/Updates.xml"; -#else - QString filename = QApplication::applicationDirPath() + QString("/LatestVersion-%1").arg(platform); -#endif - // Check updates.xml file if it's still recent.. - if (QFile::exists(filename)) { - QFileInfo fi(filename); -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QDateTime created = fi.birthTime(); -#else - QDateTime created = fi.created(); -#endif - int age = created.secsTo(QDateTime::currentDateTime()); - - if (age < 900) { - QFile file(filename); - file.open(QFile::ReadOnly); -#ifdef Q_OS_WIN - ParseUpdatesXML(&file); -#else - ParseLatestVersion(&file); -#endif - file.close(); - return; - } - } - - mainwin->Notify(tr("Checking for OSCAR Updates")); - -#ifdef Q_OS_WIN - update_url = QUrl(QString("http://sleepyhead.jedimark.net/packages/%1/Updates.xml").arg(platform)); -#else - update_url = QUrl(QString("http://sleepyhead.jedimark.net/releases/LatestVersion-%1").arg(platform)); -#endif - downloadUpdateXML(); -#endif // NO_UPDATER -} - -#ifndef NO_UPDATER -void UpdaterWindow::downloadUpdateXML() -{ - requestmode = RM_CheckUpdates; - - QNetworkRequest req = QNetworkRequest(update_url); - req.setRawHeader("User-Agent", "Wget/1.12 (linux-gnu)"); - reply = netmanager->get(req); - ui->plainTextEdit->appendPlainText(tr("Requesting ") + update_url.toString()); - - connect(netmanager, SIGNAL(finished(QNetworkReply *)), this, SLOT(updateFinished(QNetworkReply *))); - - dltime.start(); -} - -void UpdaterWindow::updateFinished(QNetworkReply *reply) -{ - if (reply->error() != QNetworkReply::NoError) { - qDebug() << "Update Check Error: "+reply->errorString(); - disconnect(netmanager, SIGNAL(finished(QNetworkReply *)), this, SLOT(updateFinished(QNetworkReply *))); - mainwin->Notify(tr("OSCAR Updates are currently unavailable for this platform"),tr("OSCAR Updates")); - } else { - QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); - - if (!redirectUrl.isEmpty() && (redirectUrl != reply->url())) { - update_url = redirectUrl; - reply->deleteLater(); - QTimer::singleShot(100, this, SLOT(downloadUpdateXML())); - return; - } - disconnect(netmanager, SIGNAL(finished(QNetworkReply *)), this, SLOT(updateFinished(QNetworkReply *))); - - - ui->plainTextEdit->appendPlainText(tr("%1 bytes received").arg(reply->size())); - -#ifdef Q_OS_WIN - QString filename = QApplication::applicationDirPath() + "/Updates.xml"; -#else - QString filename = QApplication::applicationDirPath() + QString("/LatestVersion-%1").arg(platformStr()); -#endif - - qDebug() << filename; - QFile file(filename); - file.open(QFile::WriteOnly); - file.write(reply->readAll()); - file.close(); - file.open(QFile::ReadOnly); - -#ifdef Q_OS_WIN - ParseUpdatesXML(&file); -#else - ParseLatestVersion(&file); -#endif - PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); - - file.close(); - reply->deleteLater(); - } -} - -/*void UpdaterWindow::dataReceived() -{ - QString rs = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); - - if (rs != "200") { return; } - - QByteArray read = reply->read(reply->bytesAvailable()); - qDebug() << "Received" << read.size() << "bytes"; - file.write(read); -} - -void UpdaterWindow::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) -{ - QString rs = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); - - if (rs != "200") { return; } - - if (ui->tableWidget->rowCount() > 0) { - double f = (double(bytesReceived) / double(bytesTotal)) * 100.0; - QProgressBar *bar = qobject_cast(ui->tableWidget->cellWidget(current_row, 3)); - - if (bar) { - bar->setValue(f); - } - - ui->tableWidget->item(current_row, 2)->setText(QString::number(bytesTotal / 1048576.0, 'f', - 3) + "MB"); - } - - //ui->progressBar->setValue(f); - // int elapsed=dltime.elapsed(); -} - -void UpdaterWindow::requestFile() -{ - if (!update) { return; } - - QProgressBar *bar = qobject_cast(ui->tableWidget->cellWidget(current_row, 3)); - QString style = "QProgressBar{\ - border: 1px solid gray;\ - border-radius: 3px;\ - text-align: center;\ - text-decoration: bold;\ - color: yellow;\ - }\ - QProgressBar::chunk {\ - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 \"light green\", stop: 1 green);\ - width: 10px;\ - margin: 0px;\ - }"; - - if (bar) { - bar->setStyleSheet(style); - } - - QString filename = update->filename; - ui->plainTextEdit->appendPlainText(tr("Requesting ") + update->url); - - requestmode = RM_GetFile; - - QString path = QApplication::applicationDirPath() + "/Download"; - QDir().mkpath(path); - path += "/" + filename; - ui->plainTextEdit->appendPlainText(tr("Saving as ") + path); - file.setFileName(path); - file.open(QFile::WriteOnly); - dltime.start(); - - QNetworkRequest req = QNetworkRequest(QUrl(update->url)); - req.setRawHeader("User-Agent", "Wget/1.12 (linux-gnu)"); - reply = netmanager->get(req); - connect(reply, SIGNAL(readyRead()), this, SLOT(dataReceived())); - connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProgress(qint64, - qint64))); -} -************************************************************/ -#endif - -#ifndef NO_UPDATER - -const QString UPDATE_ROSCAR = "com.jedimark.sleepyhead"; -const QString UPDATE_QT = "com.jedimark.sleepyhead.qtlibraries"; -const QString UPDATE_Translations = "com.jedimark.sleepyhead.translations"; - -bool SpawnApp(QString apppath, QStringList args = QStringList()) -{ -#ifdef Q_OS_MAC - // In Mac OS the full path of aplication binary is: - // /myApp.app/Contents/MacOS/myApp - - QStringList arglist; - arglist << "-n"; - arglist << apppath; - arglist.append(args); - - return QProcess::startDetached("/usr/bin/open", arglist); -#else - return QProcess::startDetached(apppath, args); -#endif -} - -void StartMaintenanceTool() -{ - QString mt_path = QApplication::applicationDirPath()+"/MaintenanceTool.exe"; - SpawnApp(mt_path); -#ifdef Q_OS_WIN - -#endif -} - -void UpdaterWindow::ParseLatestVersion(QIODevice *file) -{ - // Temporary Cheat.. for linux & mac, just check the latest version number - QTextStream text(file); - - QString version=text.readAll().trimmed(); - qDebug() << "Latest version is" << version; - int i=compareVersion(version); - - if (i>0) { - mainwin->Notify(tr("Version %1 of OSCAR is available, opening link to download site.").arg(version), STR_TR_OSCAR); - QDesktopServices::openUrl(QUrl(QString("http://nightowlsoftware.ca/OSCAR"))); - } else { - mainwin->Notify(tr("You are already running the latest version."), STR_TR_OSCAR); - } -} - -//New, Qt Installer framework version -void UpdaterWindow::ParseUpdatesXML(QIODevice *dev) -{ - if (updatesparser.read(dev)) { - qDebug() << " XML update structure parsed cleanly"; - QHash CurrentVersion; - - CurrentVersion[UPDATE_OSCAR] = getVersion(); - CurrentVersion[UPDATE_QT] = QT_VERSION_STR; - CurrentVersion[UPDATE_Translations] = getVersion(); - - QList updateList; - - QHash::iterator it; - - for (it = updatesparser.packages.begin(); it!=updatesparser.packages.end(); ++it) { - const PackageUpdate & update = it.value(); - if (it.key() == UPDATE_OSCAR) { - if (compareVersion(update.versionString)>0) { - updateList.push_back(update); - } - } else if (it.key() == UPDATE_QT) { - bool ok; - QStringList chunks = update.versionString.split("."); - int major = chunks[0].toInt(&ok); - int minor = chunks[1].toInt(&ok); - int patch = chunks[2].toInt(&ok); - if (QT_VERSION_CHECK(major, minor, patch) > QT_VERSION) { - updateList.push_back(update); - } - } else if (it.key() == UPDATE_Translations) { - if (compareVersion(update.versionString)>0) { - updateList.push_back(update); - } - } - } - - if (updateList.size()==0) { - mainwin->Notify(tr("No updates were found for your platform."), tr("OSCAR Updates"), 5000); - PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); - close(); - return; - } else { - - if (QMessageBox::question(mainwin, tr("OSCAR Updates"), - tr("New OSCAR Updates are avilable:")+"\n\n"+ - tr("Would you like to download and install them now?"), - QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) { - - StartMaintenanceTool(); - QApplication::instance()->quit(); - } - } - } else { - qDebug() << "Couldn't parse Updates.xml file"; - } -} -#endif - -// Old -/************************************ -void UpdaterWindow::ParseUpdateXML(QIODevice *dev) -{ - QXmlInputSource src(dev); - QXmlSimpleReader reader; - reader.setContentHandler(&updateparser); - UpdateStatus AcceptUpdates = PREF[STR_PREF_AllowEarlyUpdates].toBool() ? - UPDATE_TESTING : UPDATE_BETA; - - if (reader.parse(src)) { - ui->plainTextEdit->appendPlainText(tr("XML update structure parsed cleanly")); - - QStringList versions; - - for (QHash::iterator it = updateparser.releases.begin(); it != updateparser.releases.end(); ++it) { - versions.push_back(it.key()); - } - - // Um... not optimal. - std::sort(versions.begin(), versions.end()); - - QString platform = PlatformString.toLower(); - release = nullptr; - - // Find the highest version number available for this platform - for (int i = versions.size() - 1; i >= 0; i--) { - QString verstr = versions[i]; - release = &updateparser.releases[verstr]; - - if (release->updates.contains(platform) // Valid Release? - && (release->status >= AcceptUpdates) - && (release->version >= VersionString)) { - break; - } else { release = nullptr; } - } - - if (!release) { - mainwin->Notify(tr("No updates were found for your platform."), tr("OSCAR Updates"), 5000); - PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); - close(); - return; - } - - qDebug() << "Version" << release->version << "has release section" << platform; - - QString latestapp = "", latestqt = ""; - updates.clear(); - Update *upd = nullptr; - Update *upq = nullptr; - - for (int i = 0; i < release->updates[platform].size(); i++) { - update = &release->updates[platform][i]; - - if (update->type == "qtlibs") { - qDebug() << "QT Version" << update->version; - - if (update->version > latestqt) { - if (update->status >= AcceptUpdates) { - latestqt = update->version; - upq = update; - } - } - } else if (update->type == "application") { - qDebug() << "Application Version" << update->version; - - if (update->version > latestapp) { - if (update->status >= AcceptUpdates) { - latestapp = update->version; - upd = update; - } - } - } - } - - if (!upq && !upd) { - mainwin->Notify(tr("No new updates were found for your platform."), - tr("OSCAR Updates"), - 5000); - PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); - close(); - return; - } - - if (upq && (upq->version > QT_VERSION_STR)) { - updates.push_back(upq); - } - - if (upd && upd->version > VersionString) { - updates.push_back(upd); - } - - - if (updates.size() > 0) { - QString html = "

" + tr("OSCAR v%1, codename \"%2\"").arg(release->version). - arg(release->codename) + "

" + release->notes[""] + "

"; - html += platform.left(1).toUpper() + platform.mid(1); - html += " " + tr("platform notes") + "

" + release->notes[platform] + "

"; - ui->webView->setHtml(html); - QString info; - - if (compareVersion(release->version)) { - ui->Title->setText("" + tr("A new version of OSCAR is available!") + ""); - info = tr("Shiny new v%1 is available. You're running old and busted v%2"). - arg(latestapp).arg(VersionString); - ui->notesTabWidget->setCurrentIndex(0); - } else { - ui->Title->setText("" + tr("An update for OSCAR is available.") + ""); - info = tr("Version %1 is available. You're currently running v%1"). - arg(latestapp).arg(VersionString); - ui->notesTabWidget->setCurrentIndex(1); - } - - ui->versionInfo->setText(info); - - QString notes; - - for (int i = 0; i < release->updates[platform].size(); i++) { - update = &release->updates[platform][i]; - - if ((update->type == "application") && (update->version > VersionString)) { - notes += "" + tr("OSCAR v%1 build notes").arg(update->version) + "
" + - update->notes.trimmed() + "

"; - } else if ((update->type == "qtlibs") && (update->version > QT_VERSION_STR)) { - notes += "" + tr("Update to QtLibs (v%1)").arg(update->version) + "
" + - update->notes.trimmed(); - } - } - - ui->buildNotes->setText(notes); - setWindowModality(Qt::ApplicationModal); - show(); - } - } else { - mainwin->Notify(tr("There was an error parsing the XML Update file.")); - } -} - -void UpdaterWindow::replyFinished(QNetworkReply *reply) -{ - netmanager->disconnect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, - SLOT(downloadProgress(qint64, qint64))); - - if (reply->error() == QNetworkReply::NoError) { - - if (requestmode == RM_CheckUpdates) { - QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); - - if (!redirectUrl.isEmpty() && (redirectUrl != reply->url())) { - update_url = redirectUrl; - reply->deleteLater(); - QTimer::singleShot(100, this, SLOT(downloadUpdateXML())); - return; - } - - ui->plainTextEdit->appendPlainText(tr("%1 bytes received").arg(reply->size())); - QString filename = QApplication::applicationDirPath() + "/Updates.xml"; - qDebug() << filename; - QFile file(filename); - file.open(QFile::WriteOnly); - file.write(reply->readAll()); - file.close(); - file.open(QFile::ReadOnly); - //QTextStream ts(&file); - ParseUpdatesXML(&file); - file.close(); - reply->deleteLater(); - } else if (requestmode == RM_GetFile) { - disconnect(reply, SIGNAL(readyRead()), this, SLOT(dataReceived())); - file.close(); - //HttpStatusCodeAttribute - QString rs = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); - qDebug() << "HTTP Status Code" << rs; - - bool failed = false; - - if (rs == "404") { - qDebug() << "File not found"; - failed = true; - } else { - QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); - - if (!redirectUrl.isEmpty() && (redirectUrl != reply->url())) { - file.open(QFile::WriteOnly); //reopen file.. - update->url = redirectUrl.toString(); - ui->plainTextEdit->appendPlainText(tr("Redirected to ") + update->url); - QTimer::singleShot(100, this, SLOT(requestFile())); - reply->deleteLater(); - return; - } - - ui->plainTextEdit->appendPlainText("Received " + QString::number(file.size()) + " bytes"); - - if (update->size > 0) { - double s1 = update->size / 1048576.0; - double s2 = ui->tableWidget->item(current_row, 2)->text().toDouble(); - - if (s1 != s2) { - failed = true; - ui->plainTextEdit->appendPlainText(tr("File size mismatch for %1").arg(update->filename)); - } - } else { - QString path = QApplication::applicationDirPath() + "/Download/" + update->filename; - QFile f(path); - f.open(QFile::ReadOnly); - QCryptographicHash hash(QCryptographicHash::Sha1); - hash.addData(f.readAll()); - QString res = hash.result().toHex(); - - if (res != update->hash) { - ui->plainTextEdit->appendPlainText(tr("File integrity check failed for %1").arg(update->filename)); - failed = true; - } - } - } - - reply->deleteLater(); - QProgressBar *bar = qobject_cast(ui->tableWidget->cellWidget(current_row, 3)); - - if (!failed) { - //file.open(QFile::ReadOnly); - QuaZip zip(&file); - - if (!zip.open(QuaZip::mdUnzip)) { - failed = true; - } else { - - QStringList files = zip.getFileNameList(); - QFile f; - int errors = 0; - int fsize = files.size(); - QByteArray ba; - QStringList update_txt; - - QString apppath = QApplication::applicationDirPath() + "/"; - QString backups = apppath + "Backups/"; - QString downloads = apppath + "Downloads/"; - QDir().mkpath(backups); - - for (int i = 0; i < fsize; i++) { - ui->plainTextEdit->appendPlainText(tr("Extracting ") + files.at(i)); - QuaZipFile qzf(file.fileName(), files.at(i)); - qzf.open(QuaZipFile::ReadOnly); - - QString path = downloads + files.at(i); - - if (path.endsWith("/") || path.endsWith("\\")) { - QDir().mkpath(path); - - if (update->unzipped_path.isEmpty()) { - update->unzipped_path = path; - } - } else { - ba = qzf.readAll(); - - if (qzf.getZipError()) { - errors++; - } else if (files.at(i) == "update.txt") { - QTextStream ts(ba); - QString line; - - do { - line = ts.readLine(); - - if (!line.isNull()) { update_txt.append(line); } - } while (!line.isNull()); - } else { - QString fn = files.at(i).section("/", -1); - QFile::Permissions perm = QFile::permissions(apppath + fn); - - // delete backups - if (f.exists(backups + fn)) { f.remove(backups + fn); } - - // rename (move) current file to backup - if (!f.rename(apppath + fn, backups + fn)) { - errors++; - } - - //Save zip data as new file - f.setFileName(apppath + fn); - f.open(QFile::WriteOnly); - f.write(ba); - f.close(); - f.setPermissions(perm); - } - } - - if (bar) { - bar->setValue((1.0 / float(fsize)*float(i + 1)) * 100.0); - QApplication::processEvents(); - } - - qzf.close(); - } - - zip.close(); - - if (errors) { - // gone and wrecked the install here.. - // probably should wait till get here before replacing files.. - // but then again, this is probably what would screw up - mainwin->Notify(tr("You might need to reinstall manually. Sorry :("), - tr("Ugh.. Something went wrong with unzipping."), 5000); - // TODO: Roll back from the backup folder - failed = true; - } - } - } - - ui->tableWidget->item(current_row, 0)->setCheckState(Qt::Checked); - - if (failed) { - qDebug() << "File is corrupted"; - - if (bar) { - bar->setFormat(tr("Failed")); - QString style = "QProgressBar{\ - border: 1px solid gray;\ - border-radius: 3px;\ - text-align: center;\ - text-decoration: bold;\ - color: yellow;\ - }\ - QProgressBar::chunk {\ - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 \"dark red\", stop: 1 red);\ - width: 10px;\ - margin: 0px;\ - }"; - //: qlineargradient(x1: 0, y1: 0.5, x2: 1, y2: 0.5, stop: 0 red, stop: 1 white); - bar->setStyleSheet(style); - } - } - - ui->tableWidget->item(current_row, 0)->setData(Qt::UserRole + 1, failed); - QTimer::singleShot(100, this, SLOT(upgradeNext())); - ui->plainTextEdit->appendPlainText(tr("Download Complete")); - } - - } else { - mainwin->Notify(tr("There was an error completing a network request:\n\n(") + reply->errorString() - + ")"); - } -} -****************************************************************/ -#ifndef NO_UPDATER - -void UpdaterWindow::on_CloseButton_clicked() -{ - close(); -} -#endif - -/************************************* -void UpdaterWindow::upgradeNext() -{ - QTableWidgetItem *item; - bool fnd = false; - - for (current_row = 0; current_row < ui->tableWidget->rowCount(); current_row++) { - item = ui->tableWidget->item(current_row, 0); - bool complete = item->checkState() == Qt::Checked; - - if (complete) { - continue; - } - - update = item->data(Qt::UserRole).value(); - qDebug() << "Processing" << update->url; - fnd = true; - requestFile(); - break; - } - - if (!fnd) { - bool ok = true; - - for (current_row = 0; current_row < ui->tableWidget->rowCount(); current_row++) { - bool failed = ui->tableWidget->item(current_row, 0)->data(Qt::UserRole + 1).toBool(); - - if (failed) { - ok = false; - break; - } - } - - if (ok) { - success = true; - //QMessageBox::information(this,tr("Updates Complete"),tr("OSCAR has been updated and needs to restart."),QMessageBox::Ok); - ui->downloadTitle->setText(tr("Update Complete!")); - ui->FinishedButton->setVisible(true); - ui->downloadLabel->setText( - tr("Updates Complete. OSCAR needs to restart now, click Finished to do so.")); - PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); - } else { - ui->downloadTitle->setText(tr("Update Failed :(")); - success = false; - ui->downloadLabel->setText(tr("Download Error. Sorry, try again later.")); - ui->FinishedButton->setVisible(true); - //QMessageBox::warning(this,tr("Download Error"),tr("Sorry, could not get all necessary files for upgrade.. Try again later."),QMessageBox::Ok); - //close(); - } - } -} - - -void UpdaterWindow::on_upgradeButton_clicked() -{ - if (!updates.size()) { return; } - - ui->tableWidget->clearContents(); - ui->tableWidget->setColumnHidden(4, true); - ui->tableWidget->setColumnHidden(5, true); - ui->FinishedButton->setVisible(false); - ui->downloadLabel->setText(tr("Downloading & Installing Updates...")); - ui->downloadTitle->setText(tr("Please wait while downloading and installing updates.")); - success = false; - - for (int i = 0; i < updates.size(); i++) { - update = updates.at(i); - ui->tableWidget->insertRow(i); - QTableWidgetItem *item = new QTableWidgetItem(update->type); - QVariant av; - av.setValue(update); - item->setData(Qt::UserRole, av); - item->setCheckState(Qt::Unchecked); - item->setFlags(Qt::ItemIsEnabled); - ui->tableWidget->setItem(i, 0, item); - ui->tableWidget->setItem(i, 1, new QTableWidgetItem(update->version)); - ui->tableWidget->setItem(i, 2, new QTableWidgetItem(QString::number(update->size / 1048576.0, 'f', - 3) + "MB")); - QProgressBar *bar = new QProgressBar(ui->tableWidget); - bar->setMaximum(100); - bar->setValue(0); - - ui->tableWidget->setCellWidget(i, 3, bar); - ui->tableWidget->setItem(i, 4, new QTableWidgetItem(update->url)); - } - - ui->stackedWidget->setCurrentIndex(1); - upgradeNext(); -} -************************************************************************/ - -#ifndef NO_UPDATER -void UpdaterWindow::on_FinishedButton_clicked() -{ - if (success) { - mainwin->RestartApplication(); - } else { close(); } -} -#endif diff --git a/oscar/UpdaterWindow.h b/oscar/UpdaterWindow.h deleted file mode 100644 index 2046505d..00000000 --- a/oscar/UpdaterWindow.h +++ /dev/null @@ -1,117 +0,0 @@ -/* UpdaterWindow - * - * Copyright (c) 2020 The OSCAR Team - * Copyright (c) 2011-2018 Mark Watkins - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the source code - * for more details. */ - -#ifndef UPDATEWINDOW_H -#define UPDATEWINDOW_H - -#include -#include -#include -#include -#include -#include - -#include "updateparser.h" - -namespace Ui { -class UpdaterWindow; -} - -/*! \enum RequestMode - \brief Used in replyFinished() to differentiate the current update task. -*/ -enum RequestMode { RM_None, RM_CheckUpdates, RM_GetFile }; - - -/*! \class UpdaterWindow - \brief Auto-Update Module for OSCAR - - This class handles the complete Auto-Update procedure for OSCAR, it does the network checks, - parses the update.xml from SourceForge host, checks for any new updates, and provides the UI - and mechanisms to download and replace the binaries according to what is specified in update.xml. - */ -class UpdaterWindow : public QMainWindow -{ - Q_OBJECT - - public: - explicit UpdaterWindow(QWidget *parent = 0); - ~UpdaterWindow(); - - //! Start the - void checkForUpdates(); - -#ifndef NO_UPDATER - - /*! \fn ParseUpdateXML(QIODevice * dev) - \brief Parses the update.xml from either QFile or QNetworkReply source - */ - //void ParseUpdateXML(QIODevice *dev); - void ParseUpdatesXML(QIODevice *dev); - void ParseLatestVersion(QIODevice *dev); - - protected slots: - void updateFinished(QNetworkReply *reply); - - // //! \brief Network reply completed - //void replyFinished(QNetworkReply *reply); - - ////! \brief Update the progress bars as data is received - //void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); - - ////! \brief Save incomming data - //void dataReceived(); - -// //! \brief Request a file to download -// void requestFile(); - - //! \brief Request the update.xml file - void downloadUpdateXML(); - - private slots: - //! \brief Just close the Updater window - void on_CloseButton_clicked(); - - // //! \brief Start processing the download que, and applying the updates -// void on_upgradeButton_clicked(); - -// //! \brief Selects the next file in the download queue -// void upgradeNext(); - - //! \brief Click on finished, restart if app has been upgraded, otherwise just close the window. - void on_FinishedButton_clicked(); -#endif - - private: - - Ui::UpdaterWindow *ui; - RequestMode requestmode; - QNetworkAccessManager *netmanager; - Update *update; - -#ifndef NO_UPDATER - //! \brief Holds the results of parsing the update.xml file - UpdateParser updateparser; - - // new parser - UpdatesParser updatesparser; - - QTime dltime; - QList updates; - - Release *release; - QFile file; - QNetworkReply *reply; - int current_row; - bool success; - QUrl update_url; // for update.xml redirects.. -#endif -}; - -#endif // UPDATEWINDOW_H diff --git a/oscar/checkupdates.cpp b/oscar/checkupdates.cpp new file mode 100644 index 00000000..cd488442 --- /dev/null +++ b/oscar/checkupdates.cpp @@ -0,0 +1,275 @@ +/* CheckUpdates + * + * Copyright (c) 2011-2018 Mark Watkins + * Copyright (c) 2020 OSCAR Team + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of the source code + * for more details. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "checkupdates.h" +#include "ui_UpdaterWindow.h" +#include "version.h" +#include "mainwindow.h" + +extern MainWindow *mainwin; + +struct VersionInfo { + QString group; // test or release + QString platform; // All or Requested platform + QString version; // version number + QString urlInstaller; // URL for installer page + QString notes; // any notes +}; + +CheckUpdates::CheckUpdates(QWidget *parent) : + QMainWindow(parent) +{ + manager = new QNetworkAccessManager(this); +} + +CheckUpdates::~CheckUpdates() +{ + disconnect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(replyFinished(QNetworkReply *))); +} + +QString platformStr() +{ + static QString platform; + +#if defined(Q_OS_WIN64) + platform="win64"; +#elif defined(Q_OS_WIN) + platform="win32"; +#elif defined(Q_OS_MACOS) + platform="macOS"; +#elif defined(Q_OS_LINUX) + platform="linux"; +#else + platform="unknown"; +#endif + return platform; +} + +//static const QString OSCAR_Version_File = "http://www.guyscharf.com/VERSION/versions.xml"; +static const QString OSCAR_Version_File = "http://www.sleepfiles.com/OSCAR/versions/versions.xml"; + +static QString versionXML; + +/*! \fn readLocalVersions + \brief Reads versions.xml from local OSCAR Data directory + */ +QString readLocalVersions() { + // Connect and read XML file from disk + QString filename = GetAppData() + "/versions.xml"; + qDebug() << "Local version control file at" << filename; + QFile file(filename); + if(!file.open(QFile::ReadOnly | QFile::Text)) { + qDebug() << "Cannot open local version control file" << filename << "-" << file.errorString() << "version check disabled"; + return QString(); + } + QByteArray qba = file.readAll(); + QFileDevice::FileError error = file.error(); + file.close(); + if (error != QFile::NoError) { + qDebug() << "Error reading local version control file" << filename << "-" << file.errorString() << "version check disabled"; + qDebug() << "versionXML" << versionXML; + return QString(); + } + return QString(qba); + +} + +/*! \fn GetVersionInfo + \brief Extracts newer version info for this platform + If returned versionInfo.version is empty, no newer version was found + */ +VersionInfo getVersionInfo (QString type, QString platform) { + VersionInfo foundInfo; + + QXmlStreamReader reader(versionXML); + + if (reader.readNextStartElement()) { + if (reader.name() == "OSCAR"){ + //qDebug() << "expecting OSCAR, read" << reader.name(); + while(reader.readNextStartElement()){ + //qDebug() << "expecting group, read" << reader.name() << "with id" << reader.attributes().value("id").toString(); + if(reader.name() == "group" && + reader.attributes().hasAttribute("id")){ + if (reader.attributes().value("id").toString() == type) { + while(reader.readNextStartElement()) { + //qDebug() << "expecting url or platform, read" << reader.name(); + if (reader.name() == "installers") + foundInfo.urlInstaller = reader.readElementText(); + if (reader.name() == "platform") { + QString plat=reader.attributes().value("id").toString(); + //qDebug() << "expecting platform, read " << reader.name() << "with id" << reader.attributes().value("id").toString(); + + if ((plat == platform) || (plat == "All" && foundInfo.platform.length() == 0)) { + foundInfo.platform = plat; + while(reader.readNextStartElement()) { + //qDebug() << "expecting version or notes, read" << reader.name(); + if (reader.name() == "version") { + QString fileVersion = reader.readElementText(); + if (Version(fileVersion) > getVersion()) + foundInfo.version = fileVersion; // We found a more recent version + } + else if (reader.name() == "notes") { + foundInfo.notes = reader.readElementText(); + } + else + reader.skipCurrentElement(); + } + } + } + } + } + else + reader.skipCurrentElement(); + } + else + reader.skipCurrentElement(); + } + } + else { + qWarning() << "Versions file improperly formed --" << reader.errorString(); + reader.raiseError(QObject::tr("New versions file improperly formed")); + } + } + return foundInfo; +} + +void CheckUpdates::compareVersions () { +#ifndef NO_CHECKUPDATES + // Get any more recent versions available + VersionInfo releaseVersion = getVersionInfo ("release", platformStr()); + VersionInfo testVersion = getVersionInfo ("test", platformStr()); + + if (testVersion.version.length() == 0 && releaseVersion.version.length() == 0 && showIfCurrent) + msg = QObject::tr("You are running the latest release of OSCAR"); + else { + msg = QObject::tr("A more recent version of OSCAR is available"); + msg += "

" + QObject::tr("You are running version %1").arg(getVersion()) + "

"; + if (releaseVersion.version.length() > 0) { + msg += "

" + QObject::tr("OSCAR %1 is available here.").arg(releaseVersion.version).arg(releaseVersion.urlInstaller) + "

"; + } + if (testVersion.version.length() > 0) { + msg += "

" + QObject::tr("Information about more recent test version %1 is available at %2").arg(testVersion.version).arg(testVersion.urlInstaller) + "

"; + } + } + + if (msg.length() > 0) { + // Add elapsed time in test versions only + if (elapsedTime > 0 && !getVersion().IsReleaseVersion()) + msg += "

" + QString(QObject::tr("(Reading %1 took %2 seconds)")).arg("versions.xml").arg(elapsedTime) + "

"; + msgIsReady = true; + } + + AppSetting->setUpdatesLastChecked(QDateTime::currentDateTime()); + + return; +#endif +} + +void CheckUpdates::showMessage() +{ + if (!msgIsReady) + return; + + if (showIfCurrent) { +// checkingBox->cancel(); + checkingBox->reset(); + } + + QMessageBox msgBox; + msgBox.setWindowTitle(QObject::tr("Check for OSCAR Updates")); + msgBox.setTextFormat(Qt::RichText); + msgBox.setText(msg); + msgBox.exec(); + + msgIsReady = false; +} + +void CheckUpdates::checkForUpdates(bool showWhenCurrent) +{ + showIfCurrent = showWhenCurrent; +/**** + versionXML = readLocalVersions(); + if (versionXML.length() <= 0) { + qDebug() << "Error reading local version control file - version check disabled"; + QMessageBox::warning(nullptr, STR_MessageBox_Warning, QObject::tr("Unable to read version control file from disk")); + return; + } + compareVersions(); +****/ + + readTimer.start(); + + connect(manager, SIGNAL(finished(QNetworkReply*)), + this, SLOT(replyFinished(QNetworkReply*))); + + manager->get(QNetworkRequest(QUrl(OSCAR_Version_File))); + + if (showIfCurrent) { + checkingBox = new QProgressDialog (this); +// checkingBox->setWindowModality(Qt::WindowModal); + checkingBox->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); + checkingBox->setWindowFlags(this->windowFlags() & ~Qt::WindowMinMaxButtonsHint); + checkingBox->setLabelText(tr("Checking for newer OSCAR versions")); + checkingBox->setMinimumDuration(500); + checkingBox->setRange(0,0); + checkingBox->setCancelButton(nullptr); + checkingBox->setWindowTitle(getAppName()); + checkingBox->exec(); + } + + qDebug() << "Starting network request for" << OSCAR_Version_File; + + return; +} + +void CheckUpdates::replyFinished(QNetworkReply *reply) +{ + if (reply->error() != QNetworkReply::NoError) { + qWarning() << "Update Check Error: "+reply->errorString(); + } else { +// qDebug() << reply->header(QNetworkRequest::ContentTypeHeader).toString(); +// qDebug() << reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toString(); +// qDebug() << reply->header(QNetworkRequest::ContentLengthHeader).toULongLong(); +// qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); +// qDebug() << reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(); + + versionXML = reply->readAll(); + reply->deleteLater(); + + // Only calculate elapsed time for Help/Check for Updates + // (Auto-update time would include profile opening time) + if (showIfCurrent) { + elapsedTime = readTimer.elapsed() / 1000.0; + qDebug() << "Elapsed time to read versions.XML from web:" << elapsedTime << "seconds"; + } + else + elapsedTime = 0; + } + + compareVersions(); + + if (showIfCurrent) + showMessage(); + + return; +} diff --git a/oscar/checkupdates.h b/oscar/checkupdates.h new file mode 100644 index 00000000..2a980cd8 --- /dev/null +++ b/oscar/checkupdates.h @@ -0,0 +1,58 @@ +/* Check for Updates + * + * Copyright (c) 2020 The OSCAR Team + * Copyright (c) 2011-2018 Mark Watkins + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of the source code + * for more details. */ + +#ifndef CHECKUPDATES_H +#define CHECKUPDATES_H + +#include +#include +#include + +/*! \class CheckUpdates + \brief Check-for-Updates Module for OSCAR + + This class handles the Check-for-Updates process in OSCAR: it does the network checks, + parses the version.xml file, checks for any new updates, and advises the user if updates are available. + */ +class CheckUpdates : public QMainWindow +{ + Q_OBJECT + + public: + explicit CheckUpdates(QWidget *parent = 0); + ~CheckUpdates(); + + //! Start the check + void checkForUpdates(bool showWhenCurrent); + + //! See if running version is current and prepare message if not + void compareVersions(); + + //! Show message to user, if it is available + //! If shown, clear the "message ready" flag + void showMessage(); + + protected slots: + void replyFinished(QNetworkReply *reply); + + private: + QNetworkAccessManager *manager; + + QTime readTimer; + float elapsedTime; + + QString msg; // Message to show to user + bool msgIsReady = false; // Message is ready to be displayed + bool showIfCurrent = false; // show a message if running current release + QProgressDialog * checkingBox;// Looking for updates message + + QNetworkReply *reply; +}; + +#endif // CHECKUPDATES_H diff --git a/oscar/main.cpp b/oscar/main.cpp index 5d37cc37..23b96666 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -532,9 +532,9 @@ int main(int argc, char *argv[]) { QDir newDir(GetAppData()); #if QT_VERSION < QT_VERSION_CHECK(5,9,0) - if ( ! newDir.exists() || newDir.count() == 0 ) { // directoy doesn't exist yet or is empty, try to migrate old data + if ( ! newDir.exists() || newDir.count() == 0 ) { // directory doesn't exist yet or is empty, try to migrate old data #else - if ( ! newDir.exists() || newDir.isEmpty() ) { // directoy doesn't exist yet or is empty, try to migrate old data + if ( ! newDir.exists() || newDir.isEmpty() ) { // directory doesn't exist yet or is empty, try to migrate old data #endif if (QMessageBox::question(nullptr, QObject::tr("Migrate SleepyHead Data?"), QObject::tr("On the next screen OSCAR will ask you to select a folder with SleepyHead data") +"\n" + @@ -565,7 +565,7 @@ int main(int argc, char *argv[]) { p_pref->Erase(STR_AppName); p_pref->Erase(STR_GEN_SkipLogin); -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES //////////////////////////////////////////////////////////////////////////////////////////// // Check when last checked for updates.. //////////////////////////////////////////////////////////////////////////////////////////// @@ -573,6 +573,13 @@ int main(int argc, char *argv[]) { bool check_updates = false; + if (!getVersion().IsReleaseVersion()) { + // If test build, force update autocheck, no more than 7 day interval, show test versions + AppSetting->setUpdatesAutoCheck(true); + AppSetting->setUpdateCheckFrequency(min(AppSetting->updateCheckFrequency(), 7)); + AppSetting->setAllowEarlyUpdates(true); + } + if (AppSetting->updatesAutoCheck()) { int update_frequency = AppSetting->updateCheckFrequency(); int days = 1000; @@ -583,7 +590,7 @@ int main(int argc, char *argv[]) { days /= 86400; } - if (days > update_frequency) { + if (days >= update_frequency) { check_updates = true; } } @@ -637,9 +644,9 @@ int main(int argc, char *argv[]) { Q_UNUSED(changing_language) Q_UNUSED(dont_load_profile) -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES if (check_updates) { - mainwin->CheckForUpdates(); + mainwin->CheckForUpdates(false); } #endif diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index ecf74a2e..7ca2c062 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -56,7 +56,7 @@ #include "exportcsv.h" #include "SleepLib/schema.h" #include "Graphs/glcommon.h" -#include "UpdaterWindow.h" +#include "checkupdates.h" #include "SleepLib/calcs.h" #include "SleepLib/progressdialog.h" @@ -68,6 +68,8 @@ #include #endif +CheckUpdates *updateChecker; + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -149,6 +151,9 @@ void MainWindow::SetupGUI() profileSelector = nullptr; welcome = nullptr; +#ifdef NO_CHECKUPDATES + ui->action_Check_for_Updates->setVisible(false); +#endif ui->oximetryButton->setDisabled(true); ui->dailyButton->setDisabled(true); ui->overviewButton->setDisabled(true); @@ -213,7 +218,7 @@ void MainWindow::SetupGUI() first_load = true; profileSelector = new ProfileSelector(ui->tabWidget); - ui->tabWidget->insertTab(0, profileSelector, STR_TR_Profile); + ui->tabWidget->insertTab(0, profileSelector, STR_TR_Profile); // Profiles haven't been loaded here... profileSelector->updateProfileList(); @@ -600,11 +605,15 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword) delete progress; qDebug() << "Finished opening Profile"; + updateChecker->showMessage(); + return true; } void MainWindow::CloseProfile() { + updateChecker->showMessage(); + if (daily) { daily->Unload(); daily->clearLastDay(); // otherwise Daily will crash @@ -1179,101 +1188,6 @@ void MainWindow::setStatsHTML(QString html) } -/*** -QString MainWindow::getWelcomeHTML() -{ - // This is messy, but allows it to be translated easier - return "\n" - " \n" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "
" - + tr("Welcome to OSCAR") + "
" - "

" + tr("About OSCAR") + "

" - "

" + tr("This software has been created to assist you in reviewing the data produced by CPAP Machines, used in the treatment of various Sleep Disorders.") - + "

" - "

" + tr("OSCAR has been designed by a software developer with personal experience with a sleep disorder, and shaped by the feedback of many other willing testers dealing with similar conditions.") - + "

" - "

" + tr("This is a beta release, some features may not yet behave as expected.") + - "
" + tr("Please report any bugs you find to the OSCAR developer's group.") + "

" - - "

" + tr("Currenly supported machines:") + "

" - "" + tr("CPAP") + "" - "
  • " + tr("Philips Respironics System One (CPAP Pro, Auto, BiPAP & ASV models)") + "
    • " - "
  • " + tr("ResMed S9 models (CPAP, Auto, VPAP)") + "
    • " - "
  • " + tr("DeVilbiss Intellipap (Auto)") + "
    • " - "
  • " + tr("Fisher & Paykel ICON (CPAP, Auto)") + "
    • " - "" + tr("Oximetry") + "" - "
  • " + tr("Contec CMS50D+, CMS50E and CMS50F (not 50FW) Oximeters") + "
    • " - "
  • " + tr("ResMed S9 Oximeter Attachment") + "
    • " - "

    " + tr("Online Help Resources") + "

    " - "

    " + tr("Note:") + "" + - tr("I don't recommend using this built in web browser to do any major surfing in, it will work, but it's mainly meant as a help browser.") - + - tr("(It doesn't support SSL encryption, so it's not a good idea to type your passwords or personal details anywhere.)") - + "

    " + - -// tr("OSCAR's Online Users Guide
    ") -// + -// tr("Frequently Asked Questions
    ") -// + -// tr("Glossary of Sleep Disorder Terms
    ") -// + -// tr("OSCAR Wiki
    ") -// + -// tr("OSCAR's Project Website on SourceForge
    ") -// + - "

    " + tr("Further Information") + "

    " - "

    " + - tr("The release notes for this version can be found in the About OSCAR menu item.") + - "
    " + - tr("Plus a few usage notes, and some important information for Mac users.") - + "
    " + - "

    " + tr("About Sleep Apnea on Wikipedia") - + "

    " - - "

    " + tr("Friendly forums to talk and learn about Sleep Apnea:") + "
    " + - tr("CPAPTalk Forum,") + - tr("Apnea Board") + "

    " - "
    " - "
    " - "
    " - "

    " + tr("Copyright:") + " " + "©2011-2018" + - " Mark Watkins (jedimark) and portions ©2019 Nightowl Software

    " - "

    " + tr("License:") + " " + - tr("This software is released freely under the GNU Public License version 3.") + - "

    " - "
    " - "

    " + tr("DISCLAIMER:") + "

    " - "

    " + - tr("This is NOT medical software. This application is merely a data viewer, and no guarantee is made regarding accuracy or correctness of any calculations or data displayed.") - + "

    " - "

    " + tr("The authors will NOT be held liable by anyone who harms themselves or others by use or misuse of this software.") - + "

    " - "

    " + tr("Your doctor should always be your first and best source of guidance regarding the important matter of managing your health.") - + "

    " - "

    " + tr("*** Use at your own risk ***") + "

    " - "
    " - "
    " - "" - "" - - ; -} -***/ void MainWindow::updateFavourites() { QDate date = p_profile->LastDay(MT_JOURNAL); @@ -1469,24 +1383,23 @@ void MainWindow::on_oximetryButton_clicked() } } -void MainWindow::CheckForUpdates() +// Called for automatic check for updates +void MainWindow::CheckForUpdates(bool showWhenCurrent) { - qDebug() << "procedure called"; -#ifndef NO_UPDATER - on_actionCheck_for_Updates_triggered(); + updateChecker = new CheckUpdates(this); +#ifdef NO_CHECKUPDATES + if (showWhenCurrent) + QMessageBox::information(nullptr, STR_MessageBox_Information, tr("Check for updates not implemented")); #else - QMessageBox::information(nullptr, STR_MessageBox_Information, tr("Updates are not yet implemented")); + updateChecker->checkForUpdates(showWhenCurrent); #endif } -#ifndef NO_UPDATER -void MainWindow::on_actionCheck_for_Updates_triggered() +// Called for manual check for updates +void MainWindow::on_action_Check_for_Updates_triggered() { - qDebug() << "procedure called"; - UpdaterWindow *w = new UpdaterWindow(this); - w->checkForUpdates(); + CheckForUpdates(true); } -#endif bool toolbox_visible = false; void MainWindow::on_action_Screenshot_triggered() diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index 8abed614..0f389833 100644 --- a/oscar/mainwindow.h +++ b/oscar/mainwindow.h @@ -106,7 +106,7 @@ class MainWindow : public QMainWindow QMenu *CreateMenu(QString title); //! \brief Start the automatic update checker process - void CheckForUpdates(); + void CheckForUpdates(bool showWhenCurrent); void EnableTabs(bool b); @@ -234,10 +234,8 @@ class MainWindow : public QMainWindow //! \brief Opens and/or shows the Oximetry page void on_oximetryButton_clicked(); - //! \brief Creates the UpdaterWindow object that actually does the real check for updates -#ifndef NO_UPDATER - void on_actionCheck_for_Updates_triggered(); -#endif + //! \brief Creates the CheckUpdates object that actually does the real check for updates + void on_action_Check_for_Updates_triggered(); //! \brief Attempts to do a screenshot of the application window void on_action_Screenshot_triggered(); diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui index fa4933e1..df56f053 100644 --- a/oscar/mainwindow.ui +++ b/oscar/mainwindow.ui @@ -1211,8 +1211,8 @@ QToolBox::tab:selected { 0 0 - 174 - 687 + 178 + 685 @@ -1669,8 +1669,8 @@ border: 2px solid #56789a; border-radius: 30px; 0 0 - 174 - 687 + 178 + 685 @@ -2713,8 +2713,8 @@ border-radius: 10px; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';"><br /></p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.84158pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;"><br /></p></body></html> false @@ -2728,8 +2728,8 @@ p, li { white-space: pre-wrap; } 0 0 - 174 - 687 + 178 + 685 @@ -2770,8 +2770,8 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';"><br /></p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.84158pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;"><br /></p></body></html> false @@ -2791,7 +2791,7 @@ p, li { white-space: pre-wrap; } 0 0 1023 - 21 + 23 @@ -2836,9 +2836,9 @@ p, li { white-space: pre-wrap; } - + @@ -2871,6 +2871,8 @@ p, li { white-space: pre-wrap; } + + @@ -3299,6 +3301,17 @@ p, li { white-space: pre-wrap; } Show Personal Data + + + true + + + Check For &Updates + + + true + + diff --git a/oscar/oscar.pro b/oscar/oscar.pro index c0c6ea9d..4d0c51dd 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -23,7 +23,9 @@ contains(DEFINES, helpless) { } DEFINES += QT_DEPRECATED_WARNINGS -DEFINES += NO_UPDATER + +# Enable this to turn off Check for Updates feature +# DEFINES += NO_CHECKUPDATES #OSCAR requires OpenGL 2.0 support to run smoothly #On platforms where it's not available, it can still be built to work @@ -246,6 +248,7 @@ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,12) { } SOURCES += \ + checkupdates.cpp \ common_gui.cpp \ cprogressbar.cpp \ daily.cpp \ @@ -258,8 +261,7 @@ SOURCES += \ profileselect.cpp \ reports.cpp \ sessionbar.cpp \ - updateparser.cpp \ - UpdaterWindow.cpp \ +# updateparser.cpp \ version.cpp \ Graphs/gFlagsLine.cpp \ Graphs/gFooBar.cpp \ @@ -325,6 +327,7 @@ SOURCES += \ } HEADERS += \ + checkupdates.h \ common_gui.h \ cprogressbar.h \ daily.h \ @@ -336,8 +339,7 @@ HEADERS += \ profileselect.h \ reports.h \ sessionbar.h \ - updateparser.h \ - UpdaterWindow.h \ +# updateparser.h \ version.h \ VERSION \ Graphs/gFlagsLine.h \ @@ -414,7 +416,7 @@ FORMS += \ profileselect.ui \ newprofile.ui \ exportcsv.ui \ - UpdaterWindow.ui \ +# UpdaterWindow.ui \ oximeterimport.ui \ profileselector.ui \ aboutdialog.ui \ diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index b8cc61c9..a20175de 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -22,6 +22,7 @@ #include #include "preferencesdialog.h" +#include "version.h" #include #include @@ -218,10 +219,26 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->includeSerial->setChecked(AppSetting->includeSerial()); ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport()); -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES + ui->test_invite->setVisible(false); + if (!getVersion().IsReleaseVersion()) { + // Test version + ui->automaticallyCheckUpdates->setVisible(false); + ui->allowEarlyUpdates->setVisible(false); + ui->updateCheckEvery->setMaximum(min(7,AppSetting->updateCheckFrequency())); + } + else { + // Release version + ui->updateCheckEvery->setMaximum(min(90,AppSetting->updateCheckFrequency())); + ui->always_look_for_updates->setVisible(false); + if (!AppSetting->allowEarlyUpdates()) { + ui->test_invite->setVisible(true); + ui->allowEarlyUpdates->setVisible(false); + } + } ui->allowEarlyUpdates->setChecked(AppSetting->allowEarlyUpdates()); #else - ui->automaticallyCheckUpdates->setVisible(false); + ui->automaticallyCheckUpdates_GroupBox->setVisible(false); #endif int s = profile->cpap->clockDrift(); @@ -266,7 +283,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->graphHeight->setValue(AppSetting->graphHeight()); -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES ui->automaticallyCheckUpdates->setChecked(AppSetting->updatesAutoCheck()); ui->updateCheckEvery->setValue(AppSetting->updateCheckFrequency()); if (AppSetting->updatesLastChecked().isValid()) { @@ -901,7 +918,7 @@ bool PreferencesDialog::Save() AppSetting->setAutoLaunchImport(ui->autoLaunchImporter->isChecked()); -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES AppSetting->setUpdatesAutoCheck(ui->automaticallyCheckUpdates->isChecked()); AppSetting->setUpdateCheckFrequency(ui->updateCheckEvery->value()); AppSetting->setAllowEarlyUpdates(ui->allowEarlyUpdates->isChecked()); @@ -1058,18 +1075,13 @@ void PreferencesDialog::on_IgnoreSlider_valueChanged(int position) } else { ui->IgnoreLCD->display(STR_TR_Off); } } -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES #include "mainwindow.h" extern MainWindow *mainwin; void PreferencesDialog::RefreshLastChecked() { ui->updateLastChecked->setText(AppSetting->updatesLastChecked().toString(Qt::SystemLocaleLongDate)); } - -void PreferencesDialog::on_checkForUpdatesButton_clicked() -{ - mainwin->CheckForUpdates(); -} #endif MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent) diff --git a/oscar/preferencesdialog.h b/oscar/preferencesdialog.h index fdebac10..cc8d9949 100644 --- a/oscar/preferencesdialog.h +++ b/oscar/preferencesdialog.h @@ -52,7 +52,7 @@ class PreferencesDialog : public QDialog //! \brief Save the current preferences, called when Ok button is clicked on. bool Save(); -#ifndef NO_UPDATER +#ifndef NO_CHECKUPDATES //! \brief Updates the date text of the last time updates where checked void RefreshLastChecked(); #endif @@ -62,10 +62,6 @@ class PreferencesDialog : public QDialog void on_IgnoreSlider_valueChanged(int value); -#ifndef NO_UPDATER - void on_checkForUpdatesButton_clicked(); -#endif - //void on_genOpWidget_itemActivated(QListWidgetItem *item); void on_createSDBackups_toggled(bool checked); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 5b8d29cb..c7c68fb7 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -10,7 +10,7 @@ 0 0 942 - 650 + 651 @@ -57,7 +57,7 @@ - 3 + 5 @@ -2057,7 +2057,7 @@ Mainly affects the importer. - + 0 @@ -2065,12 +2065,43 @@ Mainly affects the importer. - Automatically Check For Updates + Check For Updates - true + false + + + + + 0 + 0 + + + + You are using a test version of OSCAR. Test versions check for updates automatically at least once every seven days. You may set the interval to less than seven days. + + + true + + + + + + + + 50 + false + false + false + + + + Automatically check for updates + + + @@ -2089,7 +2120,7 @@ Mainly affects the importer. - Sourceforge hosts this project for free.. Please be considerate of their resources.. + How often OSCAR should check for updates. 90 @@ -2122,64 +2153,6 @@ Mainly affects the importer. - - - - - - - - - 0 - 0 - 255 - - - - - - - - - 0 - 0 - 255 - - - - - - - - - 118 - 118 - 117 - - - - - - - - - 50 - false - false - true - - - - &Check for Updates now - - - Qt::ToolButtonTextOnly - - - true - - - @@ -2228,16 +2201,29 @@ Mainly affects the importer. - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If your interested in helping test new features and bugfixes early, click here.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">But please be warned this will sometimes mean breaky code..</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> + If you are interested in helping test new features and bugfixes early, click here. - I want to try experimental and test builds (Advanced users only please.) + I want to try experimental and test builds. (Advanced users only please.) + + + + + + + + 0 + 0 + + + + If you would like to help test early versions of OSCAR, please see the Wiki page about testing OSCAR. We welcome everyone who would like to test OSCAR, help develop OSCAR, and help with translations to existing or new languages. https://www.sleepfiles.com/OSCAR + + + true + + + true