git.iko.soy/unity8
on xenial help sign in
Pause notifications while tutorial is up
commit17f7ee9d0d4fc5aa5b9ac4acb4c94984e91f2bc8 authorMichael Terry <michael.terry@canonical.com> dateFri 29 Apr 2016, 17:14 (10 years ago) parentf828e55
4 files changed+10−1
compare with xenial
unifiedsplit
debian/control+1−1 qml/Shell.qml+5 tests/qmltests/Tutorial/tst_Tutorial.qml+2 tests/qmltests/tst_Shell.qml+2
debian/control+1−1
@@ -131,7 +131,7 @@ Depends: qml-module-qtquick-layouts,
131131 qtdeclarative5-ubuntu-settings-components (>= 0.7),
132132 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
133133 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,
135135 ubuntu-thumbnailer-impl-0,
136136 unity-application-impl-15,
137137 unity-notifications-impl-3,
qml/Shell.qml+5
@@ -667,6 +667,11 @@ Item {
667667 y: topmostIsFullscreen ? 0 : panel.panelHeight
668668 height: parent.height - (topmostIsFullscreen ? 0 : panel.panelHeight)
669669
670+ Binding {
671+ target: model
672+ paused: tutorial.running
673+ }
674+
670675 states: [
671676 State {
672677 name: "narrow"
tests/qmltests/Tutorial/tst_Tutorial.qml+2
@@ -64,6 +64,8 @@ Rectangle {
6464 ListModel {
6565 id: mockNotificationsModel
6666
67+ property bool paused
68+
6769 function getRaw(id) {
6870 return mockNotification.createObject(mockNotificationsModel)
6971 }
tests/qmltests/tst_Shell.qml+2
@@ -349,6 +349,8 @@ Rectangle {
349349 ListModel {
350350 id: mockNotificationsModel
351351
352+ property bool paused
353+
352354 signal actionInvoked(string actionId)
353355
354356 function getRaw(id) {