1
=== modified file 'debian/control'
2
--- debian/control	2015-04-27 22:15:19 +0000
3
+++ debian/control	2015-05-15 15:18:10 +0000
4
@@ -16,7 +16,7 @@
5
16
               qtdeclarative5-dev (>= 5.0),
16
               qtdeclarative5-dev (>= 5.0),
6
17
               qtdeclarative5-dev-tools,
17
               qtdeclarative5-dev-tools,
7
18
               qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
18
               qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
9
19
               qtdeclarative5-ubuntu-contacts0.1,
19
               qtdeclarative5-ubuntu-addressbook0.1,
10
20
               qtdeclarative5-qtcontacts-plugin,
20
               qtdeclarative5-qtcontacts-plugin,
11
21
               qtdeclarative5-ubuntu-telephony-phonenumber0.1,
21
               qtdeclarative5-ubuntu-telephony-phonenumber0.1,
12
22
               qtdeclarative5-ubuntu-history0.1,
22
               qtdeclarative5-ubuntu-history0.1,
13
@@ -39,7 +39,7 @@
14
39
         qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
39
         qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
15
40
         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
40
         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
16
41
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
41
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
18
42
         qtdeclarative5-ubuntu-contacts0.1 (>= 0.2+14.10.20140805),
42
         qtdeclarative5-ubuntu-addressbook0.1,
19
43
         qtdeclarative5-qtcontacts-plugin,
43
         qtdeclarative5-qtcontacts-plugin,
20
44
Recommends: unity8 (>= 7.81.0~),
44
Recommends: unity8 (>= 7.81.0~),
21
45
Description: Dialer application for Ubuntu
45
Description: Dialer application for Ubuntu
22
@@ -50,6 +50,7 @@
23
50
Section: debug
50
Section: debug
24
51
Depends: ${misc:Depends},
51
Depends: ${misc:Depends},
25
52
         ${python3:Depends},
52
         ${python3:Depends},
26
53
         address-book-app-autopilot,
27
53
         autopilot-qt5,
54
         autopilot-qt5,
28
54
         dbus,
55
         dbus,
29
55
         libqt5test5,
56
         libqt5test5,
30
56
57
31
=== modified file 'debian/dialer-app-autopilot.install'
32
--- debian/dialer-app-autopilot.install	2013-07-16 14:05:40 +0000
33
+++ debian/dialer-app-autopilot.install	2015-05-15 15:18:10 +0000
34
@@ -1,1 +1,2 @@
35
1
usr/lib/python*/dist-packages/dialer_app/*
1
usr/lib/python*/dist-packages/dialer_app/*
36
2
usr/lib/python*/dist-packages/dialer_app/testdata/*
37
2
3
38
=== modified file 'debian/dialer-app.install'
39
--- debian/dialer-app.install	2014-08-22 14:51:14 +0000
40
+++ debian/dialer-app.install	2015-05-15 15:18:10 +0000
41
@@ -6,6 +6,8 @@
42
6
usr/share/dialer-app/HistoryPage
6
usr/share/dialer-app/HistoryPage
43
7
usr/share/dialer-app/DialerPage
7
usr/share/dialer-app/DialerPage
44
8
usr/share/dialer-app/ContactsPage
8
usr/share/dialer-app/ContactsPage
45
9
usr/share/dialer-app/ContactViewPage
46
10
usr/share/dialer-app/ContactEditorPage
47
9
usr/share/dialer-app/Dialogs
11
usr/share/dialer-app/Dialogs
48
10
usr/share/dialer-app/assets
12
usr/share/dialer-app/assets
49
11
usr/share/dialer-app/MMI
13
usr/share/dialer-app/MMI
50
12
14
51
=== modified file 'src/dialerapplication.cpp'
52
--- src/dialerapplication.cpp	2014-11-13 14:41:07 +0000
53
+++ src/dialerapplication.cpp	2015-05-15 15:18:10 +0000
54
@@ -143,6 +143,10 @@
55
143
        m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", contactsBackend);
143
        m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", contactsBackend);
56
144
    }
144
    }
57
145
145
58
146
    // used by autopilot tests to load vcards during tests
59
147
    QByteArray testData = qgetenv("QTCONTACTS_PRELOAD_VCARD");
60
148
    m_view->rootContext()->setContextProperty("QTCONTACTS_PRELOAD_VCARD", testData);
61
149
62
146
    QString pluginPath = ubuntuPhonePluginPath();
150
    QString pluginPath = ubuntuPhonePluginPath();
63
147
    if (!pluginPath.isNull()) {
151
    if (!pluginPath.isNull()) {
64
148
        m_view->engine()->addImportPath(pluginPath);
152
        m_view->engine()->addImportPath(pluginPath);
65
149
153
66
=== modified file 'src/qml/CMakeLists.txt'
67
--- src/qml/CMakeLists.txt	2014-08-27 16:07:33 +0000
68
+++ src/qml/CMakeLists.txt	2015-05-15 15:18:10 +0000
69
@@ -16,4 +16,6 @@
70
16
add_subdirectory(HistoryPage)
16
add_subdirectory(HistoryPage)
71
17
add_subdirectory(LiveCallPage)
17
add_subdirectory(LiveCallPage)
72
18
add_subdirectory(ContactsPage)
18
add_subdirectory(ContactsPage)
73
19
add_subdirectory(ContactViewPage)
74
20
add_subdirectory(ContactEditorPage)
75
19
add_subdirectory(Dialogs)
21
add_subdirectory(Dialogs)
76
20
22
77
=== added directory 'src/qml/ContactEditorPage'
78
=== added file 'src/qml/ContactEditorPage/CMakeLists.txt'
79
--- src/qml/ContactEditorPage/CMakeLists.txt	1970-01-01 00:00:00 +0000
80
+++ src/qml/ContactEditorPage/CMakeLists.txt	2015-05-15 15:18:10 +0000
81
@@ -0,0 +1,7 @@
82
1
file(GLOB CONTACT_EDITOR_QML_JS_FILES *.qml *.js)
83
2
84
3
# make the files visible on qtcreator
85
4
add_custom_target(dialer_contacteditor_QMlFiles ALL SOURCES ${CONTACT_EDITOR_QML_JS_FILES})
86
5
87
6
install(FILES ${CONTACT_EDITOR_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/ContactEditorPage)
88
7
89
0
8
90
=== added file 'src/qml/ContactEditorPage/DialerContactEditorPage.qml'
91
--- src/qml/ContactEditorPage/DialerContactEditorPage.qml	1970-01-01 00:00:00 +0000
92
+++ src/qml/ContactEditorPage/DialerContactEditorPage.qml	2015-05-15 15:18:10 +0000
93
@@ -0,0 +1,60 @@
94
1
/*
95
2
 * Copyright 2015 Canonical Ltd.
96
3
 *
97
4
 * This file is part of dialer-app.
98
5
 *
99
6
 * dialer-app is free software; you can redistribute it and/or modify
100
7
 * it under the terms of the GNU General Public License as published by
101
8
 * the Free Software Foundation; version 3.
102
9
 *
103
10
 * dialer-app is distributed in the hope that it will be useful,
104
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
105
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
106
13
 * GNU General Public License for more details.
107
14
 *
108
15
 * You should have received a copy of the GNU General Public License
109
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
110
17
 */
