1
=== modified file 'debian/rules'
2
--- debian/rules	2016-07-18 13:49:10 +0000
3
+++ debian/rules	2016-07-29 23:27:49 +0000
4
@@ -10,7 +10,7 @@
5
10
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
10
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
6
11
# Skip tests on the archs they are known to be flaky with current configuration
11
# Skip tests on the archs they are known to be flaky with current configuration
7
12
# Ref.: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1585942
12
# Ref.: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1585942
9
13
testskip_architectures := arm64 s390x
13
testskip_architectures := arm64 s390x powerpc
10
14
14
11
15
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
15
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
12
16
export DEB_BUILD_PROFILES := cross
16
export DEB_BUILD_PROFILES := cross
13
17
17
14
=== modified file 'src/messagingapplication.cpp'
15
--- src/messagingapplication.cpp	2016-03-23 19:08:39 +0000
16
+++ src/messagingapplication.cpp	2016-07-29 23:27:49 +0000
17
@@ -320,7 +320,42 @@
18
320
    g_object_unref(G_OBJECT(notification));
320
    g_object_unref(G_OBJECT(notification));
19
321
}
321
}
20
322
322
21
323
// find QQuickItem childs
22
324
inline QObject *findRecursiveChild(QQuickItem *object, const QString &objectName, const QString &property = QString::null, const QVariant &value = QVariant())
23
325
{
24
326
    // check the object
25
327
    if (!object) {
26
328
        return NULL;
27
329
    }
28
330
29
331
    // check the direct children first
30
332
    Q_FOREACH(QQuickItem *child, object->childItems()) {
31
333
        if (child->objectName() == objectName) {
32
334
            if (property.isEmpty()) {
33
335
                return child;
34
336
            } else if (child->property(property.toLatin1().data()) == value) {
35
337
                return child;
36
338
            }
37
339
        }
38
340
    }
39
341
40
342
    // now check the grand-children
41
343
    Q_FOREACH(QQuickItem *child, object->childItems()) {
42
344
        QObject *result = findRecursiveChild(child, objectName, property, value);
43
345
        if (result) {
44
346
            return result;
45
347
        }
46
348
    }
47
349
48
350
    return NULL;
49
351
}
50
352
51
323
QObject *MessagingApplication::findMessagingChild(const QString &objectName)
353
QObject *MessagingApplication::findMessagingChild(const QString &objectName)
52
324
{
354
{
54
325
    return m_view->rootObject()->findChild<QObject*>(objectName);
355
    return findRecursiveChild(m_view->rootObject(), objectName);
55
356
}
56
357
57
358
QObject *MessagingApplication::findMessagingChild(const QString &objectName, const QString &property, const QVariant &value)
58
359
{
59
360
    return findRecursiveChild(m_view->rootObject(), objectName, property, value);
60
326
}
361
}
61
327
362
62
=== modified file 'src/messagingapplication.h'
63
--- src/messagingapplication.h	2016-03-10 19:02:46 +0000
64
+++ src/messagingapplication.h	2016-07-29 23:27:49 +0000
65
@@ -45,6 +45,7 @@
66
45
    QString fileMimeType(const QString &fileName);
45
    QString fileMimeType(const QString &fileName);
67
46
    void showNotificationMessage(const QString &message, const QString &icon = QString());
46
    void showNotificationMessage(const QString &message, const QString &icon = QString());
68
47
    QObject *findMessagingChild(const QString &objectName);
47
    QObject *findMessagingChild(const QString &objectName);
69
48
    QObject *findMessagingChild(const QString &objectName, const QString &property, const QVariant &value);
70
48
49
71
49
private Q_SLOTS:
50
private Q_SLOTS:
72
50
    void setFullscreen(bool fullscreen);
51
    void setFullscreen(bool fullscreen);
73
51
52
74
=== removed file 'src/qml/InputInfo.qml'
75
--- src/qml/InputInfo.qml	2016-05-02 18:35:28 +0000
76
+++ src/qml/InputInfo.qml	1970-01-01 00:00:00 +0000
77
@@ -1,42 +0,0 @@
78
1
/*
79
2
 * Copyright 2016 Canonical Ltd.
80
3
 *
81
4
 * This file is part of messaging-app.
82
5
 *
83
6
 * messaging-app is free software; you can redistribute it and/or modify
84
7
 * it under the terms of the GNU General Public License as published by
85
8
 * the Free Software Foundation; version 3.
86
9
 *
87
10
 * messaging-app is distributed in the hope that it will be useful,
88
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
89
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
90
13
 * GNU General Public License for more details.
91
14
 *
92
15
 * You should have received a copy of the GNU General Public License
93
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
94
17
 */
