1
=== modified file 'README.click'
2
--- README.click	2013-12-16 15:04:12 +0000
3
+++ README.click	2014-06-09 17:04:25 +0000
4
@@ -7,8 +7,8 @@
5
7
cd build
7
cd build
6
8
cmake [path_to_this_location] -DCLICK_MODE=on \
8
cmake [path_to_this_location] -DCLICK_MODE=on \
7
9
    -DBZR_REVNO=$(cd [path_to_this_location]; bzr revno)
9
    -DBZR_REVNO=$(cd [path_to_this_location]; bzr revno)
10
10
make DESTDIR=package install
10
make DESTDIR=[package dir] install
11
11
click build package
11
click build [package dir]
12
12
12
13
13
This package can be installed by running:
13
This package can be installed by running:
14
14
14
15
15
15
16
=== modified file 'debian/control'
17
--- debian/control	2014-05-16 01:59:36 +0000
18
+++ debian/control	2014-06-09 17:04:25 +0000
19
@@ -27,7 +27,6 @@
20
27
         qmlscene,
27
         qmlscene,
21
28
         qtcontact5-galera,
28
         qtcontact5-galera,
22
29
         qtdeclarative5-ubuntu-contacts0.1 (= ${binary:Version}),
29
         qtdeclarative5-ubuntu-contacts0.1 (= ${binary:Version}),
23
30
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
24
31
         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
30
         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
25
32
         qtdeclarative5-ubuntu-content0.1,
31
         qtdeclarative5-ubuntu-content0.1,
26
33
         qtdeclarative5-ubuntu-keyboard-extensions0.1,
32
         qtdeclarative5-ubuntu-keyboard-extensions0.1,
27
@@ -41,7 +40,7 @@
28
41
Package: qtdeclarative5-ubuntu-contacts0.1
40
Package: qtdeclarative5-ubuntu-contacts0.1
29
42
Architecture: any
41
Architecture: any
30
43
Depends: qtdeclarative5-qtquick2-plugin,
42
Depends: qtdeclarative5-qtquick2-plugin,
32
44
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
43
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
33
45
         qtdeclarative5-qtcontacts-plugin,
44
         qtdeclarative5-qtcontacts-plugin,
34
46
         ${misc:Depends},
45
         ${misc:Depends},
35
47
         ${shlibs:Depends},
46
         ${shlibs:Depends},
36
@@ -71,8 +70,9 @@
37
71
         libqt5test5,
70
         libqt5test5,
38
72
         libqt5widgets5,
71
         libqt5widgets5,
39
73
         python-testscenarios,
72
         python-testscenarios,
41
74
         ubuntu-ui-toolkit-autopilot,
73
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527),
42
74
         ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),
43
75
         address-book-app (>= ${binary:Version}),
75
         address-book-app (>= ${binary:Version}),
44
76
         ubuntu-mobile-icons,
76
         ubuntu-mobile-icons,
45
77
Description: Test package for address-book-app
77
Description: Test package for address-book-app
47
78
 Autopilot tests for the address-book-app package
78
 Autopilot tests for the address-book-app package 
48
79
79
49
=== modified file 'src/imports/Common/CMakeLists.txt'
50
--- src/imports/Common/CMakeLists.txt	2014-05-08 18:10:28 +0000
51
+++ src/imports/Common/CMakeLists.txt	2014-06-09 17:04:25 +0000
52
@@ -3,7 +3,9 @@
53
3
    ContactDetailItem.qml
3
    ContactDetailItem.qml
54
4
    ContactDetailGroupBase.qml
4
    ContactDetailGroupBase.qml
55
5
    ContactDetailGroupWithTypeBase.qml
5
    ContactDetailGroupWithTypeBase.qml
56
6
    KeyboardRectangle.qml
57
6
    RemoveContactsDialog.qml
7
    RemoveContactsDialog.qml
58
8
    StandardAnimation.qml
