flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 07:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T494, CNotificationSounds refactring

Browse Source 
* use Q_DECLARE_FLAGS NotificationFlag/Notification for sounds, not the weird version from very early swift days
* splt into h/cpp files
* added new sounds
This commit is contained in:
Klaus Basan
2018-12-31 06:42:59 +01:00
committed by Mat Sutcliffe
parent dc8ea83839
commit f8c17e10e8
14 changed files with 133 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/blackmisc/audio/audiosettings.cpp
View File

@@ -11,6 +11,7 @@
#include <QChar>
#include <QtGlobal>
#include <QStringBuilder>
using namespace BlackMisc::Audio;
@@ -23,37 +24,32 @@ namespace BlackMisc
this->initDefaultValues();
}
bool CSettings::getNotificationFlag(CNotificationSounds::Notification notification) const
bool CSettings::isNotificationFlagSet(CNotificationSounds::NotificationFlag notification) const
{
const int i = static_cast<int>(notification);
if (i >= m_notificationFlags.length()) return true; // default
QChar f = m_notificationFlags.at(i);
return '1' == f;
return this->getNotification().testFlag(notification);
}
void CSettings::setNotificationFlag(CNotificationSounds::NotificationFlag notification, bool value)
{
if (value)
{
m_notification |= notification;
}
else
{
m_notification &= ~notification;
}
}
QString CSettings::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
QString s("Notification flags:");
s.append(" ").append(m_notificationFlags);
return s;
return u"Notification flags: " % CNotificationSounds::toString(this->getNotification());
}
void CSettings::initDefaultValues()
{
this->initNotificationFlags();
this->setNotification(CNotificationSounds::AllNotifications);
}
void CSettings::initNotificationFlags()
{
// if we add flags in the future, we automatically extend ...
constexpr int l = 1 + static_cast<int>(CNotificationSounds::Notification::NotificationsLoadSounds);
if (this->m_notificationFlags.length() < l)
{
int cl = m_notificationFlags.length();
this->m_notificationFlags.append(QString(l - cl, '1'));
}
}
} // namespace
} // namespace