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

Clean up notification.

Browse Source
This commit is contained in:
Black Hat
2018-12-24 20:31:40 +08:00
parent 316d1429fa
commit ec43131a10
9 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/notifications/manager.h
View File

@@ -23,7 +23,7 @@ class NotificationsManager : public QObject {
void postNotification(const QString &roomId, const QString &eventId,
const QString &roomName, const QString &senderName,
const QString &text, const QImage &icon, const QUrl &iconPath);
const QString &text, const QImage &icon);
signals:
void notificationClicked(const QString roomId, const QString eventId);

3
src/notifications/managerlinux.cpp
View File

@@ -25,8 +25,7 @@ NotificationsManager::NotificationsManager(QObject *parent)
void NotificationsManager::postNotification(
const QString &roomid, const QString &eventid, const QString &roomname,
const QString &sender, const QString &text, const QImage &icon,
const QUrl &iconPath) {
const QString &sender, const QString &text, const QImage &icon) {
uint id = showNotification(roomname, sender + ": " + text, icon);
notificationIds[id] = roomEventId{roomid, eventid};
}

4
src/notifications/managermac.mm
View File

@@ -19,13 +19,11 @@ NotificationsManager::postNotification(
const QString &roomName,
const QString &senderName,
const QString &text,
const QImage &icon,
const QUrl &iconPath)
const QImage &icon)
{
Q_UNUSED(roomId);
Q_UNUSED(eventId);
Q_UNUSED(icon);
Q_UNUSED(iconPath);
NSUserNotification * notif = [[NSUserNotification alloc] init];

6
src/notifications/managerwin.cpp
View File

@@ -46,8 +46,7 @@ NotificationsManager::NotificationsManager(QObject *parent) : QObject(parent) {}
void NotificationsManager::postNotification(
const QString &room_id, const QString &event_id, const QString &room_name,
const QString &sender, const QString &text, const QImage &icon,
const QUrl &iconPath) {
const QString &sender, const QString &text, const QImage &icon) {
Q_UNUSED(room_id)
Q_UNUSED(event_id)
Q_UNUSED(icon)
@@ -65,9 +64,6 @@ void NotificationsManager::postNotification(
templ.setTextField(QString("%1").arg(text).toStdWString(),
WinToastTemplate::SecondLine);
templ.setImagePath(
reinterpret_cast<const wchar_t *>(QDir::toNativeSeparators(iconPath.toLocalFile()).utf16()));
count++;
CustomHandler *customHandler = new CustomHandler(count, this);
notificationIds[count] = roomEventId{room_id, event_id};