diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index ee3bb501..927fa3ac 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -427,7 +427,7 @@ QString STR_TR_Sessions; QString STR_TR_PrRelief; // Pressure Relief QString STR_TR_Bookmarks; -QString STR_TR_OSCR; +QString STR_TR_OSCAR; QString STR_TR_AppVersion; QString STR_TR_Default; @@ -632,7 +632,7 @@ void initializeStrings() STR_TR_PrRelief = QObject::tr("Pr. Relief"); // Pressure Relief STR_TR_Bookmarks = QObject::tr("Bookmarks"); - STR_TR_OSCR = QObject::tr("OSCR"); + STR_TR_OSCAR = QObject::tr("OSCAR"); STR_TR_AppVersion = QObject::tr("v%1").arg(VersionString); STR_TR_Mode = QObject::tr("Mode"); diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h index c91f5380..737ff223 100644 --- a/oscar/SleepLib/common.h +++ b/oscar/SleepLib/common.h @@ -164,9 +164,9 @@ const QString STR_MACH_ZEO = "Zeo"; const QString STR_PREF_Language = "Language"; -const QString STR_AppName = "OSCR"; +const QString STR_AppName = "OSCAR"; const QString STR_DeveloperName = "NightOwl"; -const QString STR_AppRoot = "OSCR_Data"; +const QString STR_AppRoot = "OSCAR_Data"; /////////////////////////////////////////////////////////////////////////////////////////////// // Commonly used translatable text strings @@ -326,7 +326,7 @@ extern QString STR_TR_PrRelief; // Pressure Relief extern QString STR_TR_SensAwake; extern QString STR_TR_Bookmarks; -extern QString STR_TR_OSCR; +extern QString STR_TR_OSCAR; extern QString STR_TR_AppVersion; extern QString STR_TR_Mode; diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp index 3bf6fe80..fbbb13e3 100644 --- a/oscar/SleepLib/day.cpp +++ b/oscar/SleepLib/day.cpp @@ -107,7 +107,7 @@ void Day::addSession(Session *s) auto mi = machines.find(s->type()); if (mi != machines.end()) { if (mi.value() != s->machine()) { - qDebug() << "OSCR can't add session" << s->session() << "to this day record, as it already contains a different machine of the same MachineType"; + qDebug() << "OSCAR can't add session" << s->session() << "to this day record, as it already contains a different machine of the same MachineType"; return; } } else { diff --git a/oscar/SleepLib/journal.cpp b/oscar/SleepLib/journal.cpp index d9feb36f..979d9f0a 100644 --- a/oscar/SleepLib/journal.cpp +++ b/oscar/SleepLib/journal.cpp @@ -22,7 +22,7 @@ JournalEntry::JournalEntry(QDate date) { Machine * jmach = p_profile->GetMachine(MT_JOURNAL); if (jmach == nullptr) { // Create Journal machine record if it doesn't already exist - MachineInfo info(MT_JOURNAL,0, "Journal", QObject::tr("Journal Data"), QString(), QString(), QString(), QObject::tr("OSCR"), QDateTime::currentDateTime(), journal_data_version); + MachineInfo info(MT_JOURNAL,0, "Journal", QObject::tr("Journal Data"), QString(), QString(), QString(), QObject::tr("OSCAR"), QDateTime::currentDateTime(), journal_data_version); // Using machine ID 1 rather than a random number, so in future, if profile.xml gets screwed up they'll get their data back.. // TODO: Perhaps search for unlinked journal folders here to save some anger and frustration? :P @@ -40,18 +40,18 @@ JournalEntry::JournalEntry(QDate date) machid = tmp.toUInt(&ok, 16); if (!ok) { QMessageBox::warning(nullptr, STR_MessageBox_Warning, - QObject::tr("OSCR found an old Journal folder, but it looks like it's been renamed:")+"\n\n"+ + QObject::tr("OSCAR found an old Journal folder, but it looks like it's been renamed:")+"\n\n"+ QString("%1").arg(dirs[0])+ - QObject::tr("OSCR will not touch this folder, and will create a new one instead.")+"\n\n"+ - QObject::tr("Please be careful when playing in OSCR's profile folders :-P"), QMessageBox::Ok); + QObject::tr("OSCAR will not touch this folder, and will create a new one instead.")+"\n\n"+ + QObject::tr("Please be careful when playing in OSCAR's profile folders :-P"), QMessageBox::Ok); // User renamed the folder.. report this machid = 1; } if (journals > 1) { QMessageBox::warning(nullptr, STR_MessageBox_Warning, - QObject::tr("For some reason, OSCR couldn't find a journal object record in your profile, but did find multiple Journal data folders.\n\n")+ - QObject::tr("OSCR picked only the first one of these, and will use it in future:\n\n")+ + QObject::tr("For some reason, OSCAR couldn't find a journal object record in your profile, but did find multiple Journal data folders.\n\n")+ + QObject::tr("OSCAR picked only the first one of these, and will use it in future:\n\n")+ QString("%1").arg(dirs[0])+ QObject::tr("If your old data is missing, copy the contents of all the other Journal_XXXXXXX folders to this one manually."), QMessageBox::Ok); // more then one.. report this. @@ -208,7 +208,7 @@ void JournalEntry::delBookmark(qint64 start, qint64 end) void BackupJournal(QString filename) { - QDomDocument doc("OSCR Journal"); + QDomDocument doc("OSCAR Journal"); QDomElement droot = doc.createElement(STR_AppName); doc.appendChild(droot); diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 90bf8e40..cef5727d 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -575,7 +575,7 @@ int PRS1Loader::OpenMachine(const QString & path) QMessageBox::information(QApplication::activeWindow(), QObject::tr("Non Data Capable Machine"), QString(QObject::tr("Your Philips Respironics CPAP machine (Model %1) is unfortunately not a data capable model.")+"\n\n"+ - QObject::tr("I'm sorry to report that OSCR can only track hours of use and very basic settings for this machine.")). + QObject::tr("I'm sorry to report that OSCAR can only track hours of use and very basic settings for this machine.")). arg(info.modelnumber),QMessageBox::Ok); p_profile->cpap->setBrickWarning(false); @@ -587,7 +587,7 @@ int PRS1Loader::OpenMachine(const QString & path) QMessageBox::information(QApplication::activeWindow(), QObject::tr("Machine Unsupported"), QObject::tr("Sorry, your Philips Respironics CPAP machine (Model %1) is not supported yet.").arg(info.modelnumber) +"\n\n"+ - QObject::tr("The developers needs a .zip copy of this machines' SD card and matching Encore .pdf reports to make it work with OSCR.") + QObject::tr("The developers needs a .zip copy of this machines' SD card and matching Encore .pdf reports to make it work with OSCAR.") ,QMessageBox::Ok); return -1; @@ -596,8 +596,8 @@ int PRS1Loader::OpenMachine(const QString & path) // model number didn't parse.. Meh... Silently ignore it // QMessageBox::information(QApplication::activeWindow(), // QObject::tr("Machine Unsupported"), -// QObject::tr("OSCR could not parse the model number, this machine can not be imported..") +"\n\n"+ -// QObject::tr("The developers needs a .zip copy of this machines' SD card and matching Encore .pdf reports to make it work with OSCR.") +// QObject::tr("OSCAR could not parse the model number, this machine can not be imported..") +"\n\n"+ +// QObject::tr("The developers needs a .zip copy of this machines' SD card and matching Encore .pdf reports to make it work with OSCAR.") // ,QMessageBox::Ok); return -1; } diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 178f1335..dbec6e4f 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -1758,7 +1758,7 @@ int ResmedLoader::Open(const QString & dirpath) // add primary STR.edf strfiles.push_back(strpath); - // Just in case we are importing into a new folder, process OSCR backup structures + // Just in case we are importing into a new folder, process OSCAR backup structures dir.setPath(path + "STR_Backup"); dir.setFilter(QDir::Files | QDir::Hidden | QDir::Readable); QFileInfoList flist = dir.entryInfoList(); @@ -2523,7 +2523,7 @@ bool ResmedLoader::LoadBRP(Session *sess, const QString & path) return true; } -// Convert EDFSignal data to OSCR's Time-Delta Event format +// Convert EDFSignal data to OSCAR's Time-Delta Event format void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFParser &edf, EDFSignal &es, ChannelID code, long recs, qint64 duration, EventDataType t_min, EventDataType t_max, bool square) { diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp index 1c797e92..d5c7a7cc 100644 --- a/oscar/SleepLib/machine.cpp +++ b/oscar/SleepLib/machine.cpp @@ -1105,7 +1105,7 @@ bool Machine::SaveSummaryCache() qDebug() << "Saving" << info.brand << info.model << "Summaries"; QString filename = getDataPath() + summaryFileName; - QDomDocument doc("OSCR_SessionIndex"); + QDomDocument doc("OSCAR_SessionIndex"); QDomElement root = doc.createElement("sessions"); root.setAttribute("version", summaryxml_version); diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 81fabd90..69cb1b46 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -506,17 +506,17 @@ void Profile::DataFormatError(Machine *m) } if (backups) { - msg = msg + QObject::tr("OSCR maintains a backup of your devices data card that it uses for this purpose.")+ "

