1
=== modified file 'src/imports/Common/ContactDetailBase.qml'
2
--- src/imports/Common/ContactDetailBase.qml	2013-11-14 13:25:28 +0000
3
+++ src/imports/Common/ContactDetailBase.qml	2014-03-26 22:14:43 +0000
4
@@ -61,6 +61,10 @@
5
61
        imMap[QtContacts.OnlineAccount.Protocol] = "imProtocol"
61
        imMap[QtContacts.OnlineAccount.Protocol] = "imProtocol"
6
62
        imMap[QtContacts.OnlineAccount.Capabilities] = "imCaps"
62
        imMap[QtContacts.OnlineAccount.Capabilities] = "imCaps"
7
63
63
8
64
        // SyncTarget
9
65
        var syncTargetMap = {}
10
66
        syncTargetMap[QtContacts.SyncTarget.SyncTarget] = "syncTarget"
11
67
12
64
        // all
68
        // all
13
65
        var detailMap = {}
69
        var detailMap = {}
14
66
        detailMap[QtContacts.ContactDetail.Name] = nameMap
70
        detailMap[QtContacts.ContactDetail.Name] = nameMap
15
@@ -68,6 +72,7 @@
16
68
        detailMap[QtContacts.ContactDetail.Email] = emailMap
72
        detailMap[QtContacts.ContactDetail.Email] = emailMap
17
69
        detailMap[QtContacts.ContactDetail.Address] = addressMap
73
        detailMap[QtContacts.ContactDetail.Address] = addressMap
18
70
        detailMap[QtContacts.ContactDetail.OnlineAccount] = imMap
74
        detailMap[QtContacts.ContactDetail.OnlineAccount] = imMap
19
75
        detailMap[QtContacts.ContactDetail.SyncTarget] = syncTargetMap
20
71
76
21
72
        // detail name
77
        // detail name
22
73
        var detailNameMap = {}
78
        var detailNameMap = {}
23
@@ -76,6 +81,7 @@
24
76
        detailNameMap[QtContacts.ContactDetail.Email] = "email"
81
        detailNameMap[QtContacts.ContactDetail.Email] = "email"
25
77
        detailNameMap[QtContacts.ContactDetail.Address] = "address"
82
        detailNameMap[QtContacts.ContactDetail.Address] = "address"
26
78
        detailNameMap[QtContacts.ContactDetail.OnlineAccount] = "onlineAccount"
83
        detailNameMap[QtContacts.ContactDetail.OnlineAccount] = "onlineAccount"
27
84
        detailNameMap[QtContacts.ContactDetail.SyncTarget] = "syncTarget"
