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

Changed SleepApp folder to SleepyHeadData, Renamed hexid machine folders so they are recognizable, and version bumped to the start of the 0.9 BETA cycle.

Browse Source
This commit is contained in:
Mark Watkins 2011-12-22 20:29:12 +10:00
parent 8668096b32
commit 565d0c5c31
22 changed files with 111 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SleepLib/common.h
View File

@ -39,6 +39,7 @@ const QString STR_PROP_ModelNumber="ModelNumber";
const QString STR_PROP_SubModel="SubModel"; const QString STR_PROP_SubModel="SubModel";
const QString STR_PROP_Serial="Serial"; const QString STR_PROP_Serial="Serial";
const QString STR_PROP_DataVersion="DataVersion"; const QString STR_PROP_DataVersion="DataVersion";
const QString STR_PROP_Path="Path";
const QString STR_MACH_ResMed="ResMed"; const QString STR_MACH_ResMed="ResMed";
const QString STR_MACH_PRS1="PRS1"; const QString STR_MACH_PRS1="PRS1";

1
SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -328,6 +328,7 @@ Machine *CMS50Loader::CreateMachine(Profile *profile)
a.sprintf("%i",cms50_data_version); a.sprintf("%i",cms50_data_version);
m->properties[STR_PROP_DataVersion]=a; m->properties[STR_PROP_DataVersion]=a;
profile->AddMachine(m); profile->AddMachine(m);
m->properties[STR_PROP_Path]="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+m->hexid()+"/";
return m; return m;
} }

2
SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -369,6 +369,8 @@ Machine *IntellipapLoader::CreateMachine(QString serial,Profile *profile)
profile->AddMachine(m); profile->AddMachine(m);
m->properties[STR_PROP_Serial]=serial; m->properties[STR_PROP_Serial]=serial;
m->properties[STR_PROP_Path]="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+serial+"/";
return m; return m;
} }

2
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -152,6 +152,8 @@ Machine *PRS1Loader::CreateMachine(QString serial,Profile *profile)
profile->AddMachine(m); profile->AddMachine(m);
m->properties[STR_PROP_Serial]=serial; m->properties[STR_PROP_Serial]=serial;
m->properties[STR_PROP_Path]="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+serial+"/";;
return m; return m;
} }
bool isdigit(QChar c) bool isdigit(QChar c)

1
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -242,6 +242,7 @@ Machine *ResmedLoader::CreateMachine(QString serial,Profile *profile)
QString a; QString a;
a.sprintf("%i",resmed_data_version); a.sprintf("%i",resmed_data_version);
m->properties[STR_PROP_DataVersion]=a; m->properties[STR_PROP_DataVersion]=a;
m->properties[STR_PROP_Path]="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+serial+"/";
return m; return m;

1
SleepLib/loader_plugins/zeo_loader.cpp
View File

@ -80,6 +80,7 @@ Machine *ZEOLoader::CreateMachine(Profile *profile)
m->properties[STR_PROP_DataVersion]=s; m->properties[STR_PROP_DataVersion]=s;
profile->AddMachine(m); profile->AddMachine(m);
m->properties[STR_PROP_Path]="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+m->hexid()+"/";
return m; return m;
} }

10
SleepLib/machine.cpp
View File

