diff --git a/oscar/SleepLib/appsettings.h b/oscar/SleepLib/appsettings.h
index ae219147..5c05cf90 100644
--- a/oscar/SleepLib/appsettings.h
+++ b/oscar/SleepLib/appsettings.h
@@ -52,13 +52,15 @@ const QString STR_US_RemoveCardReminder = "RemoveCardReminder";
const QString STR_IS_CacheSessions = "MemoryHog";
const QString STR_GEN_AutoOpenLastUsed = "AutoOpenLastUsed";
+const QString STR_GEN_Language = "Language";
+const QString STR_PREF_VersionString = "VersionString";
+const QString STR_GEN_ShowAboutDialog = "ShowAboutDialog";
+#ifndef NO_UPDATER
const QString STR_GEN_UpdatesLastChecked = "UpdatesLastChecked";
const QString STR_GEN_UpdatesAutoCheck = "Updates_AutoCheck";
const QString STR_GEN_UpdateCheckFrequency = "Updates_CheckFrequency";
-const QString STR_GEN_Language = "Language";
const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates";
-const QString STR_PREF_VersionString = "VersionString";
-const QString STR_GEN_ShowAboutDialog = "ShowAboutDialog";
+#endif
class AppWideSetting: public PrefSettings
@@ -98,10 +100,12 @@ public:
m_profileName = initPref(STR_GEN_Profile, "").toString();
initPref(STR_GEN_AutoOpenLastUsed, true);
+#ifndef NO_UPDATER
initPref(STR_GEN_UpdatesAutoCheck, true);
initPref(STR_GEN_UpdateCheckFrequency, 7);
initPref(STR_PREF_AllowEarlyUpdates, false);
initPref(STR_GEN_UpdatesLastChecked, QDateTime());
+#endif
initPref(STR_PREF_VersionString, VersionString);
m_language = initPref(STR_GEN_Language, "en_US").toString();
initPref(STR_GEN_ShowAboutDialog, 0); // default to about screen, set to -1 afterwards
@@ -118,10 +122,12 @@ public:
QString m_profileName, m_language;
QString versionString() const { return getPref(STR_PREF_VersionString).toString(); }
+#ifndef NO_UPDATER
bool updatesAutoCheck() const { return getPref(STR_GEN_UpdatesAutoCheck).toBool(); }
bool allowEarlyUpdates() const { return getPref(STR_PREF_AllowEarlyUpdates).toBool(); }
QDateTime updatesLastChecked() const { return getPref(STR_GEN_UpdatesLastChecked).toDateTime(); }
int updateCheckFrequency() const { return getPref(STR_GEN_UpdateCheckFrequency).toInt(); }
+#endif
int showAboutDialog() const { return getPref(STR_GEN_ShowAboutDialog).toInt(); }
void setShowAboutDialog(int tab) {setPref(STR_GEN_ShowAboutDialog, tab); }
@@ -220,10 +226,12 @@ public:
void setRemoveCardReminder(bool b) { setPref(STR_US_RemoveCardReminder, b); }
void setVersionString(QString version) { setPref(STR_PREF_VersionString, version); }
+#ifndef NO_UPDATER
void setUpdatesAutoCheck(bool b) { setPref(STR_GEN_UpdatesAutoCheck, b); }
void setAllowEarlyUpdates(bool b) { setPref(STR_PREF_AllowEarlyUpdates, b); }
void setUpdatesLastChecked(QDateTime datetime) { setPref(STR_GEN_UpdatesLastChecked, datetime); }
void setUpdateCheckFrequency(int freq) { setPref(STR_GEN_UpdateCheckFrequency,freq); }
+#endif
void setAutoOpenLastUsed(bool b) { setPref(STR_GEN_AutoOpenLastUsed , b); }
void setLanguage(QString language) { setPref(STR_GEN_Language, m_language=language); }
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index a6c9f4a9..1a64bb60 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -1511,7 +1511,7 @@ void Daily::Load(QDate date)
html+="| "+tr("\"Nothing's here!\"")+" |
";
html+=" |
";
html+=" |
";
- html+="| "+tr("Bob is bored with this days lack of data.")+" |
";
+ html+="| "+tr("Oscar is bored with this days lack of data.")+" |
";
html+=" |
";
html+="\n";
}
diff --git a/oscar/docs/about.html b/oscar/docs/about.html
index 573b9295..d08fb914 100644
--- a/oscar/docs/about.html
+++ b/oscar/docs/about.html
@@ -7,39 +7,29 @@
.centre { margin:0px; text-indent:0px;}
-
+
-
- Welcome to Open Source CPAP Analysis Reporter
-
-
- This software has been designed to assist you in reviewing the data produced by your CPAP machines and related equipment.
+ Welcome to Open Source CPAP Analysis Reporter
+
+ This software has been designed to assist you in reviewing the data produced by your CPAP machines and related equipment.
-
- PLEASE READ CAREFULLY
+ PLEASE READ CAREFULLY
-
- OSCAR 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 OSCAR 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.
+ Any reports generated are for PERSONAL USE ONLY, and are NOT IN ANY WAY fit for compliance or medical diagnostic purposes.
-
- Use of this software is entirely at your own risk. The authors will not be held liable for anything related to the use or misuse of this software.
+ Use of this software is entirely at your own risk. The authors will not be held liable for anything related to the use or misuse of this software.
-
- 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.
+ 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.
-
- OSCAR is copyright ©2011-2018 Mark Watkins
-
- and portions ©2019 Nightowl Software
+ OSCAR is copyright ©2011-2018 Mark Watkins
+ and portions ©2019 Nightowl Software
diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp
index 80e13d4d..f658660a 100644
--- a/oscar/preferencesdialog.cpp
+++ b/oscar/preferencesdialog.cpp
@@ -201,7 +201,11 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling());
ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
+#ifndef NO_UPDATER
ui->allowEarlyUpdates->setChecked(AppSetting->allowEarlyUpdates());
+#else
+ ui->automaticallyCheckUpdates->setVisible(false);
+#endif
int s = profile->cpap->clockDrift();
int m = (s / 60) % 60;
@@ -243,14 +247,15 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->graphHeight->setValue(AppSetting->graphHeight());
+#ifndef NO_UPDATER
ui->automaticallyCheckUpdates->setChecked(AppSetting->updatesAutoCheck());
-
ui->updateCheckEvery->setValue(AppSetting->updateCheckFrequency());
-
-
if (AppSetting->updatesLastChecked().isValid()) {
RefreshLastChecked();
- } else { ui->updateLastChecked->setText(tr("Never")); }
+ } else {
+ ui->updateLastChecked->setText(tr("Never"));
+ }
+#endif
ui->overlayFlagsCombo->setCurrentIndex(AppSetting->overlayType());
ui->overviewLinecharts->setCurrentIndex(AppSetting->overviewLinechartMode());
@@ -873,9 +878,11 @@ bool PreferencesDialog::Save()
AppSetting->setAutoLaunchImport(ui->autoLaunchImporter->isChecked());
+#ifndef NO_UPDATER
AppSetting->setUpdatesAutoCheck(ui->automaticallyCheckUpdates->isChecked());
AppSetting->setUpdateCheckFrequency(ui->updateCheckEvery->value());
AppSetting->setAllowEarlyUpdates(ui->allowEarlyUpdates->isChecked());
+#endif
PREF["Fonts_Application_Name"] = ui->applicationFont->currentText();
@@ -1032,6 +1039,7 @@ void PreferencesDialog::on_IgnoreSlider_valueChanged(int position)
} else { ui->IgnoreLCD->display(STR_TR_Off); }
}
+#ifndef NO_UPDATER
#include "mainwindow.h"
extern MainWindow *mainwin;
void PreferencesDialog::RefreshLastChecked()
@@ -1043,6 +1051,7 @@ void PreferencesDialog::on_checkForUpdatesButton_clicked()
{
mainwin->CheckForUpdates();
}
+#endif
MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
diff --git a/oscar/preferencesdialog.h b/oscar/preferencesdialog.h
index 66f7c505..fdebac10 100644
--- a/oscar/preferencesdialog.h
+++ b/oscar/preferencesdialog.h
@@ -52,15 +52,19 @@ class PreferencesDialog : public QDialog
//! \brief Save the current preferences, called when Ok button is clicked on.
bool Save();
+#ifndef NO_UPDATER
//! \brief Updates the date text of the last time updates where checked
void RefreshLastChecked();
+#endif
private slots:
void on_combineSlider_valueChanged(int value);
void on_IgnoreSlider_valueChanged(int value);
+#ifndef NO_UPDATER
void on_checkForUpdatesButton_clicked();
+#endif
//void on_genOpWidget_itemActivated(QListWidgetItem *item);
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index eeca6d2d..e8dd24b8 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -990,7 +990,7 @@ QString Statistics::GenerateHTML()
// html += QString("| ") +
html += QString( "
" + tr("I can haz data?!?") + "
"+
"
"
- ""+tr("This lonely sleepy thing has no data :(")+" ");
+ ""+tr("Oscar has to data to report :(")+" ");
// "";
html += htmlFooter(havedata);
diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp
index 6474ce04..d6a46cb1 100644
--- a/oscar/welcome.cpp
+++ b/oscar/welcome.cpp
@@ -125,7 +125,9 @@ QString Welcome::GenerateCPAPHTML()
Machine * cpap = nullptr;
if (!havecpapdata && !haveoximeterdata) {
- html += "" + tr("It might be a good idea to check preferences first,as there are some options that affect import.")+" "
+ html += "" + tr("It would be a good idea to check File->Preferences first,") + "" +
+ tr("as there are some options that affect import.")+" " +
+ "" + tr("Note that some preferences are forced when a ResMed machine is detected") + " " +
"" + tr("First import can take a few minutes.") + " ";
} else {
QDate date = p_profile->LastDay(MT_CPAP);
|