111
18
112
19
import QtQuick 2.2
113
20
import QtContacts 5.0
114
21
115
22
import Ubuntu.Components 1.1
116
23
117
24
import Ubuntu.AddressBook.ContactEditor 0.1
118
25
119
26
ContactEditorPage {
120
27
    id: root
121
28
    objectName: "contactEditorPage"
122
29
123
30
    property var contactListPage: null
124
31
125
32
    head.backAction: Action {
126
33
        objectName: "cancel"
127
34
128
35
        text: i18n.tr("Cancel")
129
36
        iconName: "back"
130
37
        onTriggered: {
131
38
            root.cancel()
132
39
            root.active = false
133
40
        }
134
41
    }
135
42
136
43
    head.actions: [
137
44
        Action {
138
45
            objectName: "save"
139
46
140
47
            text: i18n.tr("Save")
141
48
            iconName: "ok"
142
49
            enabled: root.isContactValid
143
50
            onTriggered: root.save()
144
51
        }
145
52
    ]
146
53
147
54
    onContactSaved: {
148
55
        if (root.contactListPage) {
149
56
            root.contactListPage.moveListToContact(contact)
150
57
            root.contactListPage.phoneToAdd = ""
151
58
        }
152
59
    }
153
60
}
154
0
61
155
=== added directory 'src/qml/ContactViewPage'
156
=== added file 'src/qml/ContactViewPage/CMakeLists.txt'
157
--- src/qml/ContactViewPage/CMakeLists.txt	1970-01-01 00:00:00 +0000
158
+++ src/qml/ContactViewPage/CMakeLists.txt	2015-05-15 15:18:10 +0000
159
@@ -0,0 +1,7 @@
160
1
file(GLOB CONTACT_VIEW_QML_JS_FILES *.qml *.js)
161
2
162
3
# make the files visible on qtcreator
163
4
add_custom_target(dialer_contactviewpage_QMlFiles ALL SOURCES ${CONTACT_VIEW_QML_JS_FILES})
164
5
165
6
install(FILES ${CONTACT_VIEW_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/ContactViewPage)
166
7
167
0
8
168
=== added file 'src/qml/ContactViewPage/DialerContactViewPage.qml'
169
--- src/qml/ContactViewPage/DialerContactViewPage.qml	1970-01-01 00:00:00 +0000
170
+++ src/qml/ContactViewPage/DialerContactViewPage.qml	2015-05-15 15:18:10 +0000
171
@@ -0,0 +1,139 @@
172
1
/*
173
2
 * Copyright 2015 Canonical Ltd.
174
3
 *
175
4
 * This file is part of dialer-app.
176
5
 *
177
6
 * dialer-app is free software; you can redistribute it and/or modify
178
7
 * it under the terms of the GNU General Public License as published by
179
8
 * the Free Software Foundation; version 3.
180
9
 *
181
10
 * dialer-app is distributed in the hope that it will be useful,
182
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
183
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
184
13
 * GNU General Public License for more details.
185
14
 *
186
15
 * You should have received a copy of the GNU General Public License
187
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
188
17
 */
189
18
190
19
191
20
import QtQuick 2.2
192
21
import QtContacts 5.0
193
22
194
23
import Ubuntu.Components 1.1
195
24
import Ubuntu.Components.Popups 1.0 as Popups
196
25
import Ubuntu.Contacts 0.1
197
26
198
27
import Ubuntu.AddressBook.Base 0.1
199
28
import Ubuntu.AddressBook.ContactView 0.1
200
29
import Ubuntu.AddressBook.ContactShare 0.1
201
30
202
31
ContactViewPage {
203
32
    id: root
204
33
    objectName: "contactViewPage"
205
34
206
35
    readonly property string contactEditorPageURL: Qt.resolvedUrl("../ContactEditorPage/DialerContactEditorPage.qml")
207
36
    property string addPhoneToContact: ""
208
37
    property var contactListPage: null
209
38
210
39
    function addPhoneToContactImpl(contact, phoneNumber)
211
40
    {
212
41
        var detailSourceTemplate = "import QtContacts 5.0; PhoneNumber{ number: \"" + phoneNumber.trim() + "\" }"
213
42
        var newDetail = Qt.createQmlObject(detailSourceTemplate, contact)
214
43
        if (newDetail) {
215
44
            contact.addDetail(newDetail)
216
45
            pageStack.push(root.contactEditorPageURL,
217
46
                           { model: root.model,
218
47
                             contact: contact,
219
48
                             initialFocusSection: "phones",
220
49
                             newDetails: [newDetail],
221
50
                             contactListPage: root.contactListPage })
222
51
            root.addPhoneToContact = ""
223
52
        } else {
224
53
            console.warn("Fail to create phone number detail")
225
54
        }
226
55
    }
227
56
228
57
    head.actions: [
229
58
        Action {
230
59
            objectName: "share"
231
60
            text: i18n.tr("Share")
232
61
            iconName: "share"
233
62
            onTriggered: {
234
63
                pageStack.push(root.contactShareComponent,
235
64
                               {contactModel: root.model, contacts: [root.contact]})
236
65
            }
237
66
        },
238
67
        Action {
239
68
            objectName: "edit"
240
69
            text: i18n.tr("Edit")
241
70
            iconName: "edit"
242
71
            onTriggered: {
243
72
                pageStack.push(contactEditorPageURL,
244
73
                               { model: root.model,
245
74
                                 contact: root.contact,
246
75
                                 contactListPage: root.contactListPage })
247
76
            }
248
77
        }
249
78
    ]
250
79
251
80
    extensions: ContactDetailSyncTargetView {
252
81
        contact: root.contact
253
82
        anchors {
254
83
            left: parent.left
255
84
            right: parent.right
256
85
        }
257
86
        height: implicitHeight
258
87
    }
259
88
260
89
    onContactRemoved: pageStack.pop()
261
90
    onActionTrigerred: {
262
91
        if ((action == "tel") || (action == "default")) {
263
92
            if (callManager.hasCalls) {
264
93
                mainView.call(detail.number, mainView.account.accountId);
265
94
            } else {
266
95
                mainView.populateDialpad(detail.number)
267
96
            }
268
97
        } else {
269
98
            Qt.openUrlExternally(("%1:%2").arg(action).arg(detail.value(0)))
270
99
        }
271
100
    }
272
101
273
102
    Component {
274
103
        id: contactShareComponent
275
104
        ContactSharePage {}
276
105
    }
277
106
278
107
    onContactFetched: {
279
108
        root.contact = contact
280
109
        if (root.active && root.addPhoneToContact != "") {
281
110
            root.addPhoneToContactImpl(contact, root.addPhoneToContact)
282
111
            root.addPhoneToContact = ""
283
112
        }
284
113
    }
285
114
286
115
    Component {
287
116
        id: contactModelComponent
288
117
289
118
        ContactModel {
290
119
            id: contactModelHelper
291
120
292
121
            manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") &&
293
122
                      (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
294
123
            autoUpdate: false
295
124
        }
296
125
    }
297
126
298
127
    onActiveChanged: {
299
128
        if (active && root.contact && root.addPhoneToContact != "") {
300
129
            root.addPhoneToContactImpl(contact, root.addPhoneToContact)
301
130
            root.addPhoneToContact = ""
302
131
        }
303
132
    }
304
133
305
134
    Component.onCompleted: {
306
135
        if (!root.model) {
307
136
            root.model = contactModelComponent.createObject(root)
308
137
        }
309
138
    }
310
139
}
311
0
140
312
=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
313
--- src/qml/ContactsPage/ContactsPage.qml	2015-02-06 00:12:03 +0000
314
+++ src/qml/ContactsPage/ContactsPage.qml	2015-05-15 15:18:10 +0000
315
@@ -27,10 +27,30 @@
316
27
    id: contactsPage
27
    id: contactsPage
317
28
    objectName: "contactsPage"
28
    objectName: "contactsPage"
318
29
29
320
30
    property QtObject contact
30
    property string phoneToAdd: ""
321
31
    property QtObject contactIndex: null
322
32
323
33
    function moveListToContact(contact)
324
34
    {
325
35
        if (active) {
326
36
            contactsPage.contactIndex = null
327
37
            contactList.positionViewAtContact(contact)
328
38
        } else {
329
39
            contactsPage.contactIndex = contact
330
40
        }
331
41
    }
332
42
333
43
    Connections {
334
44
        target: contactList.listModel
335
45
        onContactsChanged: {
336
46
            if (contactsPage.contactIndex) {
337
47
                contactList.positionViewAtContact(contactsPage.contactIndex)
338
48
                contactsPage.contactIndex = null
339
49
            }
340
50
        }
341
51
    }
342
31
52
343
32
    title: i18n.tr("Contacts")
53
    title: i18n.tr("Contacts")
344
33
345
34
    TextField {
54
    TextField {
346
35
        id: searchField
55
        id: searchField
347
36
56
348
@@ -138,17 +158,36 @@
349
138
        }
158
        }
350
139
159
351
140
        showAddNewButton: true
160
        showAddNewButton: true
355
141
        showImportOptions: (contactList.count === 0) && (filterTerm === "")
161
        showImportOptions: (contactList.count === 0) &&
356
142
        onAddNewContactClicked: mainView.createNewContactForPhone(" ")
162
                           (filterTerm === "") &&
357
143
        onInfoRequested: mainView.viewContact(contact.contactId)
163
                           (contactsPage.phoneToAdd === "")
358
164
        onAddNewContactClicked: {
359
165
            var newContact = ContactsJS.createEmptyContact(contactsPage.phoneToAdd, contactsPage)
360
166
            pageStack.push(Qt.resolvedUrl("../ContactEditorPage/DialerContactEditorPage.qml"),
361
167
                           { model: contactList.listModel,
362
168
                             contact: newContact,
363
169
                             initialFocusSection: (contactsPage.phoneToAdd != "" ? "phones" : "name"),
364
170
                             contactListPage: contactsPage
365
171
                           })
366
172
        }
367
173
        onInfoRequested: mainView.viewContact(contact.contactId, contactList.listModel)
368
144
174
369
145
        filterTerm: searchField.text
175
        filterTerm: searchField.text
371
146
        detailToPick: ContactDetail.PhoneNumber
176
        detailToPick: (contactsPage.phoneToAdd != "") ? -1 : ContactDetail.PhoneNumber
372
147
        onDetailClicked: {
177
        onDetailClicked: {
373
148
            if (action === "message") {
178
            if (action === "message") {
374
149
                Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
179
                Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
375
150
                return
180
                return
376
151
            }
181
            }
377
182
378
183
            if (contactsPage.phoneToAdd != "") {
379
184
                mainView.addPhoneToContact(contact,
380
185
                                           contactsPage.phoneToAdd,
381
186
                                           contactsPage,
382
187
                                           contactList.listModel)
383
188
                return
384
189
            }
385
190
386
152
            pageStackNormalMode.pop()
191
            pageStackNormalMode.pop()
387
153
            if (callManager.hasCalls) {
192
            if (callManager.hasCalls) {
388
154
                mainView.call(detail.number, mainView.account.accountId);
193
                mainView.call(detail.number, mainView.account.accountId);
389
@@ -156,7 +195,16 @@
390
156
                mainView.populateDialpad(detail.number)
195
                mainView.populateDialpad(detail.number)
391
157
            }
196
            }
392
158
        }
197
        }
394
159
        onAddDetailClicked: mainView.addPhoneToContact(contact.contactId, " ")
198
        onAddDetailClicked: mainView.addPhoneToContact(contact.contactId,
395
199
                                                       " ",
396
200
                                                       contactsPage,
397
201
                                                       contactList.listModel)
398
202
    }
399
203
400
204
    Component.onCompleted: {
401
205
        if (QTCONTACTS_PRELOAD_VCARD !== "") {
402
206
            contactList.listModel.importContacts("file://" + QTCONTACTS_PRELOAD_VCARD)
403
207
        }
404
160
    }
208
    }
