@@ -327,38 +327,40 @@ Item {
329 ComboButton {
329 ComboButton {
330− id: localButton
330+ id: comboButton
332 width: parent.width
332 width: parent.width
333 visible: notification.type == Notification.SnapDecision && actionRepeater.count > 4
333 visible: notification.type == Notification.SnapDecision && actionRepeater.count > 4
334 gradient: darkgreyGradient
334 gradient: darkgreyGradient
335− onClicked: notification.notification.invokeAction(localRepeater.itemAt(2).actionId)
335+ onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
336 expanded: false
336 expanded: false
337− expandedHeight: (localRepeater.count) * units.gu(5) + units.gu(.5)
337+ expandedHeight: (comboRepeater.count) * units.gu(5)
338 comboList: Column {
338 comboList: Column {
339 Repeater {
339 Repeater {
340− id: localRepeater
340+ id: comboRepeater
342 Component.onCompleted: {
342 Component.onCompleted: {
343 // an assignment is ok here, since this
343 // an assignment is ok here, since this
344 // label is static and does not change
344 // label is static and does not change
345− localButton.text = localRepeater.itemAt(2).actionLabel
345+ comboButton.text = comboRepeater.itemAt(2).actionLabel
348 model: notification.actions
348 model: notification.actions
349 delegate: Loader {
349 delegate: Loader {
353+ visible: status == Loader.Ready
350 property string actionId: id
354 property string actionId: id
351 property string actionLabel: label
355 property string actionLabel: label
352 Component {
356 Component {
353− id: myEntry
357+ id: comboEntry
355 MouseArea {
359 MouseArea {
356− id: localInputArea
360+ id: comboInputArea
360− width: localButton.width
362+ width: comboButton.width
361− height: localIcon.height + units.gu(2)
363+ height: comboIcon.height + units.gu(2)
363 onClicked: {
365 onClicked: {
364 notification.notification.invokeAction(actionId)
366 notification.notification.invokeAction(actionId)
@@ -369,7 +371,7 @@ Item {
372− id: localIcon
374+ id: comboIcon
374 anchors {
376 anchors {
375 left: parent.left
377 left: parent.left
@@ -386,84 +388,23 @@ Item {
389− id: localLabel
391+ id: comboLabel
391− anchors.left: localIcon.right
393+ anchors.left: comboIcon.right
392 anchors.leftMargin: units.gu(1)
394 anchors.leftMargin: units.gu(1)
393− anchors.verticalCenter: localIcon.verticalCenter
395+ anchors.verticalCenter: comboIcon.verticalCenter
394 verticalAlignment: Text.AlignVCenter
396 verticalAlignment: Text.AlignVCenter
395− height: localIcon.height
397+ height: comboIcon.height
396 fontSize: "small"
398 fontSize: "small"
397 color: "white"
399 color: "white"
398 text: actionLabel
400 text: actionLabel
402− sourceComponent: (index > 2) ? myEntry : undefined
404+ sourceComponent: (index > 2) ? comboEntry : undefined
412− model: notification.actions
418− ListItem.ThinDivider {
428− height: localIcon.height + units.gu(2)
431− notification.notification.invokeAction(id)
439− leftMargin: units.gu(.5)
441− topMargin: units.gu(1)
442− bottom: parent.bottom
443− bottomMargin: units.gu(1)
454− anchors.left: localIcon.right
455− anchors.leftMargin: units.gu(1)
456− anchors.verticalCenter: localIcon.verticalCenter
457− verticalAlignment: Text.AlignVCenter
458− height: localIcon.height