chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add preferences to disable import warnings for untested machines and unexpected data.

Browse Source 
The preferences don't have any effect yet.
This commit is contained in:
sawinglogz 2019-12-29 21:54:59 -06:00
parent 3be691f2d8
commit 9521de7e18
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oscar/SleepLib/profiles.h
View File

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

4
oscar/preferencesdialog.cpp
View File

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

28
oscar/preferencesdialog.ui
View File

@ -568,7 +568,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
<string>Memory and Startup Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_14">
<item row="2" column="0">
<item row="3" column="0">
<widget class="QCheckBox" name="autoLaunchImporter">
<property name="toolTip">
<string>Bypass the login screen and load the most recent User Profile</string>
@ -591,7 +591,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
</property>
</spacer>
</item>
<item row="0" column="1">
<item row="1" column="0">
<widget class="QCheckBox" name="cacheSessionData">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting keeps waveform and event data in memory after use to speed up revisiting days.&lt;/p&gt;&lt;p&gt;This is not really a necessary option, as your operating system caches previously used files too.&lt;/p&gt;&lt;p&gt;Recommendation is to leave it switched off, unless your computer has a ton of memory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -611,14 +611,14 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QCheckBox" name="autoLoadLastUsed">
<property name="text">
<string>Automatically load last used profile on start-up</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="0" column="1">
<widget class="QCheckBox" name="automaticImport">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cuts down on any unimportant confirmation dialogs during import.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -628,6 +628,26 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="warnOnUntestedMachine">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Provide an alert when importing data from any machine model that has not yet been tested by OSCAR developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Warn when importing data from an untested machine</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="warnOnUnexpectedData">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Provide an alert when importing data that is somehow different from anything previously seen by OSCAR developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Warn when previously unseen data is encountered</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>