95
18
96
19
import QtQuick 2.0
97
20
//import Unity.InputInfo 0.1
98
21
99
22
Item {
100
23
    // FIXME: implement correctly without relying on unity private stuff
101
24
    property bool hasMouse: mainView.dualPanel //miceModel.count > 0 || touchPadModel.count > 0
102
25
    property bool hasKeyboard: false //keyboardsModel.count > 0
103
26
104
27
    /*InputDeviceModel {
105
28
        id: miceModel
106
29
        deviceFilter: InputInfo.Mouse
107
30
    }
108
31
109
32
    InputDeviceModel {
110
33
        id: touchPadModel
111
34
        deviceFilter: InputInfo.TouchPad
112
35
    }
113
36
114
37
    InputDeviceModel {
115
38
        id: keyboardsModel
116
39
        deviceFilter: InputInfo.Keyboard
117
40
    }*/
118
41
}
119
42
120
43
0
121
=== modified file 'src/qml/MMSDelegate.qml'
122
--- src/qml/MMSDelegate.qml	2016-07-29 23:27:49 +0000
123
+++ src/qml/MMSDelegate.qml	2016-07-29 23:27:49 +0000
124
@@ -45,7 +45,7 @@
125
45
            var properties = {}
45
            var properties = {}
126
46
            properties["attachment"] = attachment.item.attachment
46
            properties["attachment"] = attachment.item.attachment
127
47
            properties["thumbnail"] = attachment.item
47
            properties["thumbnail"] = attachment.item
129
48
            mainStack.addPageToCurrentColumn(messages.basePage, Qt.resolvedUrl(attachment.item.previewer), properties)
48
            mainStack.addPageToCurrentColumn(messages, Qt.resolvedUrl(attachment.item.previewer), properties)
130
49
        }
49
        }
131
50
    }
50
    }
132
51
51
133
@@ -88,7 +88,6 @@
134
88
    function forwardMessage()
88
    function forwardMessage()
135
89
    {
89
    {
136
90
        var properties = {}
90
        var properties = {}
137
91
        emptyStack()
138
92
        var items = []
91
        var items = []
139
93
        for (var i = 0; i < attachments.length; i++) {
92
        for (var i = 0; i < attachments.length; i++) {
140
94
            var attachment = attachments[i]
93
            var attachment = attachments[i]
141
@@ -110,7 +109,7 @@
142
110
        transfer["items"] = items
109
        transfer["items"] = items
143
111
110
144
112
        properties["sharedAttachmentsTransfer"] = transfer
111
        properties["sharedAttachmentsTransfer"] = transfer
146
113
        mainView.showBottomEdgePage(properties)
112
        mainView.showMessagesView(properties)
147
114
    }
113
    }
148
115
114
149
116
    onAttachmentsChanged: {
115
    onAttachmentsChanged: {
150
117
116
151
=== modified file 'src/qml/MainPage.qml'
152
--- src/qml/MainPage.qml	2016-07-29 23:27:49 +0000
153
+++ src/qml/MainPage.qml	2016-07-29 23:27:49 +0000
154
@@ -103,7 +103,7 @@
155
103
                    objectName: "newMessageAction"
103
                    objectName: "newMessageAction"
156
104
                    text: i18n.tr("New message")
104
                    text: i18n.tr("New message")
157
105
                    iconName: "add"
105
                    iconName: "add"
159
106
                    onTriggered: mainView.bottomEdge.commit()
106
                    onTriggered: mainView.startNewMessage()
160
107
                }
107
                }
161
108
108
162
109
            ]
109
            ]
163
@@ -227,11 +227,9 @@
164
227
        //spacing: searchField.text === "" ? units.gu(-2) : 0
227
        //spacing: searchField.text === "" ? units.gu(-2) : 0
165
228
        section.delegate: searching && searchField.text !== ""  ? null : sectionDelegate
228
        section.delegate: searching && searchField.text !== ""  ? null : sectionDelegate