28
79
85
29
80
        if ((detail in detailMap) && (field in detailMap[detail])) {
86
        if ((detail in detailMap) && (field in detailMap[detail])) {
30
81
            return detailMap[detail][field]
87
            return detailMap[detail][field]
31
82
88
32
=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
33
--- src/imports/ContactEdit/CMakeLists.txt	2013-09-24 15:07:46 +0000
34
+++ src/imports/ContactEdit/CMakeLists.txt	2014-03-26 22:14:43 +0000
35
@@ -7,6 +7,7 @@
36
7
    ContactDetailOnlineAccountsEditor.qml
7
    ContactDetailOnlineAccountsEditor.qml
37
8
    ContactDetailOrganizationsEditor.qml
8
    ContactDetailOrganizationsEditor.qml
38
9
    ContactDetailPhoneNumbersEditor.qml
9
    ContactDetailPhoneNumbersEditor.qml
39
10
    ContactDetailSyncTargetEditor.qml
40
10
    ContactDetailWithTypeEditor.qml
11
    ContactDetailWithTypeEditor.qml
41
11
    ContactEditor.qml
12
    ContactEditor.qml
42
12
    ContactFetchError.qml
13
    ContactFetchError.qml
43
13
14
44
=== added file 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
45
--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	1970-01-01 00:00:00 +0000
46
+++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-03-26 22:14:43 +0000
47
@@ -0,0 +1,106 @@
48
1
/*
49
2
 * Copyright (C) 2012-2013 Canonical, Ltd.
50
3
 *
51
4
 * This program is free software; you can redistribute it and/or modify
52
5
 * it under the terms of the GNU General Public License as published by
53
6
 * the Free Software Foundation; version 3.
54
7
 *
55
8
 * This program is distributed in the hope that it will be useful,
56
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
57
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
58
11
 * GNU General Public License for more details.
59
12
 *
60
13
 * You should have received a copy of the GNU General Public License
61
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
62
15
 */
63
16
64
17
import QtQuick 2.0
65
18
import QtContacts 5.0
66
19
import Ubuntu.Components 0.1
67
20
import Ubuntu.Components.ListItems 0.1 as ListItem
68
21
69
22
import "../Common"
70
23
71
24
ContactDetailBase {
72
25
    id: root
73
26
74
27
    function save() {
75
28
        // only changes the target sync for new contacts
76
29
        if (!isNewContact) {
77
30
            return;
78
31
        }
79
32
        var activeSource = getSelectedSource()
80
33
        if (!activeSource) {
81
34
            return;
82
35
        }
83
36
84
37
        if (!root.detail) {
85
38
            root.detail = root.contact.syncTarget
86
39
        }
87
40
        root.detail.syncTarget = activeSource
88
41
    }
89
42
90
43
    function getSelectedSource() {
91
44
        var selectedContact = sourceModel.contacts[sources.selectedIndex]
92
45
        if (selectedContact) {
93
46
            return selectedContact.guid.guid
94
47
        } else {
95
48
            return -1
96
49
        }
97
50
    }
98
51
99
52
    property bool isNewContact: contact && contact.contactId === "qtcontacts:::"
100
53
    property real myHeight: sources.containerHeight + units.gu(4) + label.height
101
54
102
55
    detail: contact ? contact.detail(ContactDetail.SyncTarget) : null
103
56
    implicitHeight: isNewContact ? myHeight : 0
104
57
105
58
    ContactModel {
106
59
        id: sourceModel
107
60
108
61
        manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
109
62
        filter:  DetailFilter {
110
63
            detail: ContactDetail.Type
111
64
            field: Type.TypeField
112
65
            value: Type.Group
113
66
            matchFlags: DetailFilter.MatchExactly
114
67
        }
115
68
    }
116
69
117
70
    Label {
118
71
        id: label
119
72
120
73
        text: i18n.tr("Addressbook")
121
74
        anchors {
122
75
            left: parent.left
123
76
            top: parent.top
124
77
            right: parent.right
125
78
            margins: units.gu(2)
126
79
        }
127
80
        height: root.active ? units.gu(4) : units.gu(3)
128
81
    }
129
82
130
83
    OptionSelector {
131
84
        id: sources
132
85
133
86
        anchors {
134
87
            left: parent.left
135
88
            leftMargin: units.gu(2)
136
89
            top: label.bottom
137
90
            topMargin: units.gu(1)
138
91
            right: parent.right
139
92
            rightMargin: units.gu(2)
140
93
            bottom: parent.bottom
141
94
            bottomMargin: units.gu(2)
142
95
        }
143
96
144
97
        model: sourceModel
145
98
        delegate: OptionSelectorDelegate {
146
99
            text: contact.displayLabel.label
147
100
            height: units.gu(5)
148
101
        }
149
102
150
103
        containerHeight: sourceModel.contacts.length > 4 ? itemHeight * 4 : itemHeight * sourceModel.contacts.length
151
104
    }
152
105
}
153
106
154
0
107
155
=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
156
--- src/imports/ContactEdit/ContactEditor.qml	2014-03-26 22:14:43 +0000
157
+++ src/imports/ContactEdit/ContactEditor.qml	2014-03-26 22:14:43 +0000
158
@@ -181,6 +181,7 @@
159
181
                }
181
                }
160
182
                height: implicitHeight + units.gu(3)
182
                height: implicitHeight + units.gu(3)
161
183
                KeyNavigation.tab: avatarEditor
