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

Fix startup crash and correct SleepyHead spelling inconsistencies (Thanks Sean)

Browse Source
This commit is contained in:
Mark Watkins 2014-04-09 15:00:34 +10:00
parent c0ecc640d3
commit 6d65611caf
15 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Translations/Bulgarian.bg.ts
View File

@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/daily.cpp" line="1159"/>
<source>Oximetry data exists for this day, however it&apos;s timestamps are too different, so the Graphs will not be linked.</source>
<source>Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked.</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/mainwindow.ui" line="2394"/>
<source>&amp;Support Sleepyhead Development</source>
<source>&amp;Support SleepyHead Development</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -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&apos;t care about the graph data)</source>
<translation type="unfinished"></translation>
</message>
@ -4011,14 +4011,14 @@ This folder currently resides at the following location:
<location filename="../sleepyhead/main.cpp" line="269"/>
<source>No SleepyHead data folder was found.
Would you like SleepyHead to use the default location for storing it&apos;s data?
Would you like SleepyHead to use the default location for storing its data?
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../sleepyhead/main.cpp" line="277"/>
<source>Choose or create new folder for Sleepyhead data</source>
<source>Choose or create new folder for SleepyHead data</source>
<translation type="unfinished"></translation>
</message>
<message>

10
Translations/Deutsch.de_DE.ts
View File

@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/daily.cpp" line="1159"/>
<source>Oximetry data exists for this day, however it&apos;s timestamps are too different, so the Graphs will not be linked.</source>
<source>Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked.</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/mainwindow.ui" line="2394"/>
<source>&amp;Support Sleepyhead Development</source>
<source>&amp;Support SleepyHead Development</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -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&apos;t care about the graph data)</source>
<translation type="unfinished"></translation>
</message>
@ -4011,14 +4011,14 @@ This folder currently resides at the following location:
<location filename="../sleepyhead/main.cpp" line="269"/>
<source>No SleepyHead data folder was found.
Would you like SleepyHead to use the default location for storing it&apos;s data?
Would you like SleepyHead to use the default location for storing its data?
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../sleepyhead/main.cpp" line="277"/>
<source>Choose or create new folder for Sleepyhead data</source>
<source>Choose or create new folder for SleepyHead data</source>
<translation type="unfinished"></translation>
</message>
<message>

10
Translations/Espaniol.es.ts
View File

@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/daily.cpp" line="1159"/>
<source>Oximetry data exists for this day, however it&apos;s timestamps are too different, so the Graphs will not be linked.</source>
<source>Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked.</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/mainwindow.ui" line="2394"/>
<source>&amp;Support Sleepyhead Development</source>
<source>&amp;Support SleepyHead Development</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -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&apos;t care about the graph data)</source>
<translation type="unfinished"></translation>
</message>
@ -4011,14 +4011,14 @@ This folder currently resides at the following location:
<location filename="../sleepyhead/main.cpp" line="269"/>
<source>No SleepyHead data folder was found.
Would you like SleepyHead to use the default location for storing it&apos;s data?
Would you like SleepyHead to use the default location for storing its data?
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../sleepyhead/main.cpp" line="277"/>
<source>Choose or create new folder for Sleepyhead data</source>
<source>Choose or create new folder for SleepyHead data</source>
<translation type="unfinished"></translation>
</message>
<message>

10
Translations/Francais.fr.ts
View File

@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/daily.cpp" line="1159"/>
<source>Oximetry data exists for this day, however it&apos;s timestamps are too different, so the Graphs will not be linked.</source>
<source>Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked.</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/mainwindow.ui" line="2394"/>
<source>&amp;Support Sleepyhead Development</source>
<source>&amp;Support SleepyHead Development</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -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&apos;t care about the graph data)</source>
<translation type="unfinished"></translation>
</message>
@ -4011,14 +4011,14 @@ This folder currently resides at the following location:
<location filename="../sleepyhead/main.cpp" line="269"/>
<source>No SleepyHead data folder was found.
Would you like SleepyHead to use the default location for storing it&apos;s data?
Would you like SleepyHead to use the default location for storing its data?
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../sleepyhead/main.cpp" line="277"/>
<source>Choose or create new folder for Sleepyhead data</source>
<source>Choose or create new folder for SleepyHead data</source>
<translation type="unfinished"></translation>
</message>
<message>

10
Translations/Nederlands.nl.ts
View File