166
229
        header: ListItem.Standard {
229
        header: ListItem.Standard {
167
230
            // FIXME: update
168
230
            id: newItem
231
            id: newItem
173
231
            height: mainView.bottomEdge &&
232
            height: mainView.dualPanel && mainView.composingNewMessage ? units.gu(8) : 0
170
232
                    mainView.bottomEdge.status === BottomEdge.Committed &&
171
233
                    !mainView.bottomEdge.showingConversation &&
172
234
                    mainView.dualPanel ? units.gu(10) : 0
174
235
            text: i18n.tr("New message")
233
            text: i18n.tr("New message")
175
236
            iconName: "message-new"
234
            iconName: "message-new"
176
237
            iconFrame: false
235
            iconFrame: false
177
@@ -252,13 +250,8 @@
178
252
            selected: {
250
            selected: {
179
253
                if (selectionMode) {
251
                if (selectionMode) {
180
254
                    return threadList.isSelected(threadDelegate)
252
                    return threadList.isSelected(threadDelegate)
181
255
                } else if (mainView.bottomEdge.status === BottomEdge.Committed ||
182
256
                           !mainView.inputInfo.hasKeyboard) {
183
257
                    return false
184
258
                } else {
185
259
                    // FIXME: there might be a better way of doing this
186
260
                    return index === threadList.currentIndex
187
261
                }
253
                }
188
254
                return false
189
262
            }
255
            }
190
263
256
191
264
            searchTerm: mainPage.searching ? searchField.text : ""
257
            searchTerm: mainPage.searching ? searchField.text : ""
192
@@ -281,7 +274,7 @@
193
281
                    if (displayedEvent != null) {
274
                    if (displayedEvent != null) {
194
282
                        properties["scrollToEventId"] = displayedEvent.eventId
275
                        properties["scrollToEventId"] = displayedEvent.eventId
195
283
                    }
276
                    }
197
284
                    mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
277
                    mainView.showMessagesView(properties)
198
285
278
199
286
                    // mark this item as current
279
                    // mark this item as current
200
287
                    threadList.currentIndex = index
280
                    threadList.currentIndex = index
201
@@ -324,7 +317,6 @@
202
324
317
203
325
    Loader {
318
    Loader {
204
326
        id: bottomEdgeLoader
319
        id: bottomEdgeLoader
205
327
        active: !selectionMode && !searching && !mainView.dualPanel
206
328
        asynchronous: true
320
        asynchronous: true
207
329
        /* FIXME: would be even more efficient to use setSource() to
321
        /* FIXME: would be even more efficient to use setSource() to
208
330
           delay the compilation step but a bug in Qt prevents us.
322
           delay the compilation step but a bug in Qt prevents us.
209
@@ -332,6 +324,8 @@
210
332
        */
324
        */
211
333
        sourceComponent: MessagingBottomEdge {
325
        sourceComponent: MessagingBottomEdge {
212
334
            parent: mainPage
326
            parent: mainPage
213
327
            enabled: !mainView.dualPanel
214
328
            hint.visible: enabled
215
335
        }
329
        }
216
336
    }
330
    }
217
337
}
331
}
218
338
332
219
=== modified file 'src/qml/Messages.qml'
220
--- src/qml/Messages.qml	2016-07-29 23:27:49 +0000
221
+++ src/qml/Messages.qml	2016-07-29 23:27:49 +0000
222
@@ -69,11 +69,6 @@
223
69
                                          contactWatcher.alias === "") ? contactWatcher.identifier : contactWatcher.alias
69
                                          contactWatcher.alias === "") ? contactWatcher.identifier : contactWatcher.alias
224
70
    property bool newMessage: false
70
    property bool newMessage: false
225
71
71
226
72
    // When using this view from the bottom edge, we are not in the stack, so we need to push on top of the parent page
227
73
    property var basePage: messages
228
74
229
75
    property bool startedFromBottomEdge: false
230
76
231
77
    signal ready
72
    signal ready
232
78
    signal cancel
73
    signal cancel
233
79
74
234
@@ -455,36 +450,6 @@
235
455
        property alias leadingActions: leadingBar.actions
450
        property alias leadingActions: leadingBar.actions
236
456
        property alias trailingActions: trailingBar.actions
451
        property alias trailingActions: trailingBar.actions
237
457
452
238
458
        property list<QtObject> bottomEdgeLeadingActions: [
239
459
            Action {
240
460
                id: backAction
241
461
242
462
                objectName: "cancel"
243
463
                name: "cancel"
244
464
                text: i18n.tr("Cancel")
245
465
                iconName: "down"
246
466
                shortcut: "Esc"
247
467
                onTriggered: {
248
468
                    messages.cancel()
249
469
                }
250
470
            }
251
471
        ]
252
472
253
473
        property list<QtObject> singlePanelLeadingActions: [
254
474
            Action {
255
475
                id: singlePanelBackAction
256
476
                objectName: "back"
257
477
                name: "cancel"
258
478
                text: i18n.tr("Cancel")
259
479
                iconName: "back"
260
480
                shortcut: "Esc"
261
481
                onTriggered: {
262
482
                    // emptyStack will make sure the page gets removed.
263
483
                    mainView.emptyStack()
264
484
                }
265
485
            }
266
486
        ]
267
487
268
488
        title: {
453
        title: {
269
489
            if (landscape) {
454
            if (landscape) {
270
490
                return ""
455
                return ""
271
@@ -523,26 +488,6 @@
272
523
488
273
524
        leadingActionBar {
489
        leadingActionBar {
274
525
            id: leadingBar
490
            id: leadingBar
275
526
276
527
            states: [
277
528
                State {
278
529
                    name: "bottomEdgeBack"
279
530
                    when: startedFromBottomEdge
280
531
                    PropertyChanges {
281
532
                        target: leadingBar
282
533
                        actions: pageHeader.bottomEdgeLeadingActions
283
534
                    }
284
535
                },
285
536
                State {
286
537
                    name: "singlePanelBack"
287
538
                    when: !mainView.dualPanel && !startedFromBottomEdge
288
539
                    PropertyChanges {
289
540
                        target: leadingBar
290
541
                        actions: pageHeader.singlePanelLeadingActions
291
542
                    }
292
543
                }
293
544
294
545
            ]
295
546
        }
491
        }
296
547
492
297
548
        trailingActionBar {
493
        trailingActionBar {
298
@@ -676,7 +621,7 @@
299
676
                    iconName: "contact"
621
                    iconName: "contact"
300
677
                    onTriggered: {
622
                    onTriggered: {
301
678
                        Qt.inputMethod.hide()
623
                        Qt.inputMethod.hide()
303
679
                        mainStack.addPageToCurrentColumn(messages.basePage,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
624
                        mainStack.addPageToCurrentColumn(messages,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
304
680
                    }
625
                    }
305
681
                }
626
                }
306
682
627
307
@@ -693,15 +638,6 @@
308
693
                    top: parent ? parent.top: undefined
638
                    top: parent ? parent.top: undefined
309
694
                    topMargin: units.gu(1)
639
                    topMargin: units.gu(1)
310
695
                }
640
                }
311
696
312
697
                Connections {
313
698
                    target: mainView.bottomEdge
314
699
                    onStatusChanged: {
315
700
                        if (mainView.bottomEdge.status === BottomEdge.Committed) {
316
701
                            multiRecipient.forceFocus()
317
702
                        }
318
703
                    }
319
704
                }
320
705
            }
641
            }
321
706
642
322
707
            PropertyChanges {
643
            PropertyChanges {
323
@@ -733,7 +669,7 @@
324
733
                    iconSource: "image://theme/contact"
669
                    iconSource: "image://theme/contact"
325
734
                    text: i18n.tr("Contact")
670
                    text: i18n.tr("Contact")
326
735
                    onTriggered: {
671
                    onTriggered: {
328
736
                        mainView.showContactDetails(messages.basePage, contactWatcher.contactId, null, null)
672
                        mainView.showContactDetails(messages, contactWatcher.contactId, null, null)
329
737
                    }
673
                    }
330
738
                }
674
                }
331
739
            ]
675
            ]