405
161
209
406
162
    KeyboardRectagle {
210
    KeyboardRectagle {
407
163
211
408
=== modified file 'src/qml/DialerPage/DialerPage.qml'
409
--- src/qml/DialerPage/DialerPage.qml	2015-04-08 22:41:26 +0000
410
+++ src/qml/DialerPage/DialerPage.qml	2015-05-15 15:18:10 +0000
411
@@ -37,6 +37,7 @@
412
37
    property list<Action> actionsGreeter
37
    property list<Action> actionsGreeter
413
38
    property list<Action> actionsNormal: [
38
    property list<Action> actionsNormal: [
414
39
        Action {
39
        Action {
415
40
            objectName: "contacts"
416
40
            iconName: "contact"
41
            iconName: "contact"
417
41
            text: i18n.tr("Contacts")
42
            text: i18n.tr("Contacts")
418
42
            onTriggered: pageStackNormalMode.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
43
            onTriggered: pageStackNormalMode.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
419
43
44
420
=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
421
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2015-04-09 19:49:26 +0000
422
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2015-05-15 15:18:10 +0000
423
@@ -57,7 +57,7 @@
424
57
                if (unknownContact) {
57
                if (unknownContact) {
425
58
                    mainView.addNewPhone(phoneNumber)
58
                    mainView.addNewPhone(phoneNumber)
426
59
                } else {
59
                } else {
428
60
                    mainView.viewContact(contactWatcher.contactId)
60
                    mainView.viewContact(contactWatcher.contactId, null)
429
61
                }
61
                }
430
62
            }
62
            }
431
63
        },
63
        },
432
64
64
433
=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
434
--- src/qml/HistoryPage/HistoryPage.qml	2015-05-06 20:06:37 +0000
435
+++ src/qml/HistoryPage/HistoryPage.qml	2015-05-15 15:18:10 +0000
436
@@ -347,7 +347,7 @@
437
347
                            if (unknownContact) {
347
                            if (unknownContact) {
438
348
                                mainView.addNewPhone(phoneNumber)
348
                                mainView.addNewPhone(phoneNumber)
439
349
                            } else {
349
                            } else {
441
350
                                mainView.viewContact(contactId)
350
                                mainView.viewContact(contactId, null)
442
351
                            }
351
                            }
443
352
                        }
352
                        }
