@@ -327,38 +327,40 @@ Item {
327327 }
328328
329329 ComboButton {
330− id: localButton
330+ id: comboButton
331331
332332 width: parent.width
333333 visible: notification.type == Notification.SnapDecision && actionRepeater.count > 4
334334 gradient: darkgreyGradient
335− onClicked: notification.notification.invokeAction(localRepeater.itemAt(2).actionId)
335+ onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
336336 expanded: false
337− expandedHeight: (localRepeater.count) * units.gu(5) + units.gu(.5)
337+ expandedHeight: (comboRepeater.count) * units.gu(5)
338338 comboList: Column {
339339 Repeater {
340− id: localRepeater
340+ id: comboRepeater
341341
342342 Component.onCompleted: {
343343 // an assignment is ok here, since this
344344 // label is static and does not change
345− localButton.text = localRepeater.itemAt(2).actionLabel
345+ comboButton.text = comboRepeater.itemAt(2).actionLabel
346346 }
347347
348348 model: notification.actions
349349 delegate: Loader {
350+ id: comboLoader
351+
352+ asynchronous: true
353+ visible: status == Loader.Ready
350354 property string actionId: id
351355 property string actionLabel: label
352356 Component {
353− id: myEntry
357+ id: comboEntry
354358
355359 MouseArea {
356− id: localInputArea
360+ id: comboInputArea
357361
358− x: localIcon.x
359− y: localIcon.y
360− width: localButton.width
361− height: localIcon.height + units.gu(2)
362+ width: comboButton.width
363+ height: comboIcon.height + units.gu(2)
362364
363365 onClicked: {
364366 notification.notification.invokeAction(actionId)
@@ -369,7 +371,7 @@ Item {
369371 }
370372
371373 Icon {
372− id: localIcon
374+ id: comboIcon
373375
374376 anchors {
375377 left: parent.left
@@ -386,84 +388,23 @@ Item {
386388 }
387389
388390 Label {
389− id: localLabel
391+ id: comboLabel
390392
391− anchors.left: localIcon.right
393+ anchors.left: comboIcon.right
392394 anchors.leftMargin: units.gu(1)
393− anchors.verticalCenter: localIcon.verticalCenter
395+ anchors.verticalCenter: comboIcon.verticalCenter
394396 verticalAlignment: Text.AlignVCenter
395− height: localIcon.height
397+ height: comboIcon.height
396398 fontSize: "small"
397399 color: "white"
398400 text: actionLabel
399401 }
400402 }
401403 }
402− sourceComponent: (index > 2) ? myEntry : undefined
404+ sourceComponent: (index > 2) ? comboEntry : undefined
403405 }
404406 }
405407 }
406− /*ListView {
407− id: myView
408−
409− width: parent.width
410− interactive: false
411−
412− model: notification.actions
413− delegate: Column {
414− id: myDelegate
415−
416− width: parent.width
417−
418− ListItem.ThinDivider {
419− visible: index != 0
420− }
421−
422− MouseArea {
423− id: localInputArea
424−
425− x: localIcon.x
426− y: localIcon.y
427− width: parent.width
428− height: localIcon.height + units.gu(2)
429−
430− onClicked: {
431− notification.notification.invokeAction(id)
432− }
433−
434− Icon {
435− id: localIcon
436−
437− anchors {
438− left: parent.left
439− leftMargin: units.gu(.5)
440− top: parent.top
441− topMargin: units.gu(1)
442− bottom: parent.bottom
443− bottomMargin: units.gu(1)
444− }
445− width: units.gu(2)
446− height: units.gu(2)
447− name: "messages"
448− color: "white"
449− }
450−
451− Label {
452− id: localLabel
453−
454− anchors.left: localIcon.right
455− anchors.leftMargin: units.gu(1)
456− anchors.verticalCenter: localIcon.verticalCenter
457− verticalAlignment: Text.AlignVCenter
458− height: localIcon.height
459− fontSize: "small"
460− color: "white"
461− text: label
462− }
463− }
464−
465− }
466− }*/
467408 }
468409 }
469410 }