332
@@ -759,6 +695,13 @@
333
759
        restoreBindings()
695
        restoreBindings()
334
760
        // if we add multiple attachments at the same time, it break the Repeater + Loaders
696
        // if we add multiple attachments at the same time, it break the Repeater + Loaders
335
761
        fillAttachmentsTimer.start()
697
        fillAttachmentsTimer.start()
336
698
        mainView.updateNewMessageStatus()
337
699
    }
338
700
339
701
    Component.onDestruction: {
340
702
        newMessage = false
341
703
        active = false
342
704
        mainView.updateNewMessageStatus()
343
762
    }
705
    }
344
763
706
345
764
    Timer {
707
    Timer {
346
@@ -777,17 +720,16 @@
347
777
        if (active && (eventModel.count > 0)){
720
        if (active && (eventModel.count > 0)){
348
778
            swipeItemDemo.enable()
721
            swipeItemDemo.enable()
349
779
        }
722
        }
350
723
        mainView.updateNewMessageStatus()
351
724
        if (!isReady) {
352
725
            messages.ready()
353
726
        }
354
780
    }
727
    }
355
781
728
356
782
    // These fake items are used to track if there are instances loaded
729
    // These fake items are used to track if there are instances loaded
357
783
    // on the second column because we have no access to the page stack
730
    // on the second column because we have no access to the page stack
365
784
    Loader {
731
    Item {
366
785
        sourceComponent: fakeItemComponent
732
        objectName:"fakeItem"
360
786
        active: !startedFromBottomEdge
361
787
    }
362
788
    Component {
363
789
        id: fakeItemComponent
364
790
        Item { objectName:"fakeItem"}
367
791
    }
733
    }
368
792
734
369
793
    Connections {
735
    Connections {
370
794
736
371
=== modified file 'src/qml/MessagesListView.qml'
372
--- src/qml/MessagesListView.qml	2016-06-28 21:06:36 +0000
373
+++ src/qml/MessagesListView.qml	2016-07-29 23:27:49 +0000
374
@@ -87,8 +87,7 @@
375
87
        transfer["items"] = items
87
        transfer["items"] = items
376
88
88
377
89
        properties["sharedAttachmentsTransfer"] = transfer
89
        properties["sharedAttachmentsTransfer"] = transfer
380
90
        emptyStack()
90
        mainView.showMessagesView(properties)
379
91
        mainView.showBottomEdgePage(properties)
381
92
91
382
93
        root.cancelSelection()
92
        root.cancelSelection()
383
94
    }
93
    }