444
353
                        visible: knownNumber
353
                        visible: knownNumber
445
354
354
446
=== modified file 'src/qml/dialer-app.qml'
447
--- src/qml/dialer-app.qml	2015-04-21 14:28:14 +0000
448
+++ src/qml/dialer-app.qml	2015-05-15 15:18:10 +0000
449
@@ -18,9 +18,11 @@
450
18
18
451
19
import QtQuick 2.0
19
import QtQuick 2.0
452
20
import Qt.labs.settings 1.0
20
import Qt.labs.settings 1.0
453
21
454
21
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.1
455
22
import Ubuntu.Components.Popups 0.1
23
import Ubuntu.Components.Popups 0.1
456
23
import Ubuntu.Telephony 0.1
24
import Ubuntu.Telephony 0.1
457
25
import Ubuntu.Contacts 0.1
458
24
26
459
25
MainView {
27
MainView {
460
26
    id: mainView
28
    id: mainView
461
@@ -69,7 +71,7 @@
462
69
                if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
71
                if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
463
70
                    pageStackNormalMode.pop();
72
                    pageStackNormalMode.pop();
464
71
                }
73
                }
466
72
 
74
467
73
                // pop live call views from both stacks if we have no calls.
75
                // pop live call views from both stacks if we have no calls.
468
74
                if (pageStackNormalMode.depth > 1 && pageStackNormalMode.currentPage.objectName == "pageLiveCall") {
76
                if (pageStackNormalMode.depth > 1 && pageStackNormalMode.currentPage.objectName == "pageLiveCall") {
469
75
                    pageStackNormalMode.pop();
77
                    pageStackNormalMode.pop();
470
@@ -175,22 +177,38 @@
471
175
        return false;
177
        return false;
472
176
    }
178
    }
473
177
179
475
178
    function createNewContactForPhone(phoneNumber)
180
    function addNewPhone(phoneNumber)
476
179
    {
181
    {
491
180
        Qt.openUrlExternally("addressbook:///create?callback=dialer-app.desktop&phone=" + encodeURIComponent(phoneNumber))
182
        pageStackNormalMode.push(Qt.resolvedUrl("ContactsPage/ContactsPage.qml"),
492
181
    }
183
                                 {"phoneToAdd": phoneNumber})
493
182
184
    }
494
183
    function viewContact(contactId) {
185
495
184
        Qt.openUrlExternally("addressbook:///contact?callback=dialer-app.desktop&id=" + encodeURIComponent(contactId))
186
    function viewContact(contactId, model) {
496
185
    }
187
        var initialPropers = {}
497
186
188
        if (model) {
498
187
    function addNewPhone(phoneNumber) {
189
            initialPropers = {"contactId": contactId, "model": model}
499
188
        Qt.openUrlExternally("addressbook:///addnewphone?callback=dialer-app.desktop&phone=" + encodeURIComponent(phoneNumber))
190
        } else {
500
189
    }
191
            initialPropers = {"contactId": contactId}
501
190
192
        }
502
191
    function addPhoneToContact(contactId, phoneNumber) {
193
        pageStackNormalMode.push(Qt.resolvedUrl("ContactViewPage/DialerContactViewPage.qml"),
503
192
        Qt.openUrlExternally("addressbook:///addphone?callback=dialer-app.desktop&id=%1&phone=%2".arg(encodeURIComponent(contactId))
194
                                 initialPropers)
504
193
                             .arg(encodeURIComponent(phoneNumber)))
195
    }
505
196
506
197
    function addPhoneToContact(contact, phoneNumber, contactListPage, model) {
507
198
        var initialPropers =  {"addPhoneToContact": phoneNumber,
508
199
                               "contactListPage": contactListPage}
509
200
510
201
        if (model) {
511
202
            initialPropers["model"] = model
512
203
        }
513
204
        if (typeof(contact) == 'string') {
514
205
            initialPropers["contactId"] = contact
515
206
        } else {
516
207
            initialPropers["contact"] = contact
517
208
        }
518
209
519
210
        pageStackNormalMode.push(Qt.resolvedUrl("ContactViewPage/DialerContactViewPage.qml"),
520
211
                                 initialPropers)
521
194
    }
212
    }