@ -505,7 +505,7 @@ CA is Clear Airway, wat gelijk staat met Centrale Apneu</translatorcomment>
</message>
<message>
<location filename="../sleepyhead/daily.cpp" line="1159"/>
<source>Oximetry data exists for this day, however it&apos;s timestamps are too different, so the Graphs will not be linked.</source>
<source>Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked.</source>
<translatorcomment>WJG: spelling oxymetrie (zie Van Dale)
AK: mee eens</translatorcomment>
<translation>Oxymetriegegevens beschikbaar, maar de tijden verschillen teveel: de grafieken worden niet verbonden.</translation>
@ -1388,7 +1388,7 @@ AK: Waar staat dat Welkomst-/Startscherm???
</message>
<message>
<location filename="../sleepyhead/mainwindow.ui" line="2394"/>
<source>&amp;Support Sleepyhead Development</source>
<source>&amp;Support SleepyHead Development</source>
<translation>&amp;Help bij ontwikkeling SleepyHead</translation>
</message>
<message>
@ -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&apos;t care about the graph data)</source>
<translatorcomment>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: &lt;grin&gt;</translatorcomment>
@ -5264,7 +5264,7 @@ De map vind je op:
<location filename="../sleepyhead/main.cpp" line="269"/>
<source>No SleepyHead data folder was found.
Would you like SleepyHead to use the default location for storing it&apos;s data?
Would you like SleepyHead to use the default location for storing its data?
</source>
<translation>Geen SleepyHeadData folder gevonden.
@ -5275,7 +5275,7 @@ Wil je dat SleepyHead de standaard lokatie gebruikt voor gegevensopslag?
</message>
<message>
<location filename="../sleepyhead/main.cpp" line="277"/>
<source>Choose or create new folder for Sleepyhead data</source>
<source>Choose or create new folder for SleepyHead data</source>
<translation>Kies of maak een nieuwe folder voor SleepyHeadData</translation>
</message>
<message>

10
Translations/Svenska.se.ts
View File

@ -294,7 +294,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/daily.cpp" line="1159"/>
<source>Oximetry data exists for this day, however it&apos;s timestamps are too different, so the Graphs will not be linked.</source>
<source>Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked.</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1014,7 +1014,7 @@ If you forgot to import todays CPAP data first, go and do that now, then import
</message>
<message>
<location filename="../sleepyhead/mainwindow.ui" line="2394"/>
<source>&amp;Support Sleepyhead Development</source>
<source>&amp;Support SleepyHead Development</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -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&apos;t care about the graph data)</source>
<translation type="unfinished"></translation>
</message>
@ -4011,14 +4011,14 @@ This folder currently resides at the following location:
<location filename="../sleepyhead/main.cpp" line="269"/>
<source>No SleepyHead data folder was found.
Would you like SleepyHead to use the default location for storing it&apos;s data?
Would you like SleepyHead to use the default location for storing its data?
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../sleepyhead/main.cpp" line="277"/>
<source>Choose or create new folder for Sleepyhead data</source>
<source>Choose or create new folder for SleepyHead data</source>
<translation type="unfinished"></translation>
</message>
<message>

4
sleepyhead/Graphs/gGraphView.cpp
View File

@ -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();

3
sleepyhead/SleepLib/calcs.cpp
View File

@ -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;

2
sleepyhead/SleepLib/machine_common.h
View File

@ -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

2
sleepyhead/daily.cpp
View File

@ -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;

4
sleepyhead/main.cpp
View File

@ -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."));

2
sleepyhead/mainwindow.cpp
View File

@ -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);

2
sleepyhead/mainwindow.h
View File

@ -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);

6
sleepyhead/mainwindow.ui
View File

@ -2156,7 +2156,7 @@ border-radius: 10px;
<addaction name="actionDebug"/>
<addaction name="actionCheck_for_Updates"/>
<addaction name="separator"/>
<addaction name="actionHelp_Support_Sleepyhead_Development"/>
<addaction name="actionHelp_Support_SleepyHead_Development"/>
<addaction name="action_About"/>
</widget>
<widget class="QMenu" name="menu_Data">
@ -2389,9 +2389,9 @@ border-radius: 10px;
<string>Import RemStar &amp;MSeries Data</string>
</property>
</action>
<action name="actionHelp_Support_Sleepyhead_Development">
<action name="actionHelp_Support_SleepyHead_Development">
<property name="text">
<string>&amp;Support Sleepyhead Development</string>
<string>&amp;Support SleepyHead Development</string>
</property>
</action>
<action name="actionSleep_Disorder_Terms_Glossary">

2
sleepyhead/preferencesdialog.ui
View File

@ -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)</string>
</property>
<property name="text">