1
=== modified file 'src/qml/Messages.qml'
2
--- src/qml/Messages.qml	2014-03-20 18:39:45 +0000
3
+++ src/qml/Messages.qml	2014-03-25 12:50:42 +0000
4
@@ -41,6 +41,7 @@
5
41
    property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
41
    property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
6
42
    property bool landscape: orientationAngle == 90 || orientationAngle == 270
42
    property bool landscape: orientationAngle == 90 || orientationAngle == 270
7
43
    property bool pendingMessage: false
43
    property bool pendingMessage: false
8
44
    property string phoneNumberSubTypeLabel: ""
9
44
    flickable: null
45
    flickable: null
10
45
    title: {
46
    title: {
11
46
        if (landscape) {
47
        if (landscape) {
12
@@ -51,7 +52,7 @@
13
51
            if (contactWatcher.isUnknown) {
52
            if (contactWatcher.isUnknown) {
14
52
                firstRecipient = contactWatcher.phoneNumber
53
                firstRecipient = contactWatcher.phoneNumber
15
53
            } else {
54
            } else {
17
54
                firstRecipient = contactWatcher.alias
55
                firstRecipient = contactWatcher.alias + phoneNumberSubTypeLabel
18
55
            }
56
            }
19
56
            if (participants.length == 1) {
57
            if (participants.length == 1) {
20
57
                return firstRecipient
58
                return firstRecipient
21
@@ -68,6 +69,10 @@
22
68
        threadId = getCurrentThreadId()
69
        threadId = getCurrentThreadId()
23
69
    }
70
    }
24
70
71
25
72
    function updateSubTypeLabel() {
26
73
        phoneNumberSubTypeLabel = contactWatcher.isUnknown ? "" : " - " + phoneTypeModel.get(phoneTypeModel.getTypeIndex(phoneDetail)).label
27
74
    }
28
75
29
71
    function getCurrentThreadId() {
76
    function getCurrentThreadId() {
30
72
        if (participants.length == 0)
77
        if (participants.length == 0)
31
73
            return ""
78
            return ""
32
@@ -193,7 +198,21 @@
33
193
    ContactWatcher {
198
    ContactWatcher {
34
194
        id: contactWatcher
199
        id: contactWatcher
35
195
        phoneNumber: participants.length > 0 ? participants[0] : ""
200
        phoneNumber: participants.length > 0 ? participants[0] : ""
37
196
    }
201
        onIsUnknownChanged: updateSubTypeLabel();
38
202
    }
39
203
40
204
    PhoneNumber {
41
205
        id: phoneDetail
42
206
        contexts: contactWatcher.phoneNumberContexts
43
207
        subTypes: contactWatcher.phoneNumberSubTypes
44
208
        onSubTypesChanged: updateSubTypeLabel();
45
209
        onContextsChanged: updateSubTypeLabel();
46
210
    }
47
211
48
212
    ContactDetailPhoneNumberTypeModel {
49
213
        id: phoneTypeModel
50
214
    }
51
215
52
197
216
53
198
    onParticipantsChanged: {
217
    onParticipantsChanged: {
54
199
        threadId = getCurrentThreadId()
218
        threadId = getCurrentThreadId()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-03-27
Ubuntu Phablet Team		2014-03-24	Pending
Review via email: mp+212489@code.launchpad.net