183
                KeyNavigation.tab: avatarEditor
162
184
                KeyNavigation.backtab : syncTargetEditor
163
184
            }
185
            }
164
185
186
165
186
            ContactDetailAvatarEditor {
187
            ContactDetailAvatarEditor {
166
@@ -261,6 +262,20 @@
167
261
                }
262
                }
168
262
                height: implicitHeight
263
                height: implicitHeight
169
263
                KeyNavigation.backtab : addressesEditor
264
                KeyNavigation.backtab : addressesEditor
170
265
                KeyNavigation.tab: syncTargetEditor
171
266
            }
172
267
173
268
            ContactDetailSyncTargetEditor {
174
269
                id: syncTargetEditor
175
270
176
271
                contact: contactEditor.contact
177
272
                anchors {
178
273
                    left: parent.left
179
274
                    right: parent.right
180
275
                }
181
276
                height: implicitHeight
182
277
                KeyNavigation.backtab : organizationsEditor
183
278
                KeyNavigation.tab: nameEditor
184
264
            }
279
            }
185
265
        }
280
        }
186
266
    }
281
    }
187
267
282
188
=== modified file 'src/imports/ContactList/ContactListPage.qml'
189
--- src/imports/ContactList/ContactListPage.qml	2014-03-26 22:14:43 +0000
190
+++ src/imports/ContactList/ContactListPage.qml	2014-03-26 22:14:43 +0000
191
@@ -174,7 +174,7 @@
192
174
    Connections {
174
    Connections {
193
175
        target: mainPage.contactModel
175
        target: mainPage.contactModel
194
176
        onContactsChanged: {
176
        onContactsChanged: {
196
177
            if (contactIndex && contactIndex.contactId != "contact:qtcontacts:::") {
177
            if (contactIndex) {
197
178
                contactList.positionViewAtContact(mainPage.contactIndex)
178
                contactList.positionViewAtContact(mainPage.contactIndex)
198
179
                mainPage.contactIndex = null
179
                mainPage.contactIndex = null
199
180
            }
180
            }
200
181
181
201
=== modified file 'src/imports/ContactView/CMakeLists.txt'
202
--- src/imports/ContactView/CMakeLists.txt	2013-10-21 19:25:51 +0000
203
+++ src/imports/ContactView/CMakeLists.txt	2014-03-26 22:14:43 +0000
204
@@ -11,6 +11,7 @@
205
11
    ContactDetailOrganizationsView.qml
11
    ContactDetailOrganizationsView.qml
206
12
    ContactDetailPhoneNumbersView.qml
12
    ContactDetailPhoneNumbersView.qml
207
13
    ContactDetailPhoneNumberView.qml
13
    ContactDetailPhoneNumberView.qml
208
14
    ContactDetailSyncTargetView.qml
209
14
    ContactDetailWithTypeView.qml
15
    ContactDetailWithTypeView.qml
210
15
    ContactHeaderView.qml
16
    ContactHeaderView.qml
211
16
    ContactView.qml
17
    ContactView.qml
212
17
18
213
=== added file 'src/imports/ContactView/ContactDetailSyncTargetView.qml'
214
--- src/imports/ContactView/ContactDetailSyncTargetView.qml	1970-01-01 00:00:00 +0000
215
+++ src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-03-26 22:14:43 +0000
216
@@ -0,0 +1,30 @@
217
1
/*
218
2
 * Copyright (C) 2014 Canonical, Ltd.
219
3
 *
220
4
 * This program is free software; you can redistribute it and/or modify
221
5
 * it under the terms of the GNU General Public License as published by
222
6
 * the Free Software Foundation; version 3.
223
7
 *
224
8
 * This program is distributed in the hope that it will be useful,
225
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
226
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
227
11
 * GNU General Public License for more details.
228
12
 *
229
13
 * You should have received a copy of the GNU General Public License
230
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
231
15
 */
232
16
233
17
import QtQuick 2.0
234
18
import Ubuntu.Components 0.1
235
19
import QtContacts 5.0 as QtContacts
236
20
237
21
ContactDetailGroupWithTypeView {
238
22
    id: root
239
23
240
24
    title: i18n.tr("Addressbook")
241
25
    defaultIcon: "image://theme/contact-group"
242
26
    detailType: QtContacts.ContactDetail.SyncTarget
243
27
    typeModel: null
244
28
245
29
    fields: [ QtContacts.SyncTarget.SyncTarget ]
246
30
}
247
0
31
248
=== modified file 'src/imports/ContactView/ContactView.qml'
249
--- src/imports/ContactView/ContactView.qml	2014-03-18 21:02:25 +0000
250
+++ src/imports/ContactView/ContactView.qml	2014-03-26 22:14:43 +0000
251
@@ -137,6 +137,15 @@
252
137
                }
137
                }
253
138
                height: implicitHeight
138
                height: implicitHeight
254
139
            }
139
            }
