1
=== modified file 'qml/Notifications/Notification.qml'
2
--- qml/Notifications/Notification.qml	2014-08-21 08:04:40 +0000
3
+++ qml/Notifications/Notification.qml	2014-09-05 10:04:40 +0000
4
@@ -39,19 +39,17 @@
5
39
    property bool fullscreen: false
39
    property bool fullscreen: false
6
40
    property int maxHeight
40
    property int maxHeight
7
41
    property int margins
41
    property int margins
16
42
    property Gradient greenGradient : Gradient {
42
    readonly property color red: "#fc4949"
17
43
        GradientStop { position: 0.0; color: "#3fb24f" }
43
    readonly property color green: "#3fb24f"
18
44
        GradientStop { position: 1.0; color: "#3fb24f" }
44
    readonly property color sdLightGrey: "#eaeaea"
19
45
    }
45
    readonly property color sdDarkGrey: "#dddddd"
20
46
    property Gradient darkgreyGradient: Gradient {
46
    readonly property color sdFontColor: "#5d5d5d"
21
47
        GradientStop { position: 0.0; color: "#4d4745" }
47
    readonly property real contentSpacing: units.gu(2)
14
48
        GradientStop { position: 1.0; color: "#4d4745" }
15
49
    }
22
50
48
23
51
    objectName: "background"
49
    objectName: "background"
25
52
    implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
50
    implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : outterColumn.height + contentSpacing * 2) : 0
26
53
51
28
54
    color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
52
    color: type == Notification.SnapDecision ? sdLightGrey : Qt.rgba(0.132, 0.117, 0.109, 0.97)
29
55
    opacity: 1 // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
53
    opacity: 1 // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
30
56
54
31
57
    state: {
55
    state: {
32
@@ -107,7 +105,7 @@
33
107
    states:[
105
    states:[
34
108
        State {
106
        State {
35
109
            name: "contracted"
107
            name: "contracted"
37
110
            PropertyChanges {target: notification; height: units.gu(8)}
108
            PropertyChanges {target: notification; height: units.gu(10)}
38
111
        },
109
        },
39
112
        State {
110
        State {
40
113
            name: "expanded"
111
            name: "expanded"
41
@@ -131,6 +129,7 @@
42
131
        color: parent.color
129
        color: parent.color
43
132
        opacity: parent.opacity
130
        opacity: parent.opacity
44
133
        radius: "medium"
131
        radius: "medium"
45
132
        borderSource: "none"
46
134
    }
133
    }
47
135
134
48
136
    Rectangle {
135
    Rectangle {
49
@@ -199,50 +198,41 @@
50
199
        }
198
        }
51
200
199
52
201
        Column {
200
        Column {
55
202
            id: contentColumn
201
            id: outterColumn
54
203
            objectName: "contentColumn"
56
204
202
57
205
            anchors {
203
            anchors {
58
206
                left: parent.left
204
                left: parent.left
59
207
                right: parent.right
205
                right: parent.right
60
208
                top: parent.top
206
                top: parent.top
62
209
                margins: fullscreen ? 0 : spacing
207
                margins: 0
63
208
                topMargin: fullscreen ? 0 : units.gu(2)
64
210
            }
209
            }
65
211
210
67
212
            spacing: units.gu(1)
211
            spacing: units.gu(2)
68
213
212
69
214
            Row {
213
            Row {
70
215
                id: topRow
214
                id: topRow
71
216
215
73
217
                spacing: contentColumn.spacing
216
                spacing: contentSpacing
74
218
                anchors {
217
                anchors {
75
219
                    left: parent.left
218
                    left: parent.left
76
220
                    right: parent.right
219
                    right: parent.right
77
220
                    margins: contentSpacing
78
221
                }
221
                }
79
222
222
80
223
                ShapedIcon {
223
                ShapedIcon {
81
224
                    id: icon
224
                    id: icon
82
225
225
83
226
                    objectName: "icon"
226
                    objectName: "icon"
86
227
                    width: units.gu(6)
227
                    width: type == Notification.Ephemeral && !bodyLabel.visible ? units.gu(3) : units.gu(6)
87
228
                    height: units.gu(6)
228
                    height: width
88
229
                    shaped: notification.hints["x-canonical-non-shaped-icon"] == "true" ? false : true
229
                    shaped: notification.hints["x-canonical-non-shaped-icon"] == "true" ? false : true
89
230
                    visible: iconSource !== undefined && iconSource != ""
230
                    visible: iconSource !== undefined && iconSource != ""
101
231
               }
231
                }
91
232
92
233
               Image {
93
234
                   id: secondaryIcon
94
235
95
236
                   objectName: "secondaryIcon"
96
237
                   width: units.gu(2)
97
238
                   height: units.gu(2)
98
239
                   visible: source !== undefined && source != ""
99
240
                   fillMode: Image.PreserveAspectCrop
100
241
               }
102
242
232
103
243
                Column {
233
                Column {
104
244
                    id: labelColumn
234
                    id: labelColumn
106
245
                    width: parent.width - x
235
                    width: secondaryIcon.visible ? parent.width - x - units.gu(4.5) : parent.width - x
107
246
236
108
247
                    anchors.verticalCenter: (icon.visible && !bodyLabel.visible) ? icon.verticalCenter : undefined
237
                    anchors.verticalCenter: (icon.visible && !bodyLabel.visible) ? icon.verticalCenter : undefined
109
248
238
110
@@ -255,8 +245,7 @@
111
255
                            right: parent.right
245
                            right: parent.right
112
256
                        }
246
                        }
113
257
                        fontSize: "medium"
247
                        fontSize: "medium"
116
258
                        font.bold: true
248
                        color: type == Notification.SnapDecision ? sdFontColor : Theme.palette.selected.backgroundText
115
259
                        color: Theme.palette.selected.backgroundText
117
260
                        elide: Text.ElideRight
249
                        elide: Text.ElideRight
118
261
                        textFormat: Text.PlainText
250
                        textFormat: Text.PlainText
119
262
                    }
251
                    }
120
@@ -271,14 +260,27 @@
121
271
                        }
260
                        }
122
272
                        visible: body != ""
261
                        visible: body != ""
123
273
                        fontSize: "small"
262
                        fontSize: "small"
126
274
                        color: Theme.palette.selected.backgroundText
263
                        color: type == Notification.SnapDecision ? sdFontColor : Theme.palette.selected.backgroundText
125
275
                        opacity: 0.6
127
276
                        wrapMode: Text.WordWrap
264
                        wrapMode: Text.WordWrap
129
277
                        maximumLineCount: 10
265
                        maximumLineCount: 2
130
278
                        elide: Text.ElideRight
266
                        elide: Text.ElideRight
131
279
                        textFormat: Text.PlainText
267
                        textFormat: Text.PlainText
132
280
                    }
268
                    }
133
281
                }
269
                }
