From 6d65611cafb5bffa98a3080ff2326b500d9bb7ca Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 9 Apr 2014 15:00:34 +1000 Subject: [PATCH] Fix startup crash and correct SleepyHead spelling inconsistencies (Thanks Sean) --- Translations/Bulgarian.bg.ts | 10 +++++----- Translations/Deutsch.de_DE.ts | 10 +++++----- Translations/Espaniol.es.ts | 10 +++++----- Translations/Francais.fr.ts | 10 +++++----- Translations/Nederlands.nl.ts | 10 +++++----- Translations/Svenska.se.ts | 10 +++++----- sleepyhead/Graphs/gGraphView.cpp | 4 ++-- sleepyhead/SleepLib/calcs.cpp | 3 +++ sleepyhead/SleepLib/machine_common.h | 2 +- sleepyhead/daily.cpp | 2 +- sleepyhead/main.cpp | 4 ++-- sleepyhead/mainwindow.cpp | 2 +- sleepyhead/mainwindow.h | 2 +- sleepyhead/mainwindow.ui | 6 +++--- sleepyhead/preferencesdialog.ui | 2 +- 15 files changed, 45 insertions(+), 42 deletions(-) diff --git a/Translations/Bulgarian.bg.ts b/Translations/Bulgarian.bg.ts index 4ded8df5..e6fd7b3a 100644 --- a/Translations/Bulgarian.bg.ts +++ b/Translations/Bulgarian.bg.ts @@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked. + Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked. @@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - &Support Sleepyhead Development + &Support SleepyHead Development @@ -2149,7 +2149,7 @@ p, li { white-space: pre-wrap; } ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days.. -Sleepyhead can keep a copy of this data if you ever need to reinstall. +SleepyHead can keep a copy of this data if you ever need to reinstall. (Highly recomended, unless your short on disk space or don't care about the graph data) @@ -4011,14 +4011,14 @@ This folder currently resides at the following location: No SleepyHead data folder was found. -Would you like SleepyHead to use the default location for storing it's data? +Would you like SleepyHead to use the default location for storing its data? - Choose or create new folder for Sleepyhead data + Choose or create new folder for SleepyHead data diff --git a/Translations/Deutsch.de_DE.ts b/Translations/Deutsch.de_DE.ts index 82414357..f82235a5 100644 --- a/Translations/Deutsch.de_DE.ts +++ b/Translations/Deutsch.de_DE.ts @@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked. + Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked. @@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - &Support Sleepyhead Development + &Support SleepyHead Development @@ -2149,7 +2149,7 @@ p, li { white-space: pre-wrap; } ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days.. -Sleepyhead can keep a copy of this data if you ever need to reinstall. +SleepyHead can keep a copy of this data if you ever need to reinstall. (Highly recomended, unless your short on disk space or don't care about the graph data) @@ -4011,14 +4011,14 @@ This folder currently resides at the following location: No SleepyHead data folder was found. -Would you like SleepyHead to use the default location for storing it's data? +Would you like SleepyHead to use the default location for storing its data? - Choose or create new folder for Sleepyhead data + Choose or create new folder for SleepyHead data diff --git a/Translations/Espaniol.es.ts b/Translations/Espaniol.es.ts index f7783d05..b3360c5c 100644 --- a/Translations/Espaniol.es.ts +++ b/Translations/Espaniol.es.ts @@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked. + Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked. @@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - &Support Sleepyhead Development + &Support SleepyHead Development @@ -2149,7 +2149,7 @@ p, li { white-space: pre-wrap; } ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days.. -Sleepyhead can keep a copy of this data if you ever need to reinstall. +SleepyHead can keep a copy of this data if you ever need to reinstall. (Highly recomended, unless your short on disk space or don't care about the graph data) @@ -4011,14 +4011,14 @@ This folder currently resides at the following location: No SleepyHead data folder was found. -Would you like SleepyHead to use the default location for storing it's data? +Would you like SleepyHead to use the default location for storing its data? - Choose or create new folder for Sleepyhead data + Choose or create new folder for SleepyHead data diff --git a/Translations/Francais.fr.ts b/Translations/Francais.fr.ts index f0058fea..3c07a7d9 100644 --- a/Translations/Francais.fr.ts +++ b/Translations/Francais.fr.ts @@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked. + Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked. @@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - &Support Sleepyhead Development + &Support SleepyHead Development @@ -2149,7 +2149,7 @@ p, li { white-space: pre-wrap; } ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days.. -Sleepyhead can keep a copy of this data if you ever need to reinstall. +SleepyHead can keep a copy of this data if you ever need to reinstall. (Highly recomended, unless your short on disk space or don't care about the graph data) @@ -4011,14 +4011,14 @@ This folder currently resides at the following location: No SleepyHead data folder was found. -Would you like SleepyHead to use the default location for storing it's data? +Would you like SleepyHead to use the default location for storing its data? - Choose or create new folder for Sleepyhead data + Choose or create new folder for SleepyHead data diff --git a/Translations/Nederlands.nl.ts b/Translations/Nederlands.nl.ts index 4734abc0..cd84abaf 100644 --- a/Translations/Nederlands.nl.ts +++ b/Translations/Nederlands.nl.ts @@ -505,7 +505,7 @@ CA is Clear Airway, wat gelijk staat met Centrale Apneu - Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked. + Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked. WJG: spelling oxymetrie (zie Van Dale) AK: mee eens Oxymetriegegevens beschikbaar, maar de tijden verschillen teveel: de grafieken worden niet verbonden. @@ -1388,7 +1388,7 @@ AK: Waar staat dat Welkomst-/Startscherm??? - &Support Sleepyhead Development + &Support SleepyHead Development &Help bij ontwikkeling SleepyHead @@ -3227,7 +3227,7 @@ p, li { white-space: pre-wrap; } ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days.. -Sleepyhead can keep a copy of this data if you ever need to reinstall. +SleepyHead can keep a copy of this data if you ever need to reinstall. (Highly recomended, unless your short on disk space or don't care about the graph data) WJG: kleine spellingsdingetjes, o.a. de twee hoofdletters in SleepyHead; die Mark is zelf niet altijd consistent, maar het is dan ook geen linguïst AK: <grin> @@ -5264,7 +5264,7 @@ De map vind je op: No SleepyHead data folder was found. -Would you like SleepyHead to use the default location for storing it's data? +Would you like SleepyHead to use the default location for storing its data? Geen SleepyHeadData folder gevonden. @@ -5275,7 +5275,7 @@ Wil je dat SleepyHead de standaard lokatie gebruikt voor gegevensopslag? - Choose or create new folder for Sleepyhead data + Choose or create new folder for SleepyHead data Kies of maak een nieuwe folder voor SleepyHeadData diff --git a/Translations/Svenska.se.ts b/Translations/Svenska.se.ts index bbf07a89..c7b840a6 100644 --- a/Translations/Svenska.se.ts +++ b/Translations/Svenska.se.ts @@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked. + Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked. @@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import - &Support Sleepyhead Development + &Support SleepyHead Development @@ -2149,7 +2149,7 @@ p, li { white-space: pre-wrap; } ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days.. -Sleepyhead can keep a copy of this data if you ever need to reinstall. +SleepyHead can keep a copy of this data if you ever need to reinstall. (Highly recomended, unless your short on disk space or don't care about the graph data) @@ -4011,14 +4011,14 @@ This folder currently resides at the following location: No SleepyHead data folder was found. -Would you like SleepyHead to use the default location for storing it's data? +Would you like SleepyHead to use the default location for storing its data? - Choose or create new folder for Sleepyhead data + Choose or create new folder for SleepyHead data diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index f008d6a6..b6d6703d 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -3177,10 +3177,10 @@ bool gGraphView::renderGraphs() // glEnable(GL_BLEND); //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBegin(GL_QUADS); - glColor4f(0.99,0.99,1.0,1.0); // Gradient start + glColor4f(0.85,0.85,1.0,1.0); // Gradient End glVertex2f(0, pinned_height); glVertex2f(0, 0); - glColor4f(0.85,0.85,1.0,1.0); // Gradient End + glColor4f(1.0, 1.0, 1.0, 1.0); // Gradient start glVertex2f(width(), 0); glVertex2f(width(), pinned_height); glEnd(); diff --git a/sleepyhead/SleepLib/calcs.cpp b/sleepyhead/SleepLib/calcs.cpp index 9a67b7cc..12fff0d1 100644 --- a/sleepyhead/SleepLib/calcs.cpp +++ b/sleepyhead/SleepLib/calcs.cpp @@ -1006,6 +1006,9 @@ void zMaskProfile::load(Profile * profile) } void zMaskProfile::save() { + if (m_filename.isEmpty()) + return; + QFile f(m_filename); if (!f.open(QFile::WriteOnly)) return; diff --git a/sleepyhead/SleepLib/machine_common.h b/sleepyhead/SleepLib/machine_common.h index 259b2a91..6168a992 100644 --- a/sleepyhead/SleepLib/machine_common.h +++ b/sleepyhead/SleepLib/machine_common.h @@ -28,7 +28,7 @@ class BoundsError {}; //! \brief Exception class for to trap old database versions. class OldDBVersion {}; -const quint32 magic=0xC73216AB; // Magic number for Sleepyhead Data Files.. Don't touch! +const quint32 magic=0xC73216AB; // Magic number for SleepyHead Data Files.. Don't touch! //const int max_number_event_fields=10; // This should probably move somewhere else diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 2bb1c5c7..4a7fa8a5 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -1156,7 +1156,7 @@ void Daily::Load(QDate date) int gr; if (qAbs(cpap->first() - oxi->first())>30000) { - mainwin->Notify(tr("Oximetry data exists for this day, however it's timestamps are too different, so the Graphs will not be linked."),"",3000); + mainwin->Notify(tr("Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked."),"",3000); gr=1; } else gr=0; diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp index 5fa6495b..f281a579 100644 --- a/sleepyhead/main.cpp +++ b/sleepyhead/main.cpp @@ -266,7 +266,7 @@ int main(int argc, char *argv[]) } if (!havefolder && !force_data_dir) { - if (QMessageBox::question(NULL,QObject::tr("Question"),QObject::tr("No SleepyHead data folder was found.\n\nWould you like SleepyHead to use the default location for storing it's data?\n\n")+GetAppRoot(),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) { + if (QMessageBox::question(NULL,QObject::tr("Question"),QObject::tr("No SleepyHead data folder was found.\n\nWould you like SleepyHead to use the default location for storing its data?\n\n")+GetAppRoot(),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) { settings.setValue("Settings/AppRoot",GetAppRoot()); change_data_dir=false; } @@ -274,7 +274,7 @@ int main(int argc, char *argv[]) retry_directory: if (change_data_dir) { - QString datadir=QFileDialog::getExistingDirectory(NULL,QObject::tr("Choose or create new folder for Sleepyhead data"),GetAppRoot(),QFileDialog::ShowDirsOnly); + QString datadir=QFileDialog::getExistingDirectory(NULL,QObject::tr("Choose or create new folder for SleepyHead data"),GetAppRoot(),QFileDialog::ShowDirsOnly); if (datadir.isEmpty()) { if (!havefolder) { QMessageBox::information(NULL,QObject::tr("Exiting"),QObject::tr("As you did not select a data folder, SleepyHead will exit.\n\nNext time you run, you will be asked again.")); diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 8ffbe021..b4ef8900 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -1460,7 +1460,7 @@ void MainWindow::on_actionSleep_Disorder_Terms_Glossary_triggered() ui->tabWidget->setCurrentWidget(ui->helpTab); } -void MainWindow::on_actionHelp_Support_Sleepyhead_Development_triggered() +void MainWindow::on_actionHelp_Support_SleepyHead_Development_triggered() { QUrl url=QUrl("http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Support_SleepyHead_Development"); QDesktopServices().openUrl(url); diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index 9d4929f4..d5ed7536 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -292,7 +292,7 @@ private slots: void on_actionSleep_Disorder_Terms_Glossary_triggered(); - void on_actionHelp_Support_Sleepyhead_Development_triggered(); + void on_actionHelp_Support_SleepyHead_Development_triggered(); void aboutBoxLinkClicked(const QUrl & url); diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index 0f7d50fa..a0af5610 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -2156,7 +2156,7 @@ border-radius: 10px; - + @@ -2389,9 +2389,9 @@ border-radius: 10px; Import RemStar &MSeries Data - + - &Support Sleepyhead Development + &Support SleepyHead Development diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index 0d159463..56d263ad 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -342,7 +342,7 @@ p, li { white-space: pre-wrap; } ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days.. -Sleepyhead can keep a copy of this data if you ever need to reinstall. +SleepyHead can keep a copy of this data if you ever need to reinstall. (Highly recomended, unless your short on disk space or don't care about the graph data)