git.iko.soy/unity8
on xenial help sign in
Made code a bit tighter.
74b95f1Mirco Müller
qml/Notifications/Notification.qml+1−7
compare with xenial
unifiedsplit
@@ -39,7 +39,6 @@ Item {
39 property bool fullscreen: false
39 property bool fullscreen: false
40 property int maxHeight
40 property int maxHeight
41 property int margins
41 property int margins
42− property string acceptActionId
43
42
44 property Gradient greenGradient : Gradient {
43 property Gradient greenGradient : Gradient {
45 GradientStop { position: 0.0; color: "#3fb24f" }
44 GradientStop { position: 0.0; color: "#3fb24f" }
@@ -146,7 +145,7 @@ Item {
146 signal accept()
145 signal accept()
147
146
148 onAccept: {
147 onAccept: {
149− notification.notification.invokeAction(notification.acceptActionId)
148+ notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
150 }
149 }
151
150
152 Item {
151 Item {
@@ -352,11 +351,6 @@ Item {
352 objectName: "button" + index
351 objectName: "button" + index
353 width: buttonRow.width / 2 - spacing
352 width: buttonRow.width / 2 - spacing
354 text: loader.actionLabel
353 text: loader.actionLabel
355− Component.onCompleted: {
356− if (index == 0) {
357− notification.acceptActionId = loader.actionId
358− }
359− }
360 gradient: notification.hints["x-canonical-private-button-tint"] == "true" && index == 0 ? greenGradient : darkgreyGradient
354 gradient: notification.hints["x-canonical-private-button-tint"] == "true" && index == 0 ? greenGradient : darkgreyGradient
361 onClicked: notification.notification.invokeAction(loader.actionId)
355 onClicked: notification.notification.invokeAction(loader.actionId)
362 }
356 }