134
270
135
271
                Image {
136
272
                    id: secondaryIcon
137
273
138
274
                    objectName: "secondaryIcon"
139
275
                    width: units.gu(3)
140
276
                    height: units.gu(3)
141
277
                    visible: status === Image.Ready
142
278
                    fillMode: Image.PreserveAspectCrop
143
279
                }
144
280
            }
145
281
146
282
            ListItem.ThinDivider {
147
283
                visible: type == Notification.SnapDecision
148
282
            }
284
            }
149
283
285
150
284
            Column {
286
            Column {
151
@@ -321,6 +323,74 @@
152
321
                }
323
                }
153
322
            }
324
            }
154
323
325
155
326
            Column {
156
327
                id: oneOverTwoCase
157
328
158
329
                anchors {
159
330
                    left: parent.left
160
331
                    right: parent.right
161
332
                    margins: contentSpacing
162
333
                }
163
334
164
335
                spacing: contentSpacing
165
336
166
337
                visible: notification.type == Notification.SnapDecision && oneOverTwoRepeaterTop.count == 3
167
338
168
339
                Repeater {
169
340
                    id: oneOverTwoRepeaterTop
170
341
171
342
                    model: notification.actions
172
343
                    delegate: Loader {
173
344
                        id: oneOverTwoLoaderTop
174
345
175
346
                        property string actionId: id
176
347
                        property string actionLabel: label
177
348
178
349
                        Component {
179
350
                            id: oneOverTwoButtonTop
180
351
181
352
                            Button {
182
353
                                objectName: "notify_oot_button" + index
183
354
                                width: oneOverTwoCase.width
184
355
                                text: oneOverTwoLoaderTop.actionLabel
185
356
                                color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? green : sdDarkGrey
186
357
                                onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
187
358
                            }
188
359
                        }
189
360
                        sourceComponent: index == 0 ? oneOverTwoButtonTop : undefined
190
361
                    }
191
362
                }
192
363
193
364
                Row {
194
365
                    spacing: contentSpacing
195
366
196
367
                    Repeater {
197
368
                        id: oneOverTwoRepeaterBottom
198
369
199
370
                        model: notification.actions
200
371
                        delegate: Loader {
201
372
                            id: oneOverTwoLoaderBottom
202
373
203
374
                            property string actionId: id
204
375
                            property string actionLabel: label
205
376
206
377
                            Component {
207
378
                                id: oneOverTwoButtonBottom
208
379
209
380
                                Button {
210
381
                                    objectName: "notify_oot_button" + index
211
382
                                    width: oneOverTwoCase.width / 2 - spacing * 2
212
383
                                    text: oneOverTwoLoaderBottom.actionLabel
213
384
                                    color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? red : sdDarkGrey
214
385
                                    onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
215
386
                                }
216
387
                            }
217
388
                            sourceComponent:  (index == 1 || index == 2) ? oneOverTwoButtonBottom : undefined
218
389
                        }
219
390
                    }
220
391
                }
221
392
            }
222
393
223
324
            Row {
394
            Row {
224
325
                id: buttonRow
395
                id: buttonRow
225
326
396
226
@@ -328,9 +398,10 @@
227
328
                anchors {
398
                anchors {
228
329
                    left: parent.left
399
                    left: parent.left
229
330
                    right: parent.right
400
                    right: parent.right
230
401
                    margins: contentSpacing
231
331
                }
402
                }
234
332
                visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0
403
                visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible
235
333
                spacing: units.gu(1)
404
                spacing: units.gu(2)
236
334
                layoutDirection: Qt.RightToLeft
405
                layoutDirection: Qt.RightToLeft
237
335
406
238
336
                Repeater {
407
                Repeater {
239
@@ -347,10 +418,19 @@
240
347
                            id: actionButton
418
                            id: actionButton
241
348
419
242
349
                            Button {
420
                            Button {
245
350
                                objectName: "button" + index
421
                                objectName: "notify_button" + index
246
351
                                width: buttonRow.width / 2 - spacing
422
                                width: buttonRow.width / 2 - spacing*2
247
352
                                text: loader.actionLabel
423
                                text: loader.actionLabel
249
353
                                gradient: notification.hints["x-canonical-private-button-tint"] == "true" && index == 0 ? greenGradient : darkgreyGradient
424
                                color: {
250
425
                                    var result = sdDarkGrey;
251
426
                                    if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
252
427
                                        result = green;
253
428
                                    }
254
429
                                    if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
255
430
                                        result = red;
256
431
                                    }
257
432
                                    return result;
258
433
                                }
259
354
                                onClicked: notification.notification.invokeAction(loader.actionId)
434
                                onClicked: notification.notification.invokeAction(loader.actionId)
260
355
                            }
435
                            }
261
356
                        }
436
                        }