@ -171,7 +171,9 @@ bool Machine::Purge(int secret)
// It would be joyous if this function screwed up.. // It would be joyous if this function screwed up..
QString path=profile->Get(STR_GEN_DataFolder)+"/"+hexid();
QString path=profile->Get(properties[STR_PROP_Path]); //STR_GEN_DataFolder)+"/"+m_class+"_";
//if (properties.contains(STR_PROP_Serial)) path+=properties[STR_PROP_Serial]; else path+=hexid();
QDir dir(path); QDir dir(path);
@ -216,7 +218,7 @@ const quint32 channel_version=1;
bool Machine::Load() bool Machine::Load()
{ {
QString path=profile->Get(STR_GEN_DataFolder)+"/"+hexid(); QString path=profile->Get(properties[STR_PROP_Path]); //STR_GEN_DataFolder)+"/"+m_class+"_"+hexid();
QDir dir(path); QDir dir(path);
qDebug() << "Loading " << path; qDebug() << "Loading " << path;
@ -272,7 +274,7 @@ bool Machine::Load()
} }
bool Machine::SaveSession(Session *sess) bool Machine::SaveSession(Session *sess)
{ {
QString path=profile->Get(STR_GEN_DataFolder)+"/"+hexid(); QString path=profile->Get(properties[STR_PROP_Path]); //STR_GEN_DataFolder)+"/"+m_class+"_"+hexid();
if (sess->IsChanged()) sess->Store(path); if (sess->IsChanged()) sess->Store(path);
return true; return true;
} }
@ -282,7 +284,7 @@ bool Machine::Save()
//int size; //int size;
int cnt=0; int cnt=0;
QString path=profile->Get(STR_GEN_DataFolder)+"/"+hexid(); QString path=profile->Get(properties[STR_PROP_Path]); //STR_GEN_DataFolder)+"/"+m_class+"_"+hexid();
QDir dir(path); QDir dir(path);
if (!dir.exists()) { if (!dir.exists()) {
dir.mkdir(path); dir.mkdir(path);

2
SleepLib/preferences.h
View File

@ -19,7 +19,7 @@ License: GPL
const QString AppName="SleepyHead"; // Outer tag of XML files const QString AppName="SleepyHead"; // Outer tag of XML files
const QString AppRoot="SleepApp"; // The Folder Name const QString AppRoot="SleepyHeadData"; // The Folder Name
extern const QString & GetAppRoot(); //returns app root path plus trailing path separator. extern const QString & GetAppRoot(); //returns app root path plus trailing path separator.

4
SleepLib/profiles.cpp
View File

@ -283,11 +283,10 @@ QDomElement Profile::ExtraSave(QDomDocument & doc)
for (QHash<MachineID,Machine *>::iterator i=machlist.begin(); i!=machlist.end(); i++) { for (QHash<MachineID,Machine *>::iterator i=machlist.begin(); i!=machlist.end(); i++) {
QDomElement me=doc.createElement("Machine"); QDomElement me=doc.createElement("Machine");
Machine *m=i.value(); Machine *m=i.value();
//QString t=wxT("0x")+m->hexid();
me.setAttribute("id",(int)m->id()); me.setAttribute("id",(int)m->id());
me.setAttribute("type",(int)m->GetType()); me.setAttribute("type",(int)m->GetType());
me.setAttribute("class",m->GetClass()); me.setAttribute("class",m->GetClass());
i.value()->properties["path"]="{DataFolder}/"+m->hexid(); if (!m->properties.contains(STR_PROP_Path)) m->properties[STR_PROP_Path]="{DataFolder}/"+m->GetClass()+"_"+m->hexid();
for (QHash<QString,QString>::iterator j=i.value()->properties.begin(); j!=i.value()->properties.end(); j++) { for (QHash<QString,QString>::iterator j=i.value()->properties.begin(); j!=i.value()->properties.end(); j++) {
QDomElement mp=doc.createElement(j.key()); QDomElement mp=doc.createElement(j.key());
@ -474,6 +473,7 @@ Profile *Create(QString name)
Machine *m=new Machine(prof,0); Machine *m=new Machine(prof,0);
m->SetClass("Journal"); m->SetClass("Journal");
m->properties[STR_PROP_Brand]="Virtual"; m->properties[STR_PROP_Brand]="Virtual";
m->properties[STR_PROP_Path]="{DataFolder}/"+m->GetClass()+"_"+m->hexid();
m->SetType(MT_JOURNAL); m->SetType(MT_JOURNAL);
prof->AddMachine(m); prof->AddMachine(m);

13
UpdaterWindow.cpp
View File

@ -189,8 +189,9 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev)
break; break;
} else release=NULL; } else release=NULL;
} }
if (!release || (VersionString() > release->version)) { if (!release || (VersionString > release->version)) {
mainwin->Notify(tr("No updates were found for your platform."),tr("SleepyHead Updates"),5000); mainwin->Notify(tr("No updates were found for your platform."),tr("SleepyHead Updates"),5000);
PREF[STR_GEN_UpdatesLastChecked]=QDateTime::currentDateTime();
close(); close();
return; return;
} }
@ -220,7 +221,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev)
if (upq && (upq->version > QT_VERSION_STR)) { if (upq && (upq->version > QT_VERSION_STR)) {
updates.push_back(upq); updates.push_back(upq);
} }
if (upd && upd->version > VersionString()) { if (upd && upd->version > VersionString) {
updates.push_back(upd); updates.push_back(upd);
} }
@ -231,13 +232,13 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev)
html+=" "+tr("platform notes")+"</b><p>"+release->notes[platform]+"</p></html>"; html+=" "+tr("platform notes")+"</b><p>"+release->notes[platform]+"</p></html>";
ui->webView->setHtml(html); ui->webView->setHtml(html);
QString info; QString info;
if (VersionString()< release->version) { if (VersionString < release->version) {
ui->Title->setText("<font size=+1>"+tr("A new version of SleepyHead is available!")+"</font>"); ui->Title->setText("<font size=+1>"+tr("A new version of SleepyHead is available!")+"</font>");
info=tr("Shiny new <b>v%1</b> is available. You're running old and busted v%2").arg(latestapp).arg(VersionString()); info=tr("Shiny new <b>v%1</b> is available. You're running old and busted v%2").arg(latestapp).arg(VersionString);
ui->notesTabWidget->setCurrentIndex(0); ui->notesTabWidget->setCurrentIndex(0);
} else { } else {
ui->Title->setText("<font size=+1>"+tr("An update for SleepyHead is available.")+"</font>"); ui->Title->setText("<font size=+1>"+tr("An update for SleepyHead is available.")+"</font>");
info=tr("Version <b>%1</b> is available. You're currently running v%1").arg(latestapp).arg(VersionString()); info=tr("Version <b>%1</b> is available. You're currently running v%1").arg(latestapp).arg(VersionString);
ui->notesTabWidget->setCurrentIndex(1); ui->notesTabWidget->setCurrentIndex(1);
} }
ui->versionInfo->setText(info); ui->versionInfo->setText(info);
@ -245,7 +246,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice * dev)
QString notes; QString notes;
for (int i=0;i<release->updates[platform].size();i++) { for (int i=0;i<release->updates[platform].size();i++) {
update=&release->updates[platform][i]; update=&release->updates[platform][i];
if ((update->type=="application") && (update->version > VersionString())) { if ((update->type=="application") && (update->version > VersionString)) {
notes+="<b>"+tr("SleepyHead v%1 build notes").arg(update->version)+"</b><br/>"+update->notes.trimmed()+"<br/><br/>"; notes+="<b>"+tr("SleepyHead v%1 build notes").arg(update->version)+"</b><br/>"+update->notes.trimmed()+"<br/><br/>";
} else if ((update->type=="qtlibs") && (update->version > QT_VERSION_STR)) { } else if ((update->type=="qtlibs") && (update->version > QT_VERSION_STR)) {
notes+="<b>"+tr("Update to QtLibs (v%1)").arg(update->version)+"</b><br/>"+update->notes.trimmed(); notes+="<b>"+tr("Update to QtLibs (v%1)").arg(update->version)+"</b><br/>"+update->notes.trimmed();

26
daily.cpp
View File

@ -286,6 +286,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
GraphView->LoadSettings("Daily"); GraphView->LoadSettings("Daily");
emptyToggleArea=new QLabel("No data available for this day",this);
ui->graphToggleArea->addWidget(emptyToggleArea,1,Qt::AlignCenter);
emptyToggleArea->setVisible(false);
for (int i=0;i<GraphView->size();i++) { for (int i=0;i<GraphView->size();i++) {
QString title=(*GraphView)[i]->title(); QString title=(*GraphView)[i]->title();
QPushButton *btn=new QPushButton(title,this); QPushButton *btn=new QPushButton(title,this);
@ -616,6 +619,8 @@ void Daily::Load(QDate date)
UpdateOXIGraphs(oxi); UpdateOXIGraphs(oxi);
UpdateCPAPGraphs(cpap); UpdateCPAPGraphs(cpap);
UpdateEventsTree(ui->treeWidget,cpap); UpdateEventsTree(ui->treeWidget,cpap);
snapGV->setDay(cpap); snapGV->setDay(cpap);
GraphView->ResetBounds(false); GraphView->ResetBounds(false);
//snapGV->ResetBounds(); //snapGV->ResetBounds();
@ -633,13 +638,18 @@ void Daily::Load(QDate date)
} }
//GraphView->redraw(); //GraphView->redraw();
//snapGV->redraw(); //snapGV->redraw();
int graphsAvailable=0;
//RedrawGraphs();
for (int i=0;i<GraphView->size();i++) { for (int i=0;i<GraphView->size();i++) {
QString title=(*GraphView)[i]->title(); QString title=(*GraphView)[i]->title();
GraphToggles[title]->setVisible(!(*GraphView)[i]->isEmpty()); bool empty=(*GraphView)[i]->isEmpty();
if (!empty) graphsAvailable++;
GraphToggles[title]->setVisible(!empty);
} }
emptyToggleArea->setVisible(graphsAvailable==0);
//ui->graphVisibilityToggleArea->setVisible(graphsAvailable>0);
//RedrawGraphs();
QString epr,modestr; QString epr,modestr;
//float iap90,eap90; //float iap90,eap90;
@ -652,10 +662,16 @@ void Daily::Load(QDate date)
if (GraphView->isEmpty()) { if (GraphView->isEmpty()) {
GraphView->setCubeImage(images["brick"]); GraphView->setCubeImage(images["brick"]);
GraphView->setEmptyText(tr("Brick Machine :(")); GraphView->setEmptyText(tr("Brick Machine :("));
isBrick=true; isBrick=true;
} else { } else {
GraphView->setEmptyText(tr("No Data")); if (graphsAvailable==0) {
GraphView->setEmptyText(tr("No Data"));
} else {
GraphView->setEmptyText(tr("Graphs Switched Off"));
}
} }
mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode);
modestr=schema::channel[CPAP_Mode].m_options[mode]; modestr=schema::channel[CPAP_Mode].m_options[mode];

1
daily.h
View File

@ -270,6 +270,7 @@ private:
gGraphView *GraphView,*snapGV; gGraphView *GraphView,*snapGV;
MyScrollBar *scrollbar; MyScrollBar *scrollbar;
QHBoxLayout *layout; QHBoxLayout *layout;
QLabel *emptyToggleArea;
bool ZombieMeterMoved; bool ZombieMeterMoved;
bool BookmarksChanged; bool BookmarksChanged;
}; };

2
daily.ui
View File

@ -730,7 +730,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="graphVisibilityToggleArea">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>

2
docs/channels.xml
View File

@ -1,5 +1,5 @@
<!DOCTYPE Channels> <!DOCTYPE Channels>
<!-- Copy this to SleepApp folder on app start once completed. <!-- Copy this to SleepHeadData folder on app start once completed.
Metric units please.. A conversion system will deal with the other measurement systems Metric units please.. A conversion system will deal with the other measurement systems
English only.. A different translation table will be used.. English only.. A different translation table will be used..
It's only details & label that will be translated. name is used internally. It's only details & label that will be translated. name is used internally.

49
docs/release_notes.html
View File

@ -1,36 +1,43 @@
<html> <html>
<body> <body>
<h1><image src='qrc:/docs/sheep.png' width=64 height=64>SleepyHead v0.8.9</h1> <h1><image src='qrc:/docs/sheep.png' width=64 height=64>SleepyHead v0.9.0 <b>BETA</b></h1>
<p><b>Please Note:</b> <i>This is STILL pre-Beta software. Expect bugs. but less than before :)</i></p>
<p><h2><b>Release Notes</b></h2></p> <p><h2><b>Release Notes</b></h2></p>
<p><i>Beta.. Hooray.. I know it doesn't feel much different :)</i></p>
<p>Getting closer... the multiple sub releases of 0.8.8 stole this ones thunder a bit.</p> <p>What does this mean for SleepyHead you ask? It means now the primary focus has been shifted away from design to smashing bugs.</p>
<p>SleepyHead's database (SleepLib) has had it's final work done on it, and is officially locked. Any changes made from now on will require a full upgrade path.</p>
<p><b>New Features</b></br> <p>Unfortunately it means starting fresh for this series, however the good news is this version can coexist with the old one while you copy your notes over.</p>
<p>There is still some stuff to do, but apart from bug-fixing, it's mostly cosmetic and easy stuff from now on in.</p>
<p><b>New Features:</b></br>
<list> <list>
<li>Auto-Updater for Windows & Mac Platforms</li> <li>Auto-Updater for Windows & Mac Platforms</li>
<li>Plenty PRS1 Bug Fixes.</li> <li>SleepLib database improvements, and lots of other underneath stuff and code cleanups you don't see.</li>
<li>A few graphical improvements.</li>
<li>Plenty of other minor bug fixes.</li> <li>Plenty of other minor bug fixes.</li>
</list> </list></p>
<br/> <p><b>Important Information:</b><br/>
<b>What's still missing/broken?</b><br/>
<list> <list>
<li>The printed reports still need some details and fine tuning.</li> <li>Just to repeat, SleepyHead can't work with the older database format. I tried to make it update, but it didn't go to plan. Sorry.</li>
<li>The mask tab in preferences is just a placeholder for future calculations</li> <li>SleepApp has now been renamed to SleepyHeadData, it still resides in your Documents folder so it's easy to find.</li>
<li>Plenty of bugs. there's a lot of new code this time..</li> </list></p>
<p><b>Planned Improvements for this beta series:</b><br/>
The hard stuffs done, and everything needs time to settle and have the bugs knocked out of it, however there still are some minor tweaks and features in the pipeline...</p>
<list>
<li>The default welcome page will show some overall summary statistics (it will still function as a help browser)</li>
<li>Lots more Performance Optimizations</li>
<li>Graphical tweaks, animations & improvements</li>
<li>Improving the quality of printed report data, and showing more data.</li>
<li>Improving the CSV export feature, and making it more customizable</li>
</list> </list>
<i>But mostly we are talking serious bug smashing time!!!</i>
</p> </p>
<p><b>Problems & Stuff?</b><br/> <p><b>Problems & Stuff?</b><br/>
SourceForge is still the best place to report bugs, especially to do with these binary builds. If your following GIT source, they mailing list is (usually) much quicker in getting my attention.</p> SourceForge is still the best place to report bugs, and this is especially important now we have reached beta. If your following GIT source, they mailing list is still a quicker way of getting my attention.</p>
<p><b>Note:</b> If you experience a crash right after starting this new version, you may need to manually remove the old "SleepApp" folder, which resides under your documents directory.</p>
<p><b>Thanks</b><br/> <p><b>Thanks</b><br/>
Thanks to all the wonderful people who have given their support to this project, be it via donations, Thanks to all of you for the wonderful support you've given, by testing the software, reporting bugs, sharing your data, giving kind words of encouragement, monetary donations, and all the cool suggestions on how to make this project even better. </p>
sharing CPAP data, following GIT source tree, testing binary builds, submitting bug reports, giving ideas for improvement, and general feedback on the CPAP forums.</p> <p>Special thanks to James M. (BreatheJimbo), who has been a huge help in getting things solid, espescially for Apple Mac users.</p>
<p>Special thanks to Jimbo, who has been a huge help in getting this far.</p> <p>I'm very glad I've had the opportunity to share this project with you all.</p>
<p>I very much appreciate all the help and encouragement.</p> <p>Sleep Well, and have fun! Please be safe over these year end holidays.</p>
<p>Sleep Well,</p>
<p>Mark Watkins (JediMark)</p> <p>Mark Watkins (JediMark)</p>
</body> </body>
</html> </html>