59
7
)
9
)
60
8
10
61
9
install(FILES ${CONTACT_COMMON_QMLS}
11
install(FILES ${CONTACT_COMMON_QMLS}
62
10
12
63
=== renamed file 'src/imports/ContactEdit/KeyboardRectangle.qml' => 'src/imports/Common/KeyboardRectangle.qml'
64
=== renamed file 'src/imports/ContactEdit/StandardAnimation.qml' => 'src/imports/Common/StandardAnimation.qml'
65
=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
66
--- src/imports/ContactEdit/CMakeLists.txt	2014-05-06 14:16:55 +0000
67
+++ src/imports/ContactEdit/CMakeLists.txt	2014-06-09 17:04:25 +0000
68
@@ -11,8 +11,6 @@
69
11
    ContactDetailWithTypeEditor.qml
11
    ContactDetailWithTypeEditor.qml
70
12
    ContactEditor.qml
12
    ContactEditor.qml
71
13
    ContactFetchError.qml
13
    ContactFetchError.qml
72
14
    KeyboardRectangle.qml
73
15
    StandardAnimation.qml
74
16
    TextInputDetail.qml
14
    TextInputDetail.qml
75
17
    ValueSelector.qml
15
    ValueSelector.qml
76
18
)
16
)
77
19
17
78
=== modified file 'src/imports/ContactList/ContactListPage.qml'
79
--- src/imports/ContactList/ContactListPage.qml	2014-05-27 14:48:50 +0000
80
+++ src/imports/ContactList/ContactListPage.qml	2014-06-09 17:04:25 +0000
81
@@ -32,8 +32,11 @@
82
32
    property bool pickMultipleContacts: false
32
    property bool pickMultipleContacts: false
83
33
    property var onlineAccountsMessageDialog: null
33
    property var onlineAccountsMessageDialog: null
84
34
    property QtObject contactIndex: null
34
    property QtObject contactIndex: null
87
35
    property bool syncEnabled: application.syncEnabled
35
    property bool contactsLoaded: false
88
36
    property var contactModel: contactList.listModel ? contactList.listModel : null
36
89
37
    readonly property bool syncEnabled: application.syncEnabled
90
38
    readonly property var contactModel: contactList.listModel ? contactList.listModel : null
91
39
    readonly property bool searching: (state === "searching")