384
95
94
385
=== modified file 'src/qml/MessagingBottomEdge.qml'
386
--- src/qml/MessagingBottomEdge.qml	2016-07-11 20:53:50 +0000
387
+++ src/qml/MessagingBottomEdge.qml	2016-07-29 23:27:49 +0000
388
@@ -22,56 +22,21 @@
389
22
BottomEdge {
22
BottomEdge {
390
23
    id: bottomEdge
23
    id: bottomEdge
391
24
24
392
25
    function commitWithProperties(properties) {
393
26
        if (_realPage) {
394
27
            _realPage.destroy()
395
28
        }
396
29
        _realPage = messagesComponent.createObject(null, properties)
397
30
        commit()
398
31
    }
399
32
400
33
    property bool showingConversation: _realPage && _realPage.state !== "newMessage"
401
34
402
35
    property var _realPage: null
403
36
404
37
    height: parent ? parent.height : 0
25
    height: parent ? parent.height : 0
405
38
    hint.text: i18n.tr("+")
26
    hint.text: i18n.tr("+")
432
39
    contentComponent: Item {
27
    contentComponent: messagesComponent
433
40
        id: pageContent
28
    preloadContent: true
434
41
        implicitWidth: bottomEdge.width
29
435
42
        implicitHeight: bottomEdge.height
30
    onCommitCompleted: {
436
43
        children: bottomEdge._realPage
31
        layout.addPageToNextColumn(mainPage, messagesComponent)
437
44
    }
32
        collapse()
412
45
413
46
    Component.onCompleted: {
414
47
        if (!_realPage) {
415
48
            _realPage = messagesComponent.createObject(null)
416
49
        }
417
50
        mainView.setBottomEdge(bottomEdge)
418
51
    }
419
52
420
53
    Component.onDestruction: {
421
54
        mainView.unsetBottomEdge(bottomEdge)
422
55
        if (_realPage) {
423
56
            _realPage.destroy()
424
57
        }
425
58
    }
426
59
427
60
    onCollapseCompleted: {
428
61
        if (_realPage) {
429
62
            _realPage.destroy()
430
63
        }
431
64
        _realPage = messagesComponent.createObject(null)
438
65
    }
33
    }
439
66
34
440
67
    Component {
35
    Component {
441
68
        id: messagesComponent
36
        id: messagesComponent
442
69
37
443
70
        Messages {
38
        Messages {
448
71
            anchors.fill: parent
39
            height: mainView.height
445
72
            onCancel: bottomEdge.collapse()
446
73
            basePage: bottomEdge.parent
447
74
            startedFromBottomEdge: true
449
75
        }
40
        }
450
76
    }
41
    }
451
77
42
452
78
43
453
=== modified file 'src/qml/SMSDelegate.qml'
454
--- src/qml/SMSDelegate.qml	2016-06-29 14:21:33 +0000
455
+++ src/qml/SMSDelegate.qml	2016-07-29 23:27:49 +0000
456
@@ -41,13 +41,12 @@
457
41
    {
41
    {
458
42
        var properties = {}
42
        var properties = {}
459
43
        var items = [{"text": textMessage, "url":""}]
43
        var items = [{"text": textMessage, "url":""}]
460
44
        emptyStack()
461
45
        var transfer = {}
44
        var transfer = {}
462
46
        transfer["items"] = items
45
        transfer["items"] = items
463
47
46
464
48
        properties["sharedAttachmentsTransfer"] = transfer
47
        properties["sharedAttachmentsTransfer"] = transfer
465
49
48
467
50
        mainView.showBottomEdgePage(properties)
49
        mainView.showMessagesView(properties)
468
51
    }
50
    }
469
52
51
470
53
    function copyMessage()
52
    function copyMessage()
471
54
53
472
=== modified file 'src/qml/SettingsPage.qml'
473
--- src/qml/SettingsPage.qml	2016-07-08 13:43:24 +0000
474
+++ src/qml/SettingsPage.qml	2016-07-29 23:27:49 +0000
475
@@ -48,21 +48,7 @@
476
48
        id: pageHeader
48
        id: pageHeader
477
49
        title: settingsPage.title
49
        title: settingsPage.title
478
50
        leadingActionBar {
50
        leadingActionBar {
494
51
            actions: [
51
            id: leadingBar
480
52
                Action {
481
53
                    id: singlePanelBackAction
482
54
                    objectName: "back"
483
55
                    name: "cancel"
484
56
                    text: i18n.tr("Cancel")
485
57
                    iconName: "back"
486
58
                    shortcut: "Esc"
487
59
                    visible: !mainView.dualPanel
488
60
                    onTriggered: {
489
61
                        // emptyStack will make sure the page gets removed.
490
62
                        mainView.emptyStack()
491
63
                    }
492
64
                }
493
65
            ]
495
66
        }
52
        }
496
67
    }
53
    }
497
68
54
498
69
55
499
=== modified file 'src/qml/messaging-app.qml'
500
--- src/qml/messaging-app.qml	2016-07-29 23:27:49 +0000
501
+++ src/qml/messaging-app.qml	2016-07-29 23:27:49 +0000
502
@@ -42,50 +42,11 @@
503
42
    property bool applicationActive: Qt.application.active
42
    property bool applicationActive: Qt.application.active
504
43
    property alias mainStack: layout
43
    property alias mainStack: layout
505
44
    property bool dualPanel: mainStack.columns > 1
44
    property bool dualPanel: mainStack.columns > 1
550
45
    property QtObject bottomEdge: null
45
    property bool composingNewMessage: activeMessagesView && activeMessagesView.newMessage
551
46
    property bool composingNewMessage: bottomEdge.status === BottomEdge.Committed
46
    property QtObject activeMessagesView: null
552
47
    property alias inputInfo: inputInfoObject
