Allow inline replies from notifications on linux
This commit is contained in:
parent
236bf09a0e
commit
4b4c321397
|
@ -282,6 +282,14 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
|
|||
room_list_->highlightSelectedRoom(roomid);
|
||||
activateWindow();
|
||||
});
|
||||
connect(¬ificationsManager,
|
||||
&NotificationsManager::sendNotificationReply,
|
||||
this,
|
||||
[this](const QString &roomid, const QString &eventid, const QString &body) {
|
||||
view_manager_->queueReply(roomid, eventid, body);
|
||||
room_list_->highlightSelectedRoom(roomid);
|
||||
activateWindow();
|
||||
});
|
||||
|
||||
setGroupViewState(userSettings_->groupView());
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@ public:
|
|||
|
||||
signals:
|
||||
void notificationClicked(const QString roomId, const QString eventId);
|
||||
void sendNotificationReply(const QString roomId, const QString eventId, const QString body);
|
||||
|
||||
public slots:
|
||||
void removeNotification(const QString &roomId, const QString &eventId);
|
||||
|
@ -58,6 +59,7 @@ private:
|
|||
private slots:
|
||||
void actionInvoked(uint id, QString action);
|
||||
void notificationClosed(uint id, uint reason);
|
||||
void notificationReplied(uint id, QString reply);
|
||||
};
|
||||
|
||||
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
|
||||
|
|
|
@ -28,6 +28,12 @@ NotificationsManager::NotificationsManager(QObject *parent)
|
|||
"NotificationClosed",
|
||||
this,
|
||||
SLOT(notificationClosed(uint, uint)));
|
||||
QDBusConnection::sessionBus().connect("org.freedesktop.Notifications",
|
||||
"/org/freedesktop/Notifications",
|
||||
"org.freedesktop.Notifications",
|
||||
"NotificationReplied",
|
||||
this,
|
||||
SLOT(notificationReplied(uint, QString)));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -61,7 +67,12 @@ NotificationsManager::showNotification(const QString summary,
|
|||
argumentList << ""; // app_icon
|
||||
argumentList << summary; // summary
|
||||
argumentList << text; // body
|
||||
argumentList << (QStringList("default") << "reply"); // actions
|
||||
// The list of actions has always the action name and then a localized version of that
|
||||
// action. Currently we just use an empty string for that.
|
||||
// TODO(Nico): Look into what to actually put there.
|
||||
argumentList << (QStringList("default") << ""
|
||||
<< "inline-reply"
|
||||
<< ""); // actions
|
||||
argumentList << hints; // hints
|
||||
argumentList << (int)-1; // timeout in ms
|
||||
|
||||
|
@ -121,11 +132,22 @@ NotificationsManager::removeNotification(const QString &roomId, const QString &e
|
|||
void
|
||||
NotificationsManager::actionInvoked(uint id, QString action)
|
||||
{
|
||||
if (action == "default" && notificationIds.contains(id)) {
|
||||
if (notificationIds.contains(id)) {
|
||||
roomEventId idEntry = notificationIds[id];
|
||||
if (action == "default") {
|
||||
emit notificationClicked(idEntry.roomId, idEntry.eventId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
NotificationsManager::notificationReplied(uint id, QString reply)
|
||||
{
|
||||
if (notificationIds.contains(id)) {
|
||||
roomEventId idEntry = notificationIds[id];
|
||||
emit sendNotificationReply(idEntry.roomId, idEntry.eventId, reply);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
NotificationsManager::notificationClosed(uint id, uint reason)
|
||||
|
|
|
@ -42,6 +42,7 @@ public slots:
|
|||
void openFileSelection();
|
||||
bool uploading() const { return uploading_; }
|
||||
void callButton();
|
||||
void message(QString body);
|
||||
|
||||
QObject *completerFor(QString completerName);
|
||||
|
||||
|
@ -54,7 +55,6 @@ signals:
|
|||
void uploadingChanged(bool value);
|
||||
|
||||
private:
|
||||
void message(QString body);
|
||||
void emote(QString body);
|
||||
void command(QString name, QString args);
|
||||
void image(const QString &filename,
|
||||
|
|
|
@ -508,6 +508,18 @@ TimelineViewManager::initWithMessages(const std::vector<QString> &roomIds)
|
|||
addRoom(roomId);
|
||||
}
|
||||
|
||||
void
|
||||
TimelineViewManager::queueReply(const QString &roomid,
|
||||
const QString &repliedToEvent,
|
||||
const QString &replyBody)
|
||||
{
|
||||
auto room = models.find(roomid);
|
||||
if (room != models.end()) {
|
||||
room.value()->setReply(repliedToEvent);
|
||||
room.value()->input()->message(replyBody);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
TimelineViewManager::queueReactionMessage(const QString &reactedEvent, const QString &reactionKey)
|
||||
{
|
||||
|
|
|
@ -120,6 +120,9 @@ public slots:
|
|||
}
|
||||
|
||||
void updateColorPalette();
|
||||
void queueReply(const QString &roomid,
|
||||
const QString &repliedToEvent,
|
||||
const QString &replyBody);
|
||||
void queueReactionMessage(const QString &reactedEvent, const QString &reactionKey);
|
||||
void queueCallMessage(const QString &roomid, const mtx::events::msg::CallInvite &);
|
||||
void queueCallMessage(const QString &roomid, const mtx::events::msg::CallCandidates &);
|
||||
|
|
Loading…
Reference in New Issue