diff --git a/Translations/Afrikaans.af.ts b/Translations/Afrikaans.af.ts index d6a60a75..60938477 100644 --- a/Translations/Afrikaans.af.ts +++ b/Translations/Afrikaans.af.ts @@ -7687,12 +7687,12 @@ TTIA: %1 - + Fisher & Paykel - + ICON @@ -7732,13 +7732,13 @@ TTIA: %1 - + Philips Respironics - + System One diff --git a/Translations/Arabic.ar.ts b/Translations/Arabic.ar.ts index a624eefa..3ab18e08 100644 --- a/Translations/Arabic.ar.ts +++ b/Translations/Arabic.ar.ts @@ -7632,12 +7632,12 @@ TTIA: %1 - + Fisher & Paykel - + ICON @@ -7677,13 +7677,13 @@ TTIA: %1 - + Philips Respironics - + System One diff --git a/Translations/Bulgarian.bg.ts b/Translations/Bulgarian.bg.ts index ada9fd55..c626f238 100755 --- a/Translations/Bulgarian.bg.ts +++ b/Translations/Bulgarian.bg.ts @@ -8446,12 +8446,12 @@ Please don't touch anything until it's done. CMS50 - + Fisher & Paykel Fisher & Paykel - + ICON ICON @@ -8491,13 +8491,13 @@ Please don't touch anything until it's done. M-Series - + Philips Respironics Philips Respironics - + System One System One diff --git a/Translations/Deutsch.de.ts b/Translations/Deutsch.de.ts index 45c85076..420f1a19 100644 --- a/Translations/Deutsch.de.ts +++ b/Translations/Deutsch.de.ts @@ -11,6 +11,26 @@ &About &Schließen + + Release Notes + Versionshinweise + + + Close + Beenden + + + Build Date: %1 + Erstellungsdatum: %1 + + + Graphics Engine: %1 + Grafikfunktion: %1 + + + About SleepyHead + Über SleepyHead + <!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"> @@ -40,58 +60,10 @@ p, li { white-space: pre-wrap; } <p align="center" 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:11pt;"><br /></p></body></html> - - Release Notes - Versionshinweise - Credits - - GPL License - - - - Support SleepyHead - - - - &Donate via Paypal - - - - Close - Beenden - - - Revision: %1 - - - - Branch: %1 - - - - Build Date: %1 - Erstellungsdatum: %1 - - - Graphics Engine: %1 - Grafikfunktion: %1 - - - Show data folder - - - - About SleepyHead - Über SleepyHead - - - SleepyHead v%1 - - <!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"> @@ -117,6 +89,14 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#000000;">Thanks to SuperSleeper over at </span><a href="http://www.apneaboard.com/"><span style=" text-decoration: underline; color:#0000ff;">ApneaBoard</span></a><span style=" color:#000000;"> for helping out with mirroring space and forums and stuff.</span></p></body></html> + + GPL License + + + + Support SleepyHead + + <!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"> @@ -135,6 +115,26 @@ p, li { white-space: pre-wrap; } <p align="center" 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:11pt;"><br /></p></body></html> + + &Donate via Paypal + + + + Revision: %1 + + + + Branch: %1 + + + + Show data folder + + + + SleepyHead v%1 + + CMS50Loader @@ -702,26 +702,22 @@ p, li { white-space: pre-wrap; } ... ... - - Search Topic: - - - - Contents - - - - Index - - Search Suche + + No + Nein + Hide this message + + Search Topic: + + Help Files are not yet available for %1 and will display in %2. @@ -739,8 +735,12 @@ p, li { white-space: pre-wrap; } - No - Nein + Contents + + + + Index + %1 result(s) for "%2" @@ -1674,6 +1674,10 @@ p, li { white-space: pre-wrap; } Report a Bug Melde einen technischen Fehler + + &copy;2011-2018 + &copy;2011-2018 + Profiles @@ -1694,10 +1698,6 @@ p, li { white-space: pre-wrap; } Processing import list... - - &copy;2011-2018 - &copy;2011-2018 - Please open a profile first. @@ -1988,6 +1988,10 @@ p, li { white-space: pre-wrap; } SleepyHead is copyright &copy;2011-2016 Mark Watkins SleepyHead ist copyright &copy;2011-2015 Mark Watkins {2011-2016 ?} + + SleepyHead is copyright &copy;2011-2018 Mark Watkins + SleepyHead ist copyright &copy;2011-2015 Mark Watkins {2011-2016 ?} {2011-2018 ?} + It's totally ok to fib or skip this, but your rough age is needed to enhance accuracy of certain calculations. @@ -1996,10 +2000,6 @@ p, li { white-space: pre-wrap; } <html><head/><body><p>Biological (birth) gender is sometimes needed to enhance the accuracy of a few calculations, feel free to leave this blank and skip any of them.</p></body></html> - - SleepyHead is copyright &copy;2011-2018 Mark Watkins - SleepyHead ist copyright &copy;2011-2015 Mark Watkins {2011-2016 ?} {2011-2018 ?} - Overview @@ -3661,6 +3661,22 @@ Wenn Sie ein verschiedene Masken verwenden, wählen Sie die Mittelwerte . Es sol Note: A linear calculation method is used. Changing these values requires a recalculation. Hinweis:Hier wird ein lineares Berechnungsverfahren verwendet. Ändern dieser Werte erfordert eine Neuberechnung. + + Profile + Profile + + + Welcome + Willkommen + + + Daily + Täglich + + + Statistics + Statistiken + Auto-Launch CPAP Importer after opening profile @@ -3705,22 +3721,6 @@ p, li { white-space: pre-wrap; } <html><head/><body><p>Which tab to open on loading a profile. (Note: It will default to Profile if SleepyHead is set to not open a profile on startup)</p></body></html> - - Profile - Profile - - - Welcome - Willkommen - - - Daily - Täglich - - - Statistics - Statistiken - Switch Tabs @@ -3733,24 +3733,6 @@ p, li { white-space: pre-wrap; } After Import - - <p><b>Please Note:</b> SleepyHead's advanced session splitting capabilities are not possible with <b>ResMed</b> machines due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile.</p><p>On ResMed machines, days will <b>split at noon</b> like in ResMed's commercial software.</p> - - - - Never - - - - Data Processing Required - - - - A data re/decompression proceedure is required to apply these changes. This operation may take a couple of minutes to complete. - -Are you sure you want to make these changes? - - Graphics Engine (Requires Restart) @@ -3771,6 +3753,24 @@ Are you sure you want to make these changes? MESA (Software Renderer) + + <p><b>Please Note:</b> SleepyHead's advanced session splitting capabilities are not possible with <b>ResMed</b> machines due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile.</p><p>On ResMed machines, days will <b>split at noon</b> like in ResMed's commercial software.</p> + + + + Never + + + + Data Processing Required + + + + A data re/decompression proceedure is required to apply these changes. This operation may take a couple of minutes to complete. + +Are you sure you want to make these changes? + + One or more of the changes you have made will require this application to be restarted, in order for these changes to come into effect. @@ -3923,10 +3923,6 @@ Would you like do this now? Form Form - - Filter: - - ... ... @@ -3940,12 +3936,64 @@ Would you like do this now? Version - &Open Profile + &Edit Profile + &Profil bearbeiten + + + Profile + Profile + + + Name + Name + + + %1, %2 + %1: %2 {1,?} + + + Enter Password for %1 + Passwort eingeben für %1 + + + You entered an incorrect password + Sie haben ein falsches Passwort eingegeben + + + Sorry + Entschuldigung + + + You need to enter DELETE in capital letters. + Sie müssen DELETE in Großbuchstaben eingeben. + + + There was an error deleting the profile directory, you need to manually remove it. + Es gab einen Fehler beim Löschen des Profil-Verzeichnisses. Sie müssen es manuell entfernen. + + + Profile '%1' was succesfully deleted + Profil '%1' wurde erfolgreich gelöscht + + + Name: %1, %2 + Name: %1, %2 + + + Phone: %1 + Telefon: %1 + + + Address: + Adresse: + + + Filter: - &Edit Profile - &Profil bearbeiten + &Open Profile + &New Profile @@ -3963,10 +4011,6 @@ Would you like do this now? Destroy Profile - - Profile - Profile - Ventilator Brand @@ -3983,22 +4027,6 @@ Would you like do this now? Last Imported - - Name - Name - - - %1, %2 - %1: %2 {1,?} - - - Enter Password for %1 - Passwort eingeben für %1 - - - You entered an incorrect password - Sie haben ein falsches Passwort eingegeben - Forgot your password? @@ -4031,22 +4059,6 @@ Would you like do this now? DELETE - - Sorry - Entschuldigung - - - You need to enter DELETE in capital letters. - Sie müssen DELETE in Großbuchstaben eingeben. - - - There was an error deleting the profile directory, you need to manually remove it. - Es gab einen Fehler beim Löschen des Profil-Verzeichnisses. Sie müssen es manuell entfernen. - - - Profile '%1' was succesfully deleted - Profil '%1' wurde erfolgreich gelöscht - Hide disk usage information @@ -4055,22 +4067,10 @@ Would you like do this now? Show disk usage information - - Name: %1, %2 - Name: %1, %2 - - - Phone: %1 - Telefon: %1 - Email: <a href='mailto:%1'>%1</a> - - Address: - Adresse: - No profile information given @@ -7104,6 +7104,10 @@ Morgen erwartet Sie ZEO ZQ Schlafqualitätsmessung + + Profile + Profile + Pop out Graph @@ -7117,6 +7121,18 @@ I'm very sorry your machine doesn't record useful data to graph in Dai Popout %1 Graph + + Software Engine + + + + ANGLE / OpenGLES + + + + Desktop OpenGL + + m @@ -7125,10 +7141,6 @@ I'm very sorry your machine doesn't record useful data to graph in Dai cm - - Profile - Profile - Getting Ready... @@ -7201,6 +7213,26 @@ I'm very sorry your machine doesn't record useful data to graph in Dai Please Wait... + + Debugging channel #1 + + + + Top secret internal stuff you're not supposed to see ;) + + + + Test #1 + + + + Debugging channel #2 + + + + Test #2 + + As this is a pre-release version, it is recommended that you <b>back up your data folder manually</b> before proceding, because attempting to roll back later may break things. @@ -7249,38 +7281,6 @@ I'm very sorry your machine doesn't record useful data to graph in Dai No oximetry data has been imported yet. - - Software Engine - - - - ANGLE / OpenGLES - - - - Desktop OpenGL - - - - Debugging channel #1 - - - - Top secret internal stuff you're not supposed to see ;) - - - - Test #1 - - - - Debugging channel #2 - - - - Test #2 - - QuaZipFilePrivate @@ -7695,38 +7695,14 @@ I'm very sorry your machine doesn't record useful data to graph in Dai Form Form - - Welcome To SleepyHead - - What would you like to do? Was möchten Sie tun? - - CPAP Importer - - - - Oximetry Wizard - - - - Daily View - - - - Overview - - Statistics Statistiken - - <html><head/><body><p align="center"><span style=" font-size:10pt; font-weight:600;">Warning: </span><span style=" font-size:10pt; color:#ff0000;">ResMed S9 SDCards </span><span style=" font-size:10pt; font-weight:600; color:#ff0000;">need </span><span style=" font-size:10pt; color:#ff0000;">to be locked </span><span style=" font-size:10pt; font-weight:600; color:#ff0000;">before </span><span style=" font-size:10pt; color:#ff0000;">inserting into your computer<br/></span><span style=" font-size:10pt; color:#000000;">Some operating systems write cache files which break their special filesystem Journal</span></p></body></html> - - It might be a good idea to check preferences first,</br>as there are some options that affect import. Es könnte eine gute Idee sein, Vorlieben zuerst zu überprüfen, </ br> da gibt es einige Optionen, die Sie verändern können. @@ -7759,34 +7735,10 @@ I'm very sorry your machine doesn't record useful data to graph in Dai %1 hours, %2 minutes and %3 seconds %1 Stunden, %2 Minuten und %3 Sekunden - - Your machine was on for %1. - - <font color = red>You only had the mask on for %1.</font> <font color = red>Sie benutzten die Maske nur %1.</font> - - under - - - - over - - - - reasonably close to - - - - equal to - - - - You had an AHI of %1, which is %2 your %3 day average of %4. - - Your CPAP machine blasted you with a constant %1%2 of air Ihr CPAP-Gerät versorgt Sie mit einer konstanten %1%2 Luft @@ -7816,12 +7768,60 @@ I'm very sorry your machine doesn't record useful data to graph in Dai Ihre EPAP- Druck war unter %1%2 für %3% diese Zeit. - Your average leaks were %1 %2, which is %3 your %4 day average of %5. + No CPAP data has been imported yet. + Es wurden noch keine CPAP-Daten importiert. + + + Welcome To SleepyHead - No CPAP data has been imported yet. - Es wurden noch keine CPAP-Daten importiert. + CPAP Importer + + + + Oximetry Wizard + + + + Daily View + + + + Overview + + + + <html><head/><body><p align="center"><span style=" font-size:10pt; font-weight:600;">Warning: </span><span style=" font-size:10pt; color:#ff0000;">ResMed S9 SDCards </span><span style=" font-size:10pt; font-weight:600; color:#ff0000;">need </span><span style=" font-size:10pt; color:#ff0000;">to be locked </span><span style=" font-size:10pt; font-weight:600; color:#ff0000;">before </span><span style=" font-size:10pt; color:#ff0000;">inserting into your computer<br/></span><span style=" font-size:10pt; color:#000000;">Some operating systems write cache files which break their special filesystem Journal</span></p></body></html> + + + + Your machine was on for %1. + + + + under + + + + over + + + + reasonably close to + + + + equal to + + + + You had an AHI of %1, which is %2 your %3 day average of %4. + + + + Your average leaks were %1 %2, which is %3 your %4 day average of %5. + diff --git a/Translations/English.en_UK.ts b/Translations/English.en_UK.ts index cd991eac..680c8e39 100644 --- a/Translations/English.en_UK.ts +++ b/Translations/English.en_UK.ts @@ -7670,12 +7670,12 @@ TTIA: %1 - + Fisher & Paykel - + ICON @@ -7715,13 +7715,13 @@ TTIA: %1 - + Philips Respironics - + System One diff --git a/Translations/Espaniol.es.ts b/Translations/Espaniol.es.ts index 23bb632f..22b4d570 100644 --- a/Translations/Espaniol.es.ts +++ b/Translations/Espaniol.es.ts @@ -8362,12 +8362,12 @@ Por favor no toque nada hasta que finalize. - + Fisher & Paykel - + ICON @@ -8407,13 +8407,13 @@ Por favor no toque nada hasta que finalize. Serie-M - + Philips Respironics - + System One diff --git a/Translations/Greek.el.ts b/Translations/Greek.el.ts index 65a62733..8f5d872f 100644 --- a/Translations/Greek.el.ts +++ b/Translations/Greek.el.ts @@ -7659,12 +7659,12 @@ TTIA: %1 - + Fisher & Paykel - + ICON @@ -7704,13 +7704,13 @@ TTIA: %1 - + Philips Respironics - + System One diff --git a/Translations/Italiano.it.ts b/Translations/Italiano.it.ts index b9682b91..4ee9df9c 100644 --- a/Translations/Italiano.it.ts +++ b/Translations/Italiano.it.ts @@ -6010,12 +6010,12 @@ TTIA: %1 - + Fisher & Paykel - + ICON @@ -6136,7 +6136,7 @@ TTIA: %1 - + System One @@ -6527,7 +6527,7 @@ TTIA: %1 - + Philips Respironics diff --git a/Translations/Nederlands.nl.ts b/Translations/Nederlands.nl.ts index 92b029fa..133cbc2e 100644 --- a/Translations/Nederlands.nl.ts +++ b/Translations/Nederlands.nl.ts @@ -8536,12 +8536,12 @@ Alsjeblieft niets aanraken tot ik klaar ben. CMS50 - + Fisher & Paykel Fisher & Paykell - + ICON ICON @@ -8581,13 +8581,13 @@ Alsjeblieft niets aanraken tot ik klaar ben. M-series - + Philips Respironics Philips Respironics - + System One System One diff --git a/Translations/Portugues.pt.ts b/Translations/Portugues.pt.ts index 7e73232c..4050dc4b 100644 --- a/Translations/Portugues.pt.ts +++ b/Translations/Portugues.pt.ts @@ -7647,12 +7647,12 @@ TTIA: %1 - + Fisher & Paykel - + ICON @@ -7692,13 +7692,13 @@ TTIA: %1 - + Philips Respironics - + System One diff --git a/Translations/Suomi.fi.ts b/Translations/Suomi.fi.ts index 1412225b..a89bb181 100644 --- a/Translations/Suomi.fi.ts +++ b/Translations/Suomi.fi.ts @@ -8420,12 +8420,12 @@ Please don't touch anything until it's done. CMS50 - + Fisher & Paykel Fisher & Paykel - + ICON ICON @@ -8465,13 +8465,13 @@ Please don't touch anything until it's done. M-Series - + Philips Respironics Philips Respironics - + System One System One diff --git a/Translations/Svenska.se.ts b/Translations/Svenska.se.ts index ffd56add..f4f3ffbc 100644 --- a/Translations/Svenska.se.ts +++ b/Translations/Svenska.se.ts @@ -8424,12 +8424,12 @@ I'm very sorry your machine doesn't record useful data to graph in Dai CMS50F - + Fisher & Paykel Fisher & Paykel - + ICON ICON @@ -8503,13 +8503,13 @@ I'm very sorry your machine doesn't record useful data to graph in Dai M-Series - + Philips Respironics Philips Respironics - + System One System One diff --git a/sleepyhead/Graphs/gGraph.cpp b/sleepyhead/Graphs/gGraph.cpp index ebcf3436..ecf84efa 100644 --- a/sleepyhead/Graphs/gGraph.cpp +++ b/sleepyhead/Graphs/gGraph.cpp @@ -741,8 +741,8 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) int w = m_rect.width() - left - right; - double xx; //= max_x - min_x; - double xmult;// = xx / double(w); + double xx; + double xmult; { xmult = (m_blockzoom ? double(rmax_x - rmin_x) : double(max_x - min_x)) / double(w); diff --git a/sleepyhead/Resources.qrc b/sleepyhead/Resources.qrc index aa1f77fe..64f50410 100644 --- a/sleepyhead/Resources.qrc +++ b/sleepyhead/Resources.qrc @@ -1,4 +1,4 @@ - + icons/sdcard.png icons/preferences.png diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.h b/sleepyhead/SleepLib/loader_plugins/icon_loader.h index 34d03c8d..9697c9ac 100644 --- a/sleepyhead/SleepLib/loader_plugins/icon_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.h @@ -47,6 +47,7 @@ const QString fpicon_class_name = STR_MACH_FPIcon; class FPIconLoader : public CPAPLoader { + Q_OBJECT public: FPIconLoader(); virtual ~FPIconLoader(); diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h index a8ab1b09..99f0d026 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h @@ -184,6 +184,7 @@ protected: */ class PRS1Loader : public CPAPLoader { + Q_OBJECT public: PRS1Loader(); virtual ~PRS1Loader(); diff --git a/sleepyhead/SleepLib/machine_loader.cpp b/sleepyhead/SleepLib/machine_loader.cpp index cf6f79e5..6d17ec15 100644 --- a/sleepyhead/SleepLib/machine_loader.cpp +++ b/sleepyhead/SleepLib/machine_loader.cpp @@ -55,10 +55,6 @@ MachineLoader * lookupLoader(QString loaderName) return nullptr; } - - - - void RegisterLoader(MachineLoader *loader) { loader->initChannels(); diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index 95035d9a..23da3782 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -1,4 +1,4 @@ -/* Oximeter Import Wizard Implementation +/* Oximeter Import Wizard Implementation * * Copyright (c) 2011-2018 Mark Watkins * @@ -170,16 +170,16 @@ SerialOximeter * OximeterImport::detectOximeter() qDebug() << "Attempt to detect Oximeter"; ui->retryButton->setVisible(false); - QList loaders; //= GetOxiLoaders(); + QList loaders; // GetOxiLoaders(); if (ui->oximeterType->currentIndex() == 0) { // CMS50F3.7 - SerialOximeter * oxi = qobject_cast(lookupLoader(cms50f37_class_name)); + SerialOximeter * oxi = qobject_cast(lookupLoader(cms50f37_class_name)); loaders.push_back(oxi); } else if (ui->oximeterType->currentIndex() == 1) { // CMS50D+/E/F - SerialOximeter * oxi = qobject_cast(lookupLoader(cms50_class_name)); + SerialOximeter * oxi = qobject_cast(lookupLoader(cms50_class_name)); loaders.push_back(oxi); } else if (ui->oximeterType->currentIndex() == 2) { // ChoiceMed - SerialOximeter * oxi = qobject_cast(lookupLoader(md300w1_class_name)); + SerialOximeter * oxi = qobject_cast(lookupLoader(md300w1_class_name)); loaders.push_back(oxi); } else return nullptr;