92
37
40
93
38
    function createEmptyContact(phoneNumber) {
41
    function createEmptyContact(phoneNumber) {
94
39
        var details = [ {detail: "PhoneNumber", field: "number", value: phoneNumber},
42
        var details = [ {detail: "PhoneNumber", field: "number", value: phoneNumber},
95
@@ -111,13 +114,29 @@
96
111
        id: contactList
114
        id: contactList
97
112
        objectName: "contactListView"
115
        objectName: "contactListView"
98
113
116
99
117
        anchors {
100
118
            top: parent.top
101
119
            left: parent.left
102
120
            bottom: keyboard.top
103
121
            right: parent.right
104
122
        }
105
123
        swipeToDelete: !pickMode
106
114
        multiSelectionEnabled: true
124
        multiSelectionEnabled: true
107
115
        multipleSelection: !pickMode ||
125
        multipleSelection: !pickMode ||
108
116
                           ((contactContentHub && contactContentHub.multipleItems) || mainPage.pickMultipleContacts)
126
                           ((contactContentHub && contactContentHub.multipleItems) || mainPage.pickMultipleContacts)
111
117
        anchors.fill: parent
127
        DetailFilter {
112
118
        swipeToDelete: !pickMode
128
            id: nameFilter
113
129
114
130
            detail: ContactDetail.DisplayLabel
115
131
            field: DisplayLabel.Label
116
132
            value: searchField.text
117
133
            matchFlags: DetailFilter.MatchContains
118
134
        }
119
119
135
120
120
        onCountChanged: {
136
        onCountChanged: {
121
137
            if (count > 0)
122
138
                mainPage.contactsLoaded = true
123
139
124
121
            if ((count > 0) && mainPage.onlineAccountsMessageDialog) {
140
            if ((count > 0) && mainPage.onlineAccountsMessageDialog) {
125
122
                // Because of some contacts can take longer to arrive due the dbus delay,
141
                // Because of some contacts can take longer to arrive due the dbus delay,
126
123
                // we need to destroy the online account dialog if this happen
142
                // we need to destroy the online account dialog if this happen
127
@@ -128,6 +147,7 @@
128
128
        }
147
        }
129
129
148
130
130
        onContactClicked: {
149
        onContactClicked: {
131
150
            mainPage.state = ""
132
131
            pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
151
            pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
133
132
                           {model: contactList.listModel,
152
                           {model: contactList.listModel,
134
133
                            contact: contact})
153
                            contact: contact})
135
@@ -171,7 +191,9 @@
136
171
191
137
172
            anchors.centerIn: parent
192
            anchors.centerIn: parent
138
173
            spacing: units.gu(2)
193
            spacing: units.gu(2)
140
174
            visible: (contactList.loading || application.syncing) && (contactList.count === 0)
194
            visible: ((contactList.loading && !mainPage.contactsLoaded) ||
141
195
                      (application.syncing && (contactList.count === 0)))
142
196
143
175
197
144
176
            ActivityIndicator {
198
            ActivityIndicator {
145
177
                id: activity
199
                id: activity
146
@@ -215,7 +237,6 @@
147
215
        }
237
        }
148
216
238
149
217
        ToolbarButton {
239
        ToolbarButton {
150
218
151
219
            action: Action {
240
            action: Action {
152
220
                objectName: "doneSelection"
241
                objectName: "doneSelection"
153
221
                text: mainPage.pickMode ? i18n.tr("Select") : i18n.tr("Delete")
242
                text: mainPage.pickMode ? i18n.tr("Select") : i18n.tr("Delete")
154
@@ -240,9 +261,81 @@
155
240
                onTriggered: application.startSync()
261
                onTriggered: application.startSync()
156
241
            }
262
            }
157
242
        }
263
        }
161
243
    }
264
        ToolbarButton {
162
244
265
            objectName: "Search"
163
245
    tools: contactList.isInSelectionMode ? toolbarItemsSelectionMode : toolbarItemsNormalMode
266
            action: Action {
164
267
                text: i18n.tr("Search")
165
268
                visible: !mainPage.searching
166
269
                iconName: "search"
167
270
                onTriggered: {
168
271
                    mainPage.state = "searching"
169
272
                    searchField.forceActiveFocus()
170
273
                }
171
274
            }
172
275
        }
173
276
    }
174
277
175
278
    ToolbarItems {
176
279
        id: toolbarItemsSearch
177
280
178
281
        visible: false
179
282
        back: ToolbarButton {
180
283
            visible: false
181
284
            action: Action {
182
285
                objectName: "cancelSearch"
183
286
184
287
                visible: mainPage.searching
185
288
                iconName: "back"
186
289
                text: i18n.tr("Cancel")
187
290
                onTriggered: mainPage.state = ""
188
291
            }
189
292
        }
190
293
    }
191
294
192
295
    TextField {
193
296
        id: searchField
194
297
195
298
        visible: mainPage.searching
196
299
        anchors {
197
300
            left: parent.left
198
301
            leftMargin: units.gu(2)
199
302
            right: parent.right
200
303
            rightMargin: units.gu(2)
201
304
            topMargin: units.gu(1.5)
202
305
            bottomMargin: units.gu(1.5)
203
306
            verticalCenter: parent.verticalCenter
204
307
        }
205
308
        onTextChanged: contactSearchTimeout.restart()
206
309
        inputMethodHints: Qt.ImhNoPredictiveText
207
310
    }
208
311
209
312
    states: [
210
313
        State {
211
314
            name: ""
212
315
            PropertyChanges {
213
316
                target: searchField
214
317
                text: ""
215
318
            }
216
319
        },
217
320
        State {
218
321
            name: "searching"
219
322
            PropertyChanges {
220
323
                target: mainPage
221
324
                __customHeaderContents: searchField
222
325
                tools: toolbarItemsSearch
223
326
            }
224
327
        },
225
328
        State {
226
329
            name: "selection"
227
330
            when: contactList.isInSelectionMode
228
331
            PropertyChanges {
229
332
                target: mainPage
230
333
                tools: toolbarItemsSelectionMode
231
334
            }
232
335
        }
233
336
    ]
234
337
235
338
    tools: toolbarItemsNormalMode
236
246
339
237
247
    // WORKAROUND: Avoid the gap btw the header and the contact list when the list moves
340
    // WORKAROUND: Avoid the gap btw the header and the contact list when the list moves
238
248
    // see bug #1296764
341
    // see bug #1296764
239
@@ -304,6 +397,11 @@
240
304
        }
397
        }
241
305
    }
398
    }