522
195
213
523
196
    function sendMessage(phoneNumber) {
214
    function sendMessage(phoneNumber) {
524
@@ -396,7 +414,7 @@
525
396
        if (currentStack.currentPage.objectName == "pageLiveCall") {
414
        if (currentStack.currentPage.objectName == "pageLiveCall") {
526
397
            return;
415
            return;
527
398
        }
416
        }
529
399
 
417
530
400
        currentStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"), properties)
418
        currentStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"), properties)
531
401
    }
419
    }
532
402
420
533
403
421
534
=== modified file 'tests/CMakeLists.txt'
535
--- tests/CMakeLists.txt	2014-09-02 21:54:21 +0000
536
+++ tests/CMakeLists.txt	2015-05-15 15:18:10 +0000
537
@@ -1,3 +1,6 @@
538
1
execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
539
2
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
540
3
541
1
add_subdirectory(qml)
4
add_subdirectory(qml)
543
2
5
add_subdirectory(data)
544
3
add_subdirectory(autopilot)
6
add_subdirectory(autopilot)
545
4
7
546
=== modified file 'tests/autopilot/CMakeLists.txt'
547
--- tests/autopilot/CMakeLists.txt	2014-08-13 17:24:42 +0000
548
+++ tests/autopilot/CMakeLists.txt	2015-05-15 15:18:10 +0000
549
@@ -1,7 +1,5 @@
550
1
set(AUTOPILOT_DIR dialer_app)
1
set(AUTOPILOT_DIR dialer_app)
551
2
2
552
3
execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
553
4
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
554
5
3
555
6
install(DIRECTORY ${AUTOPILOT_DIR}
4
install(DIRECTORY ${AUTOPILOT_DIR}
556
7
    DESTINATION ${PYTHON_PACKAGE_DIR}
5
    DESTINATION ${PYTHON_PACKAGE_DIR}
557
8
6
558
=== modified file 'tests/autopilot/dialer_app/__init__.py'
559
--- tests/autopilot/dialer_app/__init__.py	2015-04-27 22:15:19 +0000
560
+++ tests/autopilot/dialer_app/__init__.py	2015-05-15 15:18:10 +0000
561
@@ -12,6 +12,9 @@
562
12
import logging
12
import logging
563
13
13
564
14
import ubuntuuitoolkit
14
import ubuntuuitoolkit
565
15
566
16
from address_book_app.address_book import _common
567
17
from address_book_app import address_book
568
15
from autopilot import exceptions as autopilot_exceptions
18
from autopilot import exceptions as autopilot_exceptions
569
16
19
570
17
20
571
@@ -30,6 +33,18 @@
572
30
        self.hasCalls.wait_for(True)
33
        self.hasCalls.wait_for(True)
573
31
        return self.wait_select_single(LiveCall, active=True)
34
        return self.wait_select_single(LiveCall, active=True)
574
32
35
575
36
    @property
576
37
    def contacts_page(self):
577
38
        return self._get_page(ContactsPage, 'contactsPage')
578
39
579
40
    @property
580
41
    def contact_editor_page(self):
581
42
        return self._get_page(DialerContactEditorPage, 'contactEditorPage')
582
43
583
44
    @property
584
45
    def contact_view_page(self):
585
46
        return self._get_page(DialerContactViewPage, 'contactViewPage')
586
47
587
33
    def get_first_log(self):
48
    def get_first_log(self):
588
34
        return self.wait_select_single(objectName="historyDelegate0")
49
        return self.wait_select_single(objectName="historyDelegate0")
589
35
50
590
@@ -63,6 +78,11 @@
591
63
78
592
64
        return dialog.visible
79
        return dialog.visible
593
65
80
594
81
    def _get_page(self, page_type, page_name):
595
82
        page = self.wait_select_single(
596
83
            page_type, objectName=page_name, active=True)
597
84
        return page
598
85
599
66
86
600
67
class LiveCall(MainView):
87
class LiveCall(MainView):
601
68
88
602
@@ -197,3 +217,78 @@
603
197
        self.dial_number(number, formattedNumber)
217
        self.dial_number(number, formattedNumber)
604
198
        self.click_call_button()
218
        self.click_call_button()
605
199
        return self.get_root_instance().wait_select_single(LiveCall)
219
        return self.get_root_instance().wait_select_single(LiveCall)
606
220
607
221
    def get_header(self):
608
222
        """Return the Header custom proxy object of the Page."""
609
223
        return self.get_root_instance().select_single(
610
224
            'MainView').get_header()
611
225
612
226
    def click_contacts_button(self):
613
227
        self.get_header().click_action_button('contacts')
614
228
615
229
616
230
class DialerContactViewPage(address_book.ContactViewPage):
617
231
    """Autopilot custom proxy object for DialerContactViewPage components."""
618
232
619
233
    def call_phone(self, index):
620
234
        phone_group = self.select_single(
621
235
            'ContactDetailGroupWithTypeView',
622
236
            objectName='phones')
623
237
624
238
        call_buttons = phone_group.select_many(
625
239
            "ActionButton",
626
240
            objectName="tel-contact")
627
241
        self.pointing_device.click_object(call_buttons[index])
628
242
629
243
630
244
class DialerContactEditorPage(address_book.ContactEditorPage):
631
245
    """Autopilot custom proxy object for DialerContactEditorPage components."""
632
246
633
247
    def save(self):
634
248
        """
635
249
        Press the 'Save' button
636
250
        """
637
251
        header = self.get_header(main_window_name='MainView')
638
252
        header.click_action_button('save')
639
253
640
254
641
255
class ContactsPage(_common.PageWithHeader):
642
256
    """Autopilot custom proxy object for ContactsPage components."""
643
257
644
258
    def _click_button(self, button):
645
259
        """Generic way to click a button"""
646
260
        self.visible.wait_for(True)
647
261
        button.visible.wait_for(True)
648
262
        self.pointing_device.click_object(button)
649
263
        return button
650
264
651
265
    def _get_add_new_button(self):
652
266
        """Return the add-new button"""
653
267
        return self.wait_select_single('ContactListButtonDelegate',
654
268
                                       objectName='addNewButton')
655
269
656
270
    def click_add_new(self):
657
271
        self._click_button(self._get_add_new_button())
658
272
659
273
    def click_contact(self, index):
660
274
        contact_delegate = self._get_contact_delegate(index)
661
275
        self.pointing_device.click_object(contact_delegate)
662
276
663
277
    def open_contact(self, index):
664
278
        contact_delegate = self._get_contact_delegate(index)
665
279
        self.pointing_device.click_object(contact_delegate)
666
280
        contact_delegate.state.wait_for('expanded')
667
281
        details_button = contact_delegate.wait_select_single(
668
282
            objectName='infoIcon')
669
283
        self.pointing_device.click_object(details_button)
670
284
        return self.get_root_instance().select_single(
671
285
            DialerContactViewPage, objectName='contactViewPage')
672
286
673
287
    def _get_contact_delegate(self, index):
674
288
        contact_delegates = self._get_sorted_contact_delegates()
675
289
        return contact_delegates[index]
676
290
677
291
    def _get_sorted_contact_delegates(self):
678
292
        contact_delegates = self.select_many('ContactDelegate', visible=True)
679
293
        return sorted(
680
294
            contact_delegates, key=lambda delegate: delegate.globalRect.y)
681
200
295
682
=== modified file 'tests/autopilot/dialer_app/fixture_setup.py'
683
--- tests/autopilot/dialer_app/fixture_setup.py	2015-04-30 18:26:46 +0000
684
+++ tests/autopilot/dialer_app/fixture_setup.py	2015-05-15 15:18:10 +0000
685
@@ -24,6 +24,7 @@
686
24
import dbusmock
24
import dbusmock
687
25
from autopilot.platform import model
25
from autopilot.platform import model
688
26
import dbus
26
import dbus
689
27
from ubuntuuitoolkit import fixture_setup
690
27
28
691
28
29
692
29
class TestabilityEnvironment(fixtures.Fixture):
30
class TestabilityEnvironment(fixtures.Fixture):
693
@@ -136,6 +137,42 @@
694
136
        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
137
        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
695
137
138
696
138
139
697
140
class UseMemoryContactBackend(fixtures.Fixture):
698
141
699
142
    def setUp(self):
700
143
        super().setUp()
701
144
        self.useFixture(
702
145
            fixtures.EnvironmentVariable(
703
146
                'QTCONTACTS_MANAGER_OVERRIDE', newvalue='memory')
704
147
        )
705
148
        self.useFixture(
706
149
            fixture_setup.InitctlEnvironmentVariable(
707
150
                QTCONTACTS_MANAGER_OVERRIDE='memory')
708
151
        )
709
152
710
153
711
154
class PreloadVcards(fixtures.Fixture):
712
155
    AUTOPILOT_DIR = "/usr/lib/python3/dist-packages/dialer_app/"
713
156
    VCARD_PATH_BIN = ("%s/testdata/vcard.vcf" % AUTOPILOT_DIR)
714
157
    VCARD_PATH_DEV = os.path.abspath("../data/vcard.vcf")
715
158
716
159
    def setUp(self):
717
160
        super().setUp()
718
161
        vcard_full_path = PreloadVcards.VCARD_PATH_BIN
719
162
        if os.path.isfile(PreloadVcards.VCARD_PATH_DEV):
720
163
            vcard_full_path = PreloadVcards.VCARD_PATH_DEV
721
164
722
165
        print("Loading contacts from: %s" % vcard_full_path)
723
166
        self.useFixture(
724
167
            fixtures.EnvironmentVariable(
725
168
                'QTCONTACTS_PRELOAD_VCARD', newvalue=vcard_full_path)
726
169
        )
727
170
        self.useFixture(
728
171
            fixture_setup.InitctlEnvironmentVariable(
729
172
                QTCONTACTS_PRELOAD_VCARD=vcard_full_path)
730
173
        )
731
174
732
175
733
139
class MockNotificationSystem(fixtures.Fixture):
176
class MockNotificationSystem(fixtures.Fixture):
734
140
177
735
141
    def setUp(self):
178
    def setUp(self):
736
142
179
737
=== modified file 'tests/autopilot/dialer_app/tests/__init__.py'
738
--- tests/autopilot/dialer_app/tests/__init__.py	2015-04-29 21:53:05 +0000
739
+++ tests/autopilot/dialer_app/tests/__init__.py	2015-05-15 15:18:10 +0000
740
@@ -82,7 +82,8 @@
741
82
82
742
83
    def create_config_file(self, firstLaunch=False):
83
    def create_config_file(self, firstLaunch=False):
743
84
        self.user_config_dir = tempfile.mkdtemp(suffix='', prefix='dialer-app')
84
        self.user_config_dir = tempfile.mkdtemp(suffix='', prefix='dialer-app')
745
85
        self.app_config_dir = (self.user_config_dir + '/com.ubuntu.dialer-app/')
85
        self.app_config_dir = (self.user_config_dir +
746
86
                               '/com.ubuntu.dialer-app/')
747
86
        os.makedirs(self.app_config_dir)
87
        os.makedirs(self.app_config_dir)
748
87
        config_file_path = (self.app_config_dir + '/DialerApp.conf')
88
        config_file_path = (self.app_config_dir + '/DialerApp.conf')
749
88
89
750
@@ -91,13 +92,16 @@
751
91
        else:
92
        else:
752
92
            first_launch_flag = 'false'
93
            first_launch_flag = 'false'
753
93
        with open(config_file_path, 'w') as config_file:
94
        with open(config_file_path, 'w') as config_file:
755
94
            config_file.write('[General]\nhintNecessary=%s\n' % (first_launch_flag))
95
            config_file.write(
756
96
                '[General]\nhintNecessary=%s\n' % (first_launch_flag))
757
95
97
758
96
        self.useFixture(
98
        self.useFixture(
760
97
            fixtures.EnvironmentVariable('XDG_CONFIG_HOME', newvalue=self.user_config_dir)
99
            fixtures.EnvironmentVariable('XDG_CONFIG_HOME',
761
100
                                         newvalue=self.user_config_dir)
762
98
        )
101
        )
763
99
        self.useFixture(
102
        self.useFixture(
765
100
            fixture_setup.InitctlEnvironmentVariable(XDG_CONFIG_HOME=self.user_config_dir)
103
            fixture_setup.InitctlEnvironmentVariable(
766
104
                XDG_CONFIG_HOME=self.user_config_dir)
767
101
        )
105
        )
768
102
106
769
103
    @property
107
    @property
770
104
108
771
=== added file 'tests/autopilot/dialer_app/tests/test_contacts.py'
772
--- tests/autopilot/dialer_app/tests/test_contacts.py	1970-01-01 00:00:00 +0000
773
+++ tests/autopilot/dialer_app/tests/test_contacts.py	2015-05-15 15:18:10 +0000
774
@@ -0,0 +1,45 @@
775
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
776
2
# Copyright 2015 Canonical
777
3
# Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
778
4
#
779
5
# This file is part of dialer-app.
780
6
#
781
7
# dialer-app is free software: you can redistribute it and/or modify it
782
8
# under the terms of the GNU General Public License version 3, as published
783
9
# by the Free Software Foundation.
784
10
785
11
"""Tests for the Dialer App"""
786
12
787
13
from autopilot.matchers import Eventually
788
14
from testtools.matchers import Equals
789
15
790
16
from dialer_app.tests import DialerAppTestCase
791
17
from dialer_app import fixture_setup
792
18
793
19
794
20
class TestContacts(DialerAppTestCase):
795
21
    """Tests for the contacts interaction with the app."""
796
22
797
23
    def setUp(self):
798
24
        # set the fixtures before launching the app
799
25
        testability_environment = fixture_setup.TestabilityEnvironment()
800
26
        self.useFixture(testability_environment)
801
27
        memory_backend = fixture_setup.UseMemoryContactBackend()
802
28
        self.useFixture(memory_backend)
803
29
        preload_data = fixture_setup.PreloadVcards()
804
30
        self.useFixture(preload_data)
805
31
806
32
        # now launch the app
807
33
        super().setUp()
808
34
809
35
    def _get_main_view(self, proxy_object):
810
36
        return proxy_object.wait_select_single('QQuickView')
811
37
812
38
    def test_call_a_contact_from_contact_view(self):
813
39
        dialer_page = self.main_view.dialer_page
814
40
        dialer_page.click_contacts_button()
815
41
        contact_view_page = self.main_view.contacts_page.open_contact(0)
816
42
817
43
        contact_view_page.call_phone(0)
818
44
        entry = dialer_page._get_keypad_entry()
819
45
        self.assertThat(entry.value, Eventually(Equals('444-44')))
820
0
46
821
=== modified file 'tests/autopilot/dialer_app/tests/test_logs.py'
822
--- tests/autopilot/dialer_app/tests/test_logs.py	2015-04-29 21:53:05 +0000
823
+++ tests/autopilot/dialer_app/tests/test_logs.py	2015-05-15 15:18:10 +0000
824
@@ -19,13 +19,12 @@
825
19
    fixture_setup as url_dispatcher_fixtures
19
    fixture_setup as url_dispatcher_fixtures
826
20
)
20
)
827
21
21
828
22
from address_book_app.address_book import data
829
22
from dialer_app.tests import DialerAppTestCase
23
from dialer_app.tests import DialerAppTestCase
830
23
from dialer_app import fixture_setup
24
from dialer_app import fixture_setup
831
24
from dialer_app import ListItemWithActions
25
from dialer_app import ListItemWithActions
832
25
26
833
26
27
834
27
@skipIf(model() == 'Desktop',
835
28
        'only run on Ubuntu touch platforms')
