@@ -51,13 +51,13 @@ Item {
51 Notification {
51 Notification {
52 id: mockNotificationDefault
52 id: mockNotificationDefault
53 type: Notification.PlaceHolder
53 type: Notification.PlaceHolder
54− //nid: 1 //mockModel.getNextId()
54+ //nid: mockModel.getNextId()
55− hints: {}
55+ //hints: {}
56 summary: ""
56 summary: ""
59 secondaryIcon: ""
59 secondaryIcon: ""
60− rawActions: [{ id: "reply_id", label: "Dummy"}]
60+ rawActions: ["reply_id", "Dummy"]
63 ListModel {
63 ListModel {
@@ -71,9 +71,9 @@ Item {
71 return internalId++
71 return internalId++
74− function getRaw(id) {
74+ function getRaw(nid) {
75 for (var i = 0; i < mockModel.count; i++) {
75 for (var i = 0; i < mockModel.count; i++) {
76− if (id === mockModel.get(i).nid) {
76+ if (nid === mockModel.get(i).nid) {
77 return mockModel.get(i).notification
77 return mockModel.get(i).notification
@@ -88,15 +88,15 @@ Item {
88 Notification {
88 Notification {
89 id: mock2over1SnapDecisionNotification
89 id: mock2over1SnapDecisionNotification
90 type: Notification.SnapDecision
90 type: Notification.SnapDecision
91− //nid: 2 //mockModel.getNextId()
91+ //nid: mockModel.getNextId()
92 hints: {"x-canonical-private-affirmative-tint": "true"}
92 hints: {"x-canonical-private-affirmative-tint": "true"}
93 summary: "Theatre at Ferria Stadium"
93 summary: "Theatre at Ferria Stadium"
94 body: "at Ferria Stadium in Bilbao, Spain\n07578545317"
94 body: "at Ferria Stadium in Bilbao, Spain\n07578545317"
96 secondaryIcon: ""
96 secondaryIcon: ""
97− rawActions: [{ id: "ok_id", label: "Ok"},
97+ rawActions: ["ok_id", "Ok",
98− { id: "snooze_id", label: "Snooze"},
98+ "snooze_id", "Snooze",
99− { id: "view_id", label: "View"}]
99+ "view_id", "View"]
102 function add2over1SnapDecisionNotification() {
102 function add2over1SnapDecisionNotification() {
@@ -106,12 +106,12 @@ Item {
106 Notification {
106 Notification {
107 id: mockEphemeralNotification
107 id: mockEphemeralNotification
108 type: Notification.Ephemeral
108 type: Notification.Ephemeral
109− //nid: 3 //mockModel.getNextId()
109+ //nid: mockModel.getNextId()
110 summary: "Cole Raby"
110 summary: "Cole Raby"
111 body: "I did not expect it to be that late."
111 body: "I did not expect it to be that late."
112 icon: "../graphics/avatars/amanda.png"
112 icon: "../graphics/avatars/amanda.png"
113 secondaryIcon: "../graphics/applicationIcons/facebook.png"
113 secondaryIcon: "../graphics/applicationIcons/facebook.png"
114− rawActions: [{ id: "reply_id", label: "Dummy"}]
114+ rawActions: ["reply_id", "Dummy"]
117 function addEphemeralNotification() {
117 function addEphemeralNotification() {
@@ -121,13 +121,13 @@ Item {
121 Notification {
121 Notification {
122 id: mockEphemeralNonShapedIconNotification
122 id: mockEphemeralNonShapedIconNotification
123 type: Notification.Ephemeral
123 type: Notification.Ephemeral
124− //nid: 4 //mockModel.getNextId()
124+ //nid: mockModel.getNextId()
125 hints: {"x-canonical-non-shaped-icon": "true"}
125 hints: {"x-canonical-non-shaped-icon": "true"}
126 summary: "Contacts"
126 summary: "Contacts"
127 body: "Synchronised contacts-database with cloud-storage."
127 body: "Synchronised contacts-database with cloud-storage."
128 icon: "../graphics/applicationIcons/contacts-app.png"
128 icon: "../graphics/applicationIcons/contacts-app.png"
129 secondaryIcon: ""
129 secondaryIcon: ""
130− rawActions: [{ id: "reply_id", label: "Dummy"}]
130+ rawActions: ["reply_id", "Dummy"]
133 function addEphemeralNonShapedIconNotification() {
133 function addEphemeralNonShapedIconNotification() {
@@ -137,13 +137,13 @@ Item {
137 Notification {
137 Notification {
138 id: mockEphemeralIconSummaryNotification
138 id: mockEphemeralIconSummaryNotification
139 type: Notification.Ephemeral
139 type: Notification.Ephemeral
140− //nid: 5 //mockModel.getNextId()
140+ //nid: mockModel.getNextId()
141 hints: {"x-canonical-non-shaped-icon": "false"}
141 hints: {"x-canonical-non-shaped-icon": "false"}
142 summary: "Photo upload completed"
142 summary: "Photo upload completed"
144 icon: "../graphics/applicationIcons/facebook.png"
144 icon: "../graphics/applicationIcons/facebook.png"
145 secondaryIcon: ""
145 secondaryIcon: ""
146− rawActions: [{ id: "reply_id", label: "Dummy"}]
146+ rawActions: ["reply_id", "Dummy"]
149 function addEphemeralIconSummaryNotification() {
149 function addEphemeralIconSummaryNotification() {
@@ -153,12 +153,12 @@ Item {
153 Notification {
153 Notification {
154 id: mockInteractiveNotification
154 id: mockInteractiveNotification
155 type: Notification.Interactive
155 type: Notification.Interactive
156− //nid: 6 //mockModel.getNextId()
156+ //nid: mockModel.getNextId()
157 summary: "Interactive notification"
157 summary: "Interactive notification"
158 body: "This is a notification that can be clicked"
158 body: "This is a notification that can be clicked"
159 icon: "../graphics/avatars/anna_olsson.png"
159 icon: "../graphics/avatars/anna_olsson.png"
160 secondaryIcon: ""
160 secondaryIcon: ""
161− rawActions: [{ id: "reply_id", label: "Dummy"}]
161+ rawActions: ["reply_id", "Dummy"]
164 function addInteractiveNotification() {
164 function addInteractiveNotification() {
@@ -168,14 +168,14 @@ Item {
168 Notification {
168 Notification {
169 id: mockConfirmationNotification
169 id: mockConfirmationNotification
170 type: Notification.Confirmation
170 type: Notification.Confirmation
171− //nid: 7 //mockModel.getNextId()
171+ //nid: mockModel.getNextId()
172 hints: {"x-canonical-non-shaped-icon": "true"}
172 hints: {"x-canonical-non-shaped-icon": "true"}
173 summary: "Confirmation notification"
173 summary: "Confirmation notification"
175 icon: "image://theme/audio-volume-medium"
175 icon: "image://theme/audio-volume-medium"
176 secondaryIcon: ""
176 secondaryIcon: ""
177 value: 50
177 value: 50
178− rawActions: [{ id: "reply_id", label: "Dummy"}]
178+ rawActions: ["reply_id", "Dummy"]
181 function addConfirmationNotification() {
181 function addConfirmationNotification() {
@@ -185,7 +185,7 @@ Item {
185 Notification {
185 Notification {
186 id: mock2ndConfirmationNotification
186 id: mock2ndConfirmationNotification
187 type: Notification.Confirmation
187 type: Notification.Confirmation
188− //nid: 8 //mockModel.getNextId()
188+ //nid: mockModel.getNextId()
189 hints: {"x-canonical-non-shaped-icon": "true",
189 hints: {"x-canonical-non-shaped-icon": "true",
190 "x-canonical-value-bar-tint": "true"}
190 "x-canonical-value-bar-tint": "true"}
191 summary: "Confirmation notification"
191 summary: "Confirmation notification"
@@ -193,7 +193,7 @@ Item {
193 icon: "image://theme/audio-volume-high"
193 icon: "image://theme/audio-volume-high"
194 secondaryIcon: ""
194 secondaryIcon: ""
195 value: 85
195 value: 85
196− rawActions: [{ id: "reply_id", label: "Dummy"}]
196+ rawActions: ["reply_id", "Dummy"]
199 function add2ndConfirmationNotification() {
199 function add2ndConfirmationNotification() {
@@ -311,12 +311,13 @@ Item {
312 tag: "2-over-1 Snap Decision with button-tint",
312 tag: "2-over-1 Snap Decision with button-tint",
313 type: Notification.SnapDecision,
313 type: Notification.SnapDecision,
314− id: mockModel.getNextId(),
314+ //nid: mockModel.getNextId(),
315 hints: {"x-canonical-private-affirmative-tint": "true"},
315 hints: {"x-canonical-private-affirmative-tint": "true"},
316 summary: "Theatre at Ferria Stadium",
316 summary: "Theatre at Ferria Stadium",
317 body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
317 body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
318 icon: "",
318 icon: "",
319 secondaryIcon: "",
319 secondaryIcon: "",
320 actions: [{ id: "ok_id", label: "Ok"},
321 actions: [{ id: "ok_id", label: "Ok"},
321 { id: "snooze_id", label: "Snooze"},
322 { id: "snooze_id", label: "Snooze"},
322 { id: "view_id", label: "View"}],
323 { id: "view_id", label: "View"}],
@@ -336,12 +337,13 @@ Item {
337 tag: "Ephemeral notification - icon-summary layout",
338 tag: "Ephemeral notification - icon-summary layout",
338 type: Notification.Ephemeral,
339 type: Notification.Ephemeral,
339− id: mockModel.getNextId(),
340+ //nid: mockModel.getNextId(),
340 hints: {},
341 hints: {},
341 summary: "Photo upload completed",
342 summary: "Photo upload completed",
342 body: "",
343 body: "",
343 icon: "../graphics/applicationIcons/facebook.png",
344 icon: "../graphics/applicationIcons/facebook.png",
344 secondaryIcon: "",
345 secondaryIcon: "",
345 actions: [],
347 actions: [],
346 summaryVisible: true,
348 summaryVisible: true,
347 bodyVisible: false,
349 bodyVisible: false,
@@ -359,7 +361,7 @@ Item {
360 tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
362 tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
361 type: Notification.Ephemeral,
363 type: Notification.Ephemeral,
362− id: mockModel.getNextId(),
364+ //nid: mockModel.getNextId(),
363 hints: {"x-canonical-private-affirmative-tint": "false",
365 hints: {"x-canonical-private-affirmative-tint": "false",
364 "sound-file": "dummy.ogg",
366 "sound-file": "dummy.ogg",
365 "suppress-sound": "true"},
367 "suppress-sound": "true"},
@@ -367,6 +369,7 @@ Item {
367 body: "",
369 body: "",
368 icon: "",
370 icon: "",
369 secondaryIcon: "../graphics/applicationIcons/facebook.png",
371 secondaryIcon: "../graphics/applicationIcons/facebook.png",
370 actions: [],
373 actions: [],
371 summaryVisible: true,
374 summaryVisible: true,
372 bodyVisible: false,
375 bodyVisible: false,
@@ -385,13 +388,14 @@ Item {
386 tag: "Interactive notification",
389 tag: "Interactive notification",
387 type: Notification.Interactive,
390 type: Notification.Interactive,
388− id: mockModel.getNextId(),
391+ //nid: mockModel.getNextId(),
389 hints: {"x-canonical-private-affirmative-tint": "false",
392 hints: {"x-canonical-private-affirmative-tint": "false",
390 "sound-file": "dummy.ogg"},
393 "sound-file": "dummy.ogg"},
391 summary: "Interactive notification",
394 summary: "Interactive notification",
392 body: "This is a notification that can be clicked",
395 body: "This is a notification that can be clicked",
393 icon: "../graphics/avatars/amanda.png",
396 icon: "../graphics/avatars/amanda.png",
394 secondaryIcon: "",
397 secondaryIcon: "",
395 actions: [{ id: "reply_id", label: "Dummy"}],
399 actions: [{ id: "reply_id", label: "Dummy"}],
396 summaryVisible: true,
400 summaryVisible: true,
397 bodyVisible: true,
401 bodyVisible: true,
@@ -409,13 +413,14 @@ Item {
410 tag: "Snap Decision without secondary icon and no button-tint",
414 tag: "Snap Decision without secondary icon and no button-tint",
411 type: Notification.SnapDecision,
415 type: Notification.SnapDecision,
412− id: mockModel.getNextId(),
416+ //nid: mockModel.getNextId(),
413 hints: {"x-canonical-private-affirmative-tint": "false",
417 hints: {"x-canonical-private-affirmative-tint": "false",
414 "sound-file": "dummy.ogg"},
418 "sound-file": "dummy.ogg"},
415 summary: "Bro Coly",
419 summary: "Bro Coly",
416 body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
420 body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
417 icon: "../graphics/avatars/anna_olsson.png",
421 icon: "../graphics/avatars/anna_olsson.png",
418 secondaryIcon: "",
422 secondaryIcon: "",
419 actions: [{ id: "accept_id", label: "Accept"},
424 actions: [{ id: "accept_id", label: "Accept"},
420 { id: "reject_id", label: "Reject"}],
425 { id: "reject_id", label: "Reject"}],
421 summaryVisible: true,
426 summaryVisible: true,
@@ -434,13 +439,14 @@ Item {
435 tag: "Ephemeral notification",
440 tag: "Ephemeral notification",
436 type: Notification.Ephemeral,
441 type: Notification.Ephemeral,
437− id: mockModel.getNextId(),
442+ //nid: mockModel.getNextId(),
438 hints: {"x-canonical-private-affirmative-tint": "false",
443 hints: {"x-canonical-private-affirmative-tint": "false",
439 "sound-file": "dummy.ogg"},
444 "sound-file": "dummy.ogg"},
440 summary: "Cole Raby",
445 summary: "Cole Raby",
441 body: "I did not expect it to be that late.",
446 body: "I did not expect it to be that late.",
442 icon: "../graphics/avatars/funky.png",
447 icon: "../graphics/avatars/funky.png",
443 secondaryIcon: "../graphics/applicationIcons/facebook.png",
448 secondaryIcon: "../graphics/applicationIcons/facebook.png",
444 actions: [],
450 actions: [],
445 summaryVisible: true,
451 summaryVisible: true,
446 bodyVisible: true,
452 bodyVisible: true,
@@ -458,13 +464,14 @@ Item {
459 tag: "Ephemeral notification with non-shaped icon",
465 tag: "Ephemeral notification with non-shaped icon",
460 type: Notification.Ephemeral,
466 type: Notification.Ephemeral,
461− id: mockModel.getNextId(),
467+ //nid: mockModel.getNextId(),
462 hints: {"x-canonical-private-affirmative-tint": "false",
468 hints: {"x-canonical-private-affirmative-tint": "false",
463 "x-canonical-non-shaped-icon": "true"},
469 "x-canonical-non-shaped-icon": "true"},
464 summary: "Contacts",
470 summary: "Contacts",
465 body: "Synchronised contacts-database with cloud-storage.",
471 body: "Synchronised contacts-database with cloud-storage.",
466 icon: "image://theme/contacts-app",
472 icon: "image://theme/contacts-app",
467 secondaryIcon: "",
473 secondaryIcon: "",
468 actions: [],
475 actions: [],
469 summaryVisible: true,
476 summaryVisible: true,
470 bodyVisible: true,
477 bodyVisible: true,
@@ -482,7 +489,7 @@ Item {
483 tag: "Confirmation notification with value",
490 tag: "Confirmation notification with value",
484 type: Notification.Confirmation,
491 type: Notification.Confirmation,
485− id: mockModel.getNextId(),
492+ //nid: mockModel.getNextId(),
486 hints: {"x-canonical-non-shaped-icon": "true"},
493 hints: {"x-canonical-non-shaped-icon": "true"},
487 summary: "",
494 summary: "",
488 body: "",
495 body: "",
@@ -506,7 +513,7 @@ Item {
507 tag: "Confirmation notification with value, label and tint",
514 tag: "Confirmation notification with value, label and tint",
508 type: Notification.Confirmation,
515 type: Notification.Confirmation,
509− id: mockModel.getNextId(),
516+ //nid: mockModel.getNextId(),
510 hints: {"x-canonical-non-shaped-icon": "true",
517 hints: {"x-canonical-non-shaped-icon": "true",
511 "x-canonical-value-bar-tint" : "true"},
518 "x-canonical-value-bar-tint" : "true"},
512 summary: "",
519 summary: "",