git.iko.soy/unity8
on xenial help sign in
Fixed issues from MP-comments.
commitdac7e672987bccf44e996c46fa43dd00cb52a9e8 authorMirco Müller <mirco.mueller@ubuntu.com> dateMon 16 Jun 2014, 13:07 (12 years ago) parentd69bc88
2 files changed+9−9
compare with xenial
unifiedsplit
qml/Notifications/Notification.qml+4−4 tests/qmltests/Notifications/tst_Notifications.qml+5−5
qml/Notifications/Notification.qml+4−4
@@ -70,12 +70,12 @@ Item {
7070 Audio {
7171 id: sound
7272 objectName: "sound"
73− source: hints["sound-file"]
73+ source: hints["suppress-sound"] != "" ? hints["sound-file"] : undefined
7474 }
7575
76− Component.onCompleted: {
77− if (hints["suppress-sound"] != "true") {
78− sound.play ()
76+ onVisibleChanged: {
77+ if (visible == true && sound.source != undefined) {
78+ sound.play()
7979 }
8080 }
8181
tests/qmltests/Notifications/tst_Notifications.qml+5−5
@@ -272,7 +272,7 @@ Row {
272272 tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
273273 type: Notification.Ephemeral,
274274 hints: {"x-canonical-private-button-tint": "false",
275− "sound-file": "/usr/share/sounds/ubuntu/stereo/message.ogg",
275+ "sound-file": "dummy.ogg",
276276 "suppress-sound": "true"},
277277 summary: "New comment successfully published",
278278 body: "",
@@ -294,7 +294,7 @@ Row {
294294 tag: "Interactive notification",
295295 type: Notification.Interactive,
296296 hints: {"x-canonical-private-button-tint": "false",
297− "sound-file": "/usr/share/sounds/ubuntu/stereo/message.ogg"},
297+ "sound-file": "dummy.ogg"},
298298 summary: "Interactive notification",
299299 body: "This is a notification that can be clicked",
300300 icon: "../graphics/avatars/amanda.png",
@@ -314,7 +314,7 @@ Row {
314314 tag: "Snap Decision without secondary icon and no button-tint",
315315 type: Notification.SnapDecision,
316316 hints: {"x-canonical-private-button-tint": "false",
317− "sound-file": "/usr/share/sounds/ubuntu/stereo/message.ogg"},
317+ "sound-file": "dummy.ogg"},
318318 summary: "Bro Coly",
319319 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.",
320320 icon: "../graphics/avatars/anna_olsson.png",
@@ -335,7 +335,7 @@ Row {
335335 tag: "Ephemeral notification",
336336 type: Notification.Ephemeral,
337337 hints: {"x-canonical-private-button-tint": "false",
338− "sound-file": "/usr/share/sounds/ubuntu/stereo/message.ogg"},
338+ "sound-file": "dummy.ogg"},
339339 summary: "Cole Raby",
340340 body: "I did not expect it to be that late.",
341341 icon: "../graphics/avatars/funky.png",
@@ -356,7 +356,7 @@ Row {
356356 type: Notification.Ephemeral,
357357 hints: {"x-canonical-private-button-tint": "false",
358358 "x-canonical-non-shaped-icon": "true",
359− "sound-file": "/usr/share/sounds/ubuntu/stereo/message.ogg"},
359+ "sound-file": "dummy.ogg"},
360360 summary: "Contacts",
361361 body: "Synchronised contacts-database with cloud-storage.",
362362 icon: "../graphics/applicationIcons/contacts-app.png",