47
553
48
48
    function updateNewMessageStatus() {
554
49
    signal emptyStackRequested()
49
        activeMessagesView = application.findMessagingChild("messagesPage", "active", true)
511
50
512
51
    activeFocusOnPress: false
513
52
514
53
    /* Multiple MessagingBottomEdge instances can be created simultaneously
515
54
       and ask to become the unique 'bottomEdge'.
516
55
       Queue the requests until only one MessagingBottomEdge instance is left.
517
56
    */
518
57
    property var bottomEdgeQueue: []
519
58
    function setBottomEdge(newBottomEdge) {
520
59
        /* If the queue is empty and no other bottom edge is set then
521
60
           set 'bottomEdge' to newBottomEdge. Otherwise insert newBottomEdge
522
61
           in the queue
523
62
        */
524
63
        if (!bottomEdge && bottomEdgeQueue.length == 0) {
525
64
            bottomEdge = newBottomEdge;
526
65
        } else {
527
66
            if (bottomEdge) {
528
67
                bottomEdgeQueue.unshift(bottomEdge)
529
68
                bottomEdge = null
530
69
            }
531
70
            bottomEdgeQueue.push(newBottomEdge)
532
71
        }
533
72
    }
534
73
535
74
    function unsetBottomEdge(oldBottomEdge) {
536
75
        /* Remove all references to oldBottomEdge (from the queue and from 'bottomEdge')
537
76
           If only one bottom edge remains in the queue then set 'bottomEdge' to it
538
77
        */
539
78
        if (bottomEdge == oldBottomEdge) {
540
79
            bottomEdge = null;
541
80
        } else {
542
81
            var index = bottomEdgeQueue.indexOf(oldBottomEdge);
543
82
            if (index != -1) {
544
83
                bottomEdgeQueue.splice(index, 1);
545
84
                if (bottomEdgeQueue.length == 1) {
546
85
                    bottomEdge = bottomEdgeQueue.pop();
547
86
                }
548
87
            }
549
88
        }
555
89
    }
50
    }
556
90
51
557
91
    function defaultPhoneAccount() {
52
    function defaultPhoneAccount() {
558
@@ -170,29 +131,11 @@
559
170
        threadModel.removeThreads(threads);
131
        threadModel.removeThreads(threads);
560
171
    }
132
    }
561
172
133
562
173
    property var pendingCommitProperties
563
174
    function bottomEdgeCommit() {
564
175
        if (bottomEdge) {
565
176
            mainView.onBottomEdgeChanged.disconnect(bottomEdgeCommit);
566
177
            bottomEdge.commitWithProperties(pendingCommitProperties);
567
178
            pendingCommitProperties = null;
568
179
        }
569
180
    }
570
181
571
182
    function showBottomEdgePage(properties) {
572
183
        pendingCommitProperties = properties;
573
184
        if (bottomEdge) {
574
185
            bottomEdgeCommit();
575
186
        } else {
576
187
            mainView.onBottomEdgeChanged.connect(bottomEdgeCommit);
577
188
        }
578
189
    }
579
190
580
191
    function startImport(transfer) {
134
    function startImport(transfer) {
581
192
        var properties = {}
135
        var properties = {}
582
193
        emptyStack()
136
        emptyStack()
583
194
        properties["sharedAttachmentsTransfer"] = transfer
137
        properties["sharedAttachmentsTransfer"] = transfer
585
195
        mainView.showBottomEdgePage(properties)
138
        mainView.showMessagesView(properties)
586
196
    }
139
    }
