ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new notification action api

Browse Source
This commit is contained in:
Tobias Fella
2023-08-22 16:43:54 +02:00
committed by Nicolas Fella
parent 0c60bfdb83
commit eddb2b73c2
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/notificationsmanager.cpp
View File

@@ -204,8 +204,8 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
notification->setText(notification->text() + QLatin1Char('\n') + entry); notification->setText(notification->text() + QLatin1Char('\n') + entry);
notification->setPixmap(createNotificationImage(icon, room)); notification->setPixmap(createNotificationImage(icon, room));
notification->setDefaultAction(i18n("Open NeoChat in this room")); auto defaultAction = notification->addDefaultAction(i18n("Open NeoChat in this room"));
connect(notification, &KNotification::defaultActivated, this, [notification, room]() { connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken()); WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
if (!room) { if (!room) {
return; return;
@@ -240,28 +240,31 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
notification->setTitle(title); notification->setTitle(title);
notification->setPixmap(createNotificationImage(icon, nullptr)); notification->setPixmap(createNotificationImage(icon, nullptr));
notification->setFlags(KNotification::Persistent); notification->setFlags(KNotification::Persistent);
notification->setDefaultAction(i18n("Open this invitation in NeoChat")); auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat"));
connect(notification, &KNotification::defaultActivated, this, [notification, room]() { connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken()); WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
notification->close(); notification->close();
RoomManager::instance().enterRoom(room); RoomManager::instance().enterRoom(room);
}); });
notification->setActions({i18nc("@action:button The thing being accepted is an invitation to chat", "Accept"), i18nc("@action:button The thing being rejected is an invitation to chat", "Reject"), i18nc("@action:button The thing being rejected is an invitation to chat", "Reject and Ignore User")});
connect(notification, &KNotification::action1Activated, this, [room, notification]() { const auto acceptAction = notification->addAction(i18nc("@action:button The thing being accepted is an invitation to chat", "Accept"));
const auto rejectAction = notification->addAction(i18nc("@action:button The thing being rejected is an invitation to chat", "Reject"));
const auto rejectAndIgnoreAction = notification->addAction(i18nc("@action:button The thing being rejected is an invitation to chat", "Reject and Ignore User"));
connect(acceptAction, &KNotificationAction::activated, this, [room, notification]() {
if (!room) { if (!room) {
return; return;
} }
room->acceptInvitation(); room->acceptInvitation();
notification->close(); notification->close();
}); });
connect(notification, &KNotification::action2Activated, this, [room, notification]() { connect(rejectAction, &KNotificationAction::activated, this, [room, notification]() {
if (!room) { if (!room) {
return; return;
} }
RoomManager::instance().leaveRoom(room); RoomManager::instance().leaveRoom(room);
notification->close(); notification->close();
}); });
connect(notification, &KNotification::action3Activated, this, [room, notification]() { connect(rejectAndIgnoreAction, &KNotificationAction::activated, this, [room, notification]() {
if (!room) { if (!room) {
return; return;
} }