1
=== modified file 'src/qml/KeyboardRectangle.qml'
2
--- src/qml/KeyboardRectangle.qml	2014-07-25 16:22:54 +0000
3
+++ src/qml/KeyboardRectangle.qml	2014-08-12 15:32:18 +0000
4
@@ -16,7 +16,7 @@
5
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
6
17
 */
17
 */
7
18
18
9
19
import QtQuick 2.0
19
import QtQuick 2.2
10
20
20
11
21
Item {
21
Item {
12
22
    id: keyboardRect
22
    id: keyboardRect
13
23
23
14
=== modified file 'src/qml/MMS/MMSBase.qml'
15
--- src/qml/MMS/MMSBase.qml	2014-07-31 19:58:34 +0000
16
+++ src/qml/MMS/MMSBase.qml	2014-08-12 15:32:18 +0000
17
@@ -16,82 +16,13 @@
18
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
17
 */
17
 */
20
18
import QtQuick 2.2
18
import QtQuick 2.2
21
19
import Ubuntu.Components 1.1
22
20
import Ubuntu.Contacts 0.1
23
21
19
25
22
ListItemWithActions {
20
Item {
26
23
    id: baseDelegate
21
    id: baseDelegate
27
24
22
28
25
    property var attachment
23
    property var attachment
100
26
    property bool parentSelected: false
24
    property string previewer
101
27
    property bool incoming
25
    property bool incoming: false
102
28
    property bool showInfo: false
26
    property bool lastItem: false
103
29
27
    property string timestamp
33
30
    signal itemRemoved()
34
31
    signal attachmentClicked()
35
32
36
33
    function checkClick(bubble, mouse) {
37
34
        var itemX1 = bubble.x
38
35
        var itemX2 = itemX1+bubble.width
39
36
        var itemY1 = bubble.y
40
37
        var itemY2 = itemY1+bubble.height
41
38
        if (mouse.x >= itemX1 && mouse.x <= itemX2 &&
42
39
            mouse.y >= itemY1 && mouse.y <= itemY2) {
43
40
            return true
44
41
        }
45
42
        return false
46
43
    }
47
44
48
45
    Component.onCompleted: {
49
46
        visibleAttachments++
50
47
    }
51
48
    Component.onDestruction:  {
52
49
        visibleAttachments--
53
50
    }
54
51
55
52
    leftSideAction: Action {
56
53
        iconName: "delete"
57
54
        text: i18n.tr("Delete")
58
55
        onTriggered: baseDelegate.itemRemoved()
59
56
    }
60
57
61
58
    internalAnchors {
62
59
        topMargin: 0
63
60
        bottomMargin: 0
64
61
    }
65
62
66
63
    color: parentSelected ? selectedColor : Theme.palette.normal.background
67
64
    states: [
68
65
        State {
69
66
            when: incoming
70
67
            name: "incoming"
71
68
            AnchorChanges {
72
69
                target: bubble
73
70
                anchors.left: parent.left
74
71
                anchors.right: undefined
75
72
            }
76
73
            PropertyChanges {
77
74
                target: bubble
78
75
                anchors.leftMargin: units.gu(1)
79
76
                anchors.rightMargin: 0
80
77
            }
81
78
        },
82
79
        State {
83
80
            when: !incoming
84
81
            name: "outgoing"
85
82
            AnchorChanges {
86
83
                target: bubble
87
84
                anchors.left: undefined
88
85
                anchors.right: parent.right
89
86
            }
90
87
            PropertyChanges {
91
88
                target: bubble
92
89
                anchors.leftMargin: 0
93
90
                anchors.rightMargin: units.gu(1)
94
91
            }
95
92
        }
96
93
    ]
97
94
98
95
    onSwippingChanged: messageList.updateSwippedItem(baseDelegate)
99
96
    onSwipeStateChanged: messageList.updateSwippedItem(baseDelegate)
104
97
}
28
}
105
98
29
106
=== modified file 'src/qml/MMS/MMSContact.qml'
107
--- src/qml/MMS/MMSContact.qml	2014-07-31 19:01:23 +0000
108
+++ src/qml/MMS/MMSContact.qml	2014-08-12 15:32:18 +0000
109
@@ -16,93 +16,73 @@
110
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
111
17
 */
17
 */
112
18
18
115
19
import QtQuick 2.0
19
import QtQuick 2.2
116
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.1
117
21
import Ubuntu.Contacts 0.1
21
import Ubuntu.Contacts 0.1
119
22
import ".."
22
import Ubuntu.History 0.1
120
23
23
121
24
MMSBase {
24
MMSBase {
122
25
    id: vcardDelegate
25
    id: vcardDelegate
179
26
    property string previewer: "MMS/PreviewerContact.qml"
26
180
27
    onItemClicked: {
27
    readonly property bool error: (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
181
28
        if (checkClick(bubble, mouse)) {
28
    readonly property bool sending: (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||
182
29
            attachmentClicked()
29
                                     textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !incoming
183
30
        }
30
184
31
    }
31
    previewer: "MMS/PreviewerContact.qml"
185
32
    states: [
32
    height: units.gu(8)
186
33
        State {
33
    width: units.gu(27)
187
34
            name: "incoming"
34
188
35
            AnchorChanges {
35
    Rectangle {
133
36
                target: bubble
134
37
                anchors.left: parent.left
135
38
                anchors.right: undefined
136
39
            }
137
40
            PropertyChanges {
138
41
                target: bubble
139
42
                anchors.leftMargin: units.gu(1)
140
43
                anchors.rightMargin: units.gu(1)
141
44
            }
142
45
            AnchorChanges {
143
46
                target: contactName
144
47
                anchors.left: bubble.right
145
48
                anchors.right: undefined
146
49
            }
147
50
            PropertyChanges {
148
51
                target: contactName
149
52
                anchors.leftMargin: units.gu(2)
150
53
                anchors.rightMargin: units.gu(2)
151
54
            }
152
55
        },
153
56
        State {
154
57
            name: "outgoing"
155
58
            AnchorChanges {
156
59
                target: bubble
157
60
                anchors.left: undefined
158
61
                anchors.right: parent.right
159
62
            }
160
63
            PropertyChanges {
161
64
                target: bubble
162
65
                anchors.leftMargin: units.gu(1)
163
66
                anchors.rightMargin: units.gu(1)
164
67
            }
165
68
            AnchorChanges {
166
69
                target: contactName
167
70
                anchors.left: undefined
168
71
                anchors.right: bubble.left
169
72
            }
170
73
            PropertyChanges {
171
74
                target: contactName
172
75
                anchors.leftMargin: units.gu(2)
173
76
                anchors.rightMargin: units.gu(2)
174
77
            }
175
78
        }
176
79
    ]
177
80
    height: bubble.height + units.gu(2)
178
81
    Item {
189
82
        id: bubble
36
        id: bubble
193
83
        anchors.top: parent.top
37
194
84
        width: avatar.width
38
        anchors.fill: parent
195
85
        height: avatar.height
39
        color: {
196
40
            if (error) {
197
41
                return "#fc4949"
198
42
            } else if (sending) {
199
43
                return "#b2b2b2"
200
44
            } else if (incoming) {
201
45
                return "#ffffff"
202
46
            } else {
203
47
                return "#3fb24f"
204
48
            }
205
49
        }
206
50
        radius: height * 0.1
207
51
208
86
        ContactAvatar {
52
        ContactAvatar {
209
87
            id: avatar
53
            id: avatar
210
88
54
211
55
            anchors {
212
56
                top: parent.top
213
57
                topMargin: units.gu(1)
214
58
                bottom: parent.bottom
215
59
                bottomMargin: units.gu(1)
216
60
                left: parent.left
217
61
                leftMargin: units.gu(1)
218
62
            }
219
89
            fallbackAvatarUrl: "image://theme/contact"
63
            fallbackAvatarUrl: "image://theme/contact"
220
90
            fallbackDisplayName: contactName.name
64
            fallbackDisplayName: contactName.name
237
91
            anchors.centerIn: parent
65
            width: height
238
92
            height: units.gu(6)
66
        }
239
93
            width: units.gu(6)
67
240
94
        }
68
        Label {
241
95
    }
69
            id: contactName
242
96
    Label {
70
243
97
        id: contactName
71
            property string name: application.contactNameFromVCard(attachment.filePath)
244
98
        property string name: application.contactNameFromVCard(attachment.filePath)
72
245
99
        anchors.bottom: bubble.bottom
73
            anchors {
246
100
        anchors.left: incoming ? bubble.right : undefined
74
                left: avatar.right
247
101
        anchors.right: !incoming ? bubble.left : undefined
75
                leftMargin: units.gu(1)
248
102
        anchors.rightMargin: !incoming ? units.gu(1) : undefined
76
                top: avatar.top
249
103
        anchors.leftMargin: incoming ? units.gu(1) : undefined
77
                bottom: avatar.bottom
250
104
        text: name !== "" ? name : i18n.tr("Unknown contact")
78
                right: parent.right
251
105
        height: paintedHeight
79
                rightMargin: units.gu(1)
252
106
        width: paintedWidth
80
            }
253
81
254
82
            verticalAlignment: Text.AlignVCenter
255
83
            text: name !== "" ? name : i18n.tr("Unknown contact")
256
84
            elide: Text.ElideRight
257
85
            color: vcardDelegate.incoming ? UbuntuColors.darkGrey : "#ffffff"
258
86
        }
259
107
    }
87
    }
260
108
}
88
}
261
109
89
262
=== modified file 'src/qml/MMS/MMSDefault.qml'
263
--- src/qml/MMS/MMSDefault.qml	2014-07-31 19:01:23 +0000
264
+++ src/qml/MMS/MMSDefault.qml	2014-08-12 15:32:18 +0000
265
@@ -16,54 +16,16 @@
266
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
267
17
 */
17
 */
268
18
18
271
19
import QtQuick 2.0
19
import QtQuick 2.2
272
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.1
273
21
import ".."
21
import ".."
274
22
22
275
23
MMSBase {
23
MMSBase {
276
24
    id: defaultDelegate
24
    id: defaultDelegate
281
25
    property var attachment
25
278
26
    property bool incoming
279
27
    property string previewer: ""
280
28
    property string textColor: incoming ? "#333333" : "#ffffff"
282
29
    anchors.left: parent.left
26
    anchors.left: parent.left
283
30
    anchors.right: parent.right
27
    anchors.right: parent.right
284
31
    onItemClicked: {
285
32
        if (checkClick(bubble, mouse)) {
286
33
            attachmentClicked()
287
34
        }
288
35
    }
289
36
    state: incoming ? "incoming" : "outgoing"
290
37
    states: [
291
38
        State {
292
39
            name: "incoming"
293
40
            AnchorChanges {
294
41
                target: bubble
295
42
                anchors.left: parent.left
296
43
                anchors.right: undefined
297
44
            }
298
45
            PropertyChanges {
299
46
                target: bubble
300
47
                anchors.leftMargin: units.gu(1)
301
48
                anchors.rightMargin: units.gu(1)
302
49
            }
303
50
        },
304
51
        State {
305
52
            name: "outgoing"
306
53
            AnchorChanges {
307
54
                target: bubble
308
55
                anchors.left: undefined
309
56
                anchors.right: parent.right
310
57
            }
311
58
            PropertyChanges {
312
59
                target: bubble
313
60
                anchors.leftMargin: units.gu(1)
314
61
                anchors.rightMargin: units.gu(1)
315
62
            }
316
63
        }
317
64
    ]
318
65
    height: bubble.height + units.gu(1)
28
    height: bubble.height + units.gu(1)
319
66
    clip: true
320
67
    Item {
29
    Item {
321
68
        id: bubble
30
        id: bubble
322
69
        anchors.top: parent.top
31
        anchors.top: parent.top
323
70
32
324
=== modified file 'src/qml/MMS/MMSImage.qml'
325
--- src/qml/MMS/MMSImage.qml	2014-07-31 19:01:23 +0000
326
+++ src/qml/MMS/MMSImage.qml	2014-08-12 15:32:18 +0000
327
@@ -16,27 +16,19 @@
328
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
329
17
 */
17
 */
330
18
18
332
19
import QtQuick 2.0
19
import QtQuick 2.2
333
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
334
21
import Ubuntu.Contacts 0.1
335
22
import ".."
336
23
21
337
24
MMSBase {
22
MMSBase {
338
25
    id: imageDelegate
23
    id: imageDelegate
339
26
    property string previewer: "MMS/PreviewerImage.qml"
340
27
    onItemClicked: {
341
28
        if (checkClick(bubble, mouse)) {
342
29
            attachmentClicked()
343
30
        }
344
31
    }
345
32
24
346
25
    previewer: "MMS/PreviewerImage.qml"
347
33
    height: imageAttachment.height
26
    height: imageAttachment.height
348
27
    width: imageAttachment.width
349
28
350
34
    UbuntuShape {
29
    UbuntuShape {
351
35
        id: bubble
30
        id: bubble
356
36
        anchors {
31
        anchors.top: parent.top
353
37
            top: parent.top
354
38
            bottom: parent.bottom
355
39
        }
357
40
        width: image.width
32
        width: image.width
358
41
        height: image.height
33
        height: image.height
359
42
34
360
@@ -49,16 +41,42 @@
361
49
            smooth: true
41
            smooth: true
362
50
            source: attachment.filePath
42
            source: attachment.filePath
363
51
            visible: false
43
            visible: false
375
52
        }
44
            asynchronous: true
376
53
    }
45
377
54
46
            onStatusChanged:  {
378
55
    Loader {
47
                if (status === Image.Error) {
379
56
        active: (index == visibleAttachments-1) && !incoming && mmsText == "" && (inProgress || failed)
48
                    source = "image://theme/image-missing"
380
57
        visible: active
49
                    width = 128
381
58
        height: active ? item.height : 0
50
                    height = 128
382
59
        sourceComponent: statusIcon
51
                }
383
60
        anchors.right: bubble.left
52
            }
384
61
        anchors.rightMargin: units.gu(1)
53
        }
385
62
        anchors.verticalCenter: bubble.verticalCenter
54
386
55
        Rectangle {
387
56
            visible: imageDelegate.lastItem
388
57
            gradient: Gradient {
389
58
                GradientStop { position: 0.0; color: "transparent" }
390
59
                GradientStop { position: 1.0; color: "gray" }
391
60
            }
392
61
393
62
            anchors {
394
63
                bottom: parent.bottom
395
64
                left: parent.left
396
65
                right: parent.right
397
66
            }
398
67
            height: units.gu(2)
399
68
            radius: bubble.height * 0.1
400
69
            Label {
401
70
                anchors{
402
71
                    left: parent.left
403
72
                    bottom: parent.bottom
404
73
                    leftMargin: incoming ? units.gu(2) : units.gu(1)
405
74
                    bottomMargin: units.gu(0.5)
406
75
                }
407
76
                fontSize: "xx-small"
408
77
                text: Qt.formatDateTime(timestamp, "hh:mm AP")
409
78
                color: "white"
410
79
            }
411
80
        }
412
63
    }
81
    }
413
64
}
82
}
414
65
83
415
=== modified file 'src/qml/MMS/MMSVideo.qml'
416
--- src/qml/MMS/MMSVideo.qml	2014-07-31 19:01:23 +0000
417
+++ src/qml/MMS/MMSVideo.qml	2014-08-12 15:32:18 +0000
418
@@ -16,54 +16,19 @@
419
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
420
17
 */
17
 */
421
18
18
424
19
import QtQuick 2.0
19
import QtQuick 2.2
425
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.1
426
21
import QtMultimedia 5.0
21
import QtMultimedia 5.0
427
22
import ".."
22
import ".."
428
23
23
429
24
MMSBase {
24
MMSBase {
430
25
    id: videoDelegate
25
    id: videoDelegate
434
26
    property var attachment
26
435
27
    property bool incoming
27
    previewer: "MMS/PreviewerVideo.qml"
433
28
    property string previewer: "MMS/PreviewerVideo.qml"
436
29
    anchors.left: parent.left
28
    anchors.left: parent.left
437
30
    anchors.right: parent.right
29
    anchors.right: parent.right
438
31
    onItemClicked: {
439
32
        if (checkClick(bubble, mouse)) {
440
33
            attachmentClicked()
441
34
        }
442
35
    }
443
36
    state: incoming ? "incoming" : "outgoing"
444
37
    states: [
445
38
        State {
446
39
            name: "incoming"
447
40
            AnchorChanges {
448
41
                target: bubble
449
42
                anchors.left: parent.left
450
43
                anchors.right: undefined
451
44
            }
452
45
            PropertyChanges {
453
46
                target: bubble
454
47
                anchors.leftMargin: units.gu(1)
455
48
                anchors.rightMargin: units.gu(1)
456
49
            }
457
50
        },
458
51
        State {
459
52
            name: "outgoing"
460
53
            AnchorChanges {
461
54
                target: bubble
462
55
                anchors.left: undefined
463
56
                anchors.right: parent.right
464
57
            }
465
58
            PropertyChanges {
466
59
                target: bubble
467
60
                anchors.leftMargin: units.gu(1)
468
61
                anchors.rightMargin: units.gu(1)
469
62
            }
470
63
        }
471
64
    ]
472
65
    height: bubble.height + units.gu(1)
30
    height: bubble.height + units.gu(1)
474
66
    clip: true
31
475
67
    Item {
32
    Item {
476
68
        id: bubble
33
        id: bubble
477
69
        anchors.top: parent.top
34
        anchors.top: parent.top
478
70
35
479
=== modified file 'src/qml/MMS/Previewer.qml'
480
--- src/qml/MMS/Previewer.qml	2014-06-13 19:39:49 +0000
481
+++ src/qml/MMS/Previewer.qml	2014-08-12 15:32:18 +0000
482
@@ -16,8 +16,8 @@
483
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
484
17
 */
17
 */
485
18
18
488
19
import QtQuick 2.0
19
import QtQuick 2.2
489
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.1
490
21
import Ubuntu.Content 0.1
21
import Ubuntu.Content 0.1
491
22
import ".."
22
import ".."
492
23
23
493
24
24
494
=== modified file 'src/qml/MMS/PreviewerContact.qml'
495
--- src/qml/MMS/PreviewerContact.qml	2014-07-30 18:23:16 +0000
496
+++ src/qml/MMS/PreviewerContact.qml	2014-08-12 15:32:18 +0000
497
@@ -16,12 +16,14 @@
498
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
499
17
 */
17
 */
500
18
18
503
19
import QtQuick 2.0
19
import QtQuick 2.2
504
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.1
505
21
import Ubuntu.Content 0.1
21
import Ubuntu.Content 0.1
506
22
import ".."
22
import ".."
507
23
23
508
24
Previewer {
24
Previewer {
510
25
    title: application.contactNameFromVCard(attachment.filePath)
25
    property string contactName: application.contactNameFromVCard(attachment.filePath)
511
26
512
27
    title: contactName !== "" ? contactName : i18n.tr("Unknown contact")
513
26
    clip: true
28
    clip: true
514
27
}
29
}
515
28
30
516
=== modified file 'src/qml/MMS/PreviewerImage.qml'
517
--- src/qml/MMS/PreviewerImage.qml	2014-06-13 19:39:49 +0000
518
+++ src/qml/MMS/PreviewerImage.qml	2014-08-12 15:32:18 +0000
519
@@ -16,8 +16,8 @@
520
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
521
17
 */
17
 */
522
18
18
525
19
import QtQuick 2.0
19
import QtQuick 2.2
526
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.1
527
21
import Ubuntu.Content 0.1
21
import Ubuntu.Content 0.1
528
22
import ".."
22
import ".."
529
23
23
530
24
24
531
=== modified file 'src/qml/MMS/PreviewerVideo.qml'
532
--- src/qml/MMS/PreviewerVideo.qml	2014-05-30 21:16:51 +0000
533
+++ src/qml/MMS/PreviewerVideo.qml	2014-08-12 15:32:18 +0000
534
@@ -16,8 +16,8 @@
535
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
536
17
 */
17
 */
537
18
18
540
19
import QtQuick 2.0
19
import QtQuick 2.2
541
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.1
542
21
import QtMultimedia 5.0
21
import QtMultimedia 5.0
543
22
import ".."
22
import ".."
544
23
23
545
24
24
546
=== added file 'src/qml/MMSDelegate.qml'
547
--- src/qml/MMSDelegate.qml	1970-01-01 00:00:00 +0000
548
+++ src/qml/MMSDelegate.qml	2014-08-12 15:32:18 +0000
549
@@ -0,0 +1,198 @@
550
1
/*
551
2
 * Copyright 2012, 2013, 2014 Canonical Ltd.
552
3
 *
553
4
 * This file is part of messaging-app.
554
5
 *
555
6
 * messaging-app is free software; you can redistribute it and/or modify
556
7
 * it under the terms of the GNU General Public License as published by
557
8
 * the Free Software Foundation; version 3.
558
9
 *
559
10
 * messaging-app is distributed in the hope that it will be useful,
560
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
561
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
562
13
 * GNU General Public License for more details.
563
14
 *
564
15
 * You should have received a copy of the GNU General Public License
565
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
566
17
 */
567
18
568
19
import QtQuick 2.2
569
20
import Ubuntu.Components 1.1
570
21
571
22
MessageDelegate {
572
23
    id: root
573
24
574
25
    property var dataAttachments: []
575
26
    property var textAttachements: []
576
27
577
28
    function clicked(mouse)
578
29
    {
579
30
        var childPoint = root.mapToItem(attachmentsView, mouse.x, mouse.y)
580
31
        var attachment = attachmentsView.childAt(childPoint.x, childPoint.y)
581
32
        if (attachment && attachment.item && attachment.item.previewer) {
582
33
            var properties = {}
583
34
            properties["attachment"] = attachment.item.attachment
584
35
            mainStack.push(Qt.resolvedUrl(attachment.item.previewer), properties)
585
36
        }
586
37
    }
587
38
588
39
    function deleteMessage()
589
40
    {
590
41
        eventModel.removeEvent(accountId, threadId, eventId, type)
591
42
    }
592
43
593
44
    function resendMessage()
594
45
    {
595
46
        var newAttachments = []
596
47
        for (var i = 0; i < attachments.length; i++) {
597
48
            var attachment = []
598
49
            var item = textMessageAttachments[i]
599
50
            // we dont include smil files. they will be auto generated
600
51
            if (item.contentType.toLowerCase() === "application/smil") {
601
52
                continue
602
53
            }
603
54
            attachment.push(item.attachmentId)
604
55
            attachment.push(item.contentType)
605
56
            attachment.push(item.filePath)
606
57
            newAttachments.push(attachment)
607
58
        }
608
59
        eventModel.removeEvent(accountId, threadId, eventId, type)
609
60
        chatManager.sendMMS(participants, textMessage, newAttachments, messages.accountId)
610
61
    }
611
62
612
63
    function copyMessage()
613
64
    {
614
65
        if (bubble.visible) {
615
66
            Clipboard.push(bubble.messageText)
616
67
        }
617
68
    }
618
69
619
70
    onAttachmentsChanged: {
620
71
        dataAttachments = []
621
72
        textAttachements = []
622
73
        for (var i=0; i < attachments.length; i++) {
623
74
            var attachment = attachments[i]
624
75
            if (startsWith(attachment.contentType, "text/plain") ) {
625
76
                textAttachements.push(attachment)
626
77
            } else if (startsWith(attachment.contentType, "image/")) {
627
78
                dataAttachments.push({"type": "image",
628
79
                                      "data": attachment,
629
80
                                      "delegateSource": "MMS/MMSImage.qml",
630
81
                                    })
631
82
            } else if (startsWith(attachment.contentType, "video/")) {
632
83
                        // TODO: implement proper video attachment support
633
84
                        //                dataAttachments.push({type: "video",
634
85
                        //                                  data: attachment,
635
86
                        //                                  delegateSource: "MMS/MMSVideo.qml",
636
87
                        //                                 })
637
88
            } else if (startsWith(attachment.contentType, "application/smil") ||
638
89
                       startsWith(attachment.contentType, "application/x-smil")) {
639
90
                        // TODO: implement support for this kind of attachment
640
91
                        //                dataAttachments.push({type: "application",
641
92
                        //                                  data: attachment,
642
93
                        //                                  delegateSource: "",
643
94
                        //                                 })
644
95
            } else if (startsWith(attachment.contentType, "text/vcard") ||
645
96
                       startsWith(attachment.contentType, "text/x-vcard")) {
646
97
                dataAttachments.push({"type": "vcard",
647
98
                                      "data": attachment,
648
99
                                      "delegateSource": "MMS/MMSContact.qml"
649
100
                                    })
650
101
            } else {
651
102
                console.log("No MMS render for " + attachment.contentType)
652
103
            }
653
104
        }
654
105
    }
655
106
    height: attachmentsView.height
656
107
    _lastItem: bubble.visible ? bubble : attachmentsRepeater.itemAt(attachmentsRepeater - 1)
657
108
    Column {
658
109
        id: attachmentsView
659
110
660
111
        anchors {
661
112
            top: parent.top
662
113
            left: parent.left
663
114
            right: parent.right
664
115
        }
665
116
        height: childrenRect.height
666
117
667
118
        Repeater {
668
119
            id: attachmentsRepeater
669
120
            model: dataAttachments
670
121
671
122
            Loader {
672
123
                id: attachmentLoader
673
124
                asynchronous: true
674
125
                states: [
675
126
                    State {
676
127
                        when: root.incoming
677
128
                        name: "incoming"
678
129
                        AnchorChanges {
679
130
                            target: attachmentLoader
680
131
                            anchors.left: parent.left
681
132
                        }
682
133
                        PropertyChanges {
683
134
                            target: attachmentLoader
684
135
                            anchors.leftMargin: units.gu(1)
685
136
                            anchors.rightMargin: 0
686
137
                        }
687
138
                    },
688
139
                    State {
689
140
                        when: !root.incoming
690
141
                        name: "outgoing"
691
142
                        AnchorChanges {
692
143
                            target: attachmentLoader
693
144
                            anchors.right: parent.right
694
145
                        }
695
146
                        PropertyChanges {
696
147
                            target: attachmentLoader
697
148
                            anchors.leftMargin: 0
698
149
                            anchors.rightMargin: units.gu(1)
699
150
                        }
700
151
                    }
701
152
                ]
702
153
703
154
                Component.onCompleted: {
704
155
                    var initialProperties = {
705
156
                        "incoming": root.incoming,
706
157
                        "attachment": modelData.data,
707
158
                        "timestamp": timestamp,
708
159
                        "lastItem": (index === (attachmentsRepeater.count - 1)) && (textAttachements.length === 0)
709
160
                    }
710
161
                    setSource(modelData.delegateSource, initialProperties)
711
162
                }
712
163
            }
713
164
        }
714
165
715
166
        // TODO: is possible to have more than one text ???
716
167
        MessageBubble {
717
168
            id: bubble
718
169
719
170
            property string textData: application.readTextFile(root.textAttachements[0].filePath)
720
171
721
172
            states: [
722
173
                State {
723
174
                    when: root.incoming
724
175
                    name: "incoming"
725
176
                    AnchorChanges {
726
177
                        target: bubble
727
178
                        anchors.left: parent.left
728
179
                    }
729
180
                },
730
181
                State {
731
182
                    name: "outgoing"
732
183
                    when: !root.incoming
733
184
                    AnchorChanges {
734
185
                        target: bubble
735
186
                        anchors.right: parent.right
736
187
                    }
737
188
                }
738
189
            ]
739
190
            visible: (root.textAttachements.length > 0)
740
191
            messageText: textData.length > 0 ? textData : i18n.tr("Missing message data")
741
192
            messageTimeStamp: root.timestamp
742
193
            messageStatus: textMessageStatus
743
194
            messageIncoming: root.incoming
744
195
            accountName: root.accountLabel
745
196
        }
746
197
    }
747
198
}
748
0
199
749
=== modified file 'src/qml/MainPage.qml'
750
--- src/qml/MainPage.qml	2014-08-12 15:32:18 +0000
751
+++ src/qml/MainPage.qml	2014-08-12 15:32:18 +0000
752
@@ -16,7 +16,7 @@
753
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
754
17
 */
17
 */
755
18
18
757
19
import QtQuick 2.0
19
import QtQuick 2.2
758
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
759
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
760
22
import Ubuntu.History 0.1
22
import Ubuntu.History 0.1
761
23
23
762
=== modified file 'src/qml/MessageBubble.qml'
763
--- src/qml/MessageBubble.qml	2014-08-01 02:36:29 +0000
764
+++ src/qml/MessageBubble.qml	2014-08-12 15:32:18 +0000
765
@@ -27,15 +27,16 @@
766
27
    id: root
27
    id: root
767
28
28
768
29
    property int messageStatus: -1
29
    property int messageStatus: -1
770
30
    property bool incoming: false
30
    property bool messageIncoming: false
771
31
    property alias sender: senderName.text
31
    property alias sender: senderName.text
772
32
    property string messageText
32
    property string messageText
773
33
    property var messageTimeStamp
33
    property var messageTimeStamp
775
34
    property int maxDelegateWidth: units.gu(30)
34
    property int maxDelegateWidth: units.gu(27)
776
35
    property string accountName
777
35
36
778
36
    readonly property bool error: (messageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
37
    readonly property bool error: (messageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
779
37
    readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
38
    readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
781
38
                                     messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !incoming
39
                                     messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !messageIncoming
782
39
40
783
40
    function selectBubble() {
41
    function selectBubble() {
784
41
        var fileName = "assets/conversation_";
42
        var fileName = "assets/conversation_";
785
@@ -43,7 +44,7 @@
786
43
            fileName += "error.sci"
44
            fileName += "error.sci"
787
44
        } else if (sending) {
45
        } else if (sending) {
788
45
            fileName += "pending.sci"
46
            fileName += "pending.sci"
790
46
        } else if (incoming) {
47
        } else if (messageIncoming) {
791
47
            fileName += "incoming.sci";
48
            fileName += "incoming.sci";
792
48
        } else {
49
        } else {
793
49
            fileName += "outgoing.sci";
50
            fileName += "outgoing.sci";
794
@@ -63,11 +64,11 @@
795
63
        return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
64
        return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
796
64
    }
65
    }
797
65
66
799
66
    onIncomingChanged: source = selectBubble()
67
    onMessageIncomingChanged: source = selectBubble()
800
67
    source: selectBubble()
68
    source: selectBubble()
802
68
    height: childrenRect.height + units.gu(2)
69
    height: senderName.height + textLabel.height + textTimestamp.height + units.gu(3)
803
69
    width:  Math.min(units.gu(27),
70
    width:  Math.min(units.gu(27),
805
70
                     Math.max(textLabel.text.length, textTimestamp.text.length) * units.gu(1))
71
                     Math.max(textLabel.contentWidth, textTimestamp.contentWidth))
806
71
            + border.left + border.right
72
            + border.left + border.right
807
72
    Label {
73
    Label {
808
73
        id: senderName
74
        id: senderName
809
@@ -76,7 +77,7 @@
810
76
            top: parent.top
77
            top: parent.top
811
77
            topMargin: units.gu(1)
78
            topMargin: units.gu(1)
812
78
            left: parent.left
79
            left: parent.left
814
79
            leftMargin: incoming ? units.gu(2) : units.gu(1)
80
            leftMargin: root.messageIncoming ? units.gu(2) : units.gu(1)
815
80
        }
81
        }
816
81
        height: text === "" ? 0 : paintedHeight
82
        height: text === "" ? 0 : paintedHeight
817
82
        fontSize: "large"
83
        fontSize: "large"
818
@@ -91,17 +92,15 @@
819
91
            top: sender == "" ? parent.top : senderName.bottom
92
            top: sender == "" ? parent.top : senderName.bottom
820
92
            topMargin: units.gu(1)
93
            topMargin: units.gu(1)
821
93
            left: parent.left
94
            left: parent.left
825
94
            leftMargin: incoming ? units.gu(2) : units.gu(1)
95
            leftMargin: root.messageIncoming ? units.gu(2) : units.gu(1)
823
95
            right: parent.right
824
96
            rightMargin: incoming ? units.gu(1) : units.gu(1)
826
97
        }
96
        }
827
98
        width: maxDelegateWidth
97
        width: maxDelegateWidth
828
99
        fontSize: "medium"
98
        fontSize: "medium"
830
100
        height: text === "" ? 0 : paintedHeight
99
        height: contentHeight
831
101
        onLinkActivated:  Qt.openUrlExternally(link)
100
        onLinkActivated:  Qt.openUrlExternally(link)
832
102
        text: root.parseText(messageText)
101
        text: root.parseText(messageText)
833
103
        wrapMode: Text.Wrap
102
        wrapMode: Text.Wrap
835
104
        color: root.incoming ? UbuntuColors.darkGrey : "white"
103
        color: root.messageIncoming ? UbuntuColors.darkGrey : "white"
836
105
    }
104
    }
837
106
105
838
107
    Label {
106
    Label {
839
@@ -110,16 +109,25 @@
840
110
109
841
111
        anchors{
110
        anchors{
842
112
            top: textLabel.bottom
111
            top: textLabel.bottom
844
113
            topMargin: units.gu(0.5)
112
            topMargin: units.gu(1)
845
114
            left: parent.left
113
            left: parent.left
847
115
            leftMargin: incoming ? units.gu(2) : units.gu(1)
114
            leftMargin: root.messageIncoming ? units.gu(2) : units.gu(1)
848
116
        }
115
        }
849
117
116
850
118
        visible: !root.sending
117
        visible: !root.sending
852
119
        height: visible ? paintedHeight : 0
118
        height: units.gu(2)
853
119
        width: visible ? maxDelegateWidth : 0
854
120
        fontSize: "xx-small"
120
        fontSize: "xx-small"
858
121
        color: root.incoming ? UbuntuColors.lightGrey : "white"
121
        color: root.messageIncoming ? UbuntuColors.lightGrey : "white"
859
122
        opacity: root.incoming ? 1.0 : 0.8
122
        opacity: root.messageIncoming ? 1.0 : 0.8
860
123
        text: Qt.formatDateTime(messageTimeStamp, "hh:mm AP")
123
        elide: Text.ElideRight
861
124
        text: {
862
125
            var str = Qt.formatDateTime(messageTimeStamp, "hh:mm AP")
863
126
            if (root.accountName.length === 0) {
864
127
                return str
865
128
            }
866
129
            str += " @ %1".arg(root.accountName)
867
130
            return str
868
131
        }
869
124
    }
132
    }
870
125
}
133
}
871
126
134
872
=== added file 'src/qml/MessageDateSection.qml'
873
--- src/qml/MessageDateSection.qml	1970-01-01 00:00:00 +0000
874
+++ src/qml/MessageDateSection.qml	2014-08-12 15:32:18 +0000
875
@@ -0,0 +1,38 @@
876
1
/*
877
2
 * Copyright 2012, 2013, 2014 Canonical Ltd.
878
3
 *
879
4
 * This file is part of messaging-app.
880
5
 *
881
6
 * messaging-app is free software; you can redistribute it and/or modify
882
7
 * it under the terms of the GNU General Public License as published by
883
8
 * the Free Software Foundation; version 3.
884
9
 *
885
10
 * messaging-app is distributed in the hope that it will be useful,
886
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
887
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
888
13
 * GNU General Public License for more details.
889
14
 *
890
15
 * You should have received a copy of the GNU General Public License
891
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
892
17
 */
893
18
894
19
import QtQuick 2.2
895
20
import Ubuntu.Components 1.1
896
21
import Ubuntu.Components.ListItems 0.1 as ListItem
897
22
898
23
Item {
899
24
    property alias text: label.text
900
25
901
26
    height: units.gu(3)
902
27
    Label {
903
28
        id: label
904
29
905
30
        anchors.fill: parent
906
31
        elide: Text.ElideRight
907
32
        verticalAlignment: Text.AlignVCenter
908
33
        fontSize: "small"
909
34
    }
910
35
    ListItem.ThinDivider {
911
36
        anchors.bottom: parent.bottom
912
37
    }
913
38
}
914
0
39
915
=== modified file 'src/qml/MessageDelegate.qml'
916
--- src/qml/MessageDelegate.qml	2014-07-31 19:58:54 +0000
917
+++ src/qml/MessageDelegate.qml	2014-08-12 15:32:18 +0000
918
@@ -16,242 +16,46 @@
919
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
920
17
 */
17
 */
921
18
18
931
19
import QtQuick 2.0
19
import QtQuick 2.2
923
20
import Ubuntu.Components 1.1
924
21
import Ubuntu.Components.Popups 0.1
925
22
import Ubuntu.History 0.1
926
23
import Ubuntu.Telephony 0.1
927
24
import Ubuntu.Content 0.1
928
25
import Ubuntu.Contacts 0.1
929
26
930
27
import "dateUtils.js" as DateUtils
932
28
20
933
29
Item {
21
Item {
934
30
    id: messageDelegate
22
    id: messageDelegate
1161
31
23
    objectName: "messageDelegate"
1162
32
    property alias incoming: bubble.incoming
24
1163
33
    property string textColor: incoming ? "#333333" : "white"
25
    property bool incoming
1164
34
    property bool unread: false
26
    property var attachments
1165
35
    property variant activeAttachment
27
    property string accountId
1166
36
    property string mmsText: ""
28
    property var threadId
1167
37
    property string mmsTextId: ""
29
    property var eventId
1168
38
    property string accountLabel: ""
30
    property var type
1169
39
    property bool selectionMode: false
31
    property string text
1170
40
    property bool selected: false
32
    property var timestamp
1171
41
    property bool inProgress: (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||
33
    property string accountLabel
1172
42
                               textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed)
34
    property var _lastItem: messageDelegate
1173
43
    property bool failed: (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
35
1174
44
    property int visibleAttachments: 0
36
1175
45
37
    function deleteMessage()
1176
46
    signal resend()
38
    {
1177
47
    signal itemPressAndHold(QtObject obj)
39
        //virtual implemented by each Message type
1178
48
    signal itemClicked(QtObject obj)
40
    }
1179
49
41
1180
50
    anchors {
42
    function copyMessage()
1181
51
        left: parent ? parent.left : undefined
43
    {
1182
52
        right: parent ? parent.right: undefined
44
        //virtual implemented by each Message type
1183
53
    }
45
    }
1184
54
    height: attachments.height + bubbleItem.height
46
1185
55
47
    function resendMessage()
1186
56
    Component {
48
    {
1187
57
        id: statusIcon
49
        //virtual implemented by each Message type
1188
58
        Item {
50
    }
1189
59
            height: units.gu(4)
51
1190
60
            width: units.gu(4)
52
    function showMessageDetails(mouse)
1191
61
            visible: !incoming && !messageDelegate.selectionMode
53
    {
1192
62
            ActivityIndicator {
54
        //virtual implemented by each Message type
1193
63
                id: indicator
55
    }
1194
64
56
1195
65
                anchors.centerIn: parent
57
    function clicked(mouse)
1196
66
                height: units.gu(2)
58
    {
1197
67
                width: units.gu(2)
59
        //virtual implemented by each Message type
1198
68
                visible: running && !selectionMode
60
    }
973
69
                // if temporarily failed or unknown status, then show the spinner
974
70
                running: inProgress
975
71
            }
976
72
977
73
            Item {
978
74
                id: retrybutton
979
75
980
76
                anchors.fill: parent
981
77
                Icon {
982
78
                    id: icon
983
79
984
80
                    name: "reload"
985
81
                    color: "red"
986
82
                    height: units.gu(2)
987
83
                    width: units.gu(2)
988
84
                    anchors {
989
85
                        centerIn: parent
990
86
                        verticalCenterOffset: units.gu(-1)
991
87
                    }
992
88
                }
993
89
994
90
                Label {
995
91
                    text: i18n.tr("Failed!")
996
92
                    fontSize: "small"
997
93
                    color: "red"
998
94
                    anchors {
999
95
                        horizontalCenter: retrybutton.horizontalCenter
1000
96
                        top: icon.bottom
1001
97
                    }
1002
98
                }
1003
99
                visible: failed
1004
100
                MouseArea {
1005
101
                    id: retrybuttonMouseArea
1006
102
1007
103
                    anchors.fill: parent
1008
104
                    onClicked: messageDelegate.resend()
1009
105
                }
1010
106
            }
1011
107
        }
1012
108
    }
1013
109
1014
110
    Column {
1015
111
        id: attachments
1016
112
        anchors {
1017
113
            top: parent.top
1018
114
            left: parent.left
1019
115
            right: parent.right
1020
116
        }
1021
117
        height: childrenRect.height
1022
118
        Repeater {
1023
119
            id: attachmentsRepeater
1024
120
1025
121
            model: textMessageAttachments
1026
122
            Loader {
1027
123
                anchors {
1028
124
                    left: parent ? parent.left : undefined
1029
125
                    right: parent ? parent.right : undefined
1030
126
                }
1031
127
                height: item ? item.height : 0
1032
128
                source: {
1033
129
                    if (startsWith(modelData.contentType, "image/")) {
1034
130
                        return "MMS/MMSImage.qml"
1035
131
                    } else if (startsWith(modelData.contentType, "video/")) {
1036
132
                        return "MMS/MMSVideo.qml"
1037
133
                    } else if (startsWith(modelData.contentType, "application/smil") ||
1038
134
                              startsWith(modelData.contentType, "application/x-smil")) {
1039
135
                        return ""
1040
136
                    } else if (startsWith(modelData.contentType, "text/plain") ) {
1041
137
                        mmsText = application.readTextFile(modelData.filePath)
1042
138
                        mmsTextId = modelData.attachmentId
1043
139
                        return ""
1044
140
                    } else if (startsWith(modelData.contentType, "text/vcard") ||
1045
141
                              startsWith(modelData.contentType, "text/x-vcard")) {
1046
142
                        return "MMS/MMSContact.qml"
1047
143
                    } else {
1048
144
                        console.log("No MMS render for " + modelData.contentType)
1049
145
                        return "MMS/MMSDefault.qml"
1050
146
                    }
1051
147
                }
1052
148
                onStatusChanged: {
1053
149
                    if (status == Loader.Ready) {
1054
150
                        item.attachment = modelData
1055
151
                        item.incoming = incoming
1056
152
                    }
1057
153
                }
1058
154
                Connections {
1059
155
                    target: item
1060
156
                    onItemRemoved: {
1061
157
                        eventModel.removeEventAttachment(accountId, threadId, eventId, type, modelData.attachmentId)
1062
158
                        if (visibleAttachments == 1 && mmsText === "") {
1063
159
                            // this is the last attachment. remove the whole event
1064
160
                            eventModel.removeEvent(accountId, threadId, eventId, type)
1065
161
                            return
1066
162
                        }
1067
163
                    }
1068
164
                }
1069
165
                Connections {
1070
166
                    target: item
1071
167
                    onItemPressAndHold: itemPressAndHold(bubbleItem)
1072
168
                }
1073
169
                Binding {
1074
170
                    target: item
1075
171
                    property: "parentSelected"
1076
172
                    value: messageDelegate.selected
1077
173
                }
1078
174
                Connections {
1079
175
                    target: item
1080
176
                    onAttachmentClicked: {
1081
177
                        if (item.previewer === "") {
1082
178
                            activeAttachment = modelData
1083
179
                            PopupUtils.open(popoverSaveAttachmentComponent, item)
1084
180
                            return
1085
181
                        }
1086
182
1087
183
                        var properties = {}
1088
184
                        properties["attachment"] = item.attachment
1089
185
                        mainStack.push(Qt.resolvedUrl(item.previewer), properties)
1090
186
                    }
1091
187
                }
1092
188
            }
1093
189
        }
1094
190
    }
1095
191
1096
192
    ListItemWithActions {
1097
193
        id: bubbleItem
1098
194
1099
195
        anchors {
1100
196
            top: attachments.bottom
1101
197
            left: parent.left
1102
198
            right: parent.right
1103
199
        }
1104
200
        internalAnchors {
1105
201
            topMargin: 0
1106
202
            bottomMargin: 0
1107
203
        }
1108
204
1109
205
        height: bubble.visible ? bubble.height  : 0
1110
206
        leftSideAction: Action {
1111
207
            iconName: "delete"
1112
208
            text: i18n.tr("Delete")
1113
209
            onTriggered: {
1114
210
                // if there are no attachments, remove the whole message
1115
211
                if (visibleAttachments == 0) {
1116
212
                    eventModel.removeEvent(accountId, threadId, eventId, type)
1117
213
                    return
1118
214
                }
1119
215
                // check if this is an mms text and we have more attachments
1120
216
                if (mmsText !== "" && visibleAttachments > 1) {
1121
217
                    // remove only the text attachment if we have more attachments
1122
218
                    eventModel.removeEventAttachment(accountId, threadId, eventId, type, mmsTextId)
1123
219
                    mmsText = ""
1124
220
                    mmsTextId = ""
1125
221
                    return
1126
222
                }
1127
223
            }
1128
224
        }
1129
225
1130
226
        selected: messageDelegate.selected
1131
227
        selectionMode: messageDelegate.selectionMode
1132
228
        onItemPressAndHold: messageDelegate.itemPressAndHold(bubbleItem)
1133
229
        onItemClicked: messageDelegate.itemClicked(bubbleItem)
1134
230
        onSwippingChanged: messageList.updateSwippedItem(bubbleItem)
1135
231
        onSwipeStateChanged: messageList.updateSwippedItem(bubbleItem)
1136
232
1137
233
        MessageBubble {
1138
234
            id: bubble
1139
235
1140
236
            anchors {
1141
237
                top: parent.top
1142
238
                left: incoming ? parent.left : undefined
1143
239
                right: incoming ? undefined : parent.right
1144
240
            }
1145
241
            visible: (messageText !== "")
1146
242
            messageText: textMessage !== "" ? textMessage : mmsText
1147
243
            messageTimeStamp: timestamp
1148
244
            messageStatus: textMessageStatus
1149
245
        }
1150
246
1151
247
        Loader {
1152
248
            id: statusIconLoader
1153
249
            active: !incoming && !messageDelegate.selectionMode && bubble.visible && (inProgress || failed)
1154
250
            sourceComponent: statusIcon
1155
251
            anchors.right: bubble.left
1156
252
            anchors.rightMargin: units.gu(1)
1157
253
            anchors.verticalCenter: bubble.verticalCenter
1158
254
        }
1159
255
    }
1160
256
1199
257
}
61
}
1200
258
62
1201
=== added file 'src/qml/MessageDelegateFactory.qml'
1202
--- src/qml/MessageDelegateFactory.qml	1970-01-01 00:00:00 +0000
1203
+++ src/qml/MessageDelegateFactory.qml	2014-08-12 15:32:18 +0000
1204
@@ -0,0 +1,203 @@
1205
1
/*
1206
2
 * Copyright 2012, 2013, 2014 Canonical Ltd.
1207
3
 *
1208
4
 * This file is part of messaging-app.
1209
5
 *
1210
6
 * messaging-app is free software; you can redistribute it and/or modify
1211
7
 * it under the terms of the GNU General Public License as published by
1212
8
 * the Free Software Foundation; version 3.
1213
9
 *
1214
10
 * messaging-app is distributed in the hope that it will be useful,
1215
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1216
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1217
13
 * GNU General Public License for more details.
1218
14
 *
1219
15
 * You should have received a copy of the GNU General Public License
1220
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1221
17
 */
1222
18
1223
19
import QtQuick 2.2
1224
20
import Ubuntu.Components 1.1
1225
21
import Ubuntu.Contacts 0.1
1226
22
import Ubuntu.History 0.1
1227
23
1228
24
ListItemWithActions {
1229
25
    id: root
1230
26
1231
27
    property bool incoming: false
1232
28
    property var _lastItem: loader.status === Loader.Ready ? loader.item._lastItem : null
1233
29
    property list<Action> _availableActions
1234
30
    property string accountLabel
1235
31
1236
32
    signal deleteMessage()
1237
33
    signal resendMessage()
1238
34
    signal copyMessage()
1239
35
    signal showMessageDetails()
1240
36
1241
37
    triggerActionOnMouseRelease: true
1242
38
    width: messageList.width
1243
39
    leftSideAction: Action {
1244
40
        iconName: "delete"
1245
41
        text: i18n.tr("Delete")
1246
42
        onTriggered: deleteMessage()
1247
43
    }
1248
44
1249
45
    // WORKAROUND: to filter actions on rightSideActions property based on message status
1250
46
    _availableActions: [
1251
47
        Action {
1252
48
            id: reloadAction
1253
49
1254
50
            iconName: "reload"
1255
51
            text: i18n.tr("Retry")
1256
52
            onTriggered: resendMessage()
1257
53
        },
1258
54
        Action {
1259
55
            id: copyAction
1260
56
1261
57
            iconName: "edit-copy"
1262
58
            text: i18n.tr("Copy")
1263
59
            onTriggered: copyMessage()
1264
60
        },
1265
61
        Action {
1266
62
            id: infoAction
1267
63
1268
64
            iconName: "info"
1269
65
            text: i18n.tr("Info")
1270
66
            onTriggered: {
1271
67
                // FIXME: Is that the corect way to do that?
1272
68
                var messageType = textMessageAttachments.length > 0 ? i18n.tr("MMS") : i18n.tr("SMS")
1273
69
                var messageInfo = {"type": messageType,
1274
70
                                   "senderId": senderId,
1275
71
                                   "timestamp": timestamp,
1276
72
                                   "textReadTimestamp": textReadTimestamp,
1277
73
                                   "status": textMessageStatus}
1278
74
                messageInfoDialog.showMessageInfo(messageInfo)
1279
75
            }
1280
76
        }
1281
77
    ]
1282
78
1283
79
    rightSideActions: {
1284
80
        var actions = []
1285
81
        if (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed) {
1286
82
            actions.push(reloadAction)
1287
83
        }
1288
84
        actions.push(copyAction)
1289
85
        actions.push(infoAction)
1290
86
        return actions
1291
87
    }
1292
88
1293
89
    height: loader.height + units.gu(1)
1294
90
    internalAnchors {
1295
91
        topMargin: units.gu(0.5)
1296
92
        bottomMargin: units.gu(0.5)
1297
93
    }
1298
94
1299
95
    onItemClicked: {
1300
96
        if (!selectionMode && (loader.status === Loader.Ready)) {
1301
97
            loader.item.clicked(mouse)
1302
98
        }
1303
99
    }
1304
100
1305
101
    Loader {
1306
102
        id: loader
1307
103
1308
104
        onStatusChanged:  {
1309
105
            if (status === Loader.Ready) {
1310
106
                //signals
1311
107
                root.resendMessage.connect(item.resendMessage)
1312
108
                root.deleteMessage.connect(item.deleteMessage)
1313
109
                root.copyMessage.connect(item.copyMessage)
1314
110
                root.showMessageDetails(item.showMessageDetails)
1315
111
            }
1316
112
        }
1317
113
        anchors {
1318
114
            left: parent.left
1319
115
            right: parent.right
1320
116
        }
1321
117
        height: status == Loader.Ready ? item.height : 0
1322
118
        Component.onCompleted: {
1323
119
            var initialProperties = {
1324
120
                "incoming": root.incoming,
1325
121
                "accountLabel": accountLabel,
1326
122
                "attachments": textMessageAttachments,
1327
123
                "accountId": accountId,
1328
124
                "threadId": threadId,
1329
125
                "eventId": eventId,
1330
126
                "type": type,
1331
127
                "text": textMessage,
1332
128
                "timestamp": timestamp
1333
129
            }
1334
130
            if (textMessageAttachments.length > 0) {
1335
131
                setSource(Qt.resolvedUrl("MMSDelegate.qml"), initialProperties)
1336
132
            } else {
1337
133
                setSource(Qt.resolvedUrl("SMSDelegate.qml"), initialProperties)
1338
134
            }
1339
135
        }
1340
136
    }
1341
137
1342
138
    Item {
1343
139
        id: statusIcon
1344
140
1345
141
        height: units.gu(4)
1346
142
        width: units.gu(4)
1347
143
        parent: _lastItem
1348
144
        anchors {
1349
145
            verticalCenter: parent ? parent.verticalCenter : undefined
1350
146
            right: parent ? parent.left : undefined
1351
147
            rightMargin: units.gu(2)
1352
148
        }
1353
149
1354
150
        visible: !incoming && !selectionMode
1355
151
        ActivityIndicator {
1356
152
            id: indicator
1357
153
1358
154
            anchors.centerIn: parent
1359
155
            height: units.gu(2)
1360
156
            width: units.gu(2)
1361
157
            visible: running && !selectionMode
1362
158
            // if temporarily failed or unknown status, then show the spinner
1363
159
            running: (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||
1364
160
                      textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed)
1365
161
        }
1366
162
1367
163
        Item {
1368
164
            id: retrybutton
1369
165
1370
166
            anchors.fill: parent
1371
167
            Icon {
1372
168
                id: icon
1373
169
1374
170
                name: "reload"
1375
171
                color: "red"
1376
172
                height: units.gu(2)
1377
173
                width: units.gu(2)
1378
174
                anchors {
1379
175
                    centerIn: parent
1380
176
                    verticalCenterOffset: units.gu(-1)
1381
177
                }
1382
178
            }
1383
179
1384
180
            Label {
1385
181
                text: i18n.tr("Failed!")
1386
182
                fontSize: "small"
1387
183
                color: "red"
1388
184
                anchors {
1389
185
                    horizontalCenter: retrybutton.horizontalCenter
1390
186
                    top: icon.bottom
1391
187
                }
1392
188
            }
1393
189
            visible: (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
1394
190
            MouseArea {
1395
191
                id: retrybuttonMouseArea
1396
192
1397
193
                anchors.fill: parent
1398
194
                onClicked: root.resendMessage()
1399
195
            }
1400
196
        }
1401
197
1402
198
1403
199
        MessageInfoDialog {
1404
200
            id: messageInfoDialog
1405
201
        }
1406
202
    }
1407
203
}
1408
0
204
1409
=== added file 'src/qml/MessageInfoDialog.qml'
1410
--- src/qml/MessageInfoDialog.qml	1970-01-01 00:00:00 +0000
1411
+++ src/qml/MessageInfoDialog.qml	2014-08-12 15:32:18 +0000
1412
@@ -0,0 +1,124 @@
1413
1
/*
1414
2
 * Copyright 2012, 2013, 2014 Canonical Ltd.
1415
3
 *
1416
4
 * This file is part of messaging-app.
1417
5
 *
1418
6
 * messaging-app is free software; you can redistribute it and/or modify
1419
7
 * it under the terms of the GNU General Public License as published by
1420
8
 * the Free Software Foundation; version 3.
1421
9
 *
1422
10
 * messaging-app is distributed in the hope that it will be useful,
1423
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1424
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1425
13
 * GNU General Public License for more details.
1426
14
 *
1427
15
 * You should have received a copy of the GNU General Public License
1428
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1429
17
 */
1430
18
1431
19
import QtQuick 2.2
1432
20
import Ubuntu.Components 1.1
1433
21
import Ubuntu.Components.Popups 0.1
1434
22
import Ubuntu.History 0.1
1435
23
1436
24
1437
25
Item {
1438
26
    id: root
1439
27
1440
28
    property QtObject activeDialog: null
1441
29
    property var activeMessage: null
1442
30
1443
31
    function showMessageInfo(message)
1444
32
    {
1445
33
        if (!activeDialog) {
1446
34
            activeMessage = message
1447
35
            activeDialog = PopupUtils.open(messageInfoDialog, messages)
1448
36
        }
1449
37
    }
1450
38
1451
39
    Component {
1452
40
        id: messageInfoDialog
1453
41
1454
42
        Dialog {
1455
43
            id: dialogue
1456
44
1457
45
            parent: messages
1458
46
1459
47
            function statusToString(status)
1460
48
            {
1461
49
                switch(status)
1462
50
                {
1463
51
                case HistoryThreadModel.MessageStatusDelivered:
1464
52
                    return i18n.tr("Delivered")
1465
53
                case HistoryThreadModel.MessageStatusTemporarilyFailed:
1466
54
                    return i18n.tr("Temporarily Failed")
1467
55
                case HistoryThreadModel.MessageStatusPermanentlyFailed:
1468
56
                    return i18n.tr("Failed")
1469
57
                case HistoryThreadModel.MessageStatusAccepted:
1470
58
                    return i18n.tr("Accepted")
1471
59
                case HistoryThreadModel.MessageStatusRead:
1472
60
                    return i18n.tr("Read")
1473
61
                case HistoryThreadModel.MessageStatusDeleted:
1474
62
                    return i18n.tr("Deleted")
1475
63
                case HistoryThreadModel.MessageStatusPending:
1476
64
                    return i18n.tr("Pending")
1477
65
                case HistoryThreadModel.MessageStatusUnknown:
1478
66
                    //FIXME: Received messages has Unknown status is that correct??
1479
67
                    if (root.activeMessage.senderId !== "self") {
1480
68
                        return i18n.tr("Received")
1481
69
                    } else {
1482
70
                        return i18n.tr("Unknown")
1483
71
                    }
1484
72
                default:
1485
73
                    return i18n.tr("Unknown")
1486
74
                }
1487
75
            }
1488
76
1489
77
1490
78
            title: i18n.tr("Message info")
1491
79
1492
80
            anchors.centerIn: parent
1493
81
            height: childrenRect.height
1494
82
            width: childrenRect.width
1495
83
1496
84
            Label {
1497
85
                text: "<b>%1:</b> %2".arg(i18n.tr("Type")).arg(root.activeMessage.type)
1498
86
            }
1499
87
1500
88
            Label {
1501
89
                text: "<b>%1:</b> %2".arg(i18n.tr("From")).arg(root.activeMessage.senderId !== "self" ? root.activeMessage.senderId : i18n.tr("Myself"))
1502
90
            }
1503
91
1504
92
            Label {
1505
93
                text: "<b>%1:</b> %2".arg(i18n.tr("Sent")).arg(Qt.formatDateTime(root.activeMessage.timestamp, Qt.DefaultLocaleShortDate))
1506
94
                visible: (root.activeMessage.senderId === "self")
1507
95
            }
1508
96
1509
97
            Label {
1510
98
                text: "<b>%1:</b> %2".arg(i18n.tr("Received")).arg(Qt.formatDateTime(root.activeMessage.timestamp, Qt.DefaultLocaleShortDate))
1511
99
                visible: (root.activeMessage.senderId !== "self")
1512
100
            }
1513
101
1514
102
            Label {
1515
103
                text: "<b>%1:</b> %2".arg(i18n.tr("Read")).arg(Qt.formatDateTime(root.activeMessage.textReadTimestamp, Qt.DefaultLocaleShortDate))
1516
104
                visible: (root.activeMessage.senderId !== "self") && (root.activeMessage.textReadTimestamp > 0)
1517
105
            }
1518
106
1519
107
            Label {
1520
108
                text: "<b>%1:</b> %2".arg(i18n.tr("Status")).arg(statusToString(root.activeMessage.status))
1521
109
            }
1522
110
1523
111
            Button {
1524
112
                text: i18n.tr("Close")
1525
113
                onClicked: {
1526
114
                    PopupUtils.close(root.activeDialog)
1527
115
                }
1528
116
            }
1529
117
1530
118
            Component.onDestruction: {
1531
119
                root.activeDialog = null
1532
120
                root.activeMessage = null
1533
121
            }
1534
122
        }
1535
123
    }
1536
124
}
1537
0
125
1538
=== modified file 'src/qml/Messages.qml'
1539
--- src/qml/Messages.qml	2014-08-12 15:32:18 +0000
1540
+++ src/qml/Messages.qml	2014-08-12 15:32:18 +0000
1541
@@ -16,7 +16,7 @@
1542
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1543
17
 */
17
 */
1544
18
18
1546
19
import QtQuick 2.0
19
import QtQuick 2.2
1547
20
import QtQuick.Window 2.0
20
import QtQuick.Window 2.0
1548
21
import QtContacts 5.0
21
import QtContacts 5.0
1549
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.1
1550
@@ -28,12 +28,16 @@
1551
28
import Ubuntu.Contacts 0.1
28
import Ubuntu.Contacts 0.1
1552
29
import QtContacts 5.0
29
import QtContacts 5.0
1553
30
30
1554
31
import "dateUtils.js" as DateUtils
1555
32
1556
31
Page {
33
Page {
1557
32
    id: messages
34
    id: messages
1558
33
    objectName: "messagesPage"
35
    objectName: "messagesPage"
1559
36
1560
34
    // this property can be overriden by the user using the account switcher,
37
    // this property can be overriden by the user using the account switcher,
1561
35
    // in the suru divider
38
    // in the suru divider
1562
36
    property QtObject account: mainView.defaultAccount
39
    property QtObject account: mainView.defaultAccount
1563
40
1564
37
    property variant participants: []
41
    property variant participants: []
1565
38
    property bool groupChat: participants.length > 1
42
    property bool groupChat: participants.length > 1
1566
39
    property bool keyboardFocus: true
43
    property bool keyboardFocus: true
1567
@@ -41,7 +45,6 @@
1568
41
    // FIXME: MainView should provide if the view is in portait or landscape
45
    // FIXME: MainView should provide if the view is in portait or landscape
1569
42
    property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
46
    property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
1570
43
    property bool landscape: orientationAngle == 90 || orientationAngle == 270
47
    property bool landscape: orientationAngle == 90 || orientationAngle == 270
1571
44
    property bool pendingMessage: false
1572
45
    property var activeTransfer: null
48
    property var activeTransfer: null
1573
46
    property int activeAttachmentIndex: -1
49
    property int activeAttachmentIndex: -1
1574
47
    property var sharedAttachmentsTransfer: []
50
    property var sharedAttachmentsTransfer: []
1575
@@ -111,7 +114,7 @@
1576
111
114
1577
112
    title: {
115
    title: {
1578
113
        if (selectionMode) {
116
        if (selectionMode) {
1580
114
            return i18n.tr("Edit")
117
            return i18n.tr(" ")
1581
115
        }
118
        }
1582
116
119
1583
117
        if (landscape) {
120
        if (landscape) {
1584
@@ -127,7 +130,7 @@
1585
127
            if (participants.length == 1) {
130
            if (participants.length == 1) {
1586
128
                return firstRecipient
131
                return firstRecipient
1587
129
            } else {
132
            } else {
1589
130
                return i18n.tr("Group (%1 members)").arg(participants.length)
133
                return i18n.tr("Group (%1)").arg(participants.length)
1590
131
            }
134
            }
1591
132
        }
135
        }
1592
133
        return i18n.tr("New Message")
136
        return i18n.tr("New Message")
1593
@@ -269,7 +272,7 @@
1594
269
            return -1
272
            return -1
1595
270
        }
273
        }
1596
271
        for (var i in telepathyHelper.accounts) {
274
        for (var i in telepathyHelper.accounts) {
1598
272
            if (telepathyHelper.accounts[i].accountId == messages.account.accountId) {
275
            if (telepathyHelper.accounts[i].accountId === messages.account.accountId) {
1599
273
                return i
276
                return i
1600
274
            }
277
            }
1601
275
        }
278
        }
1602
@@ -277,9 +280,7 @@
1603
277
    }
280
    }
1604
278
    Connections {
281
    Connections {
1605
279
        target: messages.head.sections
282
        target: messages.head.sections
1609
280
        onSelectedIndexChanged: {
283
        onSelectedIndexChanged: messages.account = telepathyHelper.accounts[head.sections.selectedIndex]
1607
281
            messages.account = telepathyHelper.accounts[head.sections.selectedIndex]
1608
282
        }
1610
283
    }
284
    }
1611
284
285
1612
285
    Component {
286
    Component {
1613
@@ -295,30 +296,13 @@
1614
295
            filterTerm: multiRecipient.searchString
296
            filterTerm: multiRecipient.searchString
1615
296
            showSections: false
297
            showSections: false
1616
297
            autoHideKeyboard: false
298
            autoHideKeyboard: false
1617
298
1618
299
            states: [
1619
300
                State {
1620
301
                    name: "empty"
1621
302
                    when: contactSearch.count === 0
1622
303
                    PropertyChanges {
1623
304
                        target: contactSearch
1624
305
                        height: 0
1625
306
                    }
1626
307
                }
1627
308
            ]
1628
309
1629
310
            anchors {
299
            anchors {
1630
311
                top: parent.top
300
                top: parent.top
1631
312
                topMargin: units.gu(1)
301
                topMargin: units.gu(1)
1632
313
                left: parent.left
302
                left: parent.left
1633
314
                right: parent.right
303
                right: parent.right
1641
315
                bottom: bottomPanel.top
304
                bottom: parent.bottom
1642
316
            }
305
            }
1636
317
1637
318
            Behavior on height {
1638
319
                UbuntuNumberAnimation { }
1639
320
            }
1640
321
1643
322
            InvalidFilter {
306
            InvalidFilter {
1644
323
                id: invalidFilter
307
                id: invalidFilter
1645
324
            }
308
            }
1646
@@ -377,7 +361,7 @@
1647
377
                                    }
361
                                    }
1648
378
                                    height: units.gu(2)
362
                                    height: units.gu(2)
1649
379
                                    text: {
363
                                    text: {
1651
380
                                        // this is necessary to keep the string in the original format
364
                                        // this is necessary to keep the string in the original foverdrawormat
1652
381
                                        var originalText = contact.displayLabel.label
365
                                        var originalText = contact.displayLabel.label
1653
382
                                        var lowerSearchText =  multiRecipient.searchString.toLowerCase()
366
                                        var lowerSearchText =  multiRecipient.searchString.toLowerCase()
1654
383
                                        var lowerText = originalText.toLowerCase()
367
                                        var lowerText = originalText.toLowerCase()
1655
@@ -422,16 +406,27 @@
1656
422
    }
406
    }
1657
423
407
1658
424
    Loader {
408
    Loader {
1661
425
        active: multiRecipient.searchString !== "" && multiRecipient.focus
409
        property int resultCount: (status === Loader.Ready) ? item.view.count : 0
1662
426
        sourceComponent: contactSearchComponent
410
1663
411
        sourceComponent: (multiRecipient.searchString !== "") && multiRecipient.focus ? contactSearchComponent : null
1664
427
        clip: true
412
        clip: true
1665
428
        anchors {
413
        anchors {
1666
429
            top: parent.top
414
            top: parent.top
1667
430
            left: parent.left
415
            left: parent.left
1668
431
            right: parent.right
416
            right: parent.right
1669
432
            bottom: bottomPanel.top
1670
433
        }
417
        }
1671
418
        height: resultCount > 0 ? parent.height - keyboard.height : 0
1672
434
        z: 1
419
        z: 1
1673
420
        // WORKAROUND: we need to use opacity here visible FALSE cause the item to not load
1674
421
        opacity: height > 0 ? 1.0 : 0.0
1675
422
        Behavior on height {
1676
423
            UbuntuNumberAnimation { }
1677
424
        }
1678
425
1679
426
        Rectangle {
1680
427
            anchors.fill: parent
1681
428
            color: Theme.palette.normal.background
1682
429
        }
1683
435
    }
430
    }
1684
436
431
1685
437
    ContactWatcher {
432
    ContactWatcher {
1686
@@ -488,7 +483,13 @@
1687
488
                Action {
483
                Action {
1688
489
                    objectName: "selectionModeSelectAllAction"
484
                    objectName: "selectionModeSelectAllAction"
1689
490
                    iconName: "select"
485
                    iconName: "select"
1691
491
                    onTriggered: messageList.selectAll()
486
                    onTriggered: {
1692
487
                        if (messageList.selectedItems.count === messageList.count) {
1693
488
                            messageList.clearSelection()
1694
489
                        } else {
1695
490
                            messageList.selectAll()
1696
491
                        }
1697
492
                    }
1698
492
                },
493
                },
1699
493
                Action {
494
                Action {
1700
494
                    objectName: "selectionModeDeleteAction"
495
                    objectName: "selectionModeDeleteAction"
1701
@@ -645,86 +646,66 @@
1702
645
        header: Item {
646
        header: Item {
1703
646
            height: units.gu(1)
647
            height: units.gu(1)
1704
647
        }
648
        }
1705
648
1706
649
        spacing: units.gu(1)
1707
650
        listModel: participants.length > 0 ? sortProxy : null
649
        listModel: participants.length > 0 ? sortProxy : null
1708
651
        verticalLayoutDirection: ListView.BottomToTop
650
        verticalLayoutDirection: ListView.BottomToTop
1722
652
        highlightFollowsCurrentItem: false
651
        highlightFollowsCurrentItem: true
1723
653
        /*add: Transition {
652
        currentIndex: 0
1724
654
            UbuntuNumberAnimation {
653
        // keep the last item as currentItem
1712
655
                properties: "anchors.leftMargin"
1713
656
                from: -width
1714
657
                to: 0
1715
658
            }
1716
659
            UbuntuNumberAnimation {
1717
660
                properties: "anchors.rightMargin"
1718
661
                from: -width
1719
662
                to: 0
1720
663
            }
1721
664
        }*/
1725
665
654
1727
666
        listDelegate: MessageDelegate {
655
        listDelegate: Column {
1728
667
            id: messageDelegate
656
            id: messageDelegate
1764
668
            objectName: "message%1".arg(index)
657
1765
669
            incoming: senderId != "self"
658
            // WORKAROUND: we can not use sections because the verticalLayoutDirection is ListView.BottomToTop the sections will appear
1766
670
            // TODO: we have several items inside
659
            // bellow the item
1767
671
            selected: messageList.isSelected(messageDelegate)
660
            MessageDateSection {
1768
672
            unread: newEvent
661
                text: DateUtils.friendlyDay(timestamp)
1769
673
            selectionMode: messages.selectionMode
662
                anchors {
1770
674
            accountLabel: multipleAccounts ? telepathyHelper.accountForId(accountId).displayName : ""
663
                    left: parent.left
1771
675
            // TODO: need select only the item
664
                    right: parent.right
1772
676
            onItemClicked: {
665
                    leftMargin: units.gu(2)
1773
677
                if (messageList.isInSelectionMode) {
666
                    rightMargin: units.gu(2)
1774
678
                    if (!messageList.selectItem(messageDelegate)) {
667
                }
1775
679
                        messageList.deselectItem(messageDelegate)
668
                visible: (index === messageList.count) || !DateUtils.areSameDay(sortProxy.get(index+1).timestamp, timestamp)
1776
680
                    }
669
            }
1777
681
                }
670
1778
682
            }
671
            MessageDelegateFactory {
1779
683
            onItemPressAndHold: {
672
                objectName: "message%1".arg(index)
1780
684
                messageList.startSelection()
673
                incoming: senderId != "self"
1781
685
                messageList.selectItem(messageDelegate)
674
                // TODO: we have several items inside
1782
686
            }
675
                selected: messageList.isSelected(messageDelegate)
1783
687
676
                selectionMode: messages.selectionMode
1784
688
            Component.onCompleted: {
677
                accountLabel: multipleAccounts ? telepathyHelper.accountForId(accountId).displayName : ""
1785
689
                if (newEvent) {
678
                // TODO: need select only the item
1786
690
                    messages.markMessageAsRead(accountId, threadId, eventId, type);
679
                onItemClicked: {
1787
691
                }
680
                    if (messageList.isInSelectionMode) {
1788
692
            }
681
                        if (!messageList.selectItem(messageDelegate)) {
1789
693
            onResend: {
682
                            messageList.deselectItem(messageDelegate)
1755
694
                // resend this message and remove the old one
1756
695
                if (textMessageAttachments.length > 0) {
1757
696
                    var newAttachments = []
1758
697
                    for (var i = 0; i < textMessageAttachments.length; i++) {
1759
698
                        var attachment = []
1760
699
                        var item = textMessageAttachments[i]
1761
700
                        // we dont include smil files. they will be auto generated
1762
701
                        if (item.contentType.toLowerCase() == "application/smil") {
1763
702
                            continue
1790
703
                        }
683
                        }
1802
704
                        attachment.push(item.attachmentId)
684
                    }
1803
705
                        attachment.push(item.contentType)
685
                }
1804
706
                        attachment.push(item.filePath)
686
                onItemPressAndHold: {
1805
707
                        newAttachments.push(attachment)
687
                    messageList.startSelection()
1806
708
                    }
688
                    messageList.selectItem(messageDelegate)
1807
709
                    eventModel.removeEvent(accountId, threadId, eventId, type)
689
                }
1808
710
                    chatManager.sendMMS(participants, textMessage, newAttachments, messages.account.accountId)
690
1809
711
                    return
691
                Component.onCompleted: {
1810
712
                }
692
                    if (newEvent) {
1811
713
                eventModel.removeEvent(accountId, threadId, eventId, type)
693
                        messages.markMessageAsRead(accountId, threadId, eventId, type);
1812
714
                chatManager.sendMessage(messages.participants, textMessage, messages.account.accountId)
694
                    }
1813
695
                }
1814
715
            }
696
            }
1815
716
        }
697
        }
1816
698
1817
717
        onSelectionDone: {
699
        onSelectionDone: {
1818
718
            for (var i=0; i < items.count; i++) {
700
            for (var i=0; i < items.count; i++) {
1819
719
                var event = items.get(i).model
701
                var event = items.get(i).model
1820
720
                eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
702
                eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
1821
721
            }
703
            }
1822
722
        }
704
        }
1823
705
1824
723
        onCountChanged: {
706
        onCountChanged: {
1829
724
            if (messages.pendingMessage) {
707
            currentIndex = 0
1830
725
                messageList.contentY = 0
708
            positionViewAtBeginning()
1827
726
                messages.pendingMessage = false
1828
727
            }
1831
728
        }
709
        }
1832
729
    }
710
    }
1833
730
711
1834
@@ -909,7 +890,7 @@
1835
909
                height: units.gu(4.3)
890
                height: units.gu(4.3)
1836
910
                style: MultiRecipientFieldStyle {}
891
                style: MultiRecipientFieldStyle {}
1837
911
                autoSize: true
892
                autoSize: true
1839
912
                maximumLineCount: 0
893
                maximumLineCount: attachments.count == 0 ? 8 : 4
1840
913
                placeholderText: i18n.tr("Write a message...")
894
                placeholderText: i18n.tr("Write a message...")
1841
914
                focus: textEntry.focus
895
                focus: textEntry.focus
1842
915
                font.family: "Ubuntu"
896
                font.family: "Ubuntu"
1843
@@ -984,7 +965,6 @@
1844
984
                                                   true)
965
                                                   true)
1845
985
966
1846
986
                updateFilters()
967
                updateFilters()
1847
987
                messages.pendingMessage = true
1848
988
                if (attachments.count > 0) {
968
                if (attachments.count > 0) {
1849
989
                    var newAttachments = []
969
                    var newAttachments = []
1850
990
                    for (var i = 0; i < attachments.count; i++) {
970
                    for (var i = 0; i < attachments.count; i++) {
1851
991
971
1852
=== modified file 'src/qml/MultiRecipientInput.qml'
1853
--- src/qml/MultiRecipientInput.qml	2014-07-30 16:19:08 +0000
1854
+++ src/qml/MultiRecipientInput.qml	2014-08-12 15:32:18 +0000
1855
@@ -16,7 +16,7 @@
1856
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1857
17
 */
17
 */
1858
18
18
1860
19
import QtQuick 2.0
19
import QtQuick 2.2
1861
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
1862
21
import Ubuntu.Contacts 0.1
21
import Ubuntu.Contacts 0.1
1863
22
import Ubuntu.Telephony 0.1
22
import Ubuntu.Telephony 0.1
1864
23
23
1865
=== modified file 'src/qml/NewRecipientPage.qml'
1866
--- src/qml/NewRecipientPage.qml	2014-08-01 14:51:29 +0000
1867
+++ src/qml/NewRecipientPage.qml	2014-08-12 15:32:18 +0000
1868
@@ -16,7 +16,7 @@
1869
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1870
17
 */
17
 */
1871
18
18
1873
19
import QtQuick 2.0
19
import QtQuick 2.2
1874
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
1875
21
import Ubuntu.Contacts 0.1
21
import Ubuntu.Contacts 0.1
1876
22
import QtContacts 5.0
22
import QtContacts 5.0
1877
23
23
1878
=== added file 'src/qml/SMSDelegate.qml'
1879
--- src/qml/SMSDelegate.qml	1970-01-01 00:00:00 +0000
1880
+++ src/qml/SMSDelegate.qml	2014-08-12 15:32:18 +0000
1881
@@ -0,0 +1,75 @@
1882
1
/*
1883
2
 * Copyright 2012, 2013, 2014 Canonical Ltd.
1884
3
 *
1885
4
 * This file is part of messaging-app.
1886
5
 *
1887
6
 * messaging-app is free software; you can redistribute it and/or modify
1888
7
 * it under the terms of the GNU General Public License as published by
1889
8
 * the Free Software Foundation; version 3.
1890
9
 *
1891
10
 * messaging-app is distributed in the hope that it will be useful,
1892
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1893
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1894
13
 * GNU General Public License for more details.
1895
14
 *
1896
15
 * You should have received a copy of the GNU General Public License
1897
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1898
17
 */
1899
18
1900
19
import QtQuick 2.2
1901
20
import Ubuntu.Components 1.1
1902
21
1903
22
import "dateUtils.js" as DateUtils
1904
23
1905
24
MessageDelegate {
1906
25
    id: root
1907
26
1908
27
    function deleteMessage()
1909
28
    {
1910
29
        eventModel.removeEvent(accountId, threadId, eventId, type)
1911
30
    }
1912
31
1913
32
    function resendMessage()
1914
33
    {
1915
34
        eventModel.removeEvent(accountId, threadId, eventId, type)
1916
35
        chatManager.sendMessage(messages.participants, textMessage, messages.accountId)
1917
36
    }
1918
37
1919
38
    function copyMessage()
1920
39
    {
1921
40
        Clipboard.push(bubble.messageText)
1922
41
    }
1923
42
1924
43
    height: bubble.height
1925
44
    _lastItem: bubble
1926
45
1927
46
    MessageBubble {
1928
47
        id: bubble
1929
48
1930
49
        states: [
1931
50
            State {
1932
51
                name: "incoming"
1933
52
                when: incoming
1934
53
                AnchorChanges {
1935
54
                    target: bubble
1936
55
                    anchors.left: parent.left
1937
56
                }
1938
57
            },
1939
58
            State {
1940
59
                name: "outgoing"
1941
60
                when: !incoming
1942
61
                AnchorChanges {
1943
62
                    target: bubble
1944
63
                    anchors.right: parent.right
1945
64
                }
1946
65
            }
1947
66
1948
67
        ]
1949
68
        visible: (root.text !== "")
1950
69
        messageIncoming: root.incoming
1951
70
        messageText: root.text
1952
71
        messageTimeStamp: root.timestamp
1953
72
        accountName: root.accountLabel
1954
73
        messageStatus: textMessageStatus
1955
74
    }
1956
75
}
1957
0
76
1958
=== modified file 'src/qml/StandardAnimation.qml'
1959
--- src/qml/StandardAnimation.qml	2013-07-17 21:47:45 +0000
1960
+++ src/qml/StandardAnimation.qml	2014-08-12 15:32:18 +0000
1961
@@ -16,7 +16,7 @@
1962
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1963
17
 */
17
 */
1964
18
18
1966
19
import QtQuick 2.0
19
import QtQuick 2.2
1967
20
20
1968
21
NumberAnimation {
21
NumberAnimation {
1969
22
    duration: 300
22
    duration: 300
1970
23
23
1971
=== modified file 'src/qml/ThreadDelegate.qml'
1972
--- src/qml/ThreadDelegate.qml	2014-08-12 15:32:18 +0000
1973
+++ src/qml/ThreadDelegate.qml	2014-08-12 15:32:18 +0000
1974
@@ -16,7 +16,7 @@
1975
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1976
17
 */
17
 */
1977
18
18
1979
19
import QtQuick 2.0
19
import QtQuick 2.2
1980
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
1981
21
import Ubuntu.Components.Popups 0.1
21
import Ubuntu.Components.Popups 0.1
1982
22
import Ubuntu.Telephony 0.1
22
import Ubuntu.Telephony 0.1
1983
@@ -44,7 +44,6 @@
1984
44
        return firstRecipient
44
        return firstRecipient
1985
45
    }
45
    }
1986
46
46
1987
47
    property bool selectionMode: false
1988
48
    property string textMessage: {
47
    property string textMessage: {
1989
49
        // check if this is an mms, if so, search for the actual text
48
        // check if this is an mms, if so, search for the actual text
1990
50
        var imageCount = 0
49
        var imageCount = 0
1991
@@ -111,9 +110,17 @@
1992
111
    ContactAvatar {
110
    ContactAvatar {
1993
112
        id: avatar
111
        id: avatar
1994
113
112
1996
114
        fallbackAvatarUrl: groupChat ? "image://theme/contact-group" : delegateHelper.avatar !== "" ? delegateHelper.avatar : "image://theme/contact"
113
        fallbackAvatarUrl: {
1997
114
            if (groupChat) {
1998
115
                return "image://theme/contact-group"
1999
116
            } else if (delegateHelper.avatar !== "") {
2000
117
                return delegateHelper.avatar
2001
118
            } else {
2002
119
                return "image://theme/contact"
2003
120
            }
2004
121
        }
2005
115
        fallbackDisplayName: delegateHelper.alias
122
        fallbackDisplayName: delegateHelper.alias
2007
116
        showAvatarPicture: (delegateHelper.avatar !== "") || (initials.length === 0) || groupChat
123
        showAvatarPicture: groupChat || (delegateHelper.avatar !== "") || (initials.length === 0)
2008
117
        anchors {
124
        anchors {
2009
118
            left: parent.left
125
            left: parent.left
2010
119
            top: parent.top
126
            top: parent.top
2011
@@ -127,24 +134,35 @@
2012
127
        id: contactName
134
        id: contactName
2013
128
        anchors {
135
        anchors {
2014
129
            top: avatar.top
136
            top: avatar.top
2015
137
            topMargin: units.gu(0.5)
2016
130
            left: avatar.right
138
            left: avatar.right
2017
131
            leftMargin: units.gu(1)
139
            leftMargin: units.gu(1)
2018
132
        }
140
        }
2019
133
        fontSize: "medium"
2020
134
        color: UbuntuColors.lightAubergine
141
        color: UbuntuColors.lightAubergine
2021
135
        text: groupChat ? groupChatLabel : unknownContact ? delegateHelper.phoneNumber : delegateHelper.alias
142
        text: groupChat ? groupChatLabel : unknownContact ? delegateHelper.phoneNumber : delegateHelper.alias
2022
136
    }
143
    }
2023
137
144
2025
138
    Label {
145
    Row {
2026
139
        id: time
146
        id: time
2027
147
2028
140
        anchors {
148
        anchors {
2029
141
            verticalCenter: contactName.verticalCenter
149
            verticalCenter: contactName.verticalCenter
2030
142
            right: parent.right
150
            right: parent.right
2031
143
        }
151
        }
2034
144
        fontSize: "x-small"
152
        Label {
2035
145
        text: Qt.formatDateTime(eventTimestamp,"h:mm ap")
153
            fontSize: "x-small"
2036
154
            font.weight: Font.DemiBold
2037
155
            opacity: 0.70
2038
156
            text: Qt.formatDateTime(eventTimestamp,"h:mm")
2039
157
        }
2040
158
        Label {
2041
159
            fontSize: "x-small"
2042
160
            opacity: 0.70
2043
161
            text: Qt.formatDateTime(eventTimestamp," ap")
2044
162
        }
2045
146
    }
163
    }
2047
147
 
164
2048
165
2049
148
    UbuntuShape {
166
    UbuntuShape {
2050
149
        id: unreadCountIndicator
167
        id: unreadCountIndicator
2051
150
        height: units.gu(2)
168
        height: units.gu(2)
2052
@@ -181,20 +199,18 @@
2053
181
199
2054
182
    Label {
200
    Label {
2055
183
        id: latestMessage
201
        id: latestMessage
2057
184
        height: units.gu(3)
202
2058
185
        anchors {
203
        anchors {
2059
186
            top: contactName.bottom
204
            top: contactName.bottom
2060
187
            topMargin: units.gu(0.5)
205
            topMargin: units.gu(0.5)
2061
188
            left: contactName.left
206
            left: contactName.left
2062
189
            right: time.left
207
            right: time.left
2063
190
            rightMargin: units.gu(3)
208
            rightMargin: units.gu(3)
2064
209
            bottom: avatar.bottom
2065
191
        }
210
        }
2066
192
        elide: Text.ElideRight
211
        elide: Text.ElideRight
2067
193
        maximumLineCount: 2
2068
194
        fontSize: "x-small"
212
        fontSize: "x-small"
2069
195
        wrapMode: Text.WordWrap
2070
196
        text: textMessage
213
        text: textMessage
2071
197
        font.weight: Font.Light
2072
198
    }
214
    }
2073
199
215
2074
200
    Item {
216
    Item {
2075
201
217
2076
=== modified file 'src/qml/assets/conversation_incoming@27.png'
2077
202
Binary files src/qml/assets/conversation_incoming@27.png	2014-07-07 13:09:42 +0000 and src/qml/assets/conversation_incoming@27.png	2014-08-12 15:32:18 +0000 differ
218
Binary files src/qml/assets/conversation_incoming@27.png	2014-07-07 13:09:42 +0000 and src/qml/assets/conversation_incoming@27.png	2014-08-12 15:32:18 +0000 differ
2078
=== modified file 'src/qml/messaging-app.qml'
2079
--- src/qml/messaging-app.qml	2014-08-12 15:32:18 +0000
2080
+++ src/qml/messaging-app.qml	2014-08-12 15:32:18 +0000
2081
@@ -16,7 +16,7 @@
2082
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2083
17
 */
17
 */
2084
18
18
2086
19
import QtQuick 2.0
19
import QtQuick 2.2
2087
20
import Qt.labs.settings 1.0
20
import Qt.labs.settings 1.0
2088
21
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.1
2089
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 0.1 as ListItem
2090
@@ -54,7 +54,7 @@
2091
54
    Connections {
54
    Connections {
2092
55
        target: telepathyHelper
55
        target: telepathyHelper
2093
56
        onSetupReady: {
56
        onSetupReady: {
2095
57
            if (multipleAccounts && !telepathyHelper.defaultMessagingAccount && 
57
            if (multipleAccounts && !telepathyHelper.defaultMessagingAccount &&
2096
58
                settings.mainViewDontAskCount < 3 && mainStack.depth === 1) {
58
                settings.mainViewDontAskCount < 3 && mainStack.depth === 1) {
2097
59
                PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
59
                PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
2098
60
            }
60
            }
2099
61
61
2100
=== modified file 'tests/autopilot/messaging_app/emulators.py'
2101
--- tests/autopilot/messaging_app/emulators.py	2014-08-12 15:32:18 +0000
2102
+++ tests/autopilot/messaging_app/emulators.py	2014-08-12 15:32:18 +0000
2103
@@ -57,8 +57,8 @@
2104
57
        """
57
        """
2105
58
58
2106
59
        time.sleep(2)  # message is not always found on slow emulator
59
        time.sleep(2)  # message is not always found on slow emulator
2109
60
        for message in self.select_many(MessageDelegate):
60
        for message in self.select_many(MessageDelegateFactory):
2110
61
            for item in self.select_many('Label'):
61
            for item in message.select_many('Label'):
2111
62
                if "text" in item.get_properties():
62
                if "text" in item.get_properties():
2112
63
                    if item.get_properties()['text'] == text:
63
                    if item.get_properties()['text'] == text:
2113
64
                        return message
64
                        return message
2114
@@ -280,7 +280,7 @@
2115
280
    def enable_messages_selection_mode(self):
280
    def enable_messages_selection_mode(self):
2116
281
        """Enable the selection mode on the messages page by pressing and
281
        """Enable the selection mode on the messages page by pressing and
2117
282
        holding the first item"""
282
        holding the first item"""
2119
283
        message = self.wait_select_single("MessageDelegate",
283
        message = self.wait_select_single("MessageDelegateFactory",
2120
284
                                          objectName="message0")
284
                                          objectName="message0")
2121
285
        self.long_press(message)
285
        self.long_press(message)
2122
286
286
2123
@@ -475,8 +475,7 @@
2124
475
475
2125
476
    def _get_message_delegate(self, index):
476
    def _get_message_delegate(self, index):
2126
477
        return self.wait_select_single(
477
        return self.wait_select_single(
2129
478
            'MessageDelegate', objectName='message{}'.format(index),
478
            'MessageDelegateFactory', objectName='message{}'.format(index))
2128
479
            unread=False)
2130
480
479
2131
481
    def _long_press_to_select_message(self, message):
480
    def _long_press_to_select_message(self, message):
2132
482
        # XXX We used to leave the pointing device pressed for three seconds,
481
        # XXX We used to leave the pointing device pressed for three seconds,
2133
@@ -539,5 +538,5 @@
2134
539
    """Autopilot helper for ThreadDelegate."""
538
    """Autopilot helper for ThreadDelegate."""
2135
540
539
2136
541
540
2139
542
class MessageDelegate(ListItemWithActions):
541
class MessageDelegateFactory(ListItemWithActions):
2140
543
    """Autopilot helper for the MessageDelegate."""
542
    """Autopilot helper for the MessageDelegateFactory."""
2141
544
543
2142
=== modified file 'tests/qml/tst_MessageBubble.qml'
2143
--- tests/qml/tst_MessageBubble.qml	2014-07-31 17:24:57 +0000
2144
+++ tests/qml/tst_MessageBubble.qml	2014-08-12 15:32:18 +0000
2145
@@ -34,7 +34,7 @@
2146
34
34
2147
35
        height: parent.height / 3
35
        height: parent.height / 3
2148
36
36
2150
37
        incoming: true
37
        messageIncoming: true
2151
38
    }
38
    }
2152
39
39
2153
40
    MessageBubble {
40
    MessageBubble {
2154
@@ -44,7 +44,7 @@
2155
44
        anchors.top: incomingMessageBubble.bottom
44
        anchors.top: incomingMessageBubble.bottom
2156
45
        height: parent.height / 3
45
        height: parent.height / 3
2157
46
46
2159
47
        incoming: false
47
        messageIncoming: false
2160
48
    }
48
    }
2161
49
49
2162
50
    MessageBubble {
50
    MessageBubble {
2163
@@ -54,7 +54,7 @@
2164
54
        anchors.top: outgoingMessageBubble.bottom
54
        anchors.top: outgoingMessageBubble.bottom
2165
55
        height: parent.height / 3
55
        height: parent.height / 3
2166
56
56
2168
57
        incoming: true
57
        messageIncoming: true
2169
58
    }
58
    }
2170
59
59
2171
60
    UbuntuTestCase {
60
    UbuntuTestCase {
2172
@@ -67,7 +67,7 @@
2173
67
        }
67
        }
2174
68
68
2175
69
        function cleanup() {
69
        function cleanup() {
2177
70
            changeIncomingMessageBubble.incoming = true;
70
            changeIncomingMessageBubble.messageIncoming = true;
2178
71
        }
71
        }
2179
72
72
2180
73
        function getFileName(filePath) {
73
        function getFileName(filePath) {
2181
@@ -93,7 +93,7 @@
2182
93
        function test_changeIncomingMustUpdateSource() {
93
        function test_changeIncomingMustUpdateSource() {
2183
94
            var changeIncomingMessageBubble = findChild(
94
            var changeIncomingMessageBubble = findChild(
2184
95
                root, 'changeIncomingMessageBubble');
95
                root, 'changeIncomingMessageBubble');
2186
96
            changeIncomingMessageBubble.incoming = false;
96
            changeIncomingMessageBubble.messageIncoming = false;
2187
97
            compare(
97
            compare(
2188
98
                getFileName(changeIncomingMessageBubble.source),
98
                getFileName(changeIncomingMessageBubble.source),
2189
99
                'conversation_outgoing.sci');
99
                'conversation_outgoing.sci');
Status:	Merged
Approved by:	Tiago Salem Herrmann on 2014-08-14
Approved revision:	245
Merged at revision:	189
Proposed branch:	lp:~renatofilho/messaging-app/rtm-fit-finish2
Merge into:	lp:messaging-app
Prerequisite:	lp:~tiagosh/messaging-app/dual-sim-settings
Diff against target:	2189 lines (+955/-652) 26 files modified src/qml/KeyboardRectangle.qml (+1/-1) src/qml/MMS/MMSBase.qml (+5/-74) src/qml/MMS/MMSContact.qml (+58/-78) src/qml/MMS/MMSDefault.qml (+3/-41) src/qml/MMS/MMSImage.qml (+42/-24) src/qml/MMS/MMSVideo.qml (+5/-40) src/qml/MMS/Previewer.qml (+2/-2) src/qml/MMS/PreviewerContact.qml (+5/-3) src/qml/MMS/PreviewerImage.qml (+2/-2) src/qml/MMS/PreviewerVideo.qml (+2/-2) src/qml/MMSDelegate.qml (+198/-0) src/qml/MainPage.qml (+1/-1) src/qml/MessageBubble.qml (+27/-19) src/qml/MessageDateSection.qml (+38/-0) src/qml/MessageDelegate.qml (+39/-235) src/qml/MessageDelegateFactory.qml (+203/-0) src/qml/MessageInfoDialog.qml (+124/-0) src/qml/Messages.qml (+80/-100) src/qml/MultiRecipientInput.qml (+1/-1) src/qml/NewRecipientPage.qml (+1/-1) src/qml/SMSDelegate.qml (+75/-0) src/qml/StandardAnimation.qml (+1/-1) src/qml/ThreadDelegate.qml (+29/-13) src/qml/messaging-app.qml (+2/-2) tests/autopilot/messaging_app/emulators.py (+6/-7) tests/qml/tst_MessageBubble.qml (+5/-5)
To merge this branch:	bzr merge lp:~renatofilho/messaging-app/rtm-fit-finish2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-08-12	Approve on 2014-08-14
PS Jenkins bot	continuous-integration	2014-08-12	Approve on 2014-08-12
Review via email: mp+230504@code.launchpad.net