587
197
140
588
198
    Connections {
141
    Connections {
589
@@ -213,6 +156,7 @@
590
213
    implicitWidth: units.gu(90)
156
    implicitWidth: units.gu(90)
591
214
    implicitHeight: units.gu(71)
157
    implicitHeight: units.gu(71)
592
215
    anchorToKeyboard: false
158
    anchorToKeyboard: false
593
159
    activeFocusOnPress: false
594
216
160
595
217
    Component.onCompleted: {
161
    Component.onCompleted: {
596
218
        i18n.domain = "messaging-app"
162
        i18n.domain = "messaging-app"
597
@@ -288,7 +232,6 @@
598
288
232
599
289
    function emptyStack(showEmpty) {
233
    function emptyStack(showEmpty) {
600
290
        if (typeof showEmpty === 'undefined') { showEmpty = true; }
234
        if (typeof showEmpty === 'undefined') { showEmpty = true; }
601
291
        mainView.emptyStackRequested()
602
292
        mainStack.removePages(mainPage)
235
        mainStack.removePages(mainPage)
603
293
        if (showEmpty) {
236
        if (showEmpty) {
604
294
            showEmptyState()
237
            showEmptyState()
605
@@ -303,9 +246,14 @@
606
303
    }
246
    }
607
304
247
608
305
    function startNewMessage() {
248
    function startNewMessage() {
612
306
        var properties = {}
249
        if (!mainView.composingNewMessage) {
613
307
        emptyStack()
250
            var properties = {}
614
308
        mainView.showBottomEdgePage(properties)
251
            showMessagesView(properties)
615
252
        }
616
253
    }
617
254
618
255
    function showMessagesView(properties) {
619
256
        layout.addPageToNextColumn(mainPage, Qt.resolvedUrl("Messages.qml"), properties)
620
309
    }
257
    }
621
310
258
622
311
    function startChat(identifiers, text, accountId) {
259
    function startChat(identifiers, text, accountId) {
623
@@ -348,25 +296,8 @@
624
348
            properties["accountId"] = accountId
296
            properties["accountId"] = accountId
625
349
        }
297
        }
626
350
298
646
351
        emptyStack(false)
299
        showMessagesView(properties)
647
352
        // FIXME: AdaptivePageLayout takes a really long time to create pages,
300
    }
629
353
        // so we create manually and push that
630
354
        mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
631
355
    }
632
356
633
357
    InputInfo {
634
358
        id: inputInfoObject
635
359
    }
636
360
637
361
    // WORKAROUND: Due the missing feature on SDK, they can not detect if
638
362
    // there is a mouse attached to device or not. And this will cause the
639
363
    // bootom edge component to not work correct on desktop.
640
364
    Binding {
641
365
        target:  QuickUtils
642
366
        property: "mouseAttached"
643
367
        value: inputInfo.hasMouse
644
368
    }
645
369
648
370
301
649
371
    Connections {
302
    Connections {
650
372
        target: UriHandler
303
        target: UriHandler
651
@@ -378,67 +309,16 @@
652
378
    }
309
    }
653
379
310
654
380
    Component {
311
    Component {
655
381
        id: messagesWithBottomEdge
656
382
657
383
        Messages {
658
384
            id: messages
659
385
            height: mainPage.height
660
386
661
387
            Component.onCompleted: mainPage._messagesPage = messages
662
388
            Loader {
663
389
                id: messagesBottomEdgeLoader
664
390
                active: mainView.dualPanel
665
391
                asynchronous: true
666
392
                /* FIXME: would be even more efficient to use setSource() to
667
393
                   delay the compilation step but a bug in Qt prevents us.
668
394
                   Ref.: https://bugreports.qt.io/browse/QTBUG-54657
669
395
                */
670
396
                sourceComponent: MessagingBottomEdge {
671
397
                    id: messagesBottomEdge
672
398
                    parent: messages
673
399
                    hint.text: ""
674
400
                    hint.height: 0
675
401
                }
676
402
            }
677
403
        }
678
404
    }
679
405
680
406
    Component {
681
407
        id: emptyStatePageComponent
312
        id: emptyStatePageComponent
682
408
        Page {
313
        Page {
683
409
            id: emptyStatePage
314
            id: emptyStatePage
684
410
            objectName: "emptyStatePage"
315
            objectName: "emptyStatePage"
685
411
316
686
412
            Connections {
687
413
                target: layout
688
414
                onColumnsChanged: {
689
415
                    if (layout.columns == 1) {
690
416
                        if (!application.findMessagingChild("fakeItem")) {
691
417
                            emptyStack()
692
418
                        }
693
419
                    }
694
420
                }
695
421
            }
696
422
697
423
            EmptyState {
317
            EmptyState {
698
424
                labelVisible: false
318
                labelVisible: false
699
425
            }
319
            }
700
426
320
701
427
            header: PageHeader { }
321
            header: PageHeader { }
702
428
703
429
            Loader {
704
430
                id: bottomEdgeLoader
705
431
                asynchronous: true
706
432
                /* FIXME: would be even more efficient to use setSource() to
707
433
                   delay the compilation step but a bug in Qt prevents us.
708
434
                   Ref.: https://bugreports.qt.io/browse/QTBUG-54657
709
435
                */
710
436
                sourceComponent: MessagingBottomEdge {
711
437
                    parent: emptyStatePage
712
438
                    hint.text: ""
713
439
                    hint.height: 0
714
440
                }
715
441
            }
716
442
        }
322
        }
717
443
    }
323
    }
718
444
324
719
@@ -464,13 +344,19 @@
720
464
        property bool completed: false
344
        property bool completed: false
721
465
345
722
466
        onColumnsChanged: {
346
        onColumnsChanged: {
725
467
            // we only have things to do here in case no thread is selected
347
            if (layout.completed && layout.columns == 1) {
726
468
            if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
348
                // in 1 column mode we don't have empty state as a page, so remove it
727
349
                if (application.findMessagingChild("emptyStatePage")) {
728
350
                    emptyStack(false)
729
351
                }
730
352
            } else if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
731
353
                // we only have things to do here in case no thread is selected
732
469
                emptyStack()
354
                emptyStack()
733
470
            }
355
            }
734
471
        }
356
        }
735
472
        Component.onCompleted: {
357
        Component.onCompleted: {
736
473
            if (layout.columns == 2 && !application.findMessagingChild("emptyStatePage")) {
358
            if (layout.columns == 2 && !application.findMessagingChild("emptyStatePage")) {
737
359
                // add the empty state page if necessary
738
474
                emptyStack()
360
                emptyStack()
739
475
            }
361
            }
740
476
            layout.completed = true;
362
            layout.completed = true;
741
477
363
742
=== modified file 'tests/qml/tst_DualSim.qml'
743
--- tests/qml/tst_DualSim.qml	2016-07-18 13:48:55 +0000
744
+++ tests/qml/tst_DualSim.qml	2016-07-29 23:27:49 +0000
745
@@ -153,10 +153,10 @@
746
153
153
747
154
            mainViewLoader.item.startNewMessage()
154
            mainViewLoader.item.startNewMessage()
748
155
            waitForRendering(mainViewLoader.item)
155
            waitForRendering(mainViewLoader.item)
749
156
            tryCompare(mainViewLoader.item, 'pendingCommitProperties', null)
750
157
            waitForRendering(mainViewLoader.item.bottomEdge)
751
158
156
752
159
            var messagesView = findChild(mainViewLoader, "messagesPage")
157
            var messagesView = findChild(mainViewLoader, "messagesPage")
753
158
            waitForRendering(messagesView)
754
159
755
160
            var headerSections = findChild(messagesView, "headerSections")
160
            var headerSections = findChild(messagesView, "headerSections")
756
161
            compare(headerSections.selectedIndex, -1)
161
            compare(headerSections.selectedIndex, -1)
757
162
162
758
@@ -217,10 +217,10 @@
759
217
217
760
218
            mainViewLoader.item.startNewMessage()
218
            mainViewLoader.item.startNewMessage()
761
219
            waitForRendering(mainViewLoader.item)
219
            waitForRendering(mainViewLoader.item)
762
220
            tryCompare(mainViewLoader.item, 'pendingCommitProperties', null)
763
221
            waitForRendering(mainViewLoader.item.bottomEdge)
764
222
220
765
223
            var messagesView = findChild(mainViewLoader, "messagesPage")
221
            var messagesView = findChild(mainViewLoader, "messagesPage")
766
222
            waitForRendering(messagesView)
767
223
768
224
            var textArea = findChild(messagesView, "messageTextArea")
224
            var textArea = findChild(messagesView, "messageTextArea")
769
225
            var contactSearchInput = findChild(messagesView, "contactSearchInput")
225
            var contactSearchInput = findChild(messagesView, "contactSearchInput")
770
226
            var sendButton = findChild(messagesView, "sendButton")
226
            var sendButton = findChild(messagesView, "sendButton")
771
227
227
772
=== modified file 'tests/qml/tst_MMSDelegate.qml'
773
--- tests/qml/tst_MMSDelegate.qml	2016-03-05 01:09:32 +0000
774
+++ tests/qml/tst_MMSDelegate.qml	2016-07-29 23:27:49 +0000
775
@@ -109,6 +109,7 @@
776
109
109
777
110
        when: windowShown
110
        when: windowShown
778
111
            
111
            
779
112
        /* FIXME: this text is disabled because thumbnailer sometimes fails on yakkety
780
112
        function test_load_video() {
113
        function test_load_video() {
781
113
            mmsDelegate.messageData = {
114
            mmsDelegate.messageData = {
782
114
                "newEvent": false,
115
                "newEvent": false,
783
@@ -130,13 +131,13 @@
784
130
            var video = findChild(mmsDelegate, "videoAttachment")
131
            var video = findChild(mmsDelegate, "videoAttachment")
785
131
            verify(video != null)
132
            verify(video != null)
786
132
            waitForRendering(video)
133
            waitForRendering(video)
788
133
            verify(video.source != "image://theme/image-missing")
134
            verify(video, "source" != "image://theme/image-missing")
789
134
135
790
135
            var icon = findChild(mmsDelegate, "playbackStartIcon")
136
            var icon = findChild(mmsDelegate, "playbackStartIcon")
791
136
            verify(icon != null)
137
            verify(icon != null)
792
137
            waitForRendering(icon)
138
            waitForRendering(icon)
793
138
            verify(icon.visible)
139
            verify(icon.visible)
795
139
        }
140
        }*/
796
140
141
797
141
        function test_load_invalid_path() {
142
        function test_load_invalid_path() {
798
142
            skip("image://thumbnailer is not reporting an error for wrong file path")
143
            skip("image://thumbnailer is not reporting an error for wrong file path")
799
143
144
800
=== modified file 'tests/qml/tst_SingleSim.qml'
801
--- tests/qml/tst_SingleSim.qml	2016-07-11 19:45:52 +0000
802
+++ tests/qml/tst_SingleSim.qml	2016-07-29 23:27:49 +0000
803
@@ -138,10 +138,10 @@
804
138
138
805
139
            mainViewLoader.item.startNewMessage()
139
            mainViewLoader.item.startNewMessage()
806
140
            waitForRendering(mainViewLoader.item)
140
            waitForRendering(mainViewLoader.item)
807
141
            tryCompare(mainViewLoader.item, 'pendingCommitProperties', null)
808
142
            waitForRendering(mainViewLoader.item.bottomEdge)
809
143
141
810
144
            var messagesView = findChild(mainViewLoader, "messagesPage")
142
            var messagesView = findChild(mainViewLoader, "messagesPage")
811
143
            waitForRendering(messagesView)
812
144
813
145
            var textArea = findChild(messagesView, "messageTextArea")
145
            var textArea = findChild(messagesView, "messageTextArea")
814
146
            var contactSearchInput = findChild(messagesView, "contactSearchInput")
146
            var contactSearchInput = findChild(messagesView, "contactSearchInput")
815
147
            var sendButton = findChild(messagesView, "sendButton")
147
            var sendButton = findChild(messagesView, "sendButton")
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2016-07-21	Approve on 2016-07-29
system-apps-ci-bot	continuous-integration		Approve on 2016-07-29
Review via email: mp+300795@code.launchpad.net