diff --git a/Resources.qrc b/Resources.qrc index 6fd1cd1b..00d2e50c 100644 --- a/Resources.qrc +++ b/Resources.qrc @@ -42,5 +42,6 @@ docs/script.js icons/nographs.png icons/sheep.png + docs/update_notes.html diff --git a/SleepLib/common.h b/SleepLib/common.h index 99965551..20f2b45e 100644 --- a/SleepLib/common.h +++ b/SleepLib/common.h @@ -60,6 +60,8 @@ const QString STR_GEN_DataFolder="DataFolder"; const QString STR_GEN_On=QObject::tr("On"); const QString STR_GEN_Off=QObject::tr("Off"); +const QString STR_PREF_AllowEarlyUpdates="AllowEarlyUpdates"; + const QString STR_PROP_Brand="Brand"; const QString STR_PROP_Model="Model"; const QString STR_PROP_ModelNumber="ModelNumber"; diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 14698dd0..471ca5d3 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -602,7 +602,7 @@ bool PRS1Loader::Parse002v5(qint32 sequence, quint32 timestamp, unsigned char *b EventList * TV=session->AddEventList(CPAP_TidalVolume,EVL_Event); EventList * CA=NULL; //session->AddEventList(CPAP_ClearAirway, EVL_Event); - EventList * VS=NULL, * VS2=NULL, * FL=NULL;//,* RE=NULL; + EventList * VS=NULL, * FL=NULL;//,* RE=NULL,* VS2=NULL; //EventList * PRESSURE=NULL; //EventList * PP=NULL; diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index ac185650..2fc64602 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -188,7 +188,8 @@ OTHER_FILES += \ docs/tooltips.css \ docs/script.js \ update.xml \ - docs/changelog.txt + docs/changelog.txt \ + docs/update_notes.html diff --git a/UpdaterWindow.cpp b/UpdaterWindow.cpp index bb829e4c..41c2f431 100644 --- a/UpdaterWindow.cpp +++ b/UpdaterWindow.cpp @@ -171,6 +171,8 @@ 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")); @@ -185,11 +187,13 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev) for (int i=versions.size()-1;i>=0;i--) { QString verstr=versions[i]; release=&updateparser.releases[verstr]; - if (release->updates.contains(platform)) { + if (release->updates.contains(platform) // Valid Release? + && (release->status >= AcceptUpdates) + && (release->version >= VersionString)) { break; } else release=NULL; } - if (!release || (VersionString > release->version)) { + if (!release) { mainwin->Notify(tr("No updates were found for your platform."),tr("SleepyHead Updates"),5000); PREF[STR_GEN_UpdatesLastChecked]=QDateTime::currentDateTime(); close(); @@ -201,19 +205,24 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev) updates.clear(); Update *upd=NULL; Update *upq=NULL; + for (int i=0;iupdates[platform].size();i++) { update=&release->updates[platform][i]; if (update->type=="qtlibs") { qDebug() << "QT Version" << update->version; if (update->version > latestqt) { - latestqt=update->version; - upq=update; + if (update->status >= AcceptUpdates) { + latestqt=update->version; + upq=update; + } } } else if (update->type=="application") { qDebug() << "Application Version" << update->version; if (update->version > latestapp) { - latestapp=update->version; - upd=update; + if (update->status >= AcceptUpdates) { + latestapp=update->version; + upd=update; + } } } } @@ -221,7 +230,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev) if (upq && (upq->version > QT_VERSION_STR)) { updates.push_back(upq); } - if (upd && upd->version > VersionString) { + if (upd && upd->version > FullVersionString) { updates.push_back(upd); } @@ -234,11 +243,11 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev) QString info; if (VersionString < release->version) { ui->Title->setText(""+tr("A new version of SleepyHead is available!")+""); - info=tr("Shiny new v%1 is available. You're running old and busted v%2").arg(latestapp).arg(VersionString); + info=tr("Shiny new v%1 is available. You're running old and busted v%2").arg(latestapp).arg(FullVersionString); ui->notesTabWidget->setCurrentIndex(0); } else { ui->Title->setText(""+tr("An update for SleepyHead is available.")+""); - info=tr("Version %1 is available. You're currently running v%1").arg(latestapp).arg(VersionString); + info=tr("Version %1 is available. You're currently running v%1").arg(latestapp).arg(FullVersionString); ui->notesTabWidget->setCurrentIndex(1); } ui->versionInfo->setText(info); @@ -246,7 +255,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev) QString notes; for (int i=0;iupdates[platform].size();i++) { update=&release->updates[platform][i]; - if ((update->type=="application") && (update->version > VersionString)) { + if ((update->type=="application") && (update->version > FullVersionString)) { notes+=""+tr("SleepyHead 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(); diff --git a/docs/update_notes.html b/docs/update_notes.html new file mode 100644 index 00000000..c4136edd --- /dev/null +++ b/docs/update_notes.html @@ -0,0 +1,19 @@ + + +
+

SleepyHead BETA

+

Update Notes

+
+Changes in this version
+ +
  • Auto-Updater test for Windows & Mac Platforms
    • +
  • Adds Total Leaks Overview chart for PRS1 Users.
    • +
  • Preliminary ZEO CSV Support
    • +
  • Fixes Overview AHI chart showing "No Data" on 0.00 days.
    • +
  • Fixes crash after using Preferences before importing first data.
    • +     + +

    Have fun!

    +

    Mark Watkins (JediMark)

    + + diff --git a/main.cpp b/main.cpp index 4b6b2fbc..0959c898 100644 --- a/main.cpp +++ b/main.cpp @@ -79,6 +79,27 @@ void release_notes() relnotes.exec(); } +void build_notes() +{ + QDialog relnotes; + QVBoxLayout layout(&relnotes); + QWebView web(&relnotes); + relnotes.setWindowTitle("SleepyHead v"+FullVersionString+" Update"); + // Language??? + + web.load(QUrl("qrc:/docs/update_notes.html")); + //web.page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOn); + relnotes.setLayout(&layout); + layout.insertWidget(0,&web,1); + QPushButton okbtn(QObject::tr("&Ok, get on with it.."),&relnotes); + relnotes.connect(&okbtn,SIGNAL(clicked()),SLOT(accept())); + layout.insertWidget(1,&okbtn,1); + layout.setMargin(0); + relnotes.setFixedSize(500,400); + relnotes.exec(); +} + + int main(int argc, char *argv[]) { #ifdef Q_WS_X11 @@ -122,7 +143,7 @@ int main(int argc, char *argv[]) // Skip login screen, unless asked not to on the command line - bool skip_login=(PREF.ExistsAndTrue("SkipLoginScreen")); + bool skip_login=PREF.ExistsAndTrue(STR_GEN_SkipLogin); if (force_login_screen) skip_login=false; // Todo: Make a wrapper for Preference settings, like Profile settings have.. @@ -131,6 +152,9 @@ int main(int argc, char *argv[]) PREF[STR_GEN_UpdatesAutoCheck]=true; PREF[STR_GEN_UpdateCheckFrequency]=7; } + if (!PREF.contains(STR_PREF_AllowEarlyUpdates)) { + PREF[STR_PREF_AllowEarlyUpdates]=false; + } //////////////////////////////////////////////////////////////////////////////////////////// // Check when last checked for updates.. @@ -159,9 +183,16 @@ int main(int argc, char *argv[]) } else { if (PREF.contains("VersionString")) { QString V=PREF["VersionString"].toString(); - if (VersionString>V) { - release_notes(); - //QMessageBox::warning(0,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the "+AppRoot+" folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok); + + if (FullVersionString>V) { + QString V2=V.section("-",0,0); + + if (VersionString>V2) { + release_notes(); + //QMessageBox::warning(0,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the "+AppRoot+" folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok); + } else { + build_notes(); + } check_updates=false; } } @@ -179,7 +210,7 @@ int main(int argc, char *argv[]) } } } - PREF["VersionString"]=VersionString; + PREF["VersionString"]=FullVersionString; p_profile=Profiles::Get(PREF[STR_GEN_Profile].toString()); diff --git a/mainwindow.cpp b/mainwindow.cpp index ee37ea7d..c59f8db3 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -77,7 +77,7 @@ MainWindow::MainWindow(QWidget *parent) : logtime.start(); ui->setupUi(this); - QString version=VersionString; + QString version=FullVersionString; if (QString(GIT_BRANCH)!="master") version+=QString(" ")+QString(GIT_BRANCH); this->setWindowTitle(tr("SleepyHead")+QString(" v%1 (Profile: %2)").arg(version).arg(PREF[STR_GEN_Profile].toString())); //ui->tabWidget->setCurrentIndex(1); @@ -1446,12 +1446,12 @@ void MainWindow::on_action_About_triggered() QString gitrev=QString(GIT_REVISION); if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev; - QString msg=tr("

    SleepyHead v%1.%2.%3 (%7)

    Build Date: %4 %5
    %6
    " + QString msg=tr("

    SleepyHead v%1.%2.%3-%4 (%8)

    Build Date: %5 %6
    %7
    " "Copyright ©2011 Mark Watkins (jedimark)
    \n" "http://sleepyhead.sourceforge.net
    " "This software is released under the GNU Public License
    " "This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays." - "
    ").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus); + "
    ").arg(major_version).arg(minor_version).arg(revision_number).arg(release_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus); QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this); msgbox.setTextFormat(Qt::RichText); msgbox.setText(msg); diff --git a/mainwindow.ui b/mainwindow.ui index 0900270a..d4ef299d 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1559,7 +1559,6 @@ &File - @@ -1617,10 +1616,12 @@ + + - + diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index ae70d698..f672172f 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -158,7 +158,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->useAntiAliasing->setChecked(profile->appearance->antiAliasing()); ui->useSquareWavePlots->setChecked(profile->appearance->squareWavePlots()); ui->enableGraphSnapshots->setChecked(profile->appearance->graphSnapshots()); - ui->skipLoginScreen->setChecked(PREF["SkipLoginScreen"].toBool()); + ui->skipLoginScreen->setChecked(PREF[STR_GEN_SkipLogin].toBool()); + ui->allowEarlyUpdates->setChecked(PREF[STR_PREF_AllowEarlyUpdates].toBool()); ui->skipEmptyDays->setChecked(profile->general->skipEmptyDays()); ui->enableMultithreading->setChecked(profile->session->multithreading()); @@ -395,6 +396,7 @@ bool PreferencesDialog::Save() PREF[STR_GEN_UpdatesAutoCheck]=ui->automaticallyCheckUpdates->isChecked(); PREF[STR_GEN_UpdateCheckFrequency]=ui->updateCheckEvery->value(); + PREF[STR_PREF_AllowEarlyUpdates]=ui->allowEarlyUpdates->isChecked(); PREF["Fonts_Application_Name"]=ui->applicationFont->currentText(); PREF["Fonts_Application_Size"]=ui->applicationFontSize->value(); diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 822efb5e..d0c1f117 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -1605,6 +1605,22 @@ 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> + + + Allow experimental and test builds (Advanced users only please.) + + + diff --git a/update.xml b/update.xml index 7667442c..96140922 100644 --- a/update.xml +++ b/update.xml @@ -1,12 +1,12 @@ - + - + @@ -14,7 +14,7 @@ Initial v0.9.1 release. - + diff --git a/updateparser.cpp b/updateparser.cpp index caaa6781..432966ea 100644 --- a/updateparser.cpp +++ b/updateparser.cpp @@ -68,6 +68,17 @@ bool UpdateParser::characters(const QString &ch) return true; } +UpdateStatus lookupUpdateStatus(QString stat) +{ + UpdateStatus status=UPDATE_TESTING; + + if (stat=="testing") status=UPDATE_TESTING; + else if (stat=="beta") status=UPDATE_BETA; + else if (stat=="stable") status=UPDATE_STABLE; + else if (stat=="critical") status=UPDATE_CRITICAL; + + return status; +} bool UpdateParser::startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts) { Q_UNUSED(namespaceURI) @@ -75,6 +86,7 @@ bool UpdateParser::startElement(const QString &namespaceURI, const QString &loca QString name=qName.toLower(); if (inRelease && name=="update") { QString ver, type; + UpdateStatus updatestatus=UPDATE_TESTING; for (int i=0;iupdates[platform].push_back(Update(type,ver,platform,date)); update=&release->updates[platform][release->updates[platform].size()-1]; + update->status=updatestatus; inUpdate=true; } else if (inRelease && name=="info") { QString tmp=atts.value("url"); @@ -121,14 +137,16 @@ bool UpdateParser::startElement(const QString &namespaceURI, const QString &loca inNotes=true; } else if (name=="release") { inRelease=true; - QString codename,status; + QString codename; + UpdateStatus status=UPDATE_TESTING; for (int i=0;i #include +enum UpdateStatus { UPDATE_TESTING=0, UPDATE_BETA, UPDATE_STABLE, UPDATE_CRITICAL }; + /*! \struct Update \brief Holds platform specific information about an individual updates */ @@ -17,6 +19,7 @@ public: QString type; QString version; QString platform; + UpdateStatus status; QDate date; QString filename; QString url; @@ -41,10 +44,10 @@ struct Release updates=copy.updates; } - Release(QString ver, QString code, QString stat) { version=ver; codename=code; status=stat; } + Release(QString ver, QString code, UpdateStatus stat) { version=ver; codename=code; status=stat; } QString version; QString codename; - QString status; + UpdateStatus status; QString info_url; QHash notes; // by platform QHash > updates; diff --git a/version.h b/version.h index a802a2b1..e739d231 100644 --- a/version.h +++ b/version.h @@ -5,9 +5,12 @@ const int major_version=0; const int minor_version=9; -const int revision_number=1; +const int revision_number=2; +const int release_number=1; const QString VersionString=QString().sprintf("%i.%i.%i",major_version,minor_version,revision_number); +const QString FullVersionString=QString().sprintf("%i.%i.%i-%i",major_version,minor_version,revision_number,release_number); + const QString ReleaseStatus="beta"; #ifdef Q_WS_MAC