836
29
class TestCallLogs(DialerAppTestCase):
28
class TestCallLogs(DialerAppTestCase):
837
30
    """Tests for the call log panel."""
29
    """Tests for the call log panel."""
838
31
30
839
@@ -37,6 +36,10 @@
840
37
        self.useFixture(fill_history)
36
        self.useFixture(fill_history)
841
38
        self.fake_url_dispatcher = url_dispatcher_fixtures.FakeURLDispatcher()
37
        self.fake_url_dispatcher = url_dispatcher_fixtures.FakeURLDispatcher()
842
39
        self.useFixture(self.fake_url_dispatcher)
38
        self.useFixture(self.fake_url_dispatcher)
843
39
        memory_backend = fixture_setup.UseMemoryContactBackend()
844
40
        self.useFixture(memory_backend)
845
41
        preload_data = fixture_setup.PreloadVcards()
846
42
        self.useFixture(preload_data)
847
40
43
848
41
        # now launch the app
44
        # now launch the app
849
42
        super().setUp()
45
        super().setUp()
850
@@ -52,6 +55,7 @@
851
52
        except fake_dispatcher.FakeDispatcherException:
55
        except fake_dispatcher.FakeDispatcherException:
852
53
            return None
56
            return None
853
54
57
854
58
    @skipIf(model() == 'Desktop', 'only run on Ubuntu touch platforms')