242
306
399
243
400
244
401
    KeyboardRectangle {
245
402
        id: keyboard
246
403
    }
247
404
248
307
    Connections {
405
    Connections {
249
308
        target: mainPage.contactModel
406
        target: mainPage.contactModel
250
309
        onContactsChanged: {
407
        onContactsChanged: {
251
@@ -331,6 +429,26 @@
252
331
        }
429
        }
253
332
    }
430
    }
254
333
431
255
432
    Timer {
256
433
        id: contactSearchTimeout
257
434
258
435
        running: false
259
436
        repeat: false
260
437
        interval: 300
261
438
        onTriggered: {
262
439
            if (searchField.text === "") {
263
440
                if (contactList.filter !== null) {
264
441
                    contactList.changeFilter(null)
265
442
                }
266
443
            } else {
267
444
                if (contactList.filter !== nameFilter) {
268
445
                    contactList.changeFilter(nameFilter)
269
446
                }
270
447
                nameFilter.value = searchField.text
271
448
            }
272
449
        }
273
450
    }
274
451
275
334
452
276
335
    Component.onCompleted: {
453
    Component.onCompleted: {
277
336
        if (pickMode) {
454
        if (pickMode) {
278
337
455
279
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
280
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-05 19:20:12 +0000
281
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-09 17:04:25 +0000
282
@@ -43,6 +43,14 @@
283
43
43
284
44
    property bool showFavourites: false
44
    property bool showFavourites: false
285
45
45
286
46
    function changeFilter(newFilter)
287
47
    {
288
48
        if (root.count > 0) {
289
49
            contactsModel._clearModel = true
290
50
        }
291
51
        root.filter = newFilter
292
52
    }
293
53
294
46
    header: Rectangle {
54
    header: Rectangle {
295
47
        id: itemHeader
55
        id: itemHeader
296
48
56
297
@@ -69,7 +77,12 @@
298
69
                color: root.showFavourites ? UbuntuColors.warmGrey : UbuntuColors.orange
77
                color: root.showFavourites ? UbuntuColors.warmGrey : UbuntuColors.orange
299
70
                MouseArea {
78
                MouseArea {
300
71
                    anchors.fill: parent
79
                    anchors.fill: parent
302
72
                    onClicked: root.showFavourites = false
80
                    onClicked: {
303
81
                        //WORKAROUND: clear the model before start populate it with the new contacts
304
82
                        //otherwise the model will wait for all contacts before show any new contact
305
83
                        root.changeFilter(root.filter)
306
84
                        root.showFavourites = false
307
85
                    }
308
73
                }
86
                }
309
74
            }
87
            }
310
75
88
311
@@ -102,44 +115,67 @@
312
102
        }
115
        }
313
103
    }
116
    }
