Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 20:31:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tablet opening notification sound settings added

Browse source
This commit is contained in:
vladest 2018-05-06 09:41:10 +02:00
parent c7ab1f3dbf
commit ac413c8854
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Menu.cpp
View file

@ -311,9 +311,10 @@ Menu::Menu() {
}); });
// Settings > Notifications > Tablet // Settings > Notifications > Tablet
action = addCheckableActionToQMenuAndActionHash(notificationsMenu, "Tablet", 0, action = addCheckableActionToQMenuAndActionHash(notificationsMenu, "Tablet", 0,
settings->getValue("play_notification_sounds_type_5").toBool()); settings->getValue(MenuOption::NotificationSoundsTablet).toBool());
connect(action, &QAction::triggered, [action, settings] { connect(action, &QAction::triggered, [action, settings] {
settings->setValue("play_notification_sounds_type_5", action->isChecked()); settings->setValue(MenuOption::NotificationSoundsTablet, action->isChecked());
qDebug() << "vladest. tablet sound check up" << settings->getValue(MenuOption::NotificationSoundsTablet).toBool();
}); });
// Settings > Notifications > Wallet // Settings > Notifications > Wallet
addActionToQMenuAndActionHash(notificationsMenu, "Wallet"); addActionToQMenuAndActionHash(notificationsMenu, "Wallet");

1
interface/src/Menu.h
View file

@ -218,6 +218,7 @@ namespace MenuOption {
const QString Shadows = "Shadows"; const QString Shadows = "Shadows";
const QString AmbientOcclusion = "Ambient Occlusion"; const QString AmbientOcclusion = "Ambient Occlusion";
const QString NotificationSoundsSnapshot = "play_notification_sounds_snapshot"; const QString NotificationSoundsSnapshot = "play_notification_sounds_snapshot";
const QString NotificationSoundsTablet = "play_notification_sounds_tablet";
} }
#endif // hifi_Menu_h #endif // hifi_Menu_h

5
libraries/ui/src/ui/TabletScriptingInterface.cpp
View file

@ -441,7 +441,10 @@ void TabletProxy::emitWebEvent(const QVariant& msg) {
void TabletProxy::onTabletShown() { void TabletProxy::onTabletShown() {
if (_tabletShown) { if (_tabletShown) {
static_cast<TabletScriptingInterface*>(parent())->playSound(TabletScriptingInterface::TabletOpen); Setting::Handle<bool> notificationSoundTablet{ "play_notification_sounds_tablet", true};
if (notificationSoundTablet.get()) {
static_cast<TabletScriptingInterface*>(parent())->playSound(TabletScriptingInterface::TabletOpen);
}
if (_showRunningScripts) { if (_showRunningScripts) {
_showRunningScripts = false; _showRunningScripts = false;
pushOntoStack("hifi/dialogs/TabletRunningScripts.qml"); pushOntoStack("hifi/dialogs/TabletRunningScripts.qml");