Merge lp:~lukas-kde/unity-notifications/visibleQueueFixes into lp:unity-notifications
- visibleQueueFixes
- Merge into trunk
Proposed by
Lukáš Tinkl
| Status: | Merged |
|---|---|
| Approved by: | Michael Zanetti |
| Approved revision: | 245 |
| Merged at revision: | 238 |
| Proposed branch: | lp:~lukas-kde/unity-notifications/visibleQueueFixes |
| Merge into: | lp:unity-notifications |
| Diff against target: |
685 lines (+96/-168) 11 files modified
include/ActionModel.h (+3/-3) include/Notification.h (+0/-5) include/NotificationModel.h (+0/-1) include/NotificationServer.h (+3/-4) include/notify-backend.h.in (+0/-25) src/ActionModel.cpp (+11/-11) src/CMakeLists.txt (+0/-1) src/Notification.cpp (+9/-15) src/NotificationModel.cpp (+19/-61) src/NotificationServer.cpp (+8/-13) test/notificationtest.cpp (+43/-29) |
| To merge this branch: | bzr merge lp:~lukas-kde/unity-notifications/visibleQueueFixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Zanetti (community) | Approve | ||
| Unity8 CI Bot | continuous-integration | Approve | |
| Unity API Team | Pending | ||
|
Review via email:
|
|||
Commit message
Visible queue improvements
Description of the change
Don't block the visible queue by snap decisions, allow for showing everything, sorted by type and urgency
Also do some cleanup and get rid of the Placeholder notification
Based on design request
To post a comment you must log in.
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Michael Zanetti (mzanetti) wrote : | # |
Hmm, the code reads ok to me. Nice cleanup!
However, visually it looks a bit weird. Not sure if that's because of the removal of the placeholder notification but I'm afraid this requires some visual tweaks in unity8 too:
* http://
Spacing between notifications missing
* http://
Having a SnapDecision and a Confirmation, it seems the incoming telegram message is put into the wrong place in the queue. I would think the SnapDecision should stay expanded and the telegram notification be the last one
* http://
Also without SnapDecision, the spacing seems broken now (probably really because of the removal of the placeholder)
review:
Needs Information
- 244. By Lukáš Tinkl
-
respect the order
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:244
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
- 245. By Lukáš Tinkl
-
append the notification, not prepend
side effect of the placeholder :S
Revision history for this message
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:245
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| Michael Zanetti (mzanetti) wrote : | # |
Mostly good now. Regular notifications are now displayed all at once too atm. Need to check with design if that's ok or not.
review:
Needs Information
Revision history for this message
| Michael Zanetti (mzanetti) wrote : | # |
Ok. Got confirmation from design that this is ok.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'include/ActionModel.h' | |||
| 2 | --- include/ActionModel.h 2015-10-13 14:11:24 +0000 | |||
| 3 | +++ include/ActionModel.h 2016-08-01 14:19:24 +0000 | |||
| 4 | @@ -29,9 +29,9 @@ | |||
| 5 | 29 | ActionModel(QObject *parent=nullptr); | 29 | ActionModel(QObject *parent=nullptr); |
| 6 | 30 | virtual ~ActionModel(); | 30 | virtual ~ActionModel(); |
| 7 | 31 | 31 | ||
| 11 | 32 | virtual int rowCount(const QModelIndex &index) const override; | 32 | int rowCount(const QModelIndex &index) const override; |
| 12 | 33 | virtual QVariant data(const QModelIndex &index, int role) const override; | 33 | QVariant data(const QModelIndex &index, int role) const override; |
| 13 | 34 | virtual QHash<int, QByteArray> roleNames() const override; | 34 | QHash<int, QByteArray> roleNames() const override; |
| 14 | 35 | 35 | ||
| 15 | 36 | enum ActionsRoles { | 36 | enum ActionsRoles { |
| 16 | 37 | RoleActionLabel = Qt::UserRole + 1, | 37 | RoleActionLabel = Qt::UserRole + 1, |
| 17 | 38 | 38 | ||
| 18 | === modified file 'include/Notification.h' | |||
| 19 | --- include/Notification.h 2015-10-12 15:21:27 +0000 | |||
| 20 | +++ include/Notification.h 2016-08-01 14:19:24 +0000 | |||
| 21 | @@ -26,7 +26,6 @@ | |||
| 22 | 26 | #include <QString> | 26 | #include <QString> |
| 23 | 27 | #include <QObject> | 27 | #include <QObject> |
| 24 | 28 | #include <QScopedPointer> | 28 | #include <QScopedPointer> |
| 25 | 29 | #include <QImage> | ||
| 26 | 30 | #include <QStringList> | 29 | #include <QStringList> |
| 27 | 31 | 30 | ||
| 28 | 32 | struct NotificationPrivate; | 31 | struct NotificationPrivate; |
| 29 | @@ -70,10 +69,6 @@ | |||
| 30 | 70 | void dismissed(); | 69 | void dismissed(); |
| 31 | 71 | void completed(unsigned int id); | 70 | void completed(unsigned int id); |
| 32 | 72 | 71 | ||
| 33 | 73 | public Q_SLOTS: | ||
| 34 | 74 | void onHovered(); | ||
| 35 | 75 | void onDisplayed(); | ||
| 36 | 76 | |||
| 37 | 77 | public: | 72 | public: |
| 38 | 78 | Notification(QObject *parent=nullptr); | 73 | Notification(QObject *parent=nullptr); |
| 39 | 79 | Notification(NotificationID id, | 74 | Notification(NotificationID id, |
| 40 | 80 | 75 | ||
| 41 | === modified file 'include/NotificationModel.h' | |||
| 42 | --- include/NotificationModel.h 2015-10-12 15:21:27 +0000 | |||
| 43 | +++ include/NotificationModel.h 2016-08-01 14:19:24 +0000 | |||
| 44 | @@ -79,7 +79,6 @@ | |||
| 45 | 79 | int nextTimeout() const; | 79 | int nextTimeout() const; |
| 46 | 80 | void incrementDisplayTimes(const int displayedTime) const; | 80 | void incrementDisplayTimes(const int displayedTime) const; |
| 47 | 81 | void pruneExpired(); | 81 | void pruneExpired(); |
| 48 | 82 | void removeNonSnap(); | ||
| 49 | 83 | 82 | ||
| 50 | 84 | int insertionPoint(const QSharedPointer<Notification> &n) const; | 83 | int insertionPoint(const QSharedPointer<Notification> &n) const; |
| 51 | 85 | void insertEphemeral(const QSharedPointer<Notification> &n); | 84 | void insertEphemeral(const QSharedPointer<Notification> &n); |
| 52 | 86 | 85 | ||
| 53 | === modified file 'include/NotificationServer.h' | |||
| 54 | --- include/NotificationServer.h 2015-07-06 18:13:16 +0000 | |||
| 55 | +++ include/NotificationServer.h 2016-08-01 14:19:24 +0000 | |||
| 56 | @@ -55,7 +55,7 @@ | |||
| 57 | 55 | 55 | ||
| 58 | 56 | Q_OBJECT | 56 | Q_OBJECT |
| 59 | 57 | 57 | ||
| 61 | 58 | friend NotificationsAdaptor; | 58 | friend class NotificationsAdaptor; |
| 62 | 59 | 59 | ||
| 63 | 60 | public: | 60 | public: |
| 64 | 61 | NotificationServer(const QDBusConnection& connection, NotificationModel &m, QObject *parent=nullptr); | 61 | NotificationServer(const QDBusConnection& connection, NotificationModel &m, QObject *parent=nullptr); |
| 65 | @@ -82,15 +82,14 @@ | |||
| 66 | 82 | 82 | ||
| 67 | 83 | private: | 83 | private: |
| 68 | 84 | void incrementCounter(); | 84 | void incrementCounter(); |
| 71 | 85 | QString messageSender(); | 85 | QString messageSender() const; |
| 72 | 86 | bool isCmdLine(); | 86 | bool isCmdLine() const; |
| 73 | 87 | 87 | ||
| 74 | 88 | QSharedPointer<Notification> buildNotification(NotificationID id, const QVariantMap &hints); | 88 | QSharedPointer<Notification> buildNotification(NotificationID id, const QVariantMap &hints); |
| 75 | 89 | NotificationModel &model; | 89 | NotificationModel &model; |
| 76 | 90 | unsigned int idCounter; | 90 | unsigned int idCounter; |
| 77 | 91 | QDBusConnection m_connection; | 91 | QDBusConnection m_connection; |
| 78 | 92 | QDBusServiceWatcher m_watcher; | 92 | QDBusServiceWatcher m_watcher; |
| 79 | 93 | |||
| 80 | 94 | }; | 93 | }; |
| 81 | 95 | 94 | ||
| 82 | 96 | #endif | 95 | #endif |
| 83 | 97 | 96 | ||
| 84 | === modified file 'include/notify-backend.h.in' | |||
| 85 | --- include/notify-backend.h.in 2014-11-04 13:03:18 +0000 | |||
| 86 | +++ include/notify-backend.h.in 2016-08-01 14:19:24 +0000 | |||
| 87 | @@ -22,38 +22,13 @@ | |||
| 88 | 22 | #ifndef NOTIFY_BACKEND_ | 22 | #ifndef NOTIFY_BACKEND_ |
| 89 | 23 | #define NOTIFY_BACKEND_ | 23 | #define NOTIFY_BACKEND_ |
| 90 | 24 | 24 | ||
| 91 | 25 | #include <cstdlib> | ||
| 92 | 26 | |||
| 93 | 27 | typedef unsigned int NotificationID; | 25 | typedef unsigned int NotificationID; |
| 94 | 28 | 26 | ||
| 95 | 29 | /*enum Urgency { | ||
| 96 | 30 | URGENCY_LOW, | ||
| 97 | 31 | URGENCY_NORMAL, | ||
| 98 | 32 | URGENCY_CRITICAL | ||
| 99 | 33 | }; | ||
| 100 | 34 | |||
| 101 | 35 | enum NotificationType { | ||
| 102 | 36 | SYNCHRONOUS, | ||
| 103 | 37 | SNAP, | ||
| 104 | 38 | INTERACTIVE, | ||
| 105 | 39 | ASYNCHRONOUS | ||
| 106 | 40 | };*/ | ||
| 107 | 41 | |||
| 108 | 42 | const unsigned int MAX_NOTIFICATIONS = 50; | 27 | const unsigned int MAX_NOTIFICATIONS = 50; |
| 109 | 43 | 28 | ||
| 110 | 44 | class Renderer; | ||
| 111 | 45 | class NotificationBackend; | ||
| 112 | 46 | class Notification; | ||
| 113 | 47 | |||
| 114 | 48 | #if 0 | ||
| 115 | 49 | #define DBUS_SERVICE_NAME "com.canonical.notificationproto" | ||
| 116 | 50 | #define DBUS_INTERFACE "com.canonical.notificationproto" | ||
| 117 | 51 | #define DBUS_PATH "/com/canonical/notificationproto" | ||
| 118 | 52 | #else | ||
| 119 | 53 | #define DBUS_SERVICE_NAME "org.freedesktop.Notifications" | 29 | #define DBUS_SERVICE_NAME "org.freedesktop.Notifications" |
| 120 | 54 | #define DBUS_INTERFACE "org.freedesktop.Notifications" | 30 | #define DBUS_INTERFACE "org.freedesktop.Notifications" |
| 121 | 55 | #define DBUS_PATH "/org/freedesktop/Notifications" | 31 | #define DBUS_PATH "/org/freedesktop/Notifications" |
| 122 | 56 | #endif | ||
| 123 | 57 | 32 | ||
| 124 | 58 | #define VALUE_HINT "value" | 33 | #define VALUE_HINT "value" |
| 125 | 59 | #define VALUE_TINT_HINT "x-canonical-value-bar-tint" | 34 | #define VALUE_TINT_HINT "x-canonical-value-bar-tint" |
| 126 | 60 | 35 | ||
| 127 | === modified file 'src/ActionModel.cpp' | |||
| 128 | --- src/ActionModel.cpp 2015-06-16 08:11:33 +0000 | |||
| 129 | +++ src/ActionModel.cpp 2016-08-01 14:19:24 +0000 | |||
| 130 | @@ -17,8 +17,8 @@ | |||
| 131 | 17 | #include "ActionModel.h" | 17 | #include "ActionModel.h" |
| 132 | 18 | 18 | ||
| 133 | 19 | struct ActionModelPrivate { | 19 | struct ActionModelPrivate { |
| 136 | 20 | QList<QString> labels; | 20 | QStringList labels; |
| 137 | 21 | QList<QString> ids; | 21 | QStringList ids; |
| 138 | 22 | }; | 22 | }; |
| 139 | 23 | 23 | ||
| 140 | 24 | ActionModel::ActionModel(QObject *parent) : QStringListModel(parent), p(new ActionModelPrivate) { | 24 | ActionModel::ActionModel(QObject *parent) : QStringListModel(parent), p(new ActionModelPrivate) { |
| 141 | @@ -33,17 +33,17 @@ | |||
| 142 | 33 | 33 | ||
| 143 | 34 | QVariant ActionModel::data(const QModelIndex &index, int role) const { | 34 | QVariant ActionModel::data(const QModelIndex &index, int role) const { |
| 144 | 35 | if (!index.isValid()) | 35 | if (!index.isValid()) |
| 146 | 36 | return QVariant(); | 36 | return QVariant(); |
| 147 | 37 | 37 | ||
| 148 | 38 | switch(role) { | 38 | switch(role) { |
| 157 | 39 | case RoleActionLabel: | 39 | case RoleActionLabel: |
| 158 | 40 | return QVariant(p->labels[index.row()]); | 40 | return p->labels.at(index.row()); |
| 159 | 41 | 41 | ||
| 160 | 42 | case RoleActionId: | 42 | case RoleActionId: |
| 161 | 43 | return QVariant(p->ids[index.row()]); | 43 | return p->ids.at(index.row()); |
| 162 | 44 | 44 | ||
| 163 | 45 | default: | 45 | default: |
| 164 | 46 | return QVariant(); | 46 | return QVariant(); |
| 165 | 47 | } | 47 | } |
| 166 | 48 | } | 48 | } |
| 167 | 49 | 49 | ||
| 168 | 50 | 50 | ||
| 169 | === modified file 'src/CMakeLists.txt' | |||
| 170 | --- src/CMakeLists.txt 2015-06-23 09:11:39 +0000 | |||
| 171 | +++ src/CMakeLists.txt 2016-08-01 14:19:24 +0000 | |||
| 172 | @@ -1,4 +1,3 @@ | |||
| 173 | 1 | include(FindPkgConfig) | ||
| 174 | 2 | pkg_check_modules(NOTIFICATIONS_API REQUIRED unity-shell-notifications=3) | 1 | pkg_check_modules(NOTIFICATIONS_API REQUIRED unity-shell-notifications=3) |
| 175 | 3 | 2 | ||
| 176 | 4 | set(CORE_SRCS | 3 | set(CORE_SRCS |
| 177 | 5 | 4 | ||
| 178 | === modified file 'src/Notification.cpp' | |||
| 179 | --- src/Notification.cpp 2015-10-12 15:04:29 +0000 | |||
| 180 | +++ src/Notification.cpp 2016-08-01 14:19:24 +0000 | |||
| 181 | @@ -1,5 +1,5 @@ | |||
| 182 | 1 | /* | 1 | /* |
| 184 | 2 | * Copyright (C) 2013 Canonical, Ltd. | 2 | * Copyright (C) 2013-2016 Canonical, Ltd. |
| 185 | 3 | * | 3 | * |
| 186 | 4 | * Authors: | 4 | * Authors: |
| 187 | 5 | * Jussi Pakkanen <jussi.pakkanen@canonical.com> | 5 | * Jussi Pakkanen <jussi.pakkanen@canonical.com> |
| 188 | @@ -20,7 +20,7 @@ | |||
| 189 | 20 | 20 | ||
| 190 | 21 | #include "NotificationServer.h" | 21 | #include "NotificationServer.h" |
| 191 | 22 | #include "Notification.h" | 22 | #include "Notification.h" |
| 193 | 23 | #include <string> | 23 | |
| 194 | 24 | #include <QXmlStreamReader> | 24 | #include <QXmlStreamReader> |
| 195 | 25 | 25 | ||
| 196 | 26 | using namespace std; | 26 | using namespace std; |
| 197 | @@ -74,8 +74,9 @@ | |||
| 198 | 74 | } | 74 | } |
| 199 | 75 | 75 | ||
| 200 | 76 | Notification::~Notification() { | 76 | Notification::~Notification() { |
| 202 | 77 | if(p->server) | 77 | if (p->server) { |
| 203 | 78 | p->server->forceCloseNotification(p->id); | 78 | p->server->forceCloseNotification(p->id); |
| 204 | 79 | } | ||
| 205 | 79 | } | 80 | } |
| 206 | 80 | 81 | ||
| 207 | 81 | QString Notification::getBody() const { | 82 | QString Notification::getBody() const { |
| 208 | @@ -116,8 +117,8 @@ | |||
| 209 | 116 | } | 117 | } |
| 210 | 117 | 118 | ||
| 211 | 118 | void Notification::setIcon(const QString &icon) { | 119 | void Notification::setIcon(const QString &icon) { |
| 214 | 119 | if (icon.startsWith(" ") || icon.size() == 0) { | 120 | if (icon.startsWith(" ") || icon.isEmpty()) { |
| 215 | 120 | p->icon = nullptr; | 121 | p->icon.clear(); |
| 216 | 121 | } | 122 | } |
| 217 | 122 | else { | 123 | else { |
| 218 | 123 | p->icon = icon; | 124 | p->icon = icon; |
| 219 | @@ -136,8 +137,8 @@ | |||
| 220 | 136 | } | 137 | } |
| 221 | 137 | 138 | ||
| 222 | 138 | void Notification::setSecondaryIcon(const QString &secondaryIcon) { | 139 | void Notification::setSecondaryIcon(const QString &secondaryIcon) { |
| 225 | 139 | if (secondaryIcon.startsWith(" ") || secondaryIcon.size() == 0) { | 140 | if (secondaryIcon.startsWith(" ") || secondaryIcon.isEmpty()) { |
| 226 | 140 | p->secondaryIcon = nullptr; | 141 | p->secondaryIcon.clear(); |
| 227 | 141 | } | 142 | } |
| 228 | 142 | else { | 143 | else { |
| 229 | 143 | p->secondaryIcon = secondaryIcon; | 144 | p->secondaryIcon = secondaryIcon; |
| 230 | @@ -177,6 +178,7 @@ | |||
| 231 | 177 | Notification::Urgency Notification::getUrgency() const { | 178 | Notification::Urgency Notification::getUrgency() const { |
| 232 | 178 | return p->urg; | 179 | return p->urg; |
| 233 | 179 | } | 180 | } |
| 234 | 181 | |||
| 235 | 180 | void Notification::setUrgency(Notification::Urgency urg) { | 182 | void Notification::setUrgency(Notification::Urgency urg) { |
| 236 | 181 | if(p->urg != urg) { | 183 | if(p->urg != urg) { |
| 237 | 182 | p->urg = urg; | 184 | p->urg = urg; |
| 238 | @@ -238,14 +240,6 @@ | |||
| 239 | 238 | } | 240 | } |
| 240 | 239 | } | 241 | } |
| 241 | 240 | 242 | ||
| 242 | 241 | void Notification::onHovered() { | ||
| 243 | 242 | |||
| 244 | 243 | } | ||
| 245 | 244 | |||
| 246 | 245 | void Notification::onDisplayed() { | ||
| 247 | 246 | |||
| 248 | 247 | } | ||
| 249 | 248 | |||
| 250 | 249 | void Notification::invokeAction(const QString &action) { | 243 | void Notification::invokeAction(const QString &action) { |
| 251 | 250 | for(int i=0; i<p->actions.size(); i++) { | 244 | for(int i=0; i<p->actions.size(); i++) { |
| 252 | 251 | if(p->actions[i] == action) { | 245 | if(p->actions[i] == action) { |
| 253 | 252 | 246 | ||
| 254 | === modified file 'src/NotificationModel.cpp' | |||
| 255 | --- src/NotificationModel.cpp 2015-10-13 13:49:02 +0000 | |||
| 256 | +++ src/NotificationModel.cpp 2016-08-01 14:19:24 +0000 | |||
| 257 | @@ -1,5 +1,5 @@ | |||
| 258 | 1 | /* | 1 | /* |
| 260 | 2 | * Copyright (C) 2013 Canonical, Ltd. | 2 | * Copyright (C) 2013-2016 Canonical, Ltd. |
| 261 | 3 | * | 3 | * |
| 262 | 4 | * Authors: | 4 | * Authors: |
| 263 | 5 | * Jussi Pakkanen <jussi.pakkanen@canonical.com> | 5 | * Jussi Pakkanen <jussi.pakkanen@canonical.com> |
| 264 | @@ -46,8 +46,6 @@ | |||
| 265 | 46 | } | 46 | } |
| 266 | 47 | 47 | ||
| 267 | 48 | NotificationModel::NotificationModel(QObject *parent) : QAbstractListModel(parent), p(new NotificationModelPrivate) { | 48 | NotificationModel::NotificationModel(QObject *parent) : QAbstractListModel(parent), p(new NotificationModelPrivate) { |
| 268 | 49 | p->displayedNotifications.append(QSharedPointer<Notification>(new Notification(0, -1, Notification::Normal, QString(), Notification::PlaceHolder), | ||
| 269 | 50 | &QObject::deleteLater)); | ||
| 270 | 51 | connect(&(p->timer), SIGNAL(timeout()), this, SLOT(timeout())); | 49 | connect(&(p->timer), SIGNAL(timeout()), this, SLOT(timeout())); |
| 271 | 52 | p->timer.setSingleShot(true); | 50 | p->timer.setSingleShot(true); |
| 272 | 53 | } | 51 | } |
| 273 | @@ -178,8 +176,7 @@ | |||
| 274 | 178 | } | 176 | } |
| 275 | 179 | } | 177 | } |
| 276 | 180 | 178 | ||
| 279 | 181 | QSharedPointer<Notification> empty; | 179 | return QSharedPointer<Notification>(); |
| 278 | 182 | return empty; | ||
| 280 | 183 | } | 180 | } |
| 281 | 184 | 181 | ||
| 282 | 185 | QSharedPointer<Notification> NotificationModel::getNotification(const QString &summary) const { | 182 | QSharedPointer<Notification> NotificationModel::getNotification(const QString &summary) const { |
| 283 | @@ -204,16 +201,14 @@ | |||
| 284 | 204 | } | 201 | } |
| 285 | 205 | } | 202 | } |
| 286 | 206 | 203 | ||
| 289 | 207 | QSharedPointer<Notification> empty; | 204 | return QSharedPointer<Notification>(); |
| 288 | 208 | return empty; | ||
| 290 | 209 | } | 205 | } |
| 291 | 210 | 206 | ||
| 292 | 211 | QSharedPointer<Notification> NotificationModel::getDisplayedNotification(int index) const { | 207 | QSharedPointer<Notification> NotificationModel::getDisplayedNotification(int index) const { |
| 293 | 212 | if (index < p->displayedNotifications.size()) { | 208 | if (index < p->displayedNotifications.size()) { |
| 294 | 213 | return p->displayedNotifications[index]; | 209 | return p->displayedNotifications[index]; |
| 295 | 214 | } else { | 210 | } else { |
| 298 | 215 | QSharedPointer<Notification> empty; | 211 | return QSharedPointer<Notification>(); |
| 297 | 216 | return empty; | ||
| 299 | 217 | } | 212 | } |
| 300 | 218 | } | 213 | } |
| 301 | 219 | 214 | ||
| 302 | @@ -318,8 +313,7 @@ | |||
| 303 | 318 | } | 313 | } |
| 304 | 319 | 314 | ||
| 305 | 320 | QSharedPointer<Notification> NotificationModel::deleteFromVisible(int loc) { | 315 | QSharedPointer<Notification> NotificationModel::deleteFromVisible(int loc) { |
| 308 | 321 | QModelIndex deletePoint = QModelIndex(); | 316 | beginRemoveRows(QModelIndex(), loc, loc); |
| 307 | 322 | beginRemoveRows(deletePoint, loc, loc); | ||
| 309 | 323 | QSharedPointer<Notification> n = p->displayedNotifications[loc]; | 317 | QSharedPointer<Notification> n = p->displayedNotifications[loc]; |
| 310 | 324 | p->displayTimes.erase(p->displayTimes.find(n->getID())); | 318 | p->displayTimes.erase(p->displayTimes.find(n->getID())); |
| 311 | 325 | auto notification = p->displayedNotifications.takeAt(loc); | 319 | auto notification = p->displayedNotifications.takeAt(loc); |
| 312 | @@ -345,8 +339,7 @@ | |||
| 313 | 345 | // Snap decisions override everything. | 339 | // Snap decisions override everything. |
| 314 | 346 | if(showingNotificationOfType(Notification::Type::SnapDecision) || !p->snapQueue.empty()) { | 340 | if(showingNotificationOfType(Notification::Type::SnapDecision) || !p->snapQueue.empty()) { |
| 315 | 347 | if(countShowing(Notification::Type::SnapDecision) < maxSnapsShown && !p->snapQueue.empty()) { | 341 | if(countShowing(Notification::Type::SnapDecision) < maxSnapsShown && !p->snapQueue.empty()) { |
| 318 | 348 | QSharedPointer<Notification> n = p->snapQueue[0]; | 342 | QSharedPointer<Notification> n = p->snapQueue.takeFirst(); |
| 317 | 349 | p->snapQueue.pop_front(); | ||
| 319 | 350 | insertToVisible(n, insertionPoint(n)); | 343 | insertToVisible(n, insertionPoint(n)); |
| 320 | 351 | restartTimer = true; | 344 | restartTimer = true; |
| 321 | 352 | Q_EMIT queueSizeChanged(queued()); | 345 | Q_EMIT queueSizeChanged(queued()); |
| 322 | @@ -365,15 +358,13 @@ | |||
| 323 | 365 | bool NotificationModel::nonSnapTimeout() { | 358 | bool NotificationModel::nonSnapTimeout() { |
| 324 | 366 | bool restartTimer; | 359 | bool restartTimer; |
| 325 | 367 | if(!showingNotificationOfType(Notification::Type::Interactive) && !p->interactiveQueue.empty()) { | 360 | if(!showingNotificationOfType(Notification::Type::Interactive) && !p->interactiveQueue.empty()) { |
| 328 | 368 | QSharedPointer<Notification> n = p->interactiveQueue[0]; | 361 | QSharedPointer<Notification> n = p->interactiveQueue.takeFirst(); |
| 327 | 369 | p->interactiveQueue.pop_front(); | ||
| 329 | 370 | insertToVisible(n, insertionPoint(n)); | 362 | insertToVisible(n, insertionPoint(n)); |
| 330 | 371 | restartTimer = true; | 363 | restartTimer = true; |
| 331 | 372 | Q_EMIT queueSizeChanged(queued()); | 364 | Q_EMIT queueSizeChanged(queued()); |
| 332 | 373 | } | 365 | } |
| 333 | 374 | if(!showingNotificationOfType(Notification::Type::Ephemeral) && !p->ephemeralQueue.empty()) { | 366 | if(!showingNotificationOfType(Notification::Type::Ephemeral) && !p->ephemeralQueue.empty()) { |
| 336 | 375 | QSharedPointer<Notification> n = p->ephemeralQueue[0]; | 367 | QSharedPointer<Notification> n = p->ephemeralQueue.takeFirst(); |
| 335 | 376 | p->ephemeralQueue.pop_front(); | ||
| 337 | 377 | insertToVisible(n, insertionPoint(n)); | 368 | insertToVisible(n, insertionPoint(n)); |
| 338 | 378 | restartTimer = true; | 369 | restartTimer = true; |
| 339 | 379 | Q_EMIT queueSizeChanged(queued()); | 370 | Q_EMIT queueSizeChanged(queued()); |
| 340 | @@ -392,19 +383,6 @@ | |||
| 341 | 392 | } | 383 | } |
| 342 | 393 | } | 384 | } |
| 343 | 394 | 385 | ||
| 344 | 395 | void NotificationModel::removeNonSnap() { | ||
| 345 | 396 | for(int i=p->displayedNotifications.size()-1; i>=0; i--) { | ||
| 346 | 397 | QSharedPointer<Notification> n = p->displayedNotifications[i]; | ||
| 347 | 398 | switch(n->getType()) { | ||
| 348 | 399 | case Notification::Type::SnapDecision : break; | ||
| 349 | 400 | case Notification::Type::Confirmation : deleteFromVisible(i); break; | ||
| 350 | 401 | case Notification::Type::Ephemeral : deleteFromVisible(i); p->ephemeralQueue.push_front(n); queueSizeChanged(queued()); break; | ||
| 351 | 402 | case Notification::Type::Interactive : deleteFromVisible(i); p->interactiveQueue.push_front(n); queueSizeChanged(queued()); break; | ||
| 352 | 403 | case Notification::Type::PlaceHolder : break; | ||
| 353 | 404 | } | ||
| 354 | 405 | } | ||
| 355 | 406 | } | ||
| 356 | 407 | |||
| 357 | 408 | int NotificationModel::nextTimeout() const { | 386 | int NotificationModel::nextTimeout() const { |
| 358 | 409 | int mintime = INT_MAX; | 387 | int mintime = INT_MAX; |
| 359 | 410 | if(p->displayedNotifications.empty()) { | 388 | if(p->displayedNotifications.empty()) { |
| 360 | @@ -430,51 +408,35 @@ | |||
| 361 | 430 | void NotificationModel::insertEphemeral(const QSharedPointer<Notification> &n) { | 408 | void NotificationModel::insertEphemeral(const QSharedPointer<Notification> &n) { |
| 362 | 431 | Q_ASSERT(n->getType() == Notification::Type::Ephemeral); | 409 | Q_ASSERT(n->getType() == Notification::Type::Ephemeral); |
| 363 | 432 | 410 | ||
| 369 | 433 | if(showingNotificationOfType(Notification::Type::SnapDecision)) { | 411 | if(showingNotificationOfType(Notification::Type::Ephemeral)) { |
| 365 | 434 | p->ephemeralQueue.push_back(n); | ||
| 366 | 435 | qStableSort(p->ephemeralQueue.begin(), p->ephemeralQueue.end(), notificationCompare); | ||
| 367 | 436 | Q_EMIT queueSizeChanged(queued()); | ||
| 368 | 437 | } else if(showingNotificationOfType(Notification::Type::Ephemeral)) { | ||
| 370 | 438 | int loc = findFirst(Notification::Type::Ephemeral); | 412 | int loc = findFirst(Notification::Type::Ephemeral); |
| 371 | 439 | QSharedPointer<Notification> showing = p->displayedNotifications[loc]; | 413 | QSharedPointer<Notification> showing = p->displayedNotifications[loc]; |
| 372 | 440 | if(n->getUrgency() > showing->getUrgency()) { | 414 | if(n->getUrgency() > showing->getUrgency()) { |
| 376 | 441 | deleteFromVisible(loc); | 415 | insertToVisible(n, qMax(0, loc-1)); |
| 374 | 442 | insertToVisible(n, loc); | ||
| 375 | 443 | p->ephemeralQueue.push_front(showing); | ||
| 377 | 444 | } else { | 416 | } else { |
| 379 | 445 | p->ephemeralQueue.push_back(n); | 417 | insertToVisible(n, loc+1); |
| 380 | 446 | } | 418 | } |
| 381 | 447 | qStableSort(p->ephemeralQueue.begin(), p->ephemeralQueue.end(), notificationCompare); | ||
| 382 | 448 | Q_EMIT queueSizeChanged(queued()); | ||
| 383 | 449 | } else { | 419 | } else { |
| 385 | 450 | insertToVisible(n); | 420 | int loc = insertionPoint(n); |
| 386 | 421 | insertToVisible(n, loc); | ||
| 387 | 451 | } | 422 | } |
| 388 | 452 | } | 423 | } |
| 389 | 453 | 424 | ||
| 390 | 454 | void NotificationModel::insertInteractive(const QSharedPointer<Notification> &n) { | 425 | void NotificationModel::insertInteractive(const QSharedPointer<Notification> &n) { |
| 391 | 455 | Q_ASSERT(n->getType() == Notification::Type::Interactive); | 426 | Q_ASSERT(n->getType() == Notification::Type::Interactive); |
| 392 | 456 | 427 | ||
| 398 | 457 | if(showingNotificationOfType(Notification::Type::SnapDecision)) { | 428 | if(showingNotificationOfType(Notification::Type::Interactive)) { |
| 394 | 458 | p->interactiveQueue.push_back(n); | ||
| 395 | 459 | qStableSort(p->interactiveQueue.begin(), p->interactiveQueue.end(), notificationCompare); | ||
| 396 | 460 | Q_EMIT queueSizeChanged(queued()); | ||
| 397 | 461 | } else if(showingNotificationOfType(Notification::Type::Interactive)) { | ||
| 399 | 462 | int loc = findFirst(Notification::Type::Interactive); | 429 | int loc = findFirst(Notification::Type::Interactive); |
| 400 | 463 | QSharedPointer<Notification> showing = p->displayedNotifications[loc]; | 430 | QSharedPointer<Notification> showing = p->displayedNotifications[loc]; |
| 401 | 464 | if(n->getUrgency() > showing->getUrgency()) { | 431 | if(n->getUrgency() > showing->getUrgency()) { |
| 405 | 465 | deleteFromVisible(loc); | 432 | insertToVisible(n, qMax(0, loc-1)); |
| 403 | 466 | insertToVisible(n, loc); | ||
| 404 | 467 | p->interactiveQueue.push_front(showing); | ||
| 406 | 468 | } else { | 433 | } else { |
| 408 | 469 | p->interactiveQueue.push_back(n); | 434 | insertToVisible(n, loc+1); |
| 409 | 470 | } | 435 | } |
| 410 | 471 | qStableSort(p->interactiveQueue.begin(), p->interactiveQueue.end(), notificationCompare); | ||
| 411 | 472 | Q_EMIT queueSizeChanged(queued()); | ||
| 412 | 473 | } else { | 436 | } else { |
| 413 | 474 | int loc = insertionPoint(n); | 437 | int loc = insertionPoint(n); |
| 414 | 475 | insertToVisible(n, loc); | 438 | insertToVisible(n, loc); |
| 415 | 476 | } | 439 | } |
| 416 | 477 | |||
| 417 | 478 | } | 440 | } |
| 418 | 479 | 441 | ||
| 419 | 480 | 442 | ||
| 420 | @@ -489,7 +451,6 @@ | |||
| 421 | 489 | 451 | ||
| 422 | 490 | void NotificationModel::insertSnap(const QSharedPointer<Notification> &n) { | 452 | void NotificationModel::insertSnap(const QSharedPointer<Notification> &n) { |
| 423 | 491 | Q_ASSERT(n->getType() == Notification::Type::SnapDecision); | 453 | Q_ASSERT(n->getType() == Notification::Type::SnapDecision); |
| 424 | 492 | removeNonSnap(); | ||
| 425 | 493 | int showing = countShowing(n->getType()); | 454 | int showing = countShowing(n->getType()); |
| 426 | 494 | if(showing >= maxSnapsShown) { | 455 | if(showing >= maxSnapsShown) { |
| 427 | 495 | int loc = findFirst(Notification::Type::SnapDecision); | 456 | int loc = findFirst(Notification::Type::SnapDecision); |
| 428 | @@ -522,7 +483,7 @@ | |||
| 429 | 522 | } | 483 | } |
| 430 | 523 | 484 | ||
| 431 | 524 | if (!inserted) { | 485 | if (!inserted) { |
| 433 | 525 | insertToVisible(n, 1); | 486 | insertToVisible(n, showingNotificationOfType(Notification::Type::Confirmation) ? 1 : 0); |
| 434 | 526 | } | 487 | } |
| 435 | 527 | } | 488 | } |
| 436 | 528 | } | 489 | } |
| 437 | @@ -541,7 +502,7 @@ | |||
| 438 | 541 | int i=0; | 502 | int i=0; |
| 439 | 542 | for(; i<p->displayedNotifications.size(); i++) { | 503 | for(; i<p->displayedNotifications.size(); i++) { |
| 440 | 543 | if(p->displayedNotifications[i]->getType() > n->getType()) { | 504 | if(p->displayedNotifications[i]->getType() > n->getType()) { |
| 442 | 544 | break; | 505 | return i+1; |
| 443 | 545 | } | 506 | } |
| 444 | 546 | } | 507 | } |
| 445 | 547 | return i; | 508 | return i; |
| 446 | @@ -555,10 +516,7 @@ | |||
| 447 | 555 | printf("Bad insert.\n"); | 516 | printf("Bad insert.\n"); |
| 448 | 556 | return; | 517 | return; |
| 449 | 557 | } | 518 | } |
| 454 | 558 | //QModelIndex insertionPoint = QAbstractItemModel::createIndex(location, 0); | 519 | beginInsertRows(QModelIndex(), location, location); |
| 451 | 559 | //beginInsertRows(insertionPoint, location, location); | ||
| 452 | 560 | QModelIndex insertionPoint = QModelIndex(); | ||
| 453 | 561 | beginInsertRows(insertionPoint, location, location); | ||
| 455 | 562 | p->displayedNotifications.insert(location, n); | 520 | p->displayedNotifications.insert(location, n); |
| 456 | 563 | endInsertRows(); | 521 | endInsertRows(); |
| 457 | 564 | p->displayTimes[n->getID()] = 0; | 522 | p->displayTimes[n->getID()] = 0; |
| 458 | 565 | 523 | ||
| 459 | === modified file 'src/NotificationServer.cpp' | |||
| 460 | --- src/NotificationServer.cpp 2015-10-13 11:15:28 +0000 | |||
| 461 | +++ src/NotificationServer.cpp 2016-08-01 14:19:24 +0000 | |||
| 462 | @@ -1,5 +1,5 @@ | |||
| 463 | 1 | /* | 1 | /* |
| 465 | 2 | * Copyright (C) 2013 Canonical, Ltd. | 2 | * Copyright (C) 2013-2016 Canonical, Ltd. |
| 466 | 3 | * | 3 | * |
| 467 | 4 | * Authors: | 4 | * Authors: |
| 468 | 5 | * Jussi Pakkanen <jussi.pakkanen@canonical.com> | 5 | * Jussi Pakkanen <jussi.pakkanen@canonical.com> |
| 469 | @@ -28,7 +28,7 @@ | |||
| 470 | 28 | 28 | ||
| 471 | 29 | static const char* LOCAL_OWNER = "local"; | 29 | static const char* LOCAL_OWNER = "local"; |
| 472 | 30 | 30 | ||
| 474 | 31 | static bool isAuthorised(const QString& clientId, QSharedPointer<Notification> notification) | 31 | static bool isAuthorised(const QString& clientId, const QSharedPointer<Notification> ¬ification) |
| 475 | 32 | { | 32 | { |
| 476 | 33 | return (clientId == LOCAL_OWNER) || (notification->getClientId() == clientId); | 33 | return (clientId == LOCAL_OWNER) || (notification->getClientId() == clientId); |
| 477 | 34 | } | 34 | } |
| 478 | @@ -97,7 +97,7 @@ | |||
| 479 | 97 | 97 | ||
| 480 | 98 | NotificationDataList NotificationServer::GetNotifications(const QString &app_name) { | 98 | NotificationDataList NotificationServer::GetNotifications(const QString &app_name) { |
| 481 | 99 | NotificationDataList results; | 99 | NotificationDataList results; |
| 483 | 100 | for (auto notification: model.getAllNotifications()) { | 100 | Q_FOREACH(const auto ¬ification, model.getAllNotifications()) { |
| 484 | 101 | NotificationData data; | 101 | NotificationData data; |
| 485 | 102 | data.appName = app_name; | 102 | data.appName = app_name; |
| 486 | 103 | data.id = notification->getID(); | 103 | data.id = notification->getID(); |
| 487 | @@ -159,7 +159,7 @@ | |||
| 488 | 159 | } | 159 | } |
| 489 | 160 | } | 160 | } |
| 490 | 161 | 161 | ||
| 492 | 162 | QString NotificationServer::messageSender() { | 162 | QString NotificationServer::messageSender() const { |
| 493 | 163 | QString sender(LOCAL_OWNER); | 163 | QString sender(LOCAL_OWNER); |
| 494 | 164 | if (calledFromDBus()) { | 164 | if (calledFromDBus()) { |
| 495 | 165 | sender = message().service(); | 165 | sender = message().service(); |
| 496 | @@ -167,7 +167,7 @@ | |||
| 497 | 167 | return sender; | 167 | return sender; |
| 498 | 168 | } | 168 | } |
| 499 | 169 | 169 | ||
| 501 | 170 | bool NotificationServer::isCmdLine() { | 170 | bool NotificationServer::isCmdLine() const { |
| 502 | 171 | if (!calledFromDBus()) { | 171 | if (!calledFromDBus()) { |
| 503 | 172 | return false; | 172 | return false; |
| 504 | 173 | } | 173 | } |
| 505 | @@ -179,8 +179,8 @@ | |||
| 506 | 179 | 179 | ||
| 507 | 180 | void NotificationServer::serviceUnregistered(const QString &clientId) { | 180 | void NotificationServer::serviceUnregistered(const QString &clientId) { |
| 508 | 181 | m_watcher.removeWatchedService(clientId); | 181 | m_watcher.removeWatchedService(clientId); |
| 511 | 182 | auto notifications = model.removeAllNotificationsForClient(clientId); | 182 | const auto notifications = model.removeAllNotificationsForClient(clientId); |
| 512 | 183 | for (auto notification: notifications) { | 183 | Q_FOREACH(const auto ¬ification, notifications) { |
| 513 | 184 | Q_EMIT NotificationClosed(notification->getID(), 1); | 184 | Q_EMIT NotificationClosed(notification->getID(), 1); |
| 514 | 185 | } | 185 | } |
| 515 | 186 | } | 186 | } |
| 516 | @@ -276,12 +276,7 @@ | |||
| 517 | 276 | notification->setBody(body); | 276 | notification->setBody(body); |
| 518 | 277 | notification->setIcon(app_icon); | 277 | notification->setIcon(app_icon); |
| 519 | 278 | notification->setSummary(summary); | 278 | notification->setSummary(summary); |
| 526 | 279 | 279 | notification->setHints(hints); | |
| 521 | 280 | QVariantMap notifyHints; | ||
| 522 | 281 | for (auto iter = hints.constBegin(), end = hints.constEnd(); iter != end; ++iter) { | ||
| 523 | 282 | notifyHints[iter.key()] = iter.value(); | ||
| 524 | 283 | } | ||
| 525 | 284 | notification->setHints(notifyHints); | ||
| 527 | 285 | 280 | ||
| 528 | 286 | QVariant secondaryIcon = hints[SECONDARY_ICON_HINT]; | 281 | QVariant secondaryIcon = hints[SECONDARY_ICON_HINT]; |
| 529 | 287 | notification->setSecondaryIcon(secondaryIcon.toString()); | 282 | notification->setSecondaryIcon(secondaryIcon.toString()); |
| 530 | 288 | 283 | ||
| 531 | === modified file 'test/notificationtest.cpp' | |||
| 532 | --- test/notificationtest.cpp 2015-10-12 15:21:27 +0000 | |||
| 533 | +++ test/notificationtest.cpp 2016-08-01 14:19:24 +0000 | |||
| 534 | @@ -4,11 +4,6 @@ | |||
| 535 | 4 | 4 | ||
| 536 | 5 | #include <QtTest/QtTest> | 5 | #include <QtTest/QtTest> |
| 537 | 6 | 6 | ||
| 538 | 7 | typedef struct { | ||
| 539 | 8 | const char* before; | ||
| 540 | 9 | const char* expected; | ||
| 541 | 10 | } TextComparisons; | ||
| 542 | 11 | |||
| 543 | 12 | class TestNotifications: public QObject | 7 | class TestNotifications: public QObject |
| 544 | 13 | { | 8 | { |
| 545 | 14 | Q_OBJECT | 9 | Q_OBJECT |
| 546 | @@ -33,11 +28,11 @@ | |||
| 547 | 33 | QSharedPointer<Notification> n(new Notification(42, timeout, Notification::Low, "this is text")); | 28 | QSharedPointer<Notification> n(new Notification(42, timeout, Notification::Low, "this is text")); |
| 548 | 34 | NotificationModel m; | 29 | NotificationModel m; |
| 549 | 35 | 30 | ||
| 551 | 36 | QCOMPARE(m.numNotifications(), 1); | 31 | QCOMPARE(m.numNotifications(), 0); |
| 552 | 37 | m.insertNotification(n); | 32 | m.insertNotification(n); |
| 554 | 38 | QCOMPARE(m.numNotifications(), 2); | 33 | QCOMPARE(m.numNotifications(), 1); |
| 555 | 39 | m.removeNotification(n->getID()); | 34 | m.removeNotification(n->getID()); |
| 557 | 40 | QCOMPARE(m.numNotifications(), 1); | 35 | QCOMPARE(m.numNotifications(), 0); |
| 558 | 41 | } | 36 | } |
| 559 | 42 | 37 | ||
| 560 | 43 | void TestNotifications::testTypeSimple() { | 38 | void TestNotifications::testTypeSimple() { |
| 561 | @@ -60,9 +55,9 @@ | |||
| 562 | 60 | const int timeout = 1000; | 55 | const int timeout = 1000; |
| 563 | 61 | static NotificationModel *m = new NotificationModel(this); | 56 | static NotificationModel *m = new NotificationModel(this); |
| 564 | 62 | static NotificationServer *s = new NotificationServer(QDBusConnection::sessionBus(), *m); | 57 | static NotificationServer *s = new NotificationServer(QDBusConnection::sessionBus(), *m); |
| 566 | 63 | QStringList actions = QStringList(); | 58 | QStringList actions; |
| 567 | 64 | QVariantMap hints; | 59 | QVariantMap hints; |
| 569 | 65 | int id[3]; | 60 | int id[4]; |
| 570 | 66 | 61 | ||
| 571 | 67 | hints[URGENCY_HINT] = QVariant::fromValue(Notification::Urgency::Low); | 62 | hints[URGENCY_HINT] = QVariant::fromValue(Notification::Urgency::Low); |
| 572 | 68 | id[0] = s->Notify ("test-name-low", 0, "icon-low", "summary-low", "body-low", actions, hints, timeout); | 63 | id[0] = s->Notify ("test-name-low", 0, "icon-low", "summary-low", "body-low", actions, hints, timeout); |
| 573 | @@ -70,22 +65,41 @@ | |||
| 574 | 70 | 65 | ||
| 575 | 71 | hints[URGENCY_HINT] = QVariant::fromValue(Notification::Urgency::Normal); | 66 | hints[URGENCY_HINT] = QVariant::fromValue(Notification::Urgency::Normal); |
| 576 | 72 | id[1] = s->Notify ("test-name-normal", 0, "icon-normal", "summary-normal", "body-normal", actions, hints, timeout); | 67 | id[1] = s->Notify ("test-name-normal", 0, "icon-normal", "summary-normal", "body-normal", actions, hints, timeout); |
| 578 | 73 | QVERIFY(!m->showingNotification(id[0])); | 68 | QVERIFY(m->showingNotification(id[0])); |
| 579 | 74 | QVERIFY(m->showingNotification(id[1])); | 69 | QVERIFY(m->showingNotification(id[1])); |
| 581 | 75 | QVERIFY(m->queued() == 1); | 70 | QVERIFY(m->getNotification(id[1]) == m->getDisplayedNotification(0)); // verify it's ordered by urgency |
| 582 | 71 | QVERIFY(m->queued() == 0); | ||
| 583 | 76 | 72 | ||
| 584 | 77 | hints[URGENCY_HINT] = QVariant::fromValue(Notification::Urgency::Critical); | 73 | hints[URGENCY_HINT] = QVariant::fromValue(Notification::Urgency::Critical); |
| 585 | 78 | id[2] = s->Notify ("test-name-critical", 0, "icon-critical", "summary-critical", "body-critical", actions, hints, timeout); | 74 | id[2] = s->Notify ("test-name-critical", 0, "icon-critical", "summary-critical", "body-critical", actions, hints, timeout); |
| 590 | 79 | QVERIFY(!m->showingNotification(id[0])); | 75 | QVERIFY(m->showingNotification(id[0])); |
| 591 | 80 | QVERIFY(!m->showingNotification(id[1])); | 76 | QVERIFY(m->showingNotification(id[1])); |
| 592 | 81 | QVERIFY(m->showingNotification(id[2])); | 77 | QVERIFY(m->showingNotification(id[2])); |
| 593 | 82 | QCOMPARE(m->queued(), 2); | 78 | QVERIFY(m->getNotification(id[2]) == m->getDisplayedNotification(0)); // verify it's ordered by urgency |
| 594 | 79 | QCOMPARE(m->queued(), 0); | ||
| 595 | 80 | |||
| 596 | 81 | hints[SNAP_HINT] = QStringLiteral("true"); | ||
| 597 | 82 | hints[URGENCY_HINT] = QVariant::fromValue(Notification::Urgency::Normal); | ||
| 598 | 83 | id[3] = s->Notify ("test-name-snap", 0, "icon-snap", "summary-snap", "body-snap", {"snap", "decision", "needs", "actions"}, hints, timeout); | ||
| 599 | 84 | QVERIFY(m->showingNotification(id[0])); | ||
| 600 | 85 | QVERIFY(m->showingNotification(id[1])); | ||
| 601 | 86 | QVERIFY(m->showingNotification(id[2])); | ||
| 602 | 87 | QVERIFY(m->showingNotification(id[3])); | ||
| 603 | 88 | QVERIFY(m->getNotification(id[3]) == m->getDisplayedNotification(0)); // verify it's ordered by urgency and type, snap comes first | ||
| 604 | 89 | QCOMPARE(m->queued(), 0); | ||
| 605 | 90 | |||
| 606 | 91 | m->removeNotification(id[3]); | ||
| 607 | 92 | QVERIFY(m->showingNotification(id[0])); | ||
| 608 | 93 | QVERIFY(m->showingNotification(id[1])); | ||
| 609 | 94 | QVERIFY(m->showingNotification(id[2])); | ||
| 610 | 95 | QVERIFY(!m->showingNotification(id[3])); | ||
| 611 | 96 | QCOMPARE(m->queued(), 0); | ||
| 612 | 83 | 97 | ||
| 613 | 84 | m->removeNotification(id[2]); | 98 | m->removeNotification(id[2]); |
| 615 | 85 | QVERIFY(!m->showingNotification(id[0])); | 99 | QVERIFY(m->showingNotification(id[0])); |
| 616 | 86 | QVERIFY(m->showingNotification(id[1])); | 100 | QVERIFY(m->showingNotification(id[1])); |
| 617 | 87 | QVERIFY(!m->showingNotification(id[2])); | 101 | QVERIFY(!m->showingNotification(id[2])); |
| 619 | 88 | QCOMPARE(m->queued(), 1); | 102 | QCOMPARE(m->queued(), 0); |
| 620 | 89 | 103 | ||
| 621 | 90 | m->removeNotification(id[1]); | 104 | m->removeNotification(id[1]); |
| 622 | 91 | QVERIFY(m->showingNotification(id[0])); | 105 | QVERIFY(m->showingNotification(id[0])); |
| 623 | @@ -173,7 +187,7 @@ | |||
| 624 | 173 | m.insertNotification(n3); | 187 | m.insertNotification(n3); |
| 625 | 174 | m.insertNotification(n4); | 188 | m.insertNotification(n4); |
| 626 | 175 | 189 | ||
| 628 | 176 | QCOMPARE(m.getDisplayedNotification(1)->getBody(), QString("snap-decision-critical")); | 190 | QCOMPARE(m.getDisplayedNotification(0)->getBody(), QString("snap-decision-critical")); |
| 629 | 177 | } | 191 | } |
| 630 | 178 | 192 | ||
| 631 | 179 | void TestNotifications::testVisualSDQueueWithoutCritical() { | 193 | void TestNotifications::testVisualSDQueueWithoutCritical() { |
| 632 | @@ -190,10 +204,10 @@ | |||
| 633 | 190 | m.insertNotification(n3); | 204 | m.insertNotification(n3); |
| 634 | 191 | m.insertNotification(n4); | 205 | m.insertNotification(n4); |
| 635 | 192 | 206 | ||
| 640 | 193 | QCOMPARE(m.getDisplayedNotification(4)->getBody(), QString("snap-decision-1")); | 207 | QCOMPARE(m.getDisplayedNotification(3)->getBody(), QString("snap-decision-1")); |
| 641 | 194 | QCOMPARE(m.getDisplayedNotification(3)->getBody(), QString("snap-decision-2")); | 208 | QCOMPARE(m.getDisplayedNotification(2)->getBody(), QString("snap-decision-2")); |
| 642 | 195 | QCOMPARE(m.getDisplayedNotification(2)->getBody(), QString("snap-decision-3")); | 209 | QCOMPARE(m.getDisplayedNotification(1)->getBody(), QString("snap-decision-3")); |
| 643 | 196 | QCOMPARE(m.getDisplayedNotification(1)->getBody(), QString("snap-decision-4")); | 210 | QCOMPARE(m.getDisplayedNotification(0)->getBody(), QString("snap-decision-4")); |
| 644 | 197 | } | 211 | } |
| 645 | 198 | 212 | ||
| 646 | 199 | void TestNotifications::testConfirmationValue() { | 213 | void TestNotifications::testConfirmationValue() { |
| 647 | @@ -213,8 +227,8 @@ | |||
| 648 | 213 | m.insertNotification(ephemeral); | 227 | m.insertNotification(ephemeral); |
| 649 | 214 | m.insertNotification(confirmation); | 228 | m.insertNotification(confirmation); |
| 650 | 215 | 229 | ||
| 653 | 216 | QCOMPARE(m.getDisplayedNotification(2)->getBody(), QString("ephemeral")); | 230 | QCOMPARE(m.getDisplayedNotification(1)->getBody(), QString("ephemeral")); |
| 654 | 217 | QCOMPARE(m.getDisplayedNotification(1)->getBody(), QString("")); | 231 | QCOMPARE(m.getDisplayedNotification(0)->getBody(), QString("")); |
| 655 | 218 | } | 232 | } |
| 656 | 219 | 233 | ||
| 657 | 220 | void TestNotifications::testTextFilter_data() { | 234 | void TestNotifications::testTextFilter_data() { |
| 658 | @@ -273,11 +287,11 @@ | |||
| 659 | 273 | const int max = 20; | 287 | const int max = 20; |
| 660 | 274 | static NotificationModel *m = new NotificationModel(); | 288 | static NotificationModel *m = new NotificationModel(); |
| 661 | 275 | static NotificationServer *s = new NotificationServer(QDBusConnection::sessionBus(), *m); | 289 | static NotificationServer *s = new NotificationServer(QDBusConnection::sessionBus(), *m); |
| 663 | 276 | QStringList actions = QStringList(); | 290 | QStringList actions; |
| 664 | 277 | QVariantMap hints; | 291 | QVariantMap hints; |
| 665 | 278 | int before = m->numNotifications(); | 292 | int before = m->numNotifications(); |
| 666 | 279 | 293 | ||
| 668 | 280 | for (int i = 1; i <= max; i++) { | 294 | for (int i = 0; i < max; i++) { |
| 669 | 281 | s->Notify ("test-app-name", | 295 | s->Notify ("test-app-name", |
| 670 | 282 | 0, | 296 | 0, |
| 671 | 283 | "test-icon", | 297 | "test-icon", |
| 672 | @@ -288,11 +302,11 @@ | |||
| 673 | 288 | timeout); | 302 | timeout); |
| 674 | 289 | } | 303 | } |
| 675 | 290 | 304 | ||
| 677 | 291 | QCOMPARE(m->numNotifications(), max+1); | 305 | QCOMPARE(m->numNotifications(), max); |
| 678 | 292 | 306 | ||
| 679 | 293 | for (int i = max; i >= 1; i--) { | 307 | for (int i = max; i >= 1; i--) { |
| 680 | 294 | m->getNotification(i)->close(); | 308 | m->getNotification(i)->close(); |
| 682 | 295 | QCOMPARE(m->numNotifications(), i); | 309 | QCOMPARE(m->numNotifications(), i-1); |
| 683 | 296 | } | 310 | } |
| 684 | 297 | 311 | ||
| 685 | 298 | QCOMPARE(m->numNotifications(), before); | 312 | QCOMPARE(m->numNotifications(), before); |
PASSED: Continuous integration, rev:243
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/