314
104
117
355
105
    ContactModel {
118
    DetailFilter {
356
106
        id: allContactsModel
119
        id: favouritesFilter
357
107
120
358
108
        manager: root.manager
121
        detail: ContactDetail.Favorite
359
109
        sortOrders: root.sortOrders
122
        field: Favorite.Favorite
360
110
        fetchHint: root.fetchHint
123
        value: true
361
111
124
        matchFlags: DetailFilter.MatchExactly
362
112
        onErrorChanged: {
125
    }
363
113
            if (error) {
126
364
114
                busyIndicator.busy = false
127
    InvalidFilter {
365
115
                contactListView.error(error)
128
        id: invalidFilter
366
116
            }
129
    }
367
117
        }
130
368
118
    }
131
    IntersectionFilter {
369
119
132
        id: contactsFilter
370
120
    ContactModel {
133
371
121
        id: favouritesContactsModel
134
        filters: {
372
122
135
            var filters = []
373
123
        manager: root.manager
136
            if (root.showFavourites) {
374
124
        sortOrders: root.sortOrders
137
                filters.push(favouritesFilter)
375
125
        fetchHint: root.fetchHint
138
            }
376
126
        filter: DetailFilter {
139
            if (root.filter) {
377
127
            id: favouritesFilter
140
                filters.push(root.filter)
378
128
141
            }
379
129
            detail: ContactDetail.Favorite
142
            return filters
380
130
            field: Favorite.Favorite
143
        }
381
131
            value: true
144
    }
382
132
            matchFlags: DetailFilter.MatchExactly
145
383
133
        }
146
    ContactModel {
384
134
147
        id: contactsModel
385
135
        onErrorChanged: {
148
386
136
            if (error) {
149
        property bool _clearModel: false
387
137
                busyIndicator.busy = false
150
388
138
                contactListView.error(error)
151
        manager: root.manager
389
139
            }
152
        sortOrders: root.sortOrders
390
140
        }
153
        fetchHint: root.fetchHint
391
141
154
        filter: {
392
142
    }
155
            if (contactsModel._clearModel) {
393
143
156
                return invalidFilter
394
144
    listModel: showFavourites ? favouritesContactsModel : allContactsModel
157
            } else if (root.showFavourites || root.filter) {
395
158
                return contactsFilter
396
159
            } else {
397
160
                return null
398
161
            }
399
162
        }
400
163
        onErrorChanged: {
401
164
            if (error) {
402
165
                console.error("Contact List error:" + error)
403
166
            }
404
167
        }
405
168
        onContactsChanged: {
406
169
            //WORKAROUND: clear the model before start populate it with the new contacts
407
170
            //otherwise the model will wait for all contacts before show any new contact
408
171
409
172
            //after all contacts get removed we can populate the model again, this will show
410
173
            //new contacts as soon as it arrives in the model
411
174
            if (contactsModel._clearModel && contacts.length === 0) {
412
175
                contactsModel._clearModel = false
413
176
            }
414
177
        }
415
178
    }
416
179
417
180
    listModel: contactsModel
418
145
}
181
}
419
146
182
420
=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
421
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-05 19:20:12 +0000
422
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-09 17:04:25 +0000
423
@@ -88,8 +88,6 @@
424
88
    */
88
    */
425
89
    property list<SortOrder> sortOrders : [
89
    property list<SortOrder> sortOrders : [
426
90
        SortOrder {
90
        SortOrder {
427
91
            id: sortOrder
428
92
429
93
            detail: ContactDetail.Tag
91
            detail: ContactDetail.Tag
430
94
            field: Tag.Tag
92
            field: Tag.Tag
431
95
            direction: Qt.AscendingOrder
93
            direction: Qt.AscendingOrder
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-06-05	Approve on 2014-06-09
Tiago Salem Herrmann (community)		2014-06-05	Approve on 2014-06-09
Review via email: mp+222241@code.launchpad.net