@@ -16,11 +16,13 @@
1616
1717import QtQuick 2.0
1818import QtMultimedia 5.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.1
2020import Unity.Notifications 1.0
2121import QMenuModel 0.1
2222import Utils 0.1
2323
24+import Ubuntu.Components.ListItems 0.1 as ListItem
25+
2426Item {
2527 id: notification
2628
@@ -37,6 +39,14 @@ Item {
3739 property bool fullscreen
3840 property int maxHeight
3941 property int margins
42+ property Gradient greenGradient : Gradient {
43+ GradientStop { position: 0.0; color: "#3fb24f" }
44+ GradientStop { position: 1.0; color: "#3fb24f" }
45+ }
46+ property Gradient darkgreyGradient: Gradient {
47+ GradientStop { position: 0.0; color: "#4d4745" }
48+ GradientStop { position: 1.0; color: "#4d4745" }
49+ }
4050
4151 fullscreen: false
4252 objectName: "background"
@@ -291,7 +301,7 @@ Item {
291301 }
292302 }
293303
294− Item {
304+ Row {
295305 id: buttonRow
296306
297307 objectName: "buttonRow"
@@ -300,70 +310,8 @@ Item {
300310 right: parent.right
301311 }
302312 visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0
303− height: units.gu(5)
304−
305− property real buttonWidth: (width - contentColumn.spacing) / 2
306− property bool expanded
307−
308− Button {
309− id: leftButton
310−
311− objectName: "button1"
312− width: parent.expanded ? parent.width : parent.buttonWidth
313− anchors {
314− top: parent.top
315− bottom: parent.bottom
316− }
317− text: notification.type == Notification.SnapDecision && actionRepeater.count >= 2 ? actionRepeater.itemAt(1).actionLabel : ""
318− gradient: UbuntuColors.greyGradient
319− onClicked: {
320− if (actionRepeater.count > 2) {
321− buttonRow.expanded = !buttonRow.expanded
322− } else {
323− notification.notification.invokeAction(actionRepeater.itemAt(1).actionId)
324− }
325− }
326−
327− Behavior on width {
328− UbuntuNumberAnimation {
329− duration: UbuntuAnimation.SnapDuration
330− }
331− }
332− }
333−
334− Button {
335− id: rightButton
336−
337− objectName: "button0"
338− anchors {
339− left: leftButton.right
340− leftMargin: contentColumn.spacing
341− right: parent.right
342− }
343− text: notification.type == Notification.SnapDecision && actionRepeater.count >= 1 ? actionRepeater.itemAt(0).actionLabel : ""
344− anchors {
345− top: parent.top
346− bottom: parent.bottom
347− }
348− gradient: notification.hints["x-canonical-private-button-tint"] == "true" ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient
349− visible: width > 0
350− onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
351− }
352− }
353−
354− Column {
355− objectName: "buttonColumn"
356− spacing: contentColumn.spacing
357− anchors {
358− left: parent.left
359− right: parent.right
360− }
361−
362− // calculate initial position before Column takes over
363− y: buttonRow.y + buttonRow.height + contentColumn.spacing
364−
365− visible: notification.type == Notification.SnapDecision && buttonRow.expanded
366− height: buttonRow.expanded ? implicitHeight : 0
313+ spacing: units.gu(1)
314+ layoutDirection: Qt.RightToLeft
367315
368316 Repeater {
369317 id: actionRepeater
@@ -375,28 +323,105 @@ Item {
375323 property string actionId: id
376324 property string actionLabel: label
377325
378− anchors {
379− left: parent.left
380− right: parent.right
381− }
382−
383326 Component {
384327 id: actionButton
385328
386329 Button {
387330 objectName: "button" + index
388− anchors {
389− left: parent.left
390− right: parent.right
391− }
392−
331+ width: buttonRow.width / 2 - spacing
393332 text: loader.actionLabel
394− height: units.gu(5)
395− gradient: UbuntuColors.greyGradient
333+ gradient: notification.hints["x-canonical-private-button-tint"] == "true" && index == 0 ? greenGradient : darkgreyGradient
396334 onClicked: notification.notification.invokeAction(loader.actionId)
397335 }
398336 }
399− sourceComponent: (index == 0 || index == 1) ? undefined : actionButton
337+ sourceComponent: (index == 0 || index == 1) ? actionButton : undefined
338+ }
339+ }
340+ }
341+
342+ ComboButton {
343+ id: comboButton
344+
345+ objectName: "button2"
346+ width: parent.width
347+ visible: notification.type == Notification.SnapDecision && actionRepeater.count > 3
348+ gradient: darkgreyGradient
349+ onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
350+ expanded: false
351+ expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
352+ comboList: Flickable {
353+ // this has to be wrapped inside a flickable
354+ // to work around a feature/bug? of the
355+ // ComboButton SDK-element, making a regular
356+ // unwrapped Column item flickable
357+ // see LP: #1332590
358+ interactive: false
359+ Column {
360+ Repeater {
361+ id: comboRepeater
362+
363+ onVisibleChanged: {
364+ comboButton.text = comboRepeater.itemAt(2).actionLabel
365+ }
366+
367+ model: notification.actions
368+ delegate: Loader {
369+ id: comboLoader
370+
371+ asynchronous: true
372+ visible: status == Loader.Ready
373+ property string actionId: id
374+ property string actionLabel: label
375+ readonly property var splitLabel: actionLabel.match(/(^([-a-z0-9]+):)?(.*)$/)
376+ Component {
377+ id: comboEntry
378+
379+ MouseArea {
380+ id: comboInputArea
381+
382+ objectName: "button" + index
383+ width: comboButton.width
384+ height: comboIcon.height + units.gu(2)
385+
386+ onClicked: {
387+ notification.notification.invokeAction(actionId)
388+ }
389+
390+ ListItem.ThinDivider {
391+ visible: index > 3
392+ }
393+
394+ Icon {
395+ id: comboIcon
396+
397+ anchors {
398+ left: parent.left
399+ leftMargin: units.gu(.5)
400+ verticalCenter: parent.verticalCenter
401+ }
402+ width: units.gu(2)
403+ height: units.gu(2)
404+ color: "white"
405+ name: splitLabel[2]
406+ }
407+
408+ Label {
409+ id: comboLabel
410+
411+ anchors {
412+ left: comboIcon.right
413+ leftMargin: units.gu(1)
414+ verticalCenter: comboIcon.verticalCenter
415+ }
416+ fontSize: "small"
417+ color: "white"
418+ text: splitLabel[3]
419+ }
420+ }
421+ }
422+ sourceComponent: (index > 2) ? comboEntry : undefined
423+ }
424+ }
400425 }
401426 }
402427 }