255
140
256
141
            ContactDetailSyncTargetView {
257
142
                contact: root.contact
258
143
                anchors {
259
144
                    left: parent.left
260
145
                    right: parent.right
261
146
                }
262
147
                height: implicitHeight
263
148
            }
264
140
        }
149
        }
265
141
    }
150
    }
266
142
151
267
143
152
268
=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
269
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-03-26 22:14:43 +0000
270
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-03-26 22:14:43 +0000
271
@@ -191,16 +191,32 @@
272
191
    signal detailClicked(QtObject contact, QtObject detail)
191
    signal detailClicked(QtObject contact, QtObject detail)
273
192
192
274
193
    /*!
193
    /*!
276
194
      Retrieve the contact index inside of the list
194
      Retrieve the contact index inside of the list based on contact id or contact name if the id is empty
277
195
    */
195
    */
278
196
    function getIndex(contact)
196
    function getIndex(contact)
279
197
    {
197
    {
281
198
        var contacts = listModel.contacts;
198
        var contacts = listModel.contacts
282
199
        var contactId = null
283
200
        var firstName
284
201
        var middleName
285
202
        var lastName
286
203
287
204
        if (contact.contactId !== "qtcontacts:::") {
288
205
            contactId = contact.contactId
289
206
        } else {
290
207
            firstName = contact.name.firstName
291
208
            middleName = contact.name.middleName
292
209
            lastName = contact.name.lastName
293
210
        }
294
199
211
295
200
        for (var i = 0, count = contacts.length; i < count; i++) {
212
        for (var i = 0, count = contacts.length; i < count; i++) {
298
201
            var itemId = contacts[i].contactId
213
            var c = contacts[i]
299
202
            if (itemId === contact.contactId) {
214
            if (contactId && (c.contactId === contactId)) {
300
203
                return i
215
                return i
301
216
            } else if ((c.name.firstName === firstName) &&
302
217
                       (c.name.middleName === middleName) &&
303
218
                       (c.name.lastName === lastName)) {
304
219
                    return i
305
204
            }
220
            }
306
205
        }
221
        }
307
206
222
Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2014-03-27
Approved revision:	154
Merged at revision:	159
Proposed branch:	lp:~renatofilho/address-book-app/multiple-addressbook
Merge into:	lp:address-book-app
Prerequisite:	lp:~renatofilho/address-book-app/optimize-app
Diff against target:	306 lines (+189/-5) 9 files modified src/imports/Common/ContactDetailBase.qml (+6/-0) src/imports/ContactEdit/CMakeLists.txt (+1/-0) src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml (+106/-0) src/imports/ContactEdit/ContactEditor.qml (+15/-0) src/imports/ContactList/ContactListPage.qml (+1/-1) src/imports/ContactView/CMakeLists.txt (+1/-0) src/imports/ContactView/ContactDetailSyncTargetView.qml (+30/-0) src/imports/ContactView/ContactView.qml (+9/-0) src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+20/-4)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/multiple-addressbook
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-03-19	Approve on 2014-03-27
PS Jenkins bot	continuous-integration	2014-03-19	Approve on 2014-03-26
Review via email: mp+211806@code.launchpad.net