mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(src/components/notifier/Notifier): use custom signal to close notification

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-28 09:27:25 +01:00
parent 353eac8168
commit 2ef80f3166
3 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
linphone-desktop/src/components/notifier/Notifier.cpp
View file

@ -140,11 +140,7 @@ void Notifier::showNotification (QObject *notification, int timeout) {
// Display notification.
QMetaObject::invokeMethod(notification, NOTIFICATION_SHOW_METHOD_NAME, Qt::DirectConnection);
QQuickWindow *window = notification->findChild<QQuickWindow *>();
if (!window)
qFatal("Cannot found a `QQuickWindow` instance in `notification`.");
QTimer *timer = new QTimer(window);
QTimer *timer = new QTimer(notification);
timer->setInterval(timeout > MAX_TIMEOUT ? MAX_TIMEOUT : timeout);
timer->setSingleShot(true);
notification->setProperty(NOTIFICATION_PROPERTY_TIMER, QVariant::fromValue(timer));
@ -152,30 +148,24 @@ void Notifier::showNotification (QObject *notification, int timeout) {
// Destroy it after timeout.
QObject::connect(
timer, &QTimer::timeout, this, [this, notification]() {
notification->property(NOTIFICATION_PROPERTY_TIMER).value<QTimer *>()->stop();
deleteNotification(notification);
deleteNotification(QVariant::fromValue(notification));
}
);
// Called explicitly (by a click on notification for example)
// or when single shot happen and if notification is visible.
QObject::connect(
window, &QQuickWindow::visibilityChanged, [this, notification](QWindow::Visibility visibility) {
if (visibility != QWindow::Visibility::Hidden)
return;
qInfo() << "Update notifications counter, hidden notification detected.";
notification->property(NOTIFICATION_PROPERTY_TIMER).value<QTimer *>()->stop();
deleteNotification(notification);
}
);
QObject::connect(notification, SIGNAL(deleteNotification(QVariant)), this, SLOT(deleteNotification(QVariant)));
timer->start();
}
// -----------------------------------------------------------------------------
void Notifier::deleteNotification (QObject *notification) {
void Notifier::deleteNotification (QVariant notification) {
QObject *instance = notification.value<QObject *>();
instance->property(NOTIFICATION_PROPERTY_TIMER).value<QTimer *>()->stop();
m_mutex.lock();
m_n_instances--;
@ -185,7 +175,7 @@ void Notifier::deleteNotification (QObject *notification) {
m_mutex.unlock();
notification->deleteLater();
instance->deleteLater();
}
// -----------------------------------------------------------------------------

4
linphone-desktop/src/components/notifier/Notifier.hpp
View file

@ -50,10 +50,12 @@ public:
void notifyReceivedFileMessage (const std::shared_ptr<linphone::ChatMessage> &message);
void notifyReceivedCall (const std::shared_ptr<linphone::Call> &call);
public slots:
void deleteNotification (QVariant notification);
private:
QObject *createNotification (NotificationType type);
void showNotification (QObject *notification, int timeout);
void deleteNotification (QObject *notification);
QQmlComponent *m_components[MaxNbTypes];

6
linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml
View file

@ -24,12 +24,14 @@ DesktopPopup {
// ---------------------------------------------------------------------------
function _close (cb) {
window.visibility = Window.Hidden
signal deleteNotification (var notification)
function _close (cb) {
if (cb) {
cb()
}
deleteNotification(notification)
}
// ---------------------------------------------------------------------------