From 9521de7e1898baee8c133f98e322f74d9ce5beb2 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 29 Dec 2019 21:54:59 -0600 Subject: [PATCH] Add preferences to disable import warnings for untested machines and unexpected data. The preferences don't have any effect yet. --- oscar/SleepLib/profiles.h | 9 +++++++++ oscar/preferencesdialog.cpp | 4 ++++ oscar/preferencesdialog.ui | 28 ++++++++++++++++++++++++---- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/oscar/SleepLib/profiles.h b/oscar/SleepLib/profiles.h index 706dd766..96bbf116 100644 --- a/oscar/SleepLib/profiles.h +++ b/oscar/SleepLib/profiles.h @@ -350,6 +350,8 @@ const QString STR_IS_CompressSessionData = "CompressSessionData"; const QString STR_IS_IgnoreOlderSessions = "IgnoreOlderSessions"; const QString STR_IS_IgnoreOlderSessionsDate = "IgnoreOlderSessionsDate"; const QString STR_IS_LockSummarySessions = "LockSummarySessions"; +const QString STR_IS_WarnOnUntestedMachine = "WarnOnUntestedMachine"; +const QString STR_IS_WarnOnUnexpectedData = "WarnOnUnexpectedData"; // UserSettings Strings @@ -653,6 +655,8 @@ class SessionSettings : public PrefSettings m_ignoreOlderSessions = initPref(STR_IS_IgnoreOlderSessions, false).toBool(); m_ignoreOlderSessionsDate=initPref(STR_IS_IgnoreOlderSessionsDate, QDateTime(QDate::currentDate().addYears(-1), daySplitTime()) ).toDateTime(); m_lockSummarySessions = initPref(STR_IS_LockSummarySessions, true).toBool(); + m_warnOnUntestedMachine = initPref(STR_IS_WarnOnUntestedMachine, true).toBool(); + m_warnOnUnexpectedData = initPref(STR_IS_WarnOnUnexpectedData, true).toBool(); } inline QTime daySplitTime() const { return m_daySplitTime; } @@ -665,6 +669,8 @@ class SessionSettings : public PrefSettings inline bool ignoreOlderSessions() const { return m_ignoreOlderSessions; } inline QDateTime ignoreOlderSessionsDate() const { return m_ignoreOlderSessionsDate; } inline bool lockSummarySessions() const { return m_lockSummarySessions; } + inline bool warnOnUntestedMachine() const { return m_warnOnUntestedMachine; } + inline bool warnOnUnexpectedData() const { return m_warnOnUnexpectedData; } void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, m_daySplitTime=time); } void setPreloadSummaries(bool b) { setPref(STR_IS_PreloadSummaries, m_preloadSummaries=b); } @@ -676,11 +682,14 @@ class SessionSettings : public PrefSettings void setIgnoreOlderSessions(bool b) { setPref(STR_IS_IgnoreOlderSessions, m_ignoreOlderSessions=b); } void setIgnoreOlderSessionsDate(QDate date) { setPref(STR_IS_IgnoreOlderSessionsDate, m_ignoreOlderSessionsDate=QDateTime(date, daySplitTime())); } void setLockSummarySessions(bool b) { setPref(STR_IS_LockSummarySessions, m_lockSummarySessions=b); } + void setWarnOnUntestedMachine(bool b) { setPref(STR_IS_WarnOnUntestedMachine, m_warnOnUntestedMachine=b); } + void setWarnOnUnexpectedData(bool b) { setPref(STR_IS_WarnOnUnexpectedData, m_warnOnUnexpectedData=b); } QTime m_daySplitTime; QDateTime m_ignoreOlderSessionsDate; bool m_preloadSummaries, m_backupCardData, m_compressBackupData, m_compressSessionData, m_ignoreOlderSessions, m_lockSummarySessions; + bool m_warnOnUntestedMachine, m_warnOnUnexpectedData; double m_combineCloseSessions, m_ignoreShortSessions; }; diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 54a1154f..c9306d36 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -165,6 +165,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : } else { ui->IgnoreLCD->display(STR_TR_Off); } ui->LockSummarySessionSplitting->setChecked(profile->session->lockSummarySessions()); + ui->warnOnUntestedMachine->setChecked(profile->session->warnOnUntestedMachine()); + ui->warnOnUnexpectedData->setChecked(profile->session->warnOnUnexpectedData()); // macOS default system fonts are not in QFontCombobox because they are "private": // See https://github.com/musescore/MuseScore/commit/0eecb165664a0196c2eee12e42fb273dcfc9c637 @@ -799,6 +801,8 @@ bool PreferencesDialog::Save() AppSetting->setUserEventPieChart(ui->showUserFlagsInPie->isChecked()); profile->session->setLockSummarySessions(ui->LockSummarySessionSplitting->isChecked()); + profile->session->setWarnOnUntestedMachine(ui->warnOnUntestedMachine->isChecked()); + profile->session->setWarnOnUnexpectedData(ui->warnOnUnexpectedData->isChecked()); AppSetting->setOpenTabAtStart(ui->openingTabCombo->currentIndex()); AppSetting->setOpenTabAfterImport(ui->importTabCombo->currentIndex()); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index bf5b6dcf..f56d58e4 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -568,7 +568,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall. Memory and Startup Options - + Bypass the login screen and load the most recent User Profile @@ -591,7 +591,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall. - + <html><head/><body><p>This setting keeps waveform and event data in memory after use to speed up revisiting days.</p><p>This is not really a necessary option, as your operating system caches previously used files too.</p><p>Recommendation is to leave it switched off, unless your computer has a ton of memory.</p></body></html> @@ -611,14 +611,14 @@ OSCAR can keep a copy of this data if you ever need to reinstall. - + Automatically load last used profile on start-up - + <html><head/><body><p>Cuts down on any unimportant confirmation dialogs during import.</p></body></html> @@ -628,6 +628,26 @@ OSCAR can keep a copy of this data if you ever need to reinstall. + + + + <html><head/><body><p>Provide an alert when importing data from any machine model that has not yet been tested by OSCAR developers.</p></body></html> + + + Warn when importing data from an untested machine + + + + + + + <html><head/><body><p>Provide an alert when importing data that is somehow different from anything previously seen by OSCAR developers.</p></body></html> + + + Warn when previously unseen data is encountered + + +