1
=== modified file 'src/qml/Messages.qml'
2
--- src/qml/Messages.qml	2013-09-25 17:07:07 +0000
3
+++ src/qml/Messages.qml	2013-09-27 17:28:42 +0000
4
@@ -51,6 +51,32 @@
5
51
        return eventModel.markEventAsRead(accountId, threadId, eventId, type);
51
        return eventModel.markEventAsRead(accountId, threadId, eventId, type);
6
52
    }
52
    }
7
53
53
8
54
    Component {
9
55
         id: newContactDialog
10
56
         Dialog {
11
57
             id: dialogue
12
58
             title: i18n.tr("Save contact")
13
59
             text: i18n.tr("How do you want to save the contact?")
14
60
             Button {
15
61
                 text: i18n.tr("Add to existing contact")
16
62
                 color: UbuntuColors.orange
17
63
                 onClicked: {
18
64
                     PopupUtils.open(addPhoneNumberToContactSheet)
19
65
                     PopupUtils.close(dialogue)
20
66
                 }
21
67
             }
22
68
             Button {
23
69
                 text: i18n.tr("Create new contact")
24
70
                 color: UbuntuColors.warmGrey
25
71
                 onClicked: {
26
72
                     applicationUtils.switchToAddressbookApp("addressbook://create" +
27
73
                                                             "?phone=" + encodeURIComponent(contactWatcher.phoneNumber))
28
74
                     PopupUtils.close(dialogue)
29
75
                 }
30
76
             }
31
77
         }
32
78
    }
33
79
34
54
    ContactWatcher {
80
    ContactWatcher {
35
55
        id: contactWatcher
81
        id: contactWatcher
36
56
    }
82
    }
37
@@ -60,7 +86,36 @@
38
60
    }
86
    }
39
61
87
40
62
    Component {
88
    Component {
42
63
        id: contactsSheet
89
        id: addPhoneNumberToContactSheet
43
90
        DefaultSheet {
44
91
            // FIXME: workaround to set the contact list
45
92
            // background to black
46
93
            Rectangle {
47
94
                anchors.fill: parent
48
95
                anchors.margins: -units.gu(1)
49
96
                color: "#221e1c"
50
97
            }
51
98
            id: sheet
52
99
            title: "Add Contact"
53
100
            doneButton: false
54
101
            modal: true
55
102
            contentsHeight: parent.height
56
103
            contentsWidth: parent.width
57
104
            ContactListView {
58
105
                anchors.fill: parent
59
106
                onContactClicked: {
60
107
                    applicationUtils.switchToAddressbookApp("addressbook://addphone" +
61
108
                                                            "?id=" + encodeURIComponent(contact.contactId) +
62
109
                                                            "&phone=" + encodeURIComponent(contactWatcher.phoneNumber))
63
110
                    PopupUtils.close(sheet)
64
111
                }
65
112
            }
66
113
            onDoneClicked: PopupUtils.close(sheet)
67
114
        }
68
115
    }
69
116
70
117
    Component {
71
118
        id: addContactToConversationSheet
72
64
        DefaultSheet {
119
        DefaultSheet {
73
65
            // FIXME: workaround to set the contact list
120
            // FIXME: workaround to set the contact list
74
66
            // background to black
121
            // background to black
75
@@ -110,9 +165,9 @@
76
110
            objectName: "addContactButton"
165
            objectName: "addContactButton"
77
111
            action: Action {
166
            action: Action {
78
112
                iconSource: Qt.resolvedUrl("assets/new-contact.svg")
167
                iconSource: Qt.resolvedUrl("assets/new-contact.svg")
80
113
                text: i18n.tr("Add contact")
168
                text: i18n.tr("Add")
81
114
                onTriggered: {
169
                onTriggered: {
83
115
                    applicationUtils.switchToAddressbookApp("create://" + contactWatcher.phoneNumber)
170
                    PopupUtils.open(newContactDialog)
84
116
                    messagesToolbar.opened = false
171
                    messagesToolbar.opened = false
85
117
                }
172
                }
86
118
            }
173
            }
87
@@ -124,7 +179,7 @@
88
124
                iconSource: Qt.resolvedUrl("assets/contact.svg")
179
                iconSource: Qt.resolvedUrl("assets/contact.svg")
89
125
                text: i18n.tr("Contact")
180
                text: i18n.tr("Contact")
90
126
                onTriggered: {
181
                onTriggered: {
92
127
                    applicationUtils.switchToAddressbookApp("contact://" + contactWatcher.contactId)
182
                    applicationUtils.switchToAddressbookApp("addressbook://contact?id=" + encodeURIComponent(contactWatcher.contactId))
93
128
                    messagesToolbar.opened = false
183
                    messagesToolbar.opened = false
94
129
                }
184
                }
95
130
            }
185
            }
96
@@ -225,7 +280,7 @@
97
225
            source: Qt.resolvedUrl("assets/new-contact.svg")
280
            source: Qt.resolvedUrl("assets/new-contact.svg")
98
226
            MouseArea {
281
            MouseArea {
99
227
                anchors.fill: parent
282
                anchors.fill: parent
101
228
                onClicked: PopupUtils.open(contactsSheet)
283
                onClicked: PopupUtils.open(addContactToConversationSheet)
102
229
            }
284
            }
103
230
        }
285
        }
104
231
    }
286
    }
105
232
287
106
=== modified file 'src/qml/ThreadDelegate.qml'
107
--- src/qml/ThreadDelegate.qml	2013-09-09 18:43:24 +0000
108
+++ src/qml/ThreadDelegate.qml	2013-09-27 17:28:42 +0000
109
@@ -46,32 +46,11 @@
110
46
        image: Image {
46
        image: Image {
111
47
            anchors.fill: parent
47
            anchors.fill: parent
112
48
            source: {
48
            source: {
139
49
                if(!unknownContact) {
49
                if(!unknownContact && delegateHelper.avatar !== "") {
140
50
                    if (delegateHelper.avatar != "") {
50
                    return delegateHelper.avatar
141
51
                        return delegateHelper.avatar
51
                }
142
52
                    }
52
                return Qt.resolvedUrl("assets/avatar-default.png")
143
53
                    return Qt.resolvedUrl("assets/avatar-default.png")
53
            }
118
54
                }
119
55
                return Qt.resolvedUrl("assets/new-contact.svg")
120
56
            }
121
57
        }
122
58
        MouseArea {
123
59
            anchors.fill: avatar
124
60
            onClicked: {
125
61
                mainView.newPhoneNumber = delegateHelper.phoneNumber
126
62
                if (selectionMode) {
127
63
                    delegate.clicked()
128
64
                } else {
129
65
                    PopupUtils.open(newcontactPopover, avatar)
130
66
                }
131
67
            }
132
68
            onPressAndHold: {
133
69
                mainView.newPhoneNumber = delegateHelper.phoneNumber
134
70
                if (!selectionMode) {
135
71
                    PopupUtils.open(newcontactPopover, avatar)
136
72
                }
137
73
            }
138
74
            enabled: unknownContact
144
75
        }
54
        }
145
76
    }
55
    }
146
77
56
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-27
Gustavo Pichorim Boiko (community)		2013-09-27	Approve on 2013-09-27
Review via email: mp+188088@code.launchpad.net