6
main.cpp
View File

@ -148,9 +148,9 @@ int main(int argc, char *argv[])
} else { } else {
if (PREF.contains("VersionString")) { if (PREF.contains("VersionString")) {
QString V=PREF["VersionString"].toString(); QString V=PREF["VersionString"].toString();
if (VersionString()>V) { if (VersionString>V) {
release_notes(); 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 SleepApp folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok); //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);
check_updates=false; check_updates=false;
} }
} }
@ -168,7 +168,7 @@ int main(int argc, char *argv[])
} }
} }
} }
PREF["VersionString"]=VersionString(); PREF["VersionString"]=VersionString;
p_profile=Profiles::Get(PREF[STR_GEN_Profile].toString()); p_profile=Profiles::Get(PREF[STR_GEN_Profile].toString());

14
mainwindow.cpp
View File

@ -72,7 +72,7 @@ MainWindow::MainWindow(QWidget *parent) :
logtime.start(); logtime.start();
ui->setupUi(this); ui->setupUi(this);
QString version=VersionString(); QString version=VersionString;
if (QString(GIT_BRANCH)!="master") version+=QString(" ")+QString(GIT_BRANCH); 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())); this->setWindowTitle(tr("SleepyHead")+QString(" v%1 (Profile: %2)").arg(version).arg(PREF[STR_GEN_Profile].toString()));
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
@ -125,7 +125,7 @@ MainWindow::MainWindow(QWidget *parent) :
systray->show(); systray->show();
systraymenu=new QMenu(this); systraymenu=new QMenu(this);
systray->setContextMenu(systraymenu); systray->setContextMenu(systraymenu);
QAction *a=systraymenu->addAction("SleepyHead v"+VersionString()); QAction *a=systraymenu->addAction("SleepyHead v"+VersionString);
a->setEnabled(false); a->setEnabled(false);
systraymenu->addSeparator(); systraymenu->addSeparator();
systraymenu->addAction("&About",this,SLOT(on_action_About_triggered())); systraymenu->addAction("&About",this,SLOT(on_action_About_triggered()));
@ -181,7 +181,7 @@ void MainWindow::Notify(QString s,QString title,int ms)
void MainWindow::Startup() void MainWindow::Startup()
{ {
qDebug() << PREF["AppName"].toString().toAscii()+" v"+VersionString().toAscii() << "built with Qt"<< QT_VERSION_STR << "on" << __DATE__ << __TIME__; qDebug() << PREF["AppName"].toString().toAscii()+" v"+VersionString.toAscii() << "built with Qt"<< QT_VERSION_STR << "on" << __DATE__ << __TIME__;
qstatus->setText(tr("Loading Data")); qstatus->setText(tr("Loading Data"));
qprogress->show(); qprogress->show();
//qstatusbar->showMessage(tr("Loading Data"),0); //qstatusbar->showMessage(tr("Loading Data"),0);
@ -421,12 +421,12 @@ void MainWindow::on_action_About_triggered()
QString gitrev=QString(GIT_REVISION); QString gitrev=QString(GIT_REVISION);
if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev; if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev;
QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3</h2>Build Date: %4 %5<br/>%6<hr>" QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3 (%7)</h2>Build Date: %4 %5<br/>%6<hr>"
"Copyright &copy;2011 Mark Watkins (jedimark) <br> \n" "Copyright &copy;2011 Mark Watkins (jedimark) <br> \n"
"<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>" "<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>"
"This software is released under the GNU Public License <br>" "This software is released under the GNU Public License <br>"
"<i>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." "<i>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."
"</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__).arg(gitrev); "</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus);
QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this); QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this);
msgbox.setTextFormat(Qt::RichText); msgbox.setTextFormat(Qt::RichText);
msgbox.setText(msg); msgbox.setText(msg);
@ -927,7 +927,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
} }
if (first) { if (first) {
QString footer=tr("SleepyHead v%1 - http://sleepyhead.sourceforge.net").arg(VersionString()); QString footer=tr("SleepyHead v%1 - http://sleepyhead.sourceforge.net").arg(VersionString);
QRectF bounds=painter.boundingRect(QRectF(0,virt_height,virt_width,normal_height),footer,QTextOption(Qt::AlignHCenter)); QRectF bounds=painter.boundingRect(QRectF(0,virt_height,virt_width,normal_height),footer,QTextOption(Qt::AlignHCenter));
painter.drawText(bounds,footer,QTextOption(Qt::AlignHCenter)); painter.drawText(bounds,footer,QTextOption(Qt::AlignHCenter));
@ -1112,7 +1112,7 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
Machine *m; Machine *m;
if (day) { if (day) {
m=day->machine; m=day->machine;
QString path=PROFILE.Get(STR_GEN_DataFolder)+QDir::separator()+m->hexid()+QDir::separator(); QString path=PROFILE.Get("{"+STR_GEN_DataFolder+"}/")+m->GetClass()+"_"+m->hexid()+"/";
QVector<Session *>::iterator s; QVector<Session *>::iterator s;

2
mainwindow.h
View File

@ -95,7 +95,7 @@ public:
Mac needs Growl notification system for this to work Mac needs Growl notification system for this to work
*/ */
void Notify(QString s, QString title="SleepyHead v"+VersionString(), int ms=5000); void Notify(QString s, QString title="SleepyHead v"+VersionString, int ms=5000);
/*! \fn gGraphView *snapshotGraph() /*! \fn gGraphView *snapshotGraph()
\brief Returns the current snapshotGraph object used by the report printing system */ \brief Returns the current snapshotGraph object used by the report printing system */

2
newprofile.cpp
View File

@ -71,6 +71,8 @@ NewProfile::NewProfile(QWidget *parent) :
} while(1); } while(1);
f.close(); f.close();
} }
ui->AppTitle->setText("SleepyHead v"+VersionString);
ui->releaseStatus->setText(ReleaseStatus);
} }