855
55
    def test_call_log_item_opens_messaging(self):
59
    def test_call_log_item_opens_messaging(self):
856
56
        """Ensure tapping on 'send text message' item of a call log opens
60
        """Ensure tapping on 'send text message' item of a call log opens
857
57
        the messaging app.
61
        the messaging app.
858
@@ -74,11 +78,78 @@
859
74
            ListItemWithActions.HistoryDelegate, objectName='historyDelegate0')
78
            ListItemWithActions.HistoryDelegate, objectName='historyDelegate0')
860
75
        delegate.add_contact()
79
        delegate.add_contact()
861
76
80
867
77
        self.assertThat(
81
        contacts_page = self.main_view.contacts_page
868
78
            self.get_last_dispatch_url_call_parameter,
82
        self.assertThat(
869
79
            Eventually(Equals(
83
            contacts_page.phoneToAdd, Eventually(Equals('800')))
870
80
                'addressbook:///addnewphone?callback=dialer-app.desktop&'
84
871
81
                'phone=800')))
85
        # click add new button
872
86
        contacts_page.click_add_new()
873
87
874
88
        # wait page be ready for edit
875
89
        contact_editor_page = self.main_view.contact_editor_page
876
90
        self.main_view.contact_editor_page.wait_get_focus('phones')