262
@@ -362,10 +442,16 @@
263
362
            ComboButton {
442
            ComboButton {
264
363
                id: comboButton
443
                id: comboButton
265
364
444
267
365
                objectName: "button2"
445
                objectName: "notify_button2"
268
366
                width: parent.width
446
                width: parent.width
271
367
                visible: notification.type == Notification.SnapDecision && actionRepeater.count > 3
447
                anchors {
272
368
                gradient: darkgreyGradient
448
                    left: parent.left
273
449
                    right: parent.right
274
450
                    margins: contentSpacing
275
451
                }
276
452
277
453
                visible: notification.type == Notification.SnapDecision && actionRepeater.count > 3 && !oneOverTwoCase.visible
278
454
                color: sdDarkGrey
279
369
                onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
455
                onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
280
370
                expanded: false
456
                expanded: false
281
371
                expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
457
                expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
282
@@ -399,7 +485,7 @@
283
399
                                    MouseArea {
485
                                    MouseArea {
284
400
                                        id: comboInputArea
486
                                        id: comboInputArea
285
401
487
287
402
                                        objectName: "button" + index
488
                                        objectName: "notify_button" + index
288
403
                                        width: comboButton.width
489
                                        width: comboButton.width
289
404
                                        height: comboIcon.height + units.gu(2)
490
                                        height: comboIcon.height + units.gu(2)
290
405
491
291
@@ -421,7 +507,7 @@
292
421
                                            }
507
                                            }
293
422
                                            width: units.gu(2)
508
                                            width: units.gu(2)
294
423
                                            height: units.gu(2)
509
                                            height: units.gu(2)
296
424
                                            color: "white"
510
                                            color: sdFontColor
297
425
                                            name: splitLabel[2]
511
                                            name: splitLabel[2]
298
426
                                        }
512
                                        }
299
427
513
300
@@ -434,7 +520,7 @@
301
434
                                                verticalCenter: comboIcon.verticalCenter
520
                                                verticalCenter: comboIcon.verticalCenter
302
435
                                            }
521
                                            }
303
436
                                            fontSize: "small"
522
                                            fontSize: "small"
305
437
                                            color: "white"
523
                                            color: sdFontColor
306
438
                                            text: splitLabel[3]
524
                                            text: splitLabel[3]
307
439
                                        }
525
                                        }
308
440
                                    }
526
                                    }
309
441
527
310
=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
311
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-08-22 09:28:47 +0000
312
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-09-05 10:04:40 +0000
313
@@ -55,6 +55,7 @@
314
55
            anchors {
55
            anchors {
315
56
                left: parent.left
56
                left: parent.left
316
57
                right: parent.right
57
                right: parent.right
317
58
                margins: spacing
318
58
            }
59
            }
319
59
60
320
60
            Component.onCompleted: {
61
            Component.onCompleted: {
321
@@ -65,6 +66,7 @@
322
65
66
323
66
            Label {
67
            Label {
324
67
                text: menuData.label
68
                text: menuData.label
325
69
                color: notification.sdFontColor
326
68
            }
70
            }
327
69
71
328
70
            TextField {
72
            TextField {
329
@@ -98,11 +100,13 @@
330
98
                    id: checkBox
100
                    id: checkBox
331
99
101
332
100
                    checked: false
102
                    checked: false
333
103
                    activeFocusOnPress: false
334
101
                }
104
                }
335
102
105
336
103
                Label {
106
                Label {
337
104
                    anchors.verticalCenter: checkBox.verticalCenter
107
                    anchors.verticalCenter: checkBox.verticalCenter
338
105
                    text: i18n.tr("Show password")
108
                    text: i18n.tr("Show password")
339
109
                    color: notification.sdFontColor
340
106
                }
110
                }
341
107
            }
111
            }
342
108
        }
112
        }
343
109
113
344
=== modified file 'qml/Notifications/Notifications.qml'
345
--- qml/Notifications/Notifications.qml	2014-08-21 08:04:40 +0000
346
+++ qml/Notifications/Notifications.qml	2014-09-05 10:04:40 +0000
347
@@ -33,7 +33,7 @@
348
33
        id: snapDecisionProxyModel
33
        id: snapDecisionProxyModel
349
34
34
350
35
        model: notificationList.model
35
        model: notificationList.model
352
36
        filterRole: UnityNotifications.ModelInterface.RoleType
36
        filterRole: UnityNotifications.ModelInterface != undefined ? UnityNotifications.ModelInterface.RoleType : 0
353
37
        filterRegExp: RegExp(UnityNotifications.Notification.SnapDecision)