17
newprofile.ui
View File

@ -809,7 +809,7 @@ p, li { white-space: pre-wrap; }
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="AppTitle">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -832,6 +832,21 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="releaseStatus">
<property name="font">
<font>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">

4
profileselect.cpp
View File

@ -124,7 +124,7 @@ void ProfileSelect::deleteProfile()
bool reallydelete=false; bool reallydelete=false;
Profile *profile=Profiles::profiles[name]; Profile *profile=Profiles::profiles[name];
if (!profile) { if (!profile) {
QMessageBox::warning(this,tr("WTH???"),tr("If you can read this you need to delete this profile directory manually (It's under Your Documents folder -> SleepApp -> Profiles -> [profile_name])"),QMessageBox::Ok); QMessageBox::warning(this,tr("WTH???"),tr("If you can read this you need to delete this profile directory manually (It's under %1)").arg(GetAppRoot()+"/Profiles/"+PROFILE.user->userName()),QMessageBox::Ok);
return; return;
} }
if (profile->user->hasPassword()) { if (profile->user->hasPassword()) {
@ -156,7 +156,7 @@ void ProfileSelect::deleteProfile()
} else reallydelete=true; } else reallydelete=true;
if (reallydelete) { if (reallydelete) {
QMessageBox::information(this,tr("Whoops."),tr("After all that nagging, I haven't got around to writing this code yet.. For now you can delete the directory in SleepApp -> Profiles -> [profile_name]"),QMessageBox::Ok); QMessageBox::information(this,tr("Whoops."),tr("After all that nagging, I haven't got around to writing this code yet.. For now you can delete the directory in %1").arg(GetAppRoot()+"/Profiles/"+PROFILE.user->userName()),QMessageBox::Ok);
qDebug() << "delete" << name; qDebug() << "delete" << name;
} }
} }

7
version.h
View File

@ -4,10 +4,11 @@
#include <qglobal.h> #include <qglobal.h>
const int major_version=0; const int major_version=0;
const int minor_version=8; const int minor_version=9;
const int revision_number=9; const int revision_number=0;
inline QString VersionString() { return QString().sprintf("%i.%i.%i",major_version,minor_version,revision_number); } const QString VersionString=QString().sprintf("%i.%i.%i",major_version,minor_version,revision_number);
const QString ReleaseStatus="beta";
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
const QString PlatformString="MacOSX"; const QString PlatformString="MacOSX";