on xenial help sign in
Pause notifications while tutorial is up
17f7ee9Michael Terry
debian/control+1−1
@@ -131,7 +131,7 @@ Depends: qml-module-qtquick-layouts,
131 qtdeclarative5-ubuntu-settings-components (>= 0.7),
131 qtdeclarative5-ubuntu-settings-components (>= 0.7),
132 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
132 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
133 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
133 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
134− qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
134+ qtdeclarative5-unity-notifications-plugin (>= 0.1.4) | unity-notifications-impl,
135 ubuntu-thumbnailer-impl-0,
135 ubuntu-thumbnailer-impl-0,
136 unity-application-impl-15,
136 unity-application-impl-15,
137 unity-notifications-impl-3,
137 unity-notifications-impl-3,
qml/Shell.qml+5
@@ -667,6 +667,11 @@ Item {
667 y: topmostIsFullscreen ? 0 : panel.panelHeight
667 y: topmostIsFullscreen ? 0 : panel.panelHeight
668 height: parent.height - (topmostIsFullscreen ? 0 : panel.panelHeight)
668 height: parent.height - (topmostIsFullscreen ? 0 : panel.panelHeight)
669
669
670+ Binding {
671+ target: model
672+ paused: tutorial.running
673+ }
674+
670 states: [
675 states: [
671 State {
676 State {
672 name: "narrow"
677 name: "narrow"
tests/qmltests/Tutorial/tst_Tutorial.qml+2
@@ -64,6 +64,8 @@ Rectangle {
64 ListModel {
64 ListModel {
65 id: mockNotificationsModel
65 id: mockNotificationsModel
66
66
67+ property bool paused
68+
67 function getRaw(id) {
69 function getRaw(id) {
68 return mockNotification.createObject(mockNotificationsModel)
70 return mockNotification.createObject(mockNotificationsModel)
69 }
71 }
tests/qmltests/tst_Shell.qml+2
@@ -349,6 +349,8 @@ Rectangle {
349 ListModel {
349 ListModel {
350 id: mockNotificationsModel
350 id: mockNotificationsModel
351
351
352+ property bool paused
353+
352 signal actionInvoked(string actionId)
354 signal actionInvoked(string actionId)
353
355
354 function getRaw(id) {
356 function getRaw(id) {