git.iko.soy/unity8
on xenial help sign in
Merge trunk.
ac93f95Ying-Chun Liu
debian/changelog+11
compare with xenial
unifiedsplit
@@ -1,3 +1,14 @@
1+unity8 (7.90+14.10.20140714-0ubuntu1) utopic; urgency=low
2+
3+ [ Michał Sawicz ]
4+ * Activate all results in click scope by default. (LP: #1341262)
5+
6+ [ Mirco Müller ]
7+ * Added support for utilization of the ComboButton SDK-element for
8+ snap-decision notifications with many actions.
9+
10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 14 Jul 2014 18:20:25 +0000
11+
1unity8 (7.90+14.10.20140709.2-0ubuntu1) utopic; urgency=low
12unity8 (7.90+14.10.20140709.2-0ubuntu1) utopic; urgency=low
2
13
3 [ Michal Hruby ]
14 [ Michal Hruby ]
debian/control+1−1
@@ -103,7 +103,7 @@ Package: unity8-common
103Architecture: all
103Architecture: all
104Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
104Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
105 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
105 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
106− qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
106+ qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
107 ubuntu-thumbnailer-impl-0,
107 ubuntu-thumbnailer-impl-0,
108 unity-application-impl-2,
108 unity-application-impl-2,
109 unity-notifications-impl-3,
109 unity-notifications-impl-3,
po/de.po+9−9
@@ -8,14 +8,14 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-06-06 19:34+0000\n"
11+"PO-Revision-Date: 2014-07-14 13:39+0000\n"
12"Last-Translator: Phillip Sz <Unknown>\n"
12"Last-Translator: Phillip Sz <Unknown>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-15 05:59+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17111)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -83,7 +83,7 @@ msgstr "Notruf"
83
83
84#: qml/Components/Lockscreen.qml:231
84#: qml/Components/Lockscreen.qml:231
85msgid "OK"
85msgid "OK"
86−msgstr ""
86+msgstr "OK"
87
87
88#: qml/Components/PageHeader.qml:366
88#: qml/Components/PageHeader.qml:366
89msgid "Recent searches"
89msgid "Recent searches"
@@ -100,11 +100,11 @@ msgstr "Hallo"
100
100
101#: qml/Components/PinLockscreen.qml:198
101#: qml/Components/PinLockscreen.qml:198
102msgid "CANCEL"
102msgid "CANCEL"
103−msgstr ""
103+msgstr "ABBRECHEN"
104
104
105#: qml/Components/PinLockscreen.qml:216
105#: qml/Components/PinLockscreen.qml:216
106msgid "DONE"
106msgid "DONE"
107−msgstr ""
107+msgstr "ERLEDIGT"
108
108
109#: qml/Components/SeeMore.qml:35
109#: qml/Components/SeeMore.qml:35
110msgid "See more"
110msgid "See more"
@@ -176,7 +176,7 @@ msgstr ""
176
176
177#: qml/Panel/Indicators/MenuItemFactory.qml:587
177#: qml/Panel/Indicators/MenuItemFactory.qml:587
178msgid "Downloading"
178msgid "Downloading"
179−msgstr ""
179+msgstr "Wird heruntergeladen"
180
180
181#: qml/Panel/Indicators/MenuItemFactory.qml:589
181#: qml/Panel/Indicators/MenuItemFactory.qml:589
182msgid "Paused, tap to resume"
182msgid "Paused, tap to resume"
@@ -184,11 +184,11 @@ msgstr ""
184
184
185#: qml/Panel/Indicators/MenuItemFactory.qml:591
185#: qml/Panel/Indicators/MenuItemFactory.qml:591
186msgid "Canceled"
186msgid "Canceled"
187−msgstr ""
187+msgstr "Abgebrochen"
188
188
189#: qml/Panel/Indicators/MenuItemFactory.qml:593
189#: qml/Panel/Indicators/MenuItemFactory.qml:593
190msgid "Finished"
190msgid "Finished"
191−msgstr ""
191+msgstr "Erledigt"
192
192
193#: qml/Panel/Indicators/MenuItemFactory.qml:595
193#: qml/Panel/Indicators/MenuItemFactory.qml:595
194msgid "Failed, tap to retry"
194msgid "Failed, tap to retry"
po/es.po+11−11
@@ -8,23 +8,23 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-06-26 03:08+0000\n"
11+"PO-Revision-Date: 2014-07-12 05:24+0000\n"
12"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
12"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-13 06:33+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17111)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Anclar"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Desanclar"
28
28
29#: qml/Components/EdgeDemoOverlay.qml:151
29#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
30msgid "Skip intro"
@@ -172,27 +172,27 @@ msgstr "Escriba el PIN de la SIM"
172
172
173#: qml/Panel/Indicators/MenuItemFactory.qml:583
173#: qml/Panel/Indicators/MenuItemFactory.qml:583
174msgid "In queue…"
174msgid "In queue…"
175−msgstr ""
175+msgstr "En espera…"
176
176
177#: qml/Panel/Indicators/MenuItemFactory.qml:587
177#: qml/Panel/Indicators/MenuItemFactory.qml:587
178msgid "Downloading"
178msgid "Downloading"
179−msgstr ""
179+msgstr "Descargando"
180
180
181#: qml/Panel/Indicators/MenuItemFactory.qml:589
181#: qml/Panel/Indicators/MenuItemFactory.qml:589
182msgid "Paused, tap to resume"
182msgid "Paused, tap to resume"
183−msgstr ""
183+msgstr "Pausado, toque para reanudar"
184
184
185#: qml/Panel/Indicators/MenuItemFactory.qml:591
185#: qml/Panel/Indicators/MenuItemFactory.qml:591
186msgid "Canceled"
186msgid "Canceled"
187−msgstr ""
187+msgstr "Cancelado"
188
188
189#: qml/Panel/Indicators/MenuItemFactory.qml:593
189#: qml/Panel/Indicators/MenuItemFactory.qml:593
190msgid "Finished"
190msgid "Finished"
191−msgstr ""
191+msgstr "Finalizado"
192
192
193#: qml/Panel/Indicators/MenuItemFactory.qml:595
193#: qml/Panel/Indicators/MenuItemFactory.qml:595
194msgid "Failed, tap to retry"
194msgid "Failed, tap to retry"
195−msgstr ""
195+msgstr "Falló, toque para reintentar"
196
196
197#: qml/Panel/SearchIndicator.qml:27
197#: qml/Panel/SearchIndicator.qml:27
198msgid "Search"
198msgid "Search"
po/nb.po+11−11
@@ -8,23 +8,23 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-06-11 06:36+0000\n"
11+"PO-Revision-Date: 2014-07-11 07:01+0000\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-12 06:58+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17111)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Fest snarvei"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Fjern snarvei"
28
28
29#: qml/Components/EdgeDemoOverlay.qml:151
29#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
30msgid "Skip intro"
@@ -169,27 +169,27 @@ msgstr "Skriv inn PIN-koden til SIM-kortet"
169
169
170#: qml/Panel/Indicators/MenuItemFactory.qml:583
170#: qml/Panel/Indicators/MenuItemFactory.qml:583
171msgid "In queue…"
171msgid "In queue…"
172−msgstr ""
172+msgstr "I kø …"
173
173
174#: qml/Panel/Indicators/MenuItemFactory.qml:587
174#: qml/Panel/Indicators/MenuItemFactory.qml:587
175msgid "Downloading"
175msgid "Downloading"
176−msgstr ""
176+msgstr "Laster ned"
177
177
178#: qml/Panel/Indicators/MenuItemFactory.qml:589
178#: qml/Panel/Indicators/MenuItemFactory.qml:589
179msgid "Paused, tap to resume"
179msgid "Paused, tap to resume"
180−msgstr ""
180+msgstr "Satt på pause (trykk for å fortsette)"
181
181
182#: qml/Panel/Indicators/MenuItemFactory.qml:591
182#: qml/Panel/Indicators/MenuItemFactory.qml:591
183msgid "Canceled"
183msgid "Canceled"
184−msgstr ""
184+msgstr "Avbrutt"
185
185
186#: qml/Panel/Indicators/MenuItemFactory.qml:593
186#: qml/Panel/Indicators/MenuItemFactory.qml:593
187msgid "Finished"
187msgid "Finished"
188−msgstr ""
188+msgstr "Ferdig"
189
189
190#: qml/Panel/Indicators/MenuItemFactory.qml:595
190#: qml/Panel/Indicators/MenuItemFactory.qml:595
191msgid "Failed, tap to retry"
191msgid "Failed, tap to retry"
192−msgstr ""
192+msgstr "Feilet. Trykk for å prøve på nytt"
193
193
194#: qml/Panel/SearchIndicator.qml:27
194#: qml/Panel/SearchIndicator.qml:27
195msgid "Search"
195msgid "Search"
po/uk.po+11−11
@@ -8,23 +8,23 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-06-08 19:09+0000\n"
11+"PO-Revision-Date: 2014-07-13 17:03+0000\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-14 07:10+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17111)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Заблокувати кнопку"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Розблокувати кнопку"
28
28
29#: qml/Components/EdgeDemoOverlay.qml:151
29#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
30msgid "Skip intro"
@@ -172,27 +172,27 @@ msgstr "Введіть PIN-код SIM-картки"
172
172
173#: qml/Panel/Indicators/MenuItemFactory.qml:583
173#: qml/Panel/Indicators/MenuItemFactory.qml:583
174msgid "In queue…"
174msgid "In queue…"
175−msgstr ""
175+msgstr "У черзі…"
176
176
177#: qml/Panel/Indicators/MenuItemFactory.qml:587
177#: qml/Panel/Indicators/MenuItemFactory.qml:587
178msgid "Downloading"
178msgid "Downloading"
179−msgstr ""
179+msgstr "Отримуємо"
180
180
181#: qml/Panel/Indicators/MenuItemFactory.qml:589
181#: qml/Panel/Indicators/MenuItemFactory.qml:589
182msgid "Paused, tap to resume"
182msgid "Paused, tap to resume"
183−msgstr ""
183+msgstr "Призупинено, торкніться, щоб поновити"
184
184
185#: qml/Panel/Indicators/MenuItemFactory.qml:591
185#: qml/Panel/Indicators/MenuItemFactory.qml:591
186msgid "Canceled"
186msgid "Canceled"
187−msgstr ""
187+msgstr "Скасовано"
188
188
189#: qml/Panel/Indicators/MenuItemFactory.qml:593
189#: qml/Panel/Indicators/MenuItemFactory.qml:593
190msgid "Finished"
190msgid "Finished"
191−msgstr ""
191+msgstr "Завершено"
192
192
193#: qml/Panel/Indicators/MenuItemFactory.qml:595
193#: qml/Panel/Indicators/MenuItemFactory.qml:595
194msgid "Failed, tap to retry"
194msgid "Failed, tap to retry"
195−msgstr ""
195+msgstr "Помилка, торкніться, щоб повторити спробу"
196
196
197#: qml/Panel/SearchIndicator.qml:27
197#: qml/Panel/SearchIndicator.qml:27
198msgid "Search"
198msgid "Search"
qml/Dash/GenericScopeView.qml+1−1
@@ -193,7 +193,7 @@ FocusScope {
193 Connections {
193 Connections {
194 target: rendererLoader.item
194 target: rendererLoader.item
195 onClicked: {
195 onClicked: {
196− if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && (categoryId == "local" || categoryId == "store"))) {
196+ if (scopeView.scope.id === "scopes" || scopeView.scope.id == "clickscope") {
197 // TODO Technically it is possible that calling activate() will make the scope emit
197 // TODO Technically it is possible that calling activate() will make the scope emit
198 // previewRequested so that we show a preview but there's no scope that does that yet
198 // previewRequested so that we show a preview but there's no scope that does that yet
199 // so it's not implemented
199 // so it's not implemented
qml/Notifications/Notification.qml+104−79
@@ -16,11 +16,13 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.1
20import Unity.Notifications 1.0
20import Unity.Notifications 1.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Utils 0.1
22import Utils 0.1
23
23
24+import Ubuntu.Components.ListItems 0.1 as ListItem
25+
24Item {
26Item {
25 id: notification
27 id: notification
26
28
@@ -37,6 +39,14 @@ Item {
37 property bool fullscreen
39 property bool fullscreen
38 property int maxHeight
40 property int maxHeight
39 property int margins
41 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+ }
40
50
41 fullscreen: false
51 fullscreen: false
42 objectName: "background"
52 objectName: "background"
@@ -291,7 +301,7 @@ Item {
291 }
301 }
292 }
302 }
293
303
294− Item {
304+ Row {
295 id: buttonRow
305 id: buttonRow
296
306
297 objectName: "buttonRow"
307 objectName: "buttonRow"
@@ -300,70 +310,8 @@ Item {
300 right: parent.right
310 right: parent.right
301 }
311 }
302 visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0
312 visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0
303− height: units.gu(5)
313+ spacing: units.gu(1)
304−
314+ layoutDirection: Qt.RightToLeft
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
367
315
368 Repeater {
316 Repeater {
369 id: actionRepeater
317 id: actionRepeater
@@ -375,28 +323,105 @@ Item {
375 property string actionId: id
323 property string actionId: id
376 property string actionLabel: label
324 property string actionLabel: label
377
325
378− anchors {
379− left: parent.left
380− right: parent.right
381− }
382−
383 Component {
326 Component {
384 id: actionButton
327 id: actionButton
385
328
386 Button {
329 Button {
387 objectName: "button" + index
330 objectName: "button" + index
388− anchors {
331+ width: buttonRow.width / 2 - spacing
389− left: parent.left
390− right: parent.right
391− }
392−
393 text: loader.actionLabel
332 text: loader.actionLabel
394− height: units.gu(5)
333+ gradient: notification.hints["x-canonical-private-button-tint"] == "true" && index == 0 ? greenGradient : darkgreyGradient
395− gradient: UbuntuColors.greyGradient
396 onClicked: notification.notification.invokeAction(loader.actionId)
334 onClicked: notification.notification.invokeAction(loader.actionId)
397 }
335 }
398 }
336 }
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+ }
400 }
425 }
401 }
426 }
402 }
427 }
tests/autopilot/unity8/shell/tests/test_notifications.py+10−13
@@ -178,11 +178,13 @@ class InteractiveNotificationBase(NotificationsBase):
178 ]
178 ]
179
179
180 actions = [
180 actions = [
181− ('action_accept', 'Accept'),
181+ ('action_accept', 'Hold + Answer'),
182− ('action_decline_1', 'Decline'),
182+ ('action_decline_1', 'End + Answer'),
183− ('action_decline_2', '"Can\'t talk now, what\'s up?"'),
183+ ('action_decline_2', 'Decline'),
184− ('action_decline_3', '"I call you back."'),
184+ ('action_decline_3', 'messages:I missed your call - can you call me now?'),
185− ('action_decline_4', 'Send custom message...'),
185+ ('action_decline_4', 'messages:I\'m running late. I\'m on my way.'),
186+ ('action_decline_5', 'messages:I\'m busy at the moment. I\'ll call later.'),
187+ ('action_decline_6', 'edit:Custom'),
186 ]
188 ]
187
189
188 self._create_interactive_notification(
190 self._create_interactive_notification(
@@ -200,14 +202,9 @@ class InteractiveNotificationBase(NotificationsBase):
200 notification = get_notification()
202 notification = get_notification()
201 self._assert_notification(notification, summary, body, True, True, 1.0)
203 self._assert_notification(notification, summary, body, True, True, 1.0)
202 initial_height = notification.height
204 initial_height = notification.height
203− self.touch.tap_object(notification.select_single(objectName="button1"))
205+ self.touch.tap_object(notification.select_single(objectName="combobutton_dropdown"))
204− self.assertThat(
206+ self.assertThat(notification.select_single(objectName="button2").expanded, Eventually(Equals(True)))
205− notification.height,
207+ time.sleep(2)
206− Eventually(Equals(initial_height +
207− 3 * notification.select_single(
208− objectName="buttonColumn").spacing +
209− 3 * notification.select_single(
210− objectName="button4").height)))
211 self.touch.tap_object(notification.select_single(objectName="button4"))
208 self.touch.tap_object(notification.select_single(objectName="button4"))
212 self.assert_notification_action_id_was_called("action_decline_4")
209 self.assert_notification_action_id_was_called("action_decline_4")
213
210
tests/qmltests/Dash/tst_GenericScopeView.qml+4−4
@@ -56,7 +56,7 @@ Item {
56 property Item previewListView: findChild(genericScopeView, "previewListView")
56 property Item previewListView: findChild(genericScopeView, "previewListView")
57
57
58 function init() {
58 function init() {
59− genericScopeView.scope = scopes.getScope(2)
59+ genericScopeView.scope = scopes.getScope(1)
60 shell.width = units.gu(120)
60 shell.width = units.gu(120)
61 genericScopeView.categoryView.positionAtBeginning();
61 genericScopeView.categoryView.positionAtBeginning();
62 tryCompare(genericScopeView.categoryView, "contentY", 0)
62 tryCompare(genericScopeView.categoryView, "contentY", 0)
@@ -76,13 +76,13 @@ Item {
76
76
77 function test_showDash() {
77 function test_showDash() {
78 testCase.previewListView.open = true;
78 testCase.previewListView.open = true;
79− scopes.getScope(2).showDash();
79+ scopes.getScope(1).showDash();
80 tryCompare(testCase.previewListView, "open", false);
80 tryCompare(testCase.previewListView, "open", false);
81 }
81 }
82
82
83 function test_hideDash() {
83 function test_hideDash() {
84 testCase.previewListView.open = true;
84 testCase.previewListView.open = true;
85− scopes.getScope(2).hideDash();
85+ scopes.getScope(1).hideDash();
86 tryCompare(testCase.previewListView, "open", false);
86 tryCompare(testCase.previewListView, "open", false);
87 }
87 }
88
88
@@ -99,8 +99,8 @@ Item {
99
99
100 function test_changeScope() {
100 function test_changeScope() {
101 genericScopeView.scope.searchQuery = "test"
101 genericScopeView.scope.searchQuery = "test"
102− genericScopeView.scope = scopes.getScope(1)
103 genericScopeView.scope = scopes.getScope(2)
102 genericScopeView.scope = scopes.getScope(2)
103+ genericScopeView.scope = scopes.getScope(1)
104 tryCompare(genericScopeView.scope, "searchQuery", "test")
104 tryCompare(genericScopeView.scope, "searchQuery", "test")
105 }
105 }
106
106
tests/qmltests/Notifications/tst_Notifications.qml+18−23
@@ -72,8 +72,8 @@ Row {
72 actions: [{ id: "ok_id", label: "Ok"},
72 actions: [{ id: "ok_id", label: "Ok"},
73 { id: "cancel_id", label: "Cancel"},
73 { id: "cancel_id", label: "Cancel"},
74 { id: "notreally_id", label: "Not really"},
74 { id: "notreally_id", label: "Not really"},
75− { id: "noway_id", label: "No way"},
75+ { id: "noway_id", label: "messages:No way"},
76− { id: "nada_id", label: "Nada"}]
76+ { id: "nada_id", label: "messages:Nada"}]
77 }
77 }
78
78
79 mockModel.append(n)
79 mockModel.append(n)
@@ -237,8 +237,8 @@ Row {
237 actions: [{ id: "ok_id", label: "Ok"},
237 actions: [{ id: "ok_id", label: "Ok"},
238 { id: "cancel_id", label: "Cancel"},
238 { id: "cancel_id", label: "Cancel"},
239 { id: "notreally_id", label: "Not really"},
239 { id: "notreally_id", label: "Not really"},
240− { id: "noway_id", label: "No way"},
240+ { id: "noway_id", label: "messages:No way"},
241− { id: "nada_id", label: "Nada"}],
241+ { id: "nada_id", label: "messages:Nada"}],
242 summaryVisible: true,
242 summaryVisible: true,
243 bodyVisible: true,
243 bodyVisible: true,
244 iconVisible: true,
244 iconVisible: true,
@@ -456,32 +456,27 @@ Row {
456 actionSpy.clear()
456 actionSpy.clear()
457 waitForRendering(notification)
457 waitForRendering(notification)
458
458
459− // check if there's more than one negative choice
459+ // check if there's a ComboButton created due to more actions being passed
460 if (data.actions.length > 2) {
460 if (data.actions.length > 2) {
461− var initialHeight = notification.implicitHeight
461+ var comboButton = findChild(notification, "button2")
462+ tryCompareFunction(function() { return comboButton.expanded == false; }, true);
462
463
463 // click to expand
464 // click to expand
464− mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
465+ tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
466+
467+ // try clicking on choices in expanded comboList
465− var contentColumn = findChild(notification, "contentColumn")
468+ var choiceButton1 = findChild(notification, "button3")
466− var collapsedContentColumnHeight = contentColumn.height;
469+ tryCompareFunction(function() { mouseClick(choiceButton1, choiceButton1.width / 2, choiceButton1.height / 2); return actionSpy.signalArguments.length > 0; }, true);
467− // Waiting for the inner column to change height because buttons appear
470+ compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")
468− tryCompareFunction(function() { return collapsedContentColumnHeight != contentColumn.height; }, true);
469− // Waiting for notification to reach its target size
470− tryCompare(notification, "height", contentColumn.height + contentColumn.spacing * 2)
471 actionSpy.clear()
471 actionSpy.clear()
472
472
473− // test the additional buttons
473+ var choiceButton2 = findChild(notification, "button4")
474− for (var i = 2; i < data.actions.length; i++) {
474+ tryCompareFunction(function() { mouseClick(choiceButton2, choiceButton2.width / 2, choiceButton2.height / 2); return actionSpy.signalArguments.length > 0; }, true);
475− var buttonColumn = findChild(notification, "buttonColumn")
476− var button = findChild(buttonColumn, "button" + i)
477− mouseClick(button, button.width / 2, button.height / 2)
478− compare(actionSpy.signalArguments[0][0], data.actions[i]["id"], "got wrong id for additional negative action")
475+ compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")
479− actionSpy.clear()
476+ actionSpy.clear()
480− }
481
477
482 // click to collapse
478 // click to collapse
483− mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
479+ //tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == false; }, true);
484− tryCompare(notification, "height", initialHeight)
485 } else {
480 } else {
486 mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
481 mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
487 compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
482 compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")