37
        filterRegExp: RegExp(UnityNotifications.Notification.SnapDecision)
354
38
    }
38
    }
355
39
39
356
40
40
357
=== modified file 'qml/Shell.qml'
358
--- qml/Shell.qml	2014-09-03 07:58:32 +0000
359
+++ qml/Shell.qml	2014-09-05 10:04:40 +0000
360
@@ -568,7 +568,7 @@
361
568
            visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
568
            visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
362
569
            color: "#000000"
569
            color: "#000000"
363
570
            anchors.fill: parent
570
            anchors.fill: parent
365
571
            opacity: 0.5
571
            opacity: 0.9
366
572
572
367
573
            MouseArea {
573
            MouseArea {
368
574
                anchors.fill: parent
574
                anchors.fill: parent
369
575
575
370
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
371
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-08-11 15:27:04 +0000
372
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-09-05 10:04:40 +0000
373
@@ -135,10 +135,7 @@
374
135
        actions = [("action_id", "dummy")]
135
        actions = [("action_id", "dummy")]
375
136
        hints = [
136
        hints = [
376
137
            ("x-canonical-switch-to-application", "true"),
137
            ("x-canonical-switch-to-application", "true"),
381
138
            (
138
            ("x-canonical-secondary-icon","dialer")
378
139
                "x-canonical-secondary-icon",
379
140
                self._get_icon_path('applicationIcons/dialer-app.png')
380
141
            )
382
142
        ]
139
        ]
383
143
140
384
144
        self._create_interactive_notification(
141
        self._create_interactive_notification(
385
@@ -170,20 +167,19 @@
386
170
        body = "Frank Zappa\n+44 (0)7736 027340"
167
        body = "Frank Zappa\n+44 (0)7736 027340"
387
171
        icon_path = self._get_icon_path('avatars/anna_olsson.png')
168
        icon_path = self._get_icon_path('avatars/anna_olsson.png')
388
172
        hints = [
169
        hints = [
393
173
            (
170
            ("x-canonical-secondary-icon", "incoming-call"),
390
174
                "x-canonical-secondary-icon",
391
175
                self._get_icon_path('applicationIcons/dialer-app.png')
392
176
            ),
394
177
            ("x-canonical-snap-decisions", "true"),
171
            ("x-canonical-snap-decisions", "true"),
395
172
            ("x-canonical-private-affirmative-tint", "true"),
396
173
            ("x-canonical-private-rejection-tint", "true"),
397
178
        ]
174
        ]
398
179
175
399
180
        actions = [
176
        actions = [
400
181
            ('action_accept', 'Hold + Answer'),
177
            ('action_accept', 'Hold + Answer'),
401
182
            ('action_decline_1', 'End + Answer'),
178
            ('action_decline_1', 'End + Answer'),
402
183
            ('action_decline_2', 'Decline'),
179
            ('action_decline_2', 'Decline'),
406
184
            ('action_decline_3', 'messages:I missed your call - can you call me now?'),
180
            ('action_decline_3', 'message:I missed your call - can you call me now?'),
407
185
            ('action_decline_4', 'messages:I\'m running late. I\'m on my way.'),
181
            ('action_decline_4', 'message:I\'m running late. I\'m on my way.'),
408
186
            ('action_decline_5', 'messages:I\'m busy at the moment. I\'ll call later.'),
182
            ('action_decline_5', 'message:I\'m busy at the moment. I\'ll call later.'),
409
187
            ('action_decline_6', 'edit:Custom'),
183
            ('action_decline_6', 'edit:Custom'),
410
188
        ]
184
        ]
411
189
185
412
@@ -204,13 +200,53 @@
413
204
        notification.pointing_device.click_object(
200
        notification.pointing_device.click_object(
414
205
            notification.select_single(objectName="combobutton_dropdown"))
201
            notification.select_single(objectName="combobutton_dropdown"))
415
206
        self.assertThat(
202
        self.assertThat(
417
207
            notification.select_single(objectName="button2").expanded,
203
            notification.select_single(objectName="notify_button2").expanded,
418
208
            Eventually(Equals(True)))
204
            Eventually(Equals(True)))
419
209
        time.sleep(2)
205
        time.sleep(2)
420
210
        notification.pointing_device.click_object(
206
        notification.pointing_device.click_object(
422
211
            notification.select_single(objectName="button4"))
207
            notification.select_single(objectName="notify_button4"))
423
212
        self.assert_notification_action_id_was_called("action_decline_4")
208
        self.assert_notification_action_id_was_called("action_decline_4")
424
213
209
425
210
426
211
    def test_sd_one_over_two_layout(self):
427
212
        """Snap-decision with three actions should use one-over two button layout."""
428
213
        unity_proxy = self.launch_unity()
429
214
        unlock_unity(unity_proxy)
430
215
431
216
        summary = "Theatre at Ferria Stadium"
432
217
        body = "at Ferria Stadium in Bilbao, Spain\n07578545317"
433
218
        hints = [
434
219
            ("x-canonical-snap-decisions", "true"),
435
220
            ("x-canonical-non-shaped-icon", "true"),
436
221
            ("x-canonical-private-affirmative-tint", "true")
437
222
        ]
438
223
439
224
        actions = [
440
225
            ('action_accept', 'Ok'),
441
226
            ('action_decline_1', 'Snooze'),
442
227
            ('action_decline_2', 'View'),
443
228
        ]
444
229
445
230
        self._create_interactive_notification(
446
231
            summary,
447
232
            body,
448
233
            None,
449
234
            "NORMAL",
450
235
            actions,
451
236
            hints
452
237
        )
453
238
454
239
        # verify and interact with the triggered snap-decision notification
455
240
        notify_list = self._get_notifications_list()
456
241
        get_notification = lambda: notify_list.wait_select_single(
457
242
            'Notification', objectName='notification1')
458
243
        notification = get_notification()
459
244
        self._assert_notification(
460
245
            notification, summary, body, False, False, 1.0)
461
246
        notification.pointing_device.click_object(
462
247
            notification.select_single(objectName="notify_oot_button0"))
463
248
        self.assert_notification_action_id_was_called("action_accept")
464
249
465
214
    def test_modal_sd_without_greeter(self):
250
    def test_modal_sd_without_greeter(self):
466
215
        """Snap-decision should block input to shell without greeter."""
251
        """Snap-decision should block input to shell without greeter."""
467
216
        unity_proxy = self.launch_unity()
252
        unity_proxy = self.launch_unity()
468
@@ -222,6 +258,8 @@
469
222
        hints = [
258
        hints = [
470
223
            ("x-canonical-snap-decisions", "true"),
259
            ("x-canonical-snap-decisions", "true"),
471
224
            ("x-canonical-non-shaped-icon", "true"),
260
            ("x-canonical-non-shaped-icon", "true"),
472
261
            ("x-canonical-private-affirmative-tint", "true"),
473
262
            ("x-canonical-private-rejection-tint", "true"),
474
225
        ]
263
        ]
475
226
264
476
227
        actions = [
265
        actions = [
477
@@ -253,7 +291,7 @@
478
253
        self._assert_notification(
291
        self._assert_notification(
479
254
            notification, summary, body, True, False, 1.0)
292
            notification, summary, body, True, False, 1.0)
480
255
        notification.pointing_device.click_object(
293
        notification.pointing_device.click_object(
482
256
            notification.select_single(objectName="button0"))
294
            notification.select_single(objectName="notify_button0"))
483
257
        self.assert_notification_action_id_was_called("action_accept")
295
        self.assert_notification_action_id_was_called("action_accept")
484
258
296
485
259
    def test_modal_sd_with_greeter(self):
297
    def test_modal_sd_with_greeter(self):
486
@@ -266,6 +304,8 @@
487
266
        hints = [
304
        hints = [
488
267
            ("x-canonical-snap-decisions", "true"),
305
            ("x-canonical-snap-decisions", "true"),
489
268
            ("x-canonical-non-shaped-icon", "true"),
306
            ("x-canonical-non-shaped-icon", "true"),
490
307
            ("x-canonical-private-affirmative-tint", "true"),
491
308
            ("x-canonical-private-rejection-tint", "true"),
492
269
        ]
309
        ]
493
270
310
494
271
        actions = [
311
        actions = [
495
@@ -296,7 +336,7 @@
496
296
        self._assert_notification(
336
        self._assert_notification(
497
297
            notification, summary, body, True, False, 1.0)
337
            notification, summary, body, True, False, 1.0)
498
298
        notification.pointing_device.click_object(
338
        notification.pointing_device.click_object(
500
299
            notification.select_single(objectName="button0"))
339
            notification.select_single(objectName="notify_button0"))
501
300
        self.assert_notification_action_id_was_called("action_accept")
340
        self.assert_notification_action_id_was_called("action_accept")
502
301
341
503
302
    def _create_interactive_notification(
342
    def _create_interactive_notification(
504
@@ -438,10 +478,7 @@
505
438
               "join me and Anna?"
478
               "join me and Anna?"
506
439
        icon_path = self._get_icon_path('avatars/anna_olsson.png')
479
        icon_path = self._get_icon_path('avatars/anna_olsson.png')
507
440
        hints = [
480
        hints = [
512
441
            (
481
            ("x-canonical-secondary-icon", "message")
509
442
                "x-canonical-secondary-icon",
510
443
                self._get_icon_path('applicationIcons/dialer-app.png')
511
444
            )
513
445
        ]
482
        ]
514
446
483
515
447
        notification = shell.create_ephemeral_notification(
484
        notification = shell.create_ephemeral_notification(
516
@@ -474,17 +511,13 @@
517
474
        notify_list = self._get_notifications_list()
511
        notify_list = self._get_notifications_list()
518
475
512
519
476
        summary = "Upload of image completed"
513
        summary = "Upload of image completed"
526
477
        hints = [
514
        icon_path = self._get_icon_path('applicationIcons/facebook.png')
527
478
            (
515
        hints=[]
522
479
                "x-canonical-secondary-icon",
523
480
                self._get_icon_path('applicationIcons/facebook.png')
524
481
            )
525
482
        ]
528
483
516
529
484
        notification = shell.create_ephemeral_notification(
517
        notification = shell.create_ephemeral_notification(
530
485
            summary,
518
            summary,
531
486
            None,
519
            None,
533
487
            None,
520
            icon_path,
534
488
            hints,
521
            hints,
535
489
            "NORMAL",
522
            "NORMAL",
536
490
        )
523
        )
537
@@ -497,8 +530,8 @@
538
497
            notification(),
530
            notification(),
539
498
            summary,
531
            summary,
540
499
            None,
532
            None,
541
533
            True,
542
500
            False,
534
            False,
543
501
            True,
544
502
            1.0
535
            1.0
545
503
        )
536
        )
546
504
537
547
@@ -683,7 +716,7 @@
548
683
        body = 'This bubble uses the icon-title-body layout with a ' \
716
        body = 'This bubble uses the icon-title-body layout with a ' \
549
684
            'secondary icon.'
717
            'secondary icon.'
550
685
        icon_path = self._get_icon_path('avatars/anna_olsson.png')
718
        icon_path = self._get_icon_path('avatars/anna_olsson.png')
552
686
        hint_icon = self._get_icon_path('applicationIcons/dialer-app.png')
719
        hint_icon = 'dialer'
553
687
720
554
688
        notification = shell.create_ephemeral_notification(
721
        notification = shell.create_ephemeral_notification(
555
689
            summary,
722
            summary,
556
@@ -718,72 +751,3 @@
557
718
        self.assertThat(get_notification, Eventually(NotEquals(None)))
751
        self.assertThat(get_notification, Eventually(NotEquals(None)))
558
719
        self._assert_notification(
752
        self._assert_notification(
559
720
            get_notification(), summary, body, False, False, 1.0)
753
            get_notification(), summary, body, False, False, 1.0)
560
721
561
722
    def test_append_hint(self):
562
723
        """Notification has to accumulate body-text using append-hint."""
563
724
        unity_proxy = self.launch_unity()
564
725
        unlock_unity(unity_proxy)
565
726
566
727
        notify_list = self._get_notifications_list()
567
728
568
729
        summary = 'Cole Raby'
569
730
        body = 'Hey Bro Coly!'
570
731
        icon_path = self._get_icon_path('avatars/amanda.png')
571
732
        body_sum = body
572
733
        notification = shell.create_ephemeral_notification(
573
734
            summary,
574
735
            body,
575
736
            icon_path,
576
737
            hints=[('x-canonical-append', 'true')]
577
738
        )
578
739
579
740
        notification.show()
580
741
581
742
        get_notification = lambda: notify_list.wait_select_single(
582
743
            'Notification', objectName='notification1')
583
744
584
745
        notification = get_notification()
585
746
        self._assert_notification(
586
747
            notification,
587
748
            summary,
588
749
            body_sum,
589
750
            True,
590
751
            False,
591
752
            1.0
592
753
        )
593
754
594
755
        bodies = [
595
756
            'What\'s up dude?',
596
757
            'Did you watch the air-race in Oshkosh last week?',
597
758
            'Phil owned the place like no one before him!',
598
759
            'Did really everything in the race work according to regulations?',
599
760
            'Somehow I think to remember Burt Williams did cut corners and '
600
761
            'was not punished for this.',
601
762
            'Hopefully the referees will watch the videos of the race.',
602
763
            'Burt could get fined with US$ 50000 for that rule-violation :)'
603
764
        ]
604
765
605
766
        for new_body in bodies:
606
767
            body = new_body
607
768
            body_sum += '\n' + body
608
769
            notification = shell.create_ephemeral_notification(
609
770
                summary,
610
771
                body,
611
772
                icon_path,
612
773
                hints=[('x-canonical-append', 'true')]
613
774
            )
614
775
            notification.show()
615
776
616
777
            get_notification = lambda: notify_list.wait_select_single(
617
778
                'Notification',
618
779
                objectName='notification1'
619
780
            )
620
781
            notification = get_notification()
621
782
            self._assert_notification(
622
783
                notification,
623
784
                summary,
624
785
                body_sum,
625
786
                True,
626
787
                False,
627
788
                1.0
628
789
            )
629
790
754
630
=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
631
--- tests/qmltests/Notifications/tst_Notifications.qml	2014-06-27 14:46:23 +0000
632
+++ tests/qmltests/Notifications/tst_Notifications.qml	2014-09-05 10:04:40 +0000
633
@@ -64,7 +64,7 @@
634
64
    function addSnapDecisionNotification() {
64
    function addSnapDecisionNotification() {
635
65
        var n = {
65
        var n = {
636
66
            type: Notification.SnapDecision,
66
            type: Notification.SnapDecision,
638
67
            hints: {"x-canonical-private-button-tint": "true"},
67
            hints: {"x-canonical-private-affirmative-tint": "true"},
639
68
            summary: "Tom Ato",
68
            summary: "Tom Ato",
640
69
            body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
69
            body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
641
70
            icon: "../graphics/avatars/funky.png",
70
            icon: "../graphics/avatars/funky.png",
642
@@ -79,6 +79,22 @@
643
79
        mockModel.append(n)
79
        mockModel.append(n)
644
80
    }
80
    }
645
81
81
646
82
    function add2over1SnapDecisionNotification() {
647
83
        var n = {
648
84
            type: Notification.SnapDecision,
649
85
            hints: {"x-canonical-private-affirmative-tint": "true",},
650
86
            summary: "Theatre at Ferria Stadium",
651
87
            body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
652
88
            icon: "",
653
89
            secondaryIcon: "",
654
90
            actions: [{ id: "ok_id", label: "Ok"},
655
91
                      { id: "snooze_id", label: "Snooze"},
656
92
                      { id: "view_id", label: "View"}]
657
93
        }
658
94
659
95
        mockModel.append(n)
660
96
    }
661
97
662
82
    function addEphemeralNotification() {
98
    function addEphemeralNotification() {
663
83
        var n = {
99
        var n = {
664
84
            type: Notification.Ephemeral,
100
            type: Notification.Ephemeral,
665
@@ -183,6 +199,12 @@
666
183
199
667
184
            Button {
200
            Button {
668
185
                width: parent.width
201
                width: parent.width
669
202
                text: "add a 2over1 snap-decision"
670
203
                onClicked: add2over1SnapDecisionNotification()
671
204
            }
672
205
673
206
            Button {
674
207
                width: parent.width
675
186
                text: "add an ephemeral"
208
                text: "add an ephemeral"
676
187
                onClicked: addEphemeralNotification()
209
                onClicked: addEphemeralNotification()
677
188
            }
210
            }
678
@@ -229,7 +251,7 @@
679
229
            {
251
            {
680
230
                tag: "Snap Decision with secondary icon and button-tint",
252
                tag: "Snap Decision with secondary icon and button-tint",
681
231
                type: Notification.SnapDecision,
253
                type: Notification.SnapDecision,
683
232
                hints: {"x-canonical-private-button-tint": "true"},
254
                hints: {"x-canonical-private-affirmative-tint": "true"},
684
233
                summary: "Tom Ato",
255
                summary: "Tom Ato",
685
234
                body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
256
                body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
686
235
                icon: "../graphics/avatars/funky.png",
257
                icon: "../graphics/avatars/funky.png",
687
@@ -250,9 +272,30 @@
688
250
                hasSound: false
272
                hasSound: false
689
251
            },
273
            },
690
252
            {
274
            {
691
275
                tag: "2-over-1 Snap Decision with button-tint",
692
276
                type: Notification.SnapDecision,
693
277
                hints: {"x-canonical-private-affirmative-tint": "true"},
694
278
                summary: "Theatre at Ferria Stadium",
695
279
                body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
696
280
                icon: "",
697
281
                secondaryIcon: "",
698
282
                actions: [{ id: "ok_id", label: "Ok"},
699
283
                          { id: "snooze_id", label: "Snooze"},
700
284
                          { id: "view_id", label: "View"}],
701
285
                summaryVisible: true,
702
286
                bodyVisible: true,
703
287
                iconVisible: false,
704
288
                shapedIcon: false,
705
289
                nonShapedIcon: false,
706
290
                secondaryIconVisible: false,
707
291
                buttonRowVisible: false,
708
292
                buttonTinted: true,
709
293
                hasSound: false
710
294
            },
711
295
            {
712
253
                tag: "Ephemeral notification - icon-summary layout",
296
                tag: "Ephemeral notification - icon-summary layout",
713
254
                type: Notification.Ephemeral,
297
                type: Notification.Ephemeral,
715
255
                hints: {"x-canonical-private-button-tint": "false"},
298
                hints: {"x-canonical-private-affirmative-tint": "false"},
716
256
                summary: "Photo upload completed",
299
                summary: "Photo upload completed",
717
257
                body: "",
300
                body: "",
718
258
                icon: "",
301
                icon: "",
719
@@ -271,7 +314,7 @@
720
271
            {
314
            {
721
272
                tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
315
                tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
722
273
                type: Notification.Ephemeral,
316
                type: Notification.Ephemeral,
724
274
                hints: {"x-canonical-private-button-tint": "false",
317
                hints: {"x-canonical-private-affirmative-tint": "false",
725
275
                        "sound-file": "dummy.ogg",
318
                        "sound-file": "dummy.ogg",
726
276
                        "suppress-sound": "true"},
319
                        "suppress-sound": "true"},
727
277
                summary: "New comment successfully published",
320
                summary: "New comment successfully published",
728
@@ -293,7 +336,7 @@
729
293
            {
336
            {
730
294
                tag: "Interactive notification",
337
                tag: "Interactive notification",
731
295
                type: Notification.Interactive,
338
                type: Notification.Interactive,
733
296
                hints: {"x-canonical-private-button-tint": "false",
339
                hints: {"x-canonical-private-affirmative-tint": "false",
734
297
                        "sound-file": "dummy.ogg"},
340
                        "sound-file": "dummy.ogg"},
735
298
                summary: "Interactive notification",
341
                summary: "Interactive notification",
736
299
                body: "This is a notification that can be clicked",
342
                body: "This is a notification that can be clicked",
737
@@ -313,7 +356,7 @@
738
313
            {
356
            {
739
314
                tag: "Snap Decision without secondary icon and no button-tint",
357
                tag: "Snap Decision without secondary icon and no button-tint",
740
315
                type: Notification.SnapDecision,
358
                type: Notification.SnapDecision,
742
316
                hints: {"x-canonical-private-button-tint": "false",
359
                hints: {"x-canonical-private-affirmative-tint": "false",
743
317
                        "sound-file": "dummy.ogg"},
360
                        "sound-file": "dummy.ogg"},
744
318
                summary: "Bro Coly",
361
                summary: "Bro Coly",
745
319
                body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
362
                body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
746
@@ -334,7 +377,7 @@
747
334
            {
377
            {
748
335
                tag: "Ephemeral notification",
378
                tag: "Ephemeral notification",
749
336
                type: Notification.Ephemeral,
379
                type: Notification.Ephemeral,
751
337
                hints: {"x-canonical-private-button-tint": "false",
380
                hints: {"x-canonical-private-affirmative-tint": "false",
752
338
                        "sound-file": "dummy.ogg"},
381
                        "sound-file": "dummy.ogg"},
753
339
                summary: "Cole Raby",
382
                summary: "Cole Raby",
754
340
                body: "I did not expect it to be that late.",
383
                body: "I did not expect it to be that late.",
755
@@ -354,9 +397,8 @@
756
354
            {
397
            {
757
355
                tag: "Ephemeral notification with non-shaped icon",
398
                tag: "Ephemeral notification with non-shaped icon",
758
356
                type: Notification.Ephemeral,
399
                type: Notification.Ephemeral,
762
357
                hints: {"x-canonical-private-button-tint": "false",
400
                hints: {"x-canonical-private-affirmative-tint": "false",
763
358
                        "x-canonical-non-shaped-icon": "true",
401
                        "x-canonical-non-shaped-icon": "true"},
761
359
                        "sound-file": "dummy.ogg"},
764
360
                summary: "Contacts",
402
                summary: "Contacts",
765
361
                body: "Synchronised contacts-database with cloud-storage.",
403
                body: "Synchronised contacts-database with cloud-storage.",
766
362
                icon: "../graphics/applicationIcons/contacts-app.png",
404
                icon: "../graphics/applicationIcons/contacts-app.png",
767
@@ -370,7 +412,7 @@
768
370
                secondaryIconVisible: false,
412
                secondaryIconVisible: false,
769
371
                buttonRowVisible: false,
413
                buttonRowVisible: false,
770
372
                buttonTinted: false,
414
                buttonTinted: false,
772
373
                hasSound: true
415
                hasSound: false
773
374
            }
416
            }
774
375
            ]
417
            ]
775
376
        }
418
        }
776
@@ -437,8 +479,8 @@
777
437
            tryCompare(audioItem, "playbackState", data.hasSound ? Audio.PlayingState : Audio.StoppedState)
479
            tryCompare(audioItem, "playbackState", data.hasSound ? Audio.PlayingState : Audio.StoppedState)
778
438
480
779
439
            if(data.buttonRowVisible) {
481
            if(data.buttonRowVisible) {
782
440
                var buttonCancel = findChild(buttonRow, "button1")
482
                var buttonCancel = findChild(buttonRow, "notify_button1")
783
441
                var buttonAccept = findChild(buttonRow, "button0")
483
                var buttonAccept = findChild(buttonRow, "notify_button0")
784
442
484
785
443
                // only test the left/cancel-button if two actions have been passed in
485
                // only test the left/cancel-button if two actions have been passed in
786
444
                if (data.actions.length == 2) {
486
                if (data.actions.length == 2) {
787
@@ -448,7 +490,7 @@
788
448
                }
490
                }
789
449
491
790
450
                // check the tinting of the positive/right button
492
                // check the tinting of the positive/right button
792
451
                verify(buttonAccept.gradient === data.buttonTinted ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient, "button has the wrong color-tint")
493
                verify(buttonAccept.color === data.buttonTinted ? "#3fb24f" : "#dddddd", "button has the wrong color-tint")
793
452
494
794
453
                // click the positive/right button
495
                // click the positive/right button
795
454
                tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
496
                tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
796
@@ -458,19 +500,19 @@
797
458
500
798
459
                // check if there's a ComboButton created due to more actions being passed
501
                // check if there's a ComboButton created due to more actions being passed
799
460
                if (data.actions.length > 2) {
502
                if (data.actions.length > 2) {
801
461
                    var comboButton = findChild(notification, "button2")
503
                    var comboButton = findChild(notification, "notify_button2")
802
462
                    tryCompareFunction(function() { return comboButton.expanded == false; }, true);
504
                    tryCompareFunction(function() { return comboButton.expanded == false; }, true);
803
463
505
804
464
                    // click to expand
506
                    // click to expand
805
465
                    tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
507
                    tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
806
466
508
807
467
                    // try clicking on choices in expanded comboList
509
                    // try clicking on choices in expanded comboList
809
468
                    var choiceButton1 = findChild(notification, "button3")
510
                    var choiceButton1 = findChild(notification, "notify_button3")
810
469
                    tryCompareFunction(function() { mouseClick(choiceButton1, choiceButton1.width / 2, choiceButton1.height / 2); return actionSpy.signalArguments.length > 0; }, true);
511
                    tryCompareFunction(function() { mouseClick(choiceButton1, choiceButton1.width / 2, choiceButton1.height / 2); return actionSpy.signalArguments.length > 0; }, true);
811
470
                    compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")
512
                    compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")
812
471
                    actionSpy.clear()
513
                    actionSpy.clear()
813
472
514
815
473
                    var choiceButton2 = findChild(notification, "button4")
515
                    var choiceButton2 = findChild(notification, "notify_button4")
816
474
                    tryCompareFunction(function() { mouseClick(choiceButton2, choiceButton2.width / 2, choiceButton2.height / 2); return actionSpy.signalArguments.length > 0; }, true);
516
                    tryCompareFunction(function() { mouseClick(choiceButton2, choiceButton2.width / 2, choiceButton2.height / 2); return actionSpy.signalArguments.length > 0; }, true);
817
475
                    compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")
517
                    compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")
818
476
                    actionSpy.clear()
518
                    actionSpy.clear()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-09-07
Daniel d'Andrada (community)		2014-07-24	Approve on 2014-09-03
Michał Sawicz			Needs Fixing on 2014-08-27
Albert Astals Cid (community)			Abstain on 2014-08-25
Review via email: mp+228090@code.launchpad.net