877
91
878
92
        # fill contact name
879
93
        test_contact = data.Contact('FirstName', 'LastName')
880
94
        test_contact.professional_details = []
881
95
        contact_editor_page.fill_form(test_contact)
882
96
883
97
        # save contact
884
98
        contact_editor_page.save()
885
99
886
100
        # contact view will appear with the new contact data
887
101
        contact_view_page = contacts_page.open_contact(3)
888
102
        self.assertThat(contact_view_page.visible, Eventually(Equals(True)))
889
103
890
104
        # check if contact contains the new phone number
891
105
        phone_group = contact_view_page.select_single(
892
106
            'ContactDetailGroupWithTypeView',
893
107
            objectName='phones')
894
108
        self.assertThat(phone_group.detailsCount, Eventually(Equals(1)))
895
109
896
110
        # check if the new value is correct
897
111
        phone_label_1 = contact_view_page.select_single(
898
112
            "Label",
899
113
            objectName="label_phoneNumber_0.0")
900
114
        self.assertThat(phone_label_1.text, Eventually(Equals('800')))
901
115
902
116
    def test_add_number_into_old_contact_from_log(self):
903
117
        """Ensure tapping on 'add new contact' item of a call log opens
904
118
        the address-book app to allow add the numbe into a contact
905
119
906
120
        """
907
121
        delegate = self.main_view.wait_select_single(
908
122
            ListItemWithActions.HistoryDelegate, objectName='historyDelegate0')
909
123
        delegate.add_contact()
910
124
911
125
        contacts_page = self.main_view.contacts_page
912
126
        self.assertThat(
913
127
            contacts_page.phoneToAdd, Eventually(Equals('800')))
914
128
915
129
        # click on first contact to add number
916
130
        contacts_page.click_contact(0)
917
131
918
132
        # wait page be ready for edit
919
133
        contact_editor_page = self.main_view.contact_editor_page
920
134
        contact_editor_page.wait_get_focus('phones')
921
135
922
136
        # save contact
923
137
        contact_editor_page.save()
924
138
925
139
        # contact view will appear with the new contact data
926
140
        contact_view_page = self.main_view.contact_view_page
927
141
928
142
        # check if contact contains the new phone number
929
143
        phone_group = contact_view_page.select_single(
930
144
            'ContactDetailGroupWithTypeView',
931
145
            objectName='phones')
932
146
        self.assertThat(phone_group.detailsCount, Eventually(Equals(2)))
933
147
934
148
        # check if the new value is correct
935
149
        phone_label_1 = contact_view_page.select_single(
936
150
            "Label",
937
151
            objectName="label_phoneNumber_1.0")
938
152
        self.assertThat(phone_label_1.text, Eventually(Equals('800')))
939
82
153
940
83
154
941
84
class TestSwipeItemTutorial(DialerAppTestCase):
155
class TestSwipeItemTutorial(DialerAppTestCase):
942
85
156
943
=== added directory 'tests/data'
944
=== added file 'tests/data/CMakeLists.txt'
945
--- tests/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
946
+++ tests/data/CMakeLists.txt	2015-05-15 15:18:10 +0000
947
@@ -0,0 +1,10 @@
948
1
project(test_data)
949
2
950
3
set(AUTOPILOT_DATA
951
4
    vcard.vcf
952
5
)
953
6
954
7
install(FILES ${AUTOPILOT_DATA}
955
8
    DESTINATION ${PYTHON_PACKAGE_DIR}/dialer_app/testdata/
956
9
)
957
10
958
0
11
959
=== added file 'tests/data/vcard.vcf'
960
--- tests/data/vcard.vcf	1970-01-01 00:00:00 +0000
961
+++ tests/data/vcard.vcf	2015-05-15 15:18:10 +0000
962
@@ -0,0 +1,30 @@
963
1
BEGIN:VCARD
964
2
VERSION:3.0
965
3
UID:47bbbfcab7c9b8ef0e7375074d22ff54905174bd
966
4
X-QTPROJECT-EXTENDED-DETAIL:CLIENTPIDMAP;[\n    "1"\n]\n
967
5
N:teste3;teste3;;;
968
6
FN:teste3 teste3
969
7
X-QTPROJECT-FAVORITE:false;0
970
8
TEL:3333333
971
9
CATEGORIES:T
972
10
END:VCARD
973
11
BEGIN:VCARD
974
12
VERSION:3.0
975
13
UID:e5bb57fc852541dfc9ad29d583a36f1c353b65ed
976
14
X-QTPROJECT-EXTENDED-DETAIL:CLIENTPIDMAP;[\n    "1"\n]\n
977
15
N:test34;teste;;;
978
16
FN:teste test34
979
17
X-QTPROJECT-FAVORITE:false;0
980
18
TEL:44444
981
19
CATEGORIES:T
982
20
END:VCARD
983
21
BEGIN:VCARD
984
22
VERSION:3.0
985
23
UID:0d753ce1005dde92f69e4ddb62222240691693a0
986
24
X-QTPROJECT-EXTENDED-DETAIL:CLIENTPIDMAP;[\n    "1"\n]\n
987
25
N:teste2;teste;;;
988
26
FN:teste teste2
989
27
X-QTPROJECT-FAVORITE:false;0
990
28
TEL:111111
991
29
CATEGORIES:T
992
30
END:VCARD
Reviewer	Review Type	Date Requested	Status
Ricardo Salveti (community)	packaging		Approve on 2015-06-04
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-05-15
Gustavo Pichorim Boiko (community)		2015-04-30	Approve on 2015-05-14
Review via email: mp+257914@code.launchpad.net