"; + msg = msg + QObject::tr("OSCAR maintains a backup of your devices data card that it uses for this purpose.")+ "

"; msg = msg + QObject::tr("Your old machine data should be regenerated provided this backup feature has not been disabled in preferences during a previous data import.") + "

"; backups = true; } else { - msg = msg + ""+STR_MessageBox_Warning+": "+QObject::tr("OSCR does not yet have any automatic card backups stored for this device.") + "

"; + msg = msg + ""+STR_MessageBox_Warning+": "+QObject::tr("OSCAR does not yet have any automatic card backups stored for this device.") + "

"; msg = msg + QObject::tr("This means you will need to import this machine data again afterwards from your own backups or data card.") + "

"; } msg += ""+QObject::tr("Important:")+" "+QObject::tr("Once you upgrade, you can not use this profile with the previous version anymore.")+"

"+ - QObject::tr("If you are concerned, click No to exit, and backup your profile manually, before starting OSCR again.")+ "

"; - msg = msg + ""+QObject::tr("Are you ready to upgrade, so you can run the new version of OSCR?")+""; + QObject::tr("If you are concerned, click No to exit, and backup your profile manually, before starting OSCAR again.")+ "

"; + msg = msg + ""+QObject::tr("Are you ready to upgrade, so you can run the new version of OSCAR?")+""; QMessageBox * question = new QMessageBox(QMessageBox::Warning, QObject::tr("Machine Database Changes"), msg, QMessageBox::Yes | QMessageBox::No); @@ -530,7 +530,7 @@ void Profile::DataFormatError(Machine *m) if (!m->Purge(3478216)) { // Purge failed.. probably a permissions error.. let the user deal with it. QMessageBox::critical(nullptr, STR_MessageBox_Error, - QObject::tr("Sorry, the purge operation failed, which means this version of OSCR can't start.")+"\n\n"+ + QObject::tr("Sorry, the purge operation failed, which means this version of OSCAR can't start.")+"\n\n"+ QObject::tr("The machine data folder needs to be removed manually.")+"\n\n"+ QObject::tr("This folder currently resides at the following location:")+"\n\n"+ QDir::toNativeSeparators(Get(p_preferences[STR_GEN_DataFolder].toString())), QMessageBox::Ok); @@ -543,14 +543,14 @@ void Profile::DataFormatError(Machine *m) if (!p_profile->session->backupCardData()) { // Automatic backups not available for Intellipap users yet, so don't taunt them.. if (m->loaderName() != STR_MACH_Intellipap) { - if (QMessageBox::question(nullptr, STR_MessageBox_Question, QObject::tr("Would you like to switch on automatic backups, so next time a new version of OSCR needs to do so, it can rebuild from these?"), + if (QMessageBox::question(nullptr, STR_MessageBox_Question, QObject::tr("Would you like to switch on automatic backups, so next time a new version of OSCAR needs to do so, it can rebuild from these?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) { p_profile->session->setBackupCardData(true); } } } QMessageBox::information(nullptr, STR_MessageBox_Information, - QObject::tr("OSCR will now start the import wizard so you can reinstall your %1 data.").arg(m->brand()) + QObject::tr("OSCAR will now start the import wizard so you can reinstall your %1 data.").arg(m->brand()) ,QMessageBox::Ok, QMessageBox::Ok); mainwin->startImportDialog(); } @@ -560,9 +560,9 @@ void Profile::DataFormatError(Machine *m) } else { delete question; QMessageBox::information(nullptr, STR_MessageBox_Information, - QObject::tr("OSCR will now exit, then (attempt to) launch your computers file manager so you can manually back your profile up:")+"\n\n"+ + QObject::tr("OSCAR will now exit, then (attempt to) launch your computers file manager so you can manually back your profile up:")+"\n\n"+ QDir::toNativeSeparators(Get(p_preferences[STR_GEN_DataFolder].toString()))+"\n\n"+ - QObject::tr("Use your file manager to make a copy of your profile directory, then afterwards, restart OSCR and complete the upgrade process.") + QObject::tr("Use your file manager to make a copy of your profile directory, then afterwards, restart OSCAR and complete the upgrade process.") , QMessageBox::Ok, QMessageBox::Ok); showInGraphicalShell(Get(p_preferences[STR_GEN_DataFolder].toString())); @@ -990,7 +990,7 @@ Profile *Create(QString name) Machine *m = new Machine(p_profile, 0); m->setType(MT_JOURNAL); - MachineInfo info(MT_JOURNAL, 0, STR_MACH_Journal, "OSCR", STR_MACH_Journal, QString(), m->hexid(), QString(), QDateTime::currentDateTime(), 0); + MachineInfo info(MT_JOURNAL, 0, STR_MACH_Journal, "OSCAR", STR_MACH_Journal, QString(), m->hexid(), QString(), QDateTime::currentDateTime(), 0); m->setInfo(info); p_profile->AddMachine(m); @@ -1016,7 +1016,7 @@ void saveProfileList() QDomElement root = doc.createElement("profiles"); doc.appendChild(root); - root.appendChild(doc.createComment("This file is created during Profile Scan for cloud access convenience, it's not used by Desktop version of OSCR.")); + root.appendChild(doc.createComment("This file is created during Profile Scan for cloud access convenience, it's not used by Desktop version of OSCAR.")); for (auto it = profiles.begin(); it != profiles.end(); ++it) { QDomElement elem = doc.createElement("profile"); diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp index efbe72a4..d6b7fbf0 100644 --- a/oscar/SleepLib/schema.cpp +++ b/oscar/SleepLib/schema.cpp @@ -172,13 +172,13 @@ void init() QObject::tr("SensAwake"),QObject::tr("SensAwake feature will reduce pressure when waking is detected."),QObject::tr("SA"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold)); schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag1 = 0x101e, FLAG, MT_CPAP, SESSION, "UserFlag1", - QObject::tr("User Flag #1"), QObject::tr("A user definable event detected by OSCR's flow waveform processor."), QObject::tr("UF1"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xc0,0xc0,0xe0))); + QObject::tr("User Flag #1"), QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF1"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xc0,0xc0,0xe0))); schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag2 = 0x101f, FLAG, MT_CPAP, SESSION, "UserFlag2", - QObject::tr("User Flag #2"),QObject::tr("A user definable event detected by OSCR's flow waveform processor."), QObject::tr("UF2"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xa0,0xa0,0xc0))); + QObject::tr("User Flag #2"),QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF2"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xa0,0xa0,0xc0))); schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag3 = 0x1024, FLAG, MT_CPAP, SESSION, "UserFlag3", - QObject::tr("User Flag #3"),QObject::tr("A user definable event detected by OSCR's flow waveform processor."), QObject::tr("UF3"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark grey"))); + QObject::tr("User Flag #3"),QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF3"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark grey"))); // Oximetry schema::channel.add(GRP_OXI, new Channel(OXI_Pulse = 0x1800, WAVEFORM, MT_OXIMETER, SESSION, "Pulse", diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp index 52ffa4ba..9615465f 100644 --- a/oscar/SleepLib/session.cpp +++ b/oscar/SleepLib/session.cpp @@ -21,7 +21,7 @@ using namespace std; -// This is the uber important database version for OSCR's internal storage +// This is the uber important database version for OSCAR's internal storage // Increment this after stuffing with Session's save & load code. const quint16 summary_version = 18; const quint16 events_version = 10; diff --git a/oscar/UpdaterWindow.cpp b/oscar/UpdaterWindow.cpp index 9cc9f80c..e3e5cbfa 100644 --- a/oscar/UpdaterWindow.cpp +++ b/oscar/UpdaterWindow.cpp @@ -124,7 +124,7 @@ void UpdaterWindow::checkForUpdates() } } - mainwin->Notify(tr("Checking for OSCR Updates")); + mainwin->Notify(tr("Checking for OSCAR Updates")); #ifdef Q_OS_WIN update_url = QUrl(QString("http://sleepyhead.jedimark.net/packages/%1/Updates.xml").arg(platform)); @@ -155,7 +155,7 @@ void UpdaterWindow::updateFinished(QNetworkReply *reply) if (reply->error() != QNetworkReply::NoError) { qDebug() << "Update Check Error: "+reply->errorString(); disconnect(netmanager, SIGNAL(finished(QNetworkReply *)), this, SLOT(updateFinished(QNetworkReply *))); - mainwin->Notify(tr("OSCR Updates are currently unvailable for this platform"),tr("OSCR Updates")); + mainwin->Notify(tr("OSCAR Updates are currently unvailable for this platform"),tr("OSCAR Updates")); } else { QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); @@ -416,7 +416,7 @@ int compareVersion(QString version) #ifndef NO_UPDATER -const QString UPDATE_ROSCR = "com.jedimark.sleepyhead"; +const QString UPDATE_ROSCAR = "com.jedimark.sleepyhead"; const QString UPDATE_QT = "com.jedimark.sleepyhead.qtlibraries"; const QString UPDATE_Translations = "com.jedimark.sleepyhead.translations"; @@ -456,10 +456,10 @@ void UpdaterWindow::ParseLatestVersion(QIODevice *file) int i=compareVersion(version); if (i>0) { - mainwin->Notify(tr("Version %1 of OSCR is available, opening link to download site.").arg(version), STR_TR_OSCR); - QDesktopServices::openUrl(QUrl(QString("http://nightowlsoftware.ca/OSCR"))); + mainwin->Notify(tr("Version %1 of OSCAR is available, opening link to download site.").arg(version), STR_TR_OSCAR); + QDesktopServices::openUrl(QUrl(QString("http://nightowlsoftware.ca/OSCAR"))); } else { - mainwin->Notify(tr("You are already running the latest version."), STR_TR_OSCR); + mainwin->Notify(tr("You are already running the latest version."), STR_TR_OSCAR); } } @@ -470,7 +470,7 @@ void UpdaterWindow::ParseUpdatesXML(QIODevice *dev) qDebug() << " XML update structure parsed cleanly"; QHash CurrentVersion; - CurrentVersion[UPDATE_OSCR] = VersionString; + CurrentVersion[UPDATE_OSCAR] = VersionString; CurrentVersion[UPDATE_QT] = QT_VERSION_STR; CurrentVersion[UPDATE_Translations] = VersionString; @@ -560,7 +560,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice *dev) } if (!release) { - mainwin->Notify(tr("No updates were found for your platform."), tr("OSCR Updates"), 5000); + mainwin->Notify(tr("No updates were found for your platform."), tr("OSCAR Updates"), 5000); PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); close(); return; @@ -599,7 +599,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice *dev) if (!upq && !upd) { mainwin->Notify(tr("No new updates were found for your platform."), - tr("OSCR Updates"), + tr("OSCAR Updates"), 5000); PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); close(); @@ -616,7 +616,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice *dev) if (updates.size() > 0) { - QString html = "

