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

Removed Update function and tweaked html

Browse Source
This commit is contained in:
Phil Olynyk 2019-02-24 17:10:31 -05:00
parent 89f29ae1ef
commit 43d0c844df
7 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/SleepLib/appsettings.h
View File

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

2
oscar/daily.cpp
View File

@ -1511,7 +1511,7 @@ void Daily::Load(QDate date)
html+="<tr><td align=center><font size='+3'>"+tr("\"Nothing's here!\"")+"</font></td></tr>";
html+="<tr><td align=center><img src='qrc:/icons/logo.png'></td></tr>";
html+="<tr height=5px><td align=center></td></tr>";
html+="<tr bgcolor='#89abcd'><td align=center><i><font size=+1 color=white>"+tr("Bob is bored with this days lack of data.")+"</font></i></td></tr>";
html+="<tr bgcolor='#89abcd'><td align=center><i><font size=+1 color=white>"+tr("Oscar is bored with this days lack of data.")+"</font></i></td></tr>";
html+="<tr height=25%><td align=center></td></tr>";
html+="</table>\n";
}

34
oscar/docs/about.html
View File

@ -7,39 +7,29 @@
.centre { margin:0px; text-indent:0px;}
</style>
</head>
<body style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;">
<body leftmargin=5 topmargin=10 rightmargin=5 bottommargin=5 vertical-align=center align=center style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
<p style="-qt-paragraph-type:empty; margin:0; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p>
<p class="centre" text-align="center;"><span style=" font-size:20pt;"i>
Welcome to Open Source CPAP Analysis Reporter</span></p>
<p class="centre" text-align="center;"; style="font-size:11pt;"><br /></p>
<p class="centre" text-align="center;">
This software has been designed to assist you in reviewing the data produced by your CPAP machines and related equipment.</p>
<p><span style=" font-size:20pt;">Welcome to Open Source CPAP Analysis Reporter</span></p>
<p class="centre" align=center; style="font-size:11pt;"><br /></p>
<p>This software has been designed to assist you in reviewing the data produced by your CPAP machines and related equipment.</p>
<p class="centre" ><br /></p>
<hr />
<p class="centre" text-align="center;"><span style=" font-size:18pt; color:#ff0000;">
PLEASE READ CAREFULLY</span></p>
<p><span style=" font-size:18pt; color:#ff0000;">PLEASE READ CAREFULLY</span></p>
<hr />
<p class="centre" style="font-size:11pt;"><br /></p>
<p class="centre" text-align="center;">
OSCAR is <span style=" font-weight:600;">NOT </span>a substitute for competent medical guidance from your Doctor.</p>
<p>OSCAR is <span style=" font-weight:600;">NOT </span>a substitute for competent medical guidance from your Doctor.</p>
<p class="centre" ><br /></p>
<p class="centre" text-align="center;">
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. </p>
<p>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. </p>
<p align="center" ><br /></p>
<p class="centre" text-align="center;">
Any reports generated are for <span style=" font-weight:600;">PERSONAL USE ONLY</span>, and are <span style=" font-weight:600;">NOT IN ANY WAY</span> fit for compliance or medical diagnostic purposes.</p>
<p>Any reports generated are for <span style=" font-weight:600;">PERSONAL USE ONLY</span>, and are <span style=" font-weight:600;">NOT IN ANY WAY</span> fit for compliance or medical diagnostic purposes.</p>
<p class="centre" ><br /></p>
<p class="centre" text-align="center;">
Use of this software is <span style=" font-style:italic;">entirely </span>at your own risk. The authors will not be held liable for <span style=" font-weight:600; text-decoration: underline;">anything</span> related to the use or misuse of this software.</p>
<p>Use of this software is <span style=" font-style:italic;">entirely </span>at your own risk. The authors will not be held liable for <span style=" font-weight:600; text-decoration: underline;">anything</span> related to the use or misuse of this software.</p>
<p class="centre"><br /></p>
<hr />
<p class="centre" text-align="center;">
OSCAR is free (as in freedom) software, released under the <span style=" font-style:italic;">GNU Public License v3</span>, and comes with no warranty, and without ANY claims to fitness for any purpose.</p>
<p>OSCAR is free (as in freedom) software, released under the <span style=" font-style:italic;">GNU Public License v3</span>, and comes with no warranty, and without ANY claims to fitness for any purpose.</p>
<p class="centre" ><br /></p>
<p class="centre" text-align="center;">
OSCAR is copyright ©2011-2018 <a href="http://jedimark.net"><span style=" text-decoration: underline; color:#0000ff;">Mark Watkins</span></a></p>
<p class="centre" text-align="center;">
and portions &copy;2019 Nightowl Software</p>
<p>OSCAR is copyright ©2011-2018 <a href="http://jedimark.net"><span style=" text-decoration: underline; color:#0000ff;">Mark Watkins</span></a></p>
<p>and portions &copy;2019 Nightowl Software</p>
<p class="centre" style="font-size:11pt;"><br /></p>
</body>
</html>

17
oscar/preferencesdialog.cpp
View File

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

4
oscar/preferencesdialog.h
View File

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

2
oscar/statistics.cpp
View File

@ -990,7 +990,7 @@ QString Statistics::GenerateHTML()
// html += QString("<tr><td align=center>") +
html += QString( "<p><font size=\"+3\"><br />" + tr("I can haz data?!?") + "</font></p>"+
"<p><img src='qrc:/icons/logo.png' width=\"100\" height=\"100\"></p>"
"<p><i>"+tr("This lonely sleepy thing has no data :(")+"</i></p>");
"<p><i>"+tr("Oscar has to data to report :(")+"</i></p>");
// "</table></div>";
html += htmlFooter(havedata);

4
oscar/welcome.cpp
View File

@ -125,7 +125,9 @@ QString Welcome::GenerateCPAPHTML()
Machine * cpap = nullptr;
if (!havecpapdata && !haveoximeterdata) {
html += "<p>" + tr("It might be a good idea to check preferences first,</br>as there are some options that affect import.")+"</p>"
html += "<p>" + tr("It would be a good idea to check File->Preferences first,") + "</br>" +
tr("as there are some options that affect import.")+"</p>" +
"<p>" + tr("Note that some preferences are forced when a ResMed machine is detected") + "</p>" +
"<p>" + tr("First import can take a few minutes.") + "</p>";
} else {
QDate date = p_profile->LastDay(MT_CPAP);