Skip to content

chore: Add 'enable-sound' to support notification without playing pro… #957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Dec 12, 2024
Merged

chore: Add 'enable-sound' to support notification without playing pro… #957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions panels/notification/server/notificationmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void NotificationManager::removeNotifications()
QStringList NotificationManager::GetCapabilities()
{
QStringList result;
result << "action-icons" << "actions" << "body" << "body-hyperlinks" << "body-markup" << "body-images" << "persistence";
result << "action-icons" << "actions" << "body" << "body-hyperlinks" << "body-markup" << "body-image" << "enable-sound" << "persistence";

return result;
}
Expand Down Expand Up @@ -362,6 +362,12 @@ bool NotificationManager::isDoNotDisturb() const

void NotificationManager::tryPlayNotificationSound(const NotifyEntity &entity, const QString &appId, bool dndMode) const
{
const auto hints = entity.hints();
if (!hints.isEmpty() && (!hints.value("enable-sound", true).toBool() ||
!hints.value("x-deepin-PlaySound", true).toBool())) {
return;
}

bool playSoundTip = false;
bool playSound = true;
bool systemNotification = m_systemApps.contains(appId);
Expand All @@ -372,7 +378,6 @@ void NotificationManager::tryPlayNotificationSound(const NotifyEntity &entity, c
const auto actions = entity.actions();
//接收蓝牙文件时，只在发送完成后才有提示音,"cancel"表示正在发送文件
if (actions.contains("cancel")) {
const auto hints = entity.hints();
if (auto iter = hints.find("x-deepin-action-_view"); iter != hints.end()) {
const auto action = iter.value().toString();
if (action.contains("xdg-open"))
Expand Down
Loading