" + tr("OSCR v%1, codename \"%2\"").arg(release->version). + QString html = "

" + tr("OSCAR v%1, codename \"%2\"").arg(release->version). arg(release->codename) + "

" + release->notes[""] + "

"; html += platform.left(1).toUpper() + platform.mid(1); html += " " + tr("platform notes") + "

" + release->notes[platform] + "

"; @@ -624,12 +624,12 @@ void UpdaterWindow::ParseUpdateXML(QIODevice *dev) QString info; if (compareVersion(release->version)) { - ui->Title->setText("" + tr("A new version of OSCR is available!") + ""); + ui->Title->setText("" + tr("A new version of OSCAR is available!") + ""); info = tr("Shiny new v%1 is available. You're running old and busted v%2"). arg(latestapp).arg(VersionString); ui->notesTabWidget->setCurrentIndex(0); } else { - ui->Title->setText("" + tr("An update for OSCR is available.") + ""); + ui->Title->setText("" + tr("An update for OSCAR is available.") + ""); info = tr("Version %1 is available. You're currently running v%1"). arg(latestapp).arg(VersionString); ui->notesTabWidget->setCurrentIndex(1); @@ -643,7 +643,7 @@ void UpdaterWindow::ParseUpdateXML(QIODevice *dev) update = &release->updates[platform][i]; if ((update->type == "application") && (update->version > VersionString)) { - notes += "" + tr("OSCR v%1 build notes").arg(update->version) + "
" + + notes += "" + tr("OSCAR 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) + "
" + @@ -909,11 +909,11 @@ void UpdaterWindow::upgradeNext() if (ok) { success = true; - //QMessageBox::information(this,tr("Updates Complete"),tr("OSCR has been updated and needs to restart."),QMessageBox::Ok); + //QMessageBox::information(this,tr("Updates Complete"),tr("OSCAR has been updated and needs to restart."),QMessageBox::Ok); ui->downloadTitle->setText(tr("Update Complete!")); ui->FinishedButton->setVisible(true); ui->downloadLabel->setText( - tr("Updates Complete. OSCR needs to restart now, click Finished to do so.")); + tr("Updates Complete. OSCAR needs to restart now, click Finished to do so.")); PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime(); } else { ui->downloadTitle->setText(tr("Update Failed :(")); diff --git a/oscar/UpdaterWindow.ui b/oscar/UpdaterWindow.ui index 1ec247e8..15862317 100644 --- a/oscar/UpdaterWindow.ui +++ b/oscar/UpdaterWindow.ui @@ -11,7 +11,7 @@ - OSCR Updater + OSCAR Updater diff --git a/oscar/aboutdialog.cpp b/oscar/aboutdialog.cpp index 89ae1d69..653cb19f 100644 --- a/oscar/aboutdialog.cpp +++ b/oscar/aboutdialog.cpp @@ -44,7 +44,7 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->infoLabel->setText(text); - setWindowTitle(tr("About OSCR")); + setWindowTitle(tr("About OSCAR")); setMinimumSize(QSize(400,400)); connect(ui->closeButton, SIGNAL(clicked(bool)), this, SLOT(accept())); @@ -103,7 +103,7 @@ QString AboutDialog::getRelnotes() QString text = "" "" ""+tr("Release Notes")+"
" - ""+tr("OSCR v%1").arg(VersionString)+"" + ""+tr("OSCAR v%1").arg(VersionString)+"" "
"; if (ReleaseStatus != "r") { text += "

"+tr("Important:")+" " diff --git a/oscar/aboutdialog.ui b/oscar/aboutdialog.ui index 5ab5fcfb..58687b26 100644 --- a/oscar/aboutdialog.ui +++ b/oscar/aboutdialog.ui @@ -134,7 +134,7 @@ - OSCR + OSCAR Qt::AlignCenter diff --git a/oscar/docs/about.html b/oscar/docs/about.html index 73310ecf..573b9295 100644 --- a/oscar/docs/about.html +++ b/oscar/docs/about.html @@ -21,10 +21,10 @@


- OSCR is NOT a substitute for competent medical guidance from your Doctor.

+ OSCAR is NOT a substitute for competent medical guidance from your Doctor.


- Due to the lack of documentation released by manufacturers regarding file formats, accuracy of data displayed in OSCR can not in any way be guaranteed.

+ Due to the lack of documentation released by manufacturers regarding file formats, accuracy of data displayed in OSCAR can not in any way be guaranteed.


Any reports generated are for PERSONAL USE ONLY, and are NOT IN ANY WAY fit for compliance or medical diagnostic purposes.

@@ -34,10 +34,10 @@


- OSCR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose.

+ OSCAR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose.


- OSCR is copyright ©2011-2018 Mark Watkins

+ OSCAR is copyright ©2011-2018 Mark Watkins

and portions ©2019 Nightowl Software


diff --git a/oscar/docs/credits.html b/oscar/docs/credits.html index b76ac0a3..2fe085c9 100644 --- a/oscar/docs/credits.html +++ b/oscar/docs/credits.html @@ -7,16 +7,16 @@ -

OSCR Credits

+

OSCAR Credits

-

OSCR is a derivitive of the SleepyHead program written by Mark Watkins, during the years 2011 to 2018. The current project is the combined effort of people from both CPAPtalk.com and ApneaBoard.com, starting in 2019.

-

For OSCR to come to you in the form you see it in now, it took a lot more work than just that of the project's original creator Jedimark. The following are the Credits from the last version of SleepyHead.

+

OSCAR is a derivitive of the SleepyHead program written by Mark Watkins, during the years 2011 to 2018. The current project is the combined effort of people from both CPAPtalk.com and ApneaBoard.com, starting in 2019.

+

For OSCAR to come to you in the form you see it in now, it took a lot more work than just that of the project's original creator Jedimark. The following are the Credits from the last version of SleepyHead.


OpenSource Libraries

-

OSCR uses the OpenSource version of the Qt cross platform toolkit available from http://qt.io which itself draws from many smaller open source libraries. You can read the individual licensing for many of these components that are used under the hood of ROSCR at http://doc.qt.io/archives/qt-5.7/3rdparty.html

+

OSCAR uses the OpenSource version of the Qt cross platform toolkit available from http://qt.io which itself draws from many smaller open source libraries. You can read the individual licensing for many of these components that are used under the hood of ROSCAR at http://doc.qt.io/archives/qt-5.7/3rdparty.html


Data formats

-

Becase the CPAP machine data formats are mostly undocumented and getting them working in OSCR involved a lot of hacking, Mark Watkins needed a lot of SD card data samples, and patient users willing to put up with crashes and wonky data, and plenty of help from my fellow hackers out there who shared in the workload breaking data formats. Thanks to all of you who have helped in the fight to protect our right to keep our own data open and accessible!

Patches, bugfixes and platform support
James Marshall, Rich Freeman, John Masters, Keary Griffin, Patricia Shanahan, Alec Clews, manders99, Sean Stangl, Roy Stone, François Revol, Michael Masterson, RezNet, JediBob, Pholy and names I'm sure I've missed or yet to add.

+

Becase the CPAP machine data formats are mostly undocumented and getting them working in OSCAR involved a lot of hacking, Mark Watkins needed a lot of SD card data samples, and patient users willing to put up with crashes and wonky data, and plenty of help from my fellow hackers out there who shared in the workload breaking data formats. Thanks to all of you who have helped in the fight to protect our right to keep our own data open and accessible!

Patches, bugfixes and platform support
James Marshall, Rich Freeman, John Masters, Keary Griffin, Patricia Shanahan, Alec Clews, manders99, Sean Stangl, Roy Stone, François Revol, Michael Masterson, RezNet, JediBob, Pholy and names I'm sure I've missed or yet to add.


Language and Translation

Now with sixteen (!) new languages besides English (US) it is important to mention all those people who have done an enormous job breaking their heads over 1566 strings with 9572 words, making a total of over 56.000 characters, for the original SleepyHead Version 1.0.0

diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index 92a8099a..1725436f 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -2,7 +2,7 @@

-Changes and fixes in OSCR v1.0.0-beta-1 +Changes and fixes in OSCAR v1.0.0-beta-1

  • This is a Community Release, prepared without Mark Watkin's assistance
  • The Donation and Update features have been removed
    • diff --git a/oscar/exportcsv.cpp b/oscar/exportcsv.cpp index 5570f72f..6e1d5833 100644 --- a/oscar/exportcsv.cpp +++ b/oscar/exportcsv.cpp @@ -69,7 +69,7 @@ ExportCSV::~ExportCSV() void ExportCSV::on_filenameBrowseButton_clicked() { - QString timestamp = tr("OSCR_"); + QString timestamp = tr("OSCAR_"); timestamp += p_profile->Get("Username") + "_"; if (ui->rb1_details->isChecked()) { timestamp += tr("Details_"); } diff --git a/oscar/help.cpp b/oscar/help.cpp index 91fd7af6..8b1f29e4 100644 --- a/oscar/help.cpp +++ b/oscar/help.cpp @@ -1,4 +1,4 @@ -/* OSCR Help Implementation +/* OSCAR Help Implementation * * Copyright (c) 2018 Mark Watkins * @@ -62,7 +62,7 @@ Help::Help(QWidget *parent) : if (QFile::exists(helpIndex)) QFile::remove(helpIndex); helpEngine = new QHelpEngine(helpIndex); - helpNamespace = "nightowlsoftware.ca.OSCR_Guide"; + helpNamespace = "nightowlsoftware.ca.OSCAR_Guide"; if (!helpFile.isEmpty()) { if (!helpEngine->setupData()) { diff --git a/oscar/main.cpp b/oscar/main.cpp index b073cdc3..98c11801 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -155,10 +155,10 @@ int main(int argc, char *argv[]) if (opengl2supported) { if (!settings.value(BetterBuild, false).toBool()) { - QMessageBox::information(nullptr, QObject::tr("A faster build of OSCR may be available"), - QObject::tr("This build of OSCR is a compatability version that also works on computers lacking OpenGL 2.0 support.")+"

    "+ + QMessageBox::information(nullptr, QObject::tr("A faster build of OSCAR may be available"), + QObject::tr("This build of OSCAR is a compatability version that also works on computers lacking OpenGL 2.0 support.")+"

    "+ QObject::tr("However it looks like your computer has full support for OpenGL 2.0!") + "

    "+ - QObject::tr("This version will run fine, but a \"%1\" tagged build of OSCR will likely run a bit faster on your computer.").arg("-OpenGL")+"

    "+ + QObject::tr("This version will run fine, but a \"%1\" tagged build of OSCAR will likely run a bit faster on your computer.").arg("-OpenGL")+"

    "+ QObject::tr("You will not be bothered with this message again."), QMessageBox::Ok, QMessageBox::Ok); settings.setValue(BetterBuild, true); } @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) #else if (bad_graphics) { QMessageBox::warning(nullptr, QObject::tr("Incompatible Graphics Hardware"), - QObject::tr("This build of OSCR requires OpenGL 2.0 support to function correctly, and unfortunately your computer lacks this capability.") + "

    "+ + QObject::tr("This build of OSCAR requires OpenGL 2.0 support to function correctly, and unfortunately your computer lacks this capability.") + "

    "+ QObject::tr("You may need to update your computers graphics drivers from the GPU makers website. %1"). arg(intel_graphics ? QObject::tr("(Intel's support site)") : "")+"

    "+ QObject::tr("Because graphs will not render correctly, and it may cause crashes, this build will now exit.")+"

    "+ @@ -195,9 +195,9 @@ int main(int argc, char *argv[]) if (!havefolder && !force_data_dir) { if (QMessageBox::question(nullptr, STR_MessageBox_Question, - QObject::tr("Would you like OSCR to use this location for storing its data?")+"\n\n"+ + QObject::tr("Would you like OSCAR to use this location for storing its data?")+"\n\n"+ QDir::toNativeSeparators(GetAppRoot())+"\n\n"+ - QObject::tr("If you are upgrading, don't panic, you just need to make sure this is pointed at your old OSCR data folder.")+"\n\n"+ + QObject::tr("If you are upgrading, don't panic, you just need to make sure this is pointed at your old OSCAR data folder.")+"\n\n"+ QObject::tr("(If you are unsure, just click yes.)"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) { settings.setValue("Settings/AppRoot", GetAppRoot()); change_data_dir = false; @@ -208,17 +208,17 @@ retry_directory: if (change_data_dir) { QString datadir = QFileDialog::getExistingDirectory(nullptr, - QObject::tr("Choose or create new folder for OSCR data"), GetAppRoot(), + QObject::tr("Choose or create new folder for OSCAR data"), GetAppRoot(), QFileDialog::ShowDirsOnly); if (datadir.isEmpty()) { if (!havefolder) { QMessageBox::information(nullptr, QObject::tr("Exiting"), - QObject::tr("As you did not select a data folder, OSCR will exit.")+"\n\n"+QObject::tr("Next time you run, you will be asked again.")); + QObject::tr("As you did not select a data folder, OSCAR will exit.")+"\n\n"+QObject::tr("Next time you run, you will be asked again.")); return 0; } else { QMessageBox::information(nullptr, STR_MessageBox_Warning, - QObject::tr("You did not select a directory.")+"\n\n"+QObject::tr("OSCR will now start with your old one.")+"\n\n"+ + QObject::tr("You did not select a directory.")+"\n\n"+QObject::tr("OSCAR will now start with your old one.")+"\n\n"+ QDir::toNativeSeparators(GetAppRoot()), QMessageBox::Ok); } } else { @@ -229,7 +229,7 @@ retry_directory: if (dir.count() > 2) { // Not a new directory.. nag the user. if (QMessageBox::question(nullptr, STR_MessageBox_Warning, - QObject::tr("The folder you chose is not empty, nor does it already contain valid OSCR data.") + + QObject::tr("The folder you chose is not empty, nor does it already contain valid OSCAR data.") + "\n\n"+QObject::tr("Are you sure you want to use this folder?")+"\n\n" + datadir, QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { goto retry_directory; @@ -293,7 +293,7 @@ retry_directory: // check_updates = false; } else if (vc > 0) { if (QMessageBox::warning(nullptr, STR_MessageBox_Error, - QObject::tr("The version of OSCR you just ran is OLDER than the one used to create this data (%1)."). + QObject::tr("The version of OSCAR you just ran is OLDER than the one used to create this data (%1)."). arg(AppSetting->versionString()) +"\n\n"+ QObject::tr("It is likely that doing this will cause data corruption, are you sure you want to do this?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) { diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index cc261c02..e030f03d 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -69,7 +69,7 @@ MainWindow::MainWindow(QWidget *parent) : ui(new Ui::MainWindow) { ui->setupUi(this); - ui->logText->setPlainText("00000: Startup: OSCR Logger initialized"); + ui->logText->setPlainText("00000: Startup: OSCAR Logger initialized"); if (logger) { connect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString))); @@ -88,7 +88,7 @@ MainWindow::MainWindow(QWidget *parent) : systray->show(); systraymenu = new QMenu(this); systray->setContextMenu(systraymenu); - QAction *a = systraymenu->addAction(STR_TR_OSCR + " v" + VersionString); + QAction *a = systraymenu->addAction(STR_TR_OSCAR + " v" + VersionString); a->setEnabled(false); systraymenu->addSeparator(); systraymenu->addAction(tr("&About"), this, SLOT(on_action_About_triggered())); @@ -105,7 +105,7 @@ MainWindow::MainWindow(QWidget *parent) : void MainWindow::SetupGUI() { QString version = getBranchVersion(); - setWindowTitle(STR_TR_OSCR + QString(" %1").arg(version)); + setWindowTitle(STR_TR_OSCAR + QString(" %1").arg(version)); #ifdef Q_OS_MAC @@ -234,7 +234,7 @@ void MainWindow::closeEvent(QCloseEvent * event) static bool runonce = false; if (!runonce) { if (AppSetting->removeCardReminder()) { - Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("OSCR Reminder")); + Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("OSCAR Reminder")); QThread::msleep(1000); QApplication::processEvents(); } @@ -279,7 +279,7 @@ void MainWindow::log(QString text) void MainWindow::Notify(QString s, QString title, int ms) { if (title.isEmpty()) { - title = tr("%1 %2").arg(STR_TR_OSCR).arg(STR_TR_AppVersion); + title = tr("%1 %2").arg(STR_TR_OSCAR).arg(STR_TR_AppVersion); } if (systray) { QString msg = s; @@ -391,8 +391,8 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword) if (lockhost.compare(QHostInfo::localHostName()) != 0) { if (QMessageBox::warning(nullptr, STR_MessageBox_Warning, QObject::tr("There is a lockfile already present for this profile '%1', claimed on '%2'.").arg(prof->user->userName()).arg(lockhost)+"\n\n"+ - QObject::tr("You can only work with one instance of an individual OSCR profile at a time.")+"\n\n"+ - QObject::tr("If you are using cloud storage, make sure OSCR is closed and syncing has completed first on the other computer before proceeding."), + QObject::tr("You can only work with one instance of an individual OSCAR profile at a time.")+"\n\n"+ + QObject::tr("If you are using cloud storage, make sure OSCAR is closed and syncing has completed first on the other computer before proceeding."), QMessageBox::Cancel |QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) { return false; } @@ -413,7 +413,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword) for (QList::iterator it = machines.begin(); it != machines.end(); ++it) { QString mclass=(*it)->loaderName(); if (mclass == STR_MACH_ResMed) { - qDebug() << "ResMed machine found.. locking OSCR preferences to suit it's summary system"; + qDebug() << "ResMed machine found.. locking OSCAR preferences to suit it's summary system"; // Have to sacrifice these features to get access to summary data. p_profile->session->setCombineCloseSessions(0); @@ -484,7 +484,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword) PopulatePurgeMenu(); AppSetting->setProfileName(p_profile->user->userName()); - setWindowTitle(STR_TR_OSCR + QString(" %1 (" + tr("Profile") + ": %2)").arg(getBranchVersion()).arg(AppSetting->profileName())); + setWindowTitle(STR_TR_OSCAR + QString(" %1 (" + tr("Profile") + ": %2)").arg(getBranchVersion()).arg(AppSetting->profileName())); ui->oximetryButton->setDisabled(false); ui->dailyButton->setDisabled(false); @@ -1024,16 +1024,16 @@ QString MainWindow::getWelcomeHTML() "" "" "" + + tr("Welcome to OSCAR") + "" "" "
    " - + tr("Welcome to OSCR") + "
    " - "

    " + tr("About OSCR") + "

    " + "

    " + tr("About OSCAR") + "

    " "

    " + tr("This software has been created to assist you in reviewing the data produced by CPAP Machines, used in the treatment of various Sleep Disorders.") + "

    " - "

    " + tr("OSCR has been designed by a software developer with personal experience with a sleep disorder, and shaped by the feedback of many other willing testers dealing with similar conditions.") + "

    " + tr("OSCAR has been designed by a software developer with personal experience with a sleep disorder, and shaped by the feedback of many other willing testers dealing with similar conditions.") + "

    " "

    " + tr("This is a beta release, some features may not yet behave as expected.") + - "
    " + tr("Please report any bugs you find to the OSCR developer's group.") + "

    " + "
    " + tr("Please report any bugs you find to the OSCAR developer's group.") + "

    " "

    " + tr("Currenly supported machines:") + "

    " "" + tr("CPAP") + "" @@ -1679,7 +1679,7 @@ void MainWindow::RestartApplication(bool force_login, QString cmdline) args << "-n"; // -n option is important, as it opens a new process args << apppath; - args << "--args"; // OSCR binary options after this + args << "--args"; // OSCAR binary options after this args << "-p"; // -p starts with 1 second delay, to give this process time to save.. @@ -1835,14 +1835,14 @@ void MainWindow::on_actionRebuildCPAP(QAction *action) tr("Are you sure you want to rebuild all CPAP data for the following machine:\n\n") + mach->brand() + " " + mach->model() + " " + mach->modelnumber() + " (" + mach->serial() + ")\n\n" + - tr("Please note, that this could result in loss of graph data if OSCR's backups have been disabled or interfered with in any way."), + tr("Please note, that this could result in loss of graph data if OSCAR's backups have been disabled or interfered with in any way."), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) { return; } } else { if (QMessageBox::question(this, STR_MessageBox_Warning, - "

    "+STR_MessageBox_Warning+": "+tr("For some reason, OSCR does not have any backups for the following machine:")+ "

    " + + "

    "+STR_MessageBox_Warning+": "+tr("For some reason, OSCAR does not have any backups for the following machine:")+ "

    " + "

    "+mach->brand() + " " + mach->model() + " " + mach->modelnumber() + " (" + mach->serial() + ")

    "+ "

    "+tr("Provided you have made your own backups for ALL of your CPAP data, you can still complete this operation, but you will have to restore from your backups manually.")+"

    " + "

    "+tr("Are you really sure you want to do this?")+"

    ", @@ -1897,7 +1897,7 @@ void MainWindow::on_actionPurgeMachine(QAction *action) if (QMessageBox::question(this, STR_MessageBox_Warning, "

    "+STR_MessageBox_Warning+": " + - tr("You are about to obliterate OSCR's machine database for the following machine:

    ") + + tr("You are about to obliterate OSCAR's machine database for the following machine:

    ") + "

    "+mach->brand() + " " + mach->model() + " " + mach->modelnumber() + " (" + mach->serial() + ")" + "

    " + "

    "+tr("Note as a precaution, the backup folder will be left in place.")+"

    "+ "

    "+tr("Are you absolutely sure you want to proceed?")+"

    ", @@ -2236,10 +2236,10 @@ void MainWindow::on_actionSleep_Disorder_Terms_Glossary_triggered() QMessageBox::information(nullptr, STR_MessageBox_Information, tr("The Glossary is not yet implemented")); } -void MainWindow::on_actionHelp_Support_OSCR_Development_triggered() +void MainWindow::on_actionHelp_Support_OSCAR_Development_triggered() { // QDesktopServices().openUrl(QUrl("https://sleepyhead.jedimark.net/donate.php")); - QMessageBox::information(nullptr, STR_MessageBox_Information, tr("Donations are not yet implemented")); + QMessageBox::information(nullptr, STR_MessageBox_Information, tr("Donations are not implemented")); } void MainWindow::on_actionChange_Language_triggered() diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index 20c82748..609e1a4a 100644 --- a/oscar/mainwindow.h +++ b/oscar/mainwindow.h @@ -38,7 +38,7 @@ class MainWindow; \section intro_sec Introduction - OpenSource CPAP Reviewer (OSCR) is a program derived from the SleepyHead program written by Mark Watkins. + OpenSource CPAP Reviewer (OSCAR) is a program derived from the SleepyHead program written by Mark Watkins. SleepyHead is Cross-Platform Open-Source software for reviewing data from %CPAP machines, which are used in the treatment of Sleep Disorders. @@ -267,7 +267,7 @@ class MainWindow : public QMainWindow void on_actionSleep_Disorder_Terms_Glossary_triggered(); - void on_actionHelp_Support_OSCR_Development_triggered(); + void on_actionHelp_Support_OSCAR_Development_triggered(); void aboutBoxLinkClicked(const QUrl &url); diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui index 3a59b042..5da55cf4 100644 --- a/oscar/mainwindow.ui +++ b/oscar/mainwindow.ui @@ -438,7 +438,7 @@ - OSCR + OSCAR @@ -2969,7 +2969,7 @@ p, li { white-space: pre-wrap; } - &About OSCR + &About OSCAR diff --git a/oscar/newprofile.cpp b/oscar/newprofile.cpp index 8fd91823..3a805e7c 100644 --- a/oscar/newprofile.cpp +++ b/oscar/newprofile.cpp @@ -111,10 +111,10 @@ QString NewProfile::getIntroHTML() "

    " + tr("This software is being designed to assist you in reviewing the data produced by your CPAP machines and related equipment.") + "

    " - "

    " + tr("OSCR has been released freely under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose.") + "

    " + tr("OSCAR has been released freely under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose.") + "

    " "

    " + tr("PLEASE READ CAREFULLY") + "

    " - "

    " + tr("OSCR is intended merely as a data viewer, and definitely not a substitute for competent medical guidance from your Doctor.") + "

    " + tr("OSCAR is intended merely as a data viewer, and definitely not a substitute for competent medical guidance from your Doctor.") + "

    " "

    " + tr("Accuracy of any data displayed is not and can not be guaranteed.") + "

    " @@ -129,7 +129,7 @@ QString NewProfile::getIntroHTML() "

    " + tr("Use of this software is entirely at your own risk.") + "

    " - "

    " + tr("OSCR is copyright ©2011-2018 Mark Watkins and portions ©2019 Nightowl Software") + "

    " + "

    " + tr("OSCAR is copyright ©2011-2018 Mark Watkins and portions ©2019 Nightowl Software") + "

    " "" "" ""; diff --git a/oscar/newprofile.ui b/oscar/newprofile.ui index 14a559e2..65eab5ee 100644 --- a/oscar/newprofile.ui +++ b/oscar/newprofile.ui @@ -874,7 +874,7 @@     - OSCR + OSCAR Qt::AlignHCenter|Qt::AlignTop diff --git a/oscar/oximeterimport.cpp b/oscar/oximeterimport.cpp index 1d609566..e1b677b3 100644 --- a/oscar/oximeterimport.cpp +++ b/oscar/oximeterimport.cpp @@ -1113,9 +1113,9 @@ void OximeterImport::setInformation() "

    " +tr("Pulse Oximeters are medical devices used to measure blood oxygen saturation. During extended Apnea events and abnormal breathing patterns, blood oxygen saturation levels can drop significantly, and can indicate issues that need medical attention.")+"

    " "

    " - +tr("OSCR gives you the ability to track Oximetry data alongside CPAP session data, which can give valuable insight into the effectiveness of CPAP treatment. It will also work standalone with your Pulse Oximeter, allowing you to store, track and review your recorded data.")+"

    " + +tr("OSCAR gives you the ability to track Oximetry data alongside CPAP session data, which can give valuable insight into the effectiveness of CPAP treatment. It will also work standalone with your Pulse Oximeter, allowing you to store, track and review your recorded data.")+"

    " "

    " - +tr("OSCR is currently compatible with Contec CMS50D+, CMS50E, CMS50F and CMS50I serial oximeters.
    (Note: Direct importing from bluetooth models is probaby not possible yet)")+"

    " + +tr("OSCAR is currently compatible with Contec CMS50D+, CMS50E, CMS50F and CMS50I serial oximeters.
    (Note: Direct importing from bluetooth models is probaby not possible yet)")+"

    " "

    " +tr("You may wish to note, other companies, such as Pulox, simply rebadge Contec CMS50's under new names, such as the Pulox PO-200, PO-300, PO-400. These should also work.")+"

    " @@ -1127,7 +1127,7 @@ void OximeterImport::setInformation() +tr("If you are trying to sync oximetry and CPAP data, please make sure you imported your CPAP sessions first before proceeding!")+"

    " "

    " ""+tr("Important Notes:")+" " - +tr("For OSCR to be able to locate and read directly from your Oximeter device, you need to ensure the correct device drivers (eg. USB to Serial UART) have been installed on your computer. For more information about this, %1click here%2.").arg("").arg("")+"

    " + +tr("For OSCAR to be able to locate and read directly from your Oximeter device, you need to ensure the correct device drivers (eg. USB to Serial UART) have been installed on your computer. For more information about this, %1click here%2.").arg("").arg("")+"

    " "

    " +tr("Contec CMS50D+ devices do not have an internal clock, and do not record a starting time. If you do not have a CPAP session to link a recording to, you will have to enter the start time manually after the import process is completed.")+"

    " "

    " diff --git a/oscar/oximeterimport.ui b/oscar/oximeterimport.ui index 45e4c6a7..106afe91 100644 --- a/oscar/oximeterimport.ui +++ b/oscar/oximeterimport.ui @@ -964,7 +964,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - CMS50E/F users, when importing directly, please don't select upload on your device until OSCR prompts you to. + CMS50E/F users, when importing directly, please don't select upload on your device until OSCAR prompts you to. Qt::AlignCenter @@ -1001,7 +1001,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - <html><head/><body><p>If enabled, OSCR will automatically reset your CMS50's internal clock using your computers current time.</p></body></html> + <html><head/><body><p>If enabled, OSCAR will automatically reset your CMS50's internal clock using your computers current time.</p></body></html> Set device date/time @@ -1074,7 +1074,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - <html><head/><body><p>This option will erase the imported session from your oximeter after import has completed. </p><p>Use with caution, becauseif something goes wrong before OSCR saves your session, you won't get it back.</p></body></html> + <html><head/><body><p>This option will erase the imported session from your oximeter after import has completed. </p><p>Use with caution, becauseif something goes wrong before OSCAR saves your session, you won't get it back.</p></body></html> Erase session after successful upload @@ -1645,7 +1645,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - Please choose which one you want to import into OSCR + Please choose which one you want to import into OSCAR Qt::AlignCenter @@ -1822,7 +1822,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc) - <html><head/><body><p>OSCR needs a starting time to know where to save this oximetry session to.</p><p>Choose one of the following options:</p></body></html> + <html><head/><body><p>OSCAR needs a starting time to know where to save this oximetry session to.</p><p>Choose one of the following options:</p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index af032550..80e13d4d 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -61,7 +61,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : #ifdef LOCK_RESMED_SESSIONS // Remove access to session splitting options and show ResMed users a notice instead - ui->ResMedWarning->setText(tr("

    Please Note: OSCR's advanced session splitting capabilities are not possible with ResMed machines due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile.

    On ResMed machines, days will split at noon like in ResMed's commercial software.

    ")); + ui->ResMedWarning->setText(tr("

    Please Note: OSCAR's advanced session splitting capabilities are not possible with ResMed machines due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile.

    On ResMed machines, days will split at noon like in ResMed's commercial software.

    ")); ui->ResMedWarning->setVisible(haveResMed); if (haveResMed) { @@ -1120,7 +1120,7 @@ void PreferencesDialog::on_createSDBackups_toggled(bool checked) if (haveS9 && QMessageBox::question(this, tr("This may not be a good idea"), tr("ResMed S9 machines routinely delete certain data from your SD card older than 7 and 30 days (depending on resolution).") + - tr(" If you ever need to reimport this data again (whether in OSCR or ResScan) this data won't come back.") + + tr(" If you ever need to reimport this data again (whether in OSCAR or ResScan) this data won't come back.") + tr(" If you need to conserve disk space, please remember to carry out manual backups.") + tr(" Are you sure you want to disable these backups?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { @@ -1166,7 +1166,7 @@ void PreferencesDialog::on_createSDBackups_clicked(bool checked) { if (!checked && p_profile->session->backupCardData()) { if (QMessageBox::question(this, - STR_MessageBox_Warning, tr("Switching off backups is not a good idea, because OSCR needs these to rebuild the database if errors are found.\n\n") + + STR_MessageBox_Warning, tr("Switching off backups is not a good idea, because OSCAR needs these to rebuild the database if errors are found.\n\n") + tr("Are you really sure you want to do this?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) { // do nothing } else { diff --git a/oscar/preferencesdialog.h b/oscar/preferencesdialog.h index 0fd1ea10..66f7c505 100644 --- a/oscar/preferencesdialog.h +++ b/oscar/preferencesdialog.h @@ -1,4 +1,4 @@ -/* OSCR Preferences Dialog Headers +/* OSCAR Preferences Dialog Headers * * Copyright (c) 2011-2018 Mark Watkins * @@ -37,9 +37,9 @@ class MySortFilterProxyModel: public QSortFilterProxyModel }; /*! \class PreferencesDialog - \brief OSCR's Main Preferences Window + \brief OSCAR's Main Preferences Window - This provides the Preferences form and logic to alter Preferences for OSCR + This provides the Preferences form and logic to alter Preferences for OSCAR */ class PreferencesDialog : public QDialog { diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 3f79f3a5..40c6475e 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -432,7 +432,7 @@ p, li { white-space: pre-wrap; } Backed up EDF files are stored in the .gz format, which is common on Mac & Linux platforms.. -OSCR can import from this compressed backup directory natively.. +OSCAR can import from this compressed backup directory natively.. To use it with ResScan will require the .gz files to be uncompressed first..     @@ -448,7 +448,7 @@ To use it with ResScan will require the .gz files to be uncompressed first.. - The following options affect the amount of disk space OSCR uses, and have an effect on how long import takes. + The following options affect the amount of disk space OSCAR uses, and have an effect on how long import takes. true @@ -458,12 +458,12 @@ To use it with ResScan will require the .gz files to be uncompressed first.. - This makes OSCR's data take around half as much space. + This makes OSCAR's data take around half as much space. But it makes import and day changing take longer.. If you've got a new computer with a small solid state disk, this is a good option. - Compress Session Data (makes OSCR data smaller, but day changing slower.) + Compress Session Data (makes OSCAR data smaller, but day changing slower.) @@ -475,7 +475,7 @@ If you've got a new computer with a small solid state disk, this is a good optio ResMed S9 series machines delete high resolution data older than 7 days, and graph data older than 30 days.. -OSCR can keep a copy of this data if you ever need to reinstall. +OSCAR 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) @@ -603,7 +603,7 @@ OSCR can keep a copy of this data if you ever need to reinstall. - <html><head/><body><p>Makes starting OSCR a bit slower, by pre-loading all the summary data in advance, which speeds up overview browsing and a few other calculations later on. </p><p>If you have a large amount of data, it might be worth keeping this switched off, but if you typically like to view <span style=" font-style:italic;">everything</span> in overview, all the summary data still has to be loaded anyway. </p><p>Note this setting doesn't affect waveform and event data, which is always demand loaded as needed.</p></body></html> + <html><head/><body><p>Makes starting OSCAR a bit slower, by pre-loading all the summary data in advance, which speeds up overview browsing and a few other calculations later on. </p><p>If you have a large amount of data, it might be worth keeping this switched off, but if you typically like to view <span style=" font-style:italic;">everything</span> in overview, all the summary data still has to be loaded anyway. </p><p>Note this setting doesn't affect waveform and event data, which is always demand loaded as needed.</p></body></html> Pre-Load all summary data at startup @@ -994,7 +994,7 @@ This option must be enabled before import, otherwise a purge is required. - This experimental option attempts to use OSCR's event flagging system to improve machine detected event positioning. + This experimental option attempts to use OSCAR's event flagging system to improve machine detected event positioning. Resync Machine Detected Events (Experimental) @@ -1978,7 +1978,7 @@ Mainly affects the importer. - Show Remove Card reminder notification on OSCR shutdown + Show Remove Card reminder notification on OSCAR shutdown @@ -2251,7 +2251,7 @@ 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 OSCR is set to not open a profile on startup)</p></body></html> + <html><head/><body><p>Which tab to open on loading a profile. (Note: It will default to Profile if OSCAR is set to not open a profile on startup)</p></body></html> Profile @@ -2729,7 +2729,7 @@ this application to be unstable with this feature enabled. - Try changing this from the default setting (Desktop OpenGL) if you experience rendering problems with OSCR's graphs. + Try changing this from the default setting (Desktop OpenGL) if you experience rendering problems with OSCAR's graphs. true diff --git a/oscar/profileselect.cpp b/oscar/profileselect.cpp index 470553e3..c095791e 100644 --- a/oscar/profileselect.cpp +++ b/oscar/profileselect.cpp @@ -94,13 +94,13 @@ ProfileSelect::ProfileSelect(QWidget *parent) : popupMenu->addSeparator(); popupMenu->addAction(tr("Delete Profile"), this, SLOT(deleteProfile())); - ui->labelAppName->setText(STR_TR_OSCR); + ui->labelAppName->setText(STR_TR_OSCAR); ui->labelVersion->setText(STR_TR_AppVersion); // if (GIT_BRANCH!="master") // ui->labelBuild->setText(GIT_BRANCH); // else ui->labelBuild->setText(QString()); ui->labelFolder->setText(GetAppRoot()); - ui->labelFolder->setToolTip("Current OSCR data folder\n" + GetAppRoot()); + ui->labelFolder->setToolTip("Current OSCAR data folder\n" + GetAppRoot()); ui->listView->verticalScrollBar()->setStyleSheet("QScrollBar:vertical {border: 0px solid grey; background: transparent; }" "QScrollBar::handle:vertical {" diff --git a/oscar/profileselect.ui b/oscar/profileselect.ui index 93e37153..5e13f684 100644 --- a/oscar/profileselect.ui +++ b/oscar/profileselect.ui @@ -232,7 +232,7 @@ background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, - Choose a different OSCR data folder. + Choose a different OSCAR data folder. @@ -271,7 +271,7 @@ background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, border: 0px; - OSCR + OSCAR Qt::AlignCenter @@ -307,7 +307,7 @@ background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, - Click here if you didn't want to start OSCR. + Click here if you didn't want to start OSCAR. &Quit @@ -380,7 +380,7 @@ background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, - The current location of OSCR data store. + The current location of OSCAR data store. border: 0px; diff --git a/oscar/profileselector.ui b/oscar/profileselector.ui index 9e1a98a9..b5616310 100644 --- a/oscar/profileselector.ui +++ b/oscar/profileselector.ui @@ -113,7 +113,7 @@ - + 1 @@ -159,7 +159,7 @@ - + 13 @@ -168,7 +168,7 @@ - OSCR + OSCAR Qt::AlignCenter diff --git a/oscar/reports.cpp b/oscar/reports.cpp index 17489cad..b5a30556 100644 --- a/oscar/reports.cpp +++ b/oscar/reports.cpp @@ -552,7 +552,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date) } if (first) { - QString footer = QObject::tr("OSCR v%1").arg(VersionString); + QString footer = QObject::tr("OSCAR v%1").arg(VersionString); QRectF bounds = painter.boundingRect(QRectF(0, virt_height, virt_width, normal_height), footer, QTextOption(Qt::AlignHCenter)); diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 4db1365b..eeca6d2d 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -637,9 +637,9 @@ QString Statistics::htmlHeader(bool showheader) if (showheader) { html += "
    " +resizeHTMLPixmap(logoPixmap,64,64)+"
    " - "" + STR_TR_OSCR + "
    " + "" + STR_TR_OSCAR + "
    " "" + tr("Usage Statistics") + "
    " - "" + tr("(NOT approved for compliance or medical reporting purposes)")+"
    "; + "" + tr("(NOT approved for compliance or medical reporting purposes)")+"
    "; if (!userinfo.isEmpty()) html += "
    "+userinfo+"
    "; html += "

    "; @@ -652,8 +652,8 @@ QString Statistics::htmlFooter(bool showinfo) if (showinfo) { html += "
    "; - html += tr("This report was generated by OSCR v%1").arg(ShortVersionString) + "
    " - +tr("OSCR is free open-source CPAP review software"); + html += tr("This report was generated by OSCAR v%1").arg(ShortVersionString) + "
    " + +tr("OSCAR is free open-source CPAP review software"); html += "
    "; } @@ -1424,7 +1424,7 @@ void Statistics::UpdateRecordsBox() } else { html += "
    "+tr("Want more information?")+"
    "; - html += ""+tr("OSCR needs all summary data loaded to calculate best/worst data for individual days.")+"

    "; + html += ""+tr("OSCAR needs all summary data loaded to calculate best/worst data for individual days.")+"

    "; html += ""+tr("Please enable Pre-Load Summaries checkbox in preferences to make sure this data is available.")+"

    "; }