1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2014-06-05 16:35:45 +0000
3
+++ CMakeLists.txt	2014-06-12 12:40:31 +0000
4
@@ -17,7 +17,6 @@
5
17
find_package(Qt5Quick)
17
find_package(Qt5Quick)
6
18
find_package(Qt5DBus)
18
find_package(Qt5DBus)
7
19
find_package(PkgConfig REQUIRED)
19
find_package(PkgConfig REQUIRED)
8
20
pkg_check_modules(CONTENTHUB REQUIRED libcontent-hub)
9
21
20
10
22
set(ADDRESS_BOOK_APP_DIR ${CMAKE_INSTALL_DATADIR}/address-book-app)
21
set(ADDRESS_BOOK_APP_DIR ${CMAKE_INSTALL_DATADIR}/address-book-app)
11
23
set(ADDRESS_BOOK_APP_FULL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/address-book-app)
22
set(ADDRESS_BOOK_APP_FULL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/address-book-app)
12
24
23
13
=== modified file 'click/address-book-content.json'
14
--- click/address-book-content.json	2014-03-12 01:34:34 +0000
15
+++ click/address-book-content.json	2014-06-12 12:40:31 +0000
16
@@ -1,4 +1,7 @@
17
1
{
1
{
18
2
    "destination": [
19
3
        "contacts"
20
4
    ],
21
2
    "source": [
5
    "source": [
22
3
        "contacts"
6
        "contacts"
23
4
    ]
7
    ]
24
5
8
25
=== modified file 'debian/control'
26
--- debian/control	2014-06-06 21:02:16 +0000
27
+++ debian/control	2014-06-12 12:40:31 +0000
28
@@ -5,7 +5,6 @@
29
5
Build-Depends: cmake,
5
Build-Depends: cmake,
30
6
               debhelper (>= 9),
6
               debhelper (>= 9),
31
7
               dh-translations,
7
               dh-translations,
32
8
               libcontent-hub-dev,
33
9
               libgl1-mesa-dev | libgl-dev,
8
               libgl1-mesa-dev | libgl-dev,
34
10
               libgles2-mesa-dev,
9
               libgles2-mesa-dev,
35
11
               python3,
10
               python3,
36
12
11
37
=== modified file 'src/app/CMakeLists.txt'
38
--- src/app/CMakeLists.txt	2014-05-28 20:25:19 +0000
39
+++ src/app/CMakeLists.txt	2014-06-12 12:40:31 +0000
40
@@ -4,14 +4,11 @@
41
4
4
42
5
include_directories(
5
include_directories(
43
6
    ${CMAKE_BINARY_DIR}
6
    ${CMAKE_BINARY_DIR}
44
7
    ${CONTENTHUB_INCLUDE_DIRS}
45
8
)
7
)
46
9
8
47
10
set(ADDRESS_BOOK_APP_SRCS
9
set(ADDRESS_BOOK_APP_SRCS
48
11
    addressbookapp.h
10
    addressbookapp.h
49
12
    addressbookapp.cpp
11
    addressbookapp.cpp
50
13
    contentcommunicator.h
51
14
    contentcommunicator.cpp
52
15
    imagescalethread.h
12
    imagescalethread.h
53
16
    imagescalethread.cpp
13
    imagescalethread.cpp
54
17
    main.cpp
14
    main.cpp
55
@@ -23,10 +20,6 @@
56
23
20
57
24
qt5_use_modules(${ADDRESS_BOOK_APP_BIN} Gui Core Qml Quick DBus)
21
qt5_use_modules(${ADDRESS_BOOK_APP_BIN} Gui Core Qml Quick DBus)
58
25
22
59
26
target_link_libraries(${ADDRESS_BOOK_APP_BIN}
60
27
    ${CONTENTHUB_LIBRARIES}
61
28
)
62
29
63
30
install(TARGETS ${ADDRESS_BOOK_APP_BIN}
23
install(TARGETS ${ADDRESS_BOOK_APP_BIN}
64
31
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
24
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
65
32
)
25
)
66
33
26
67
=== modified file 'src/app/addressbookapp.cpp'
68
--- src/app/addressbookapp.cpp	2014-06-05 19:22:08 +0000
69
+++ src/app/addressbookapp.cpp	2014-06-12 12:40:31 +0000
70
@@ -17,7 +17,6 @@
71
17
#include "config.h"
17
#include "config.h"
72
18
#include "addressbookapp.h"
18
#include "addressbookapp.h"
73
19
#include "imagescalethread.h"
19
#include "imagescalethread.h"
74
20
#include "contentcommunicator.h"
75
21
20
76
22
#include <QDir>
21
#include <QDir>
77
23
#include <QUrl>
22
#include <QUrl>
78
@@ -94,7 +93,6 @@
79
94
AddressBookApp::AddressBookApp(int &argc, char **argv)
93
AddressBookApp::AddressBookApp(int &argc, char **argv)
80
95
    : QGuiApplication(argc, argv),
94
    : QGuiApplication(argc, argv),
81
96
      m_view(0),
95
      m_view(0),
82
97
      m_contentComm(0),
83
98
      m_syncMonitor(0),
96
      m_syncMonitor(0),
84
99
      m_pickingMode(false),
97
      m_pickingMode(false),
85
100
      m_testMode(false),
98
      m_testMode(false),
86
@@ -151,10 +149,7 @@
87
151
            qCritical("Library qttestability load failed!");
149
            qCritical("Library qttestability load failed!");
88
152
        }
150
        }
89
153
        m_testMode = true;
151
        m_testMode = true;
90
154
    } else {
91
155
        m_contentComm = new ContentCommunicator(this);
92
156
    }
152
    }
93
157
94
158
    /* Ubuntu APP Manager gathers info on the list of running applications from the .desktop
153
    /* Ubuntu APP Manager gathers info on the list of running applications from the .desktop
95
159
       file specified on the command line with the desktop_file_hint switch, and will also pass a stage hint
154
       file specified on the command line with the desktop_file_hint switch, and will also pass a stage hint
96
160
       So app will be launched like this:
155
       So app will be launched like this:
97
@@ -186,7 +181,6 @@
98
186
    m_view->setTitle("AddressBook");
181
    m_view->setTitle("AddressBook");
99
187
    m_view->engine()->addImportPath(QCoreApplication::applicationDirPath() + "/" + importPath(""));
182
    m_view->engine()->addImportPath(QCoreApplication::applicationDirPath() + "/" + importPath(""));
100
188
    m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", defaultManager);
183
    m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", defaultManager);
101
189
    m_view->rootContext()->setContextProperty("contactContentHub", m_contentComm);
102
190
    m_view->rootContext()->setContextProperty("application", this);
184
    m_view->rootContext()->setContextProperty("application", this);
103
191
    m_view->rootContext()->setContextProperty("contactKey", contactKey);
185
    m_view->rootContext()->setContextProperty("contactKey", contactKey);
104
192
    m_view->rootContext()->setContextProperty("TEST_DATA", testData);
186
    m_view->rootContext()->setContextProperty("TEST_DATA", testData);
105
@@ -220,10 +214,6 @@
106
220
    if (m_view) {
214
    if (m_view) {
107
221
        delete m_view;
215
        delete m_view;
108
222
    }
216
    }
109
223
110
224
    if (m_contentComm) {
111
225
        delete m_contentComm;
112
226
    }
113
227
}
217
}
114
228
218
115
229
void AddressBookApp::onViewStatusChanged(QQuickView::Status status)
219
void AddressBookApp::onViewStatusChanged(QQuickView::Status status)
116
230
220
117
=== modified file 'src/app/addressbookapp.h'
118
--- src/app/addressbookapp.h	2014-05-09 20:00:09 +0000
119
+++ src/app/addressbookapp.h	2014-06-12 12:40:31 +0000
120
@@ -22,8 +22,6 @@
121
22
#include <QtGui/QGuiApplication>
22
#include <QtGui/QGuiApplication>
122
23
#include <QtQuick/QQuickView>
23
#include <QtQuick/QQuickView>
123
24
24
124
25
class ContentCommunicator;
125
26
126
27
class AddressBookApp : public QGuiApplication
25
class AddressBookApp : public QGuiApplication
127
28
{
26
{
128
29
    Q_OBJECT
27
    Q_OBJECT
129
@@ -62,7 +60,6 @@
130
62
60
131
63
private:
61
private:
132
64
    QQuickView *m_view;
62
    QQuickView *m_view;
133
65
    ContentCommunicator *m_contentComm;
134
66
    QDBusInterface *m_syncMonitor;
63
    QDBusInterface *m_syncMonitor;
135
67
    QString m_initialArg;
64
    QString m_initialArg;
136
68
    bool m_viewReady;
65
    bool m_viewReady;
137
69
66
138
=== removed file 'src/app/contentcommunicator.cpp'
139
--- src/app/contentcommunicator.cpp	2014-03-12 00:58:11 +0000
140
+++ src/app/contentcommunicator.cpp	1970-01-01 00:00:00 +0000
141
@@ -1,140 +0,0 @@
142
1
/*
143
2
 * Copyright (C) 2013 Canonical, Ltd.
144
3
 *
145
4
 * This program is free software; you can redistribute it and/or modify
146
5
 * it under the terms of the GNU General Public License as published by
147
6
 * the Free Software Foundation; version 3.
148
7
 *
149
8
 * This program is distributed in the hope that it will be useful,
150
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
151
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
152
11
 * GNU General Public License for more details.
153
12
 *
154
13
 * You should have received a copy of the GNU General Public License
155
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
156
15
 *
157
16
 */
158
17
159
18
#include <contentcommunicator.h>
160
19
161
20
#include <QDebug>
162
21
#include <QTemporaryFile>
163
22
#include <QDir>
164
23
165
24
#include <com/ubuntu/content/hub.h>
166
25
#include <com/ubuntu/content/item.h>
167
26
#include <com/ubuntu/content/transfer.h>
168
27
169
28
using namespace com::ubuntu::content;
170
29
171
30
/*!
172
31
 * \brief ContentCommunicator::ContentCommunicator
173
32
 * \param parent
174
33
 */
175
34
ContentCommunicator::ContentCommunicator(QObject *parent)
176
35
    : ImportExportHandler(parent),
177
36
      m_transfer(0)
178
37
{
179
38
    Hub *hub = Hub::Client::instance();
180
39
    if (hub) {
181
40
        hub->register_import_export_handler(this);
182
41
    } else {
183
42
        qWarning() << "Fail to get Hub client instance";
184
43
    }
185
44
}
186
45
187
46
/*!
188
47
 * \brief \reimp
189
48
 */
190
49
void ContentCommunicator::handle_import(content::Transfer *)
191
50
{
192
51
    qDebug() << Q_FUNC_INFO << "address book app does not import content";
193
52
}
194
53
195
54
/*!
196
55
 * \brief \reimp
197
56
 */
198
57
void ContentCommunicator::handle_export(content::Transfer *transfer)
199
58
{
200
59
    if (m_transfer != 0) {
201
60
        qWarning() << "address book app does only one content export at a time";
202
61
        transfer->abort();
203
62
        m_transfer = 0;
204
63
        return;
205
64
    }
206
65
207
66
    if (transfer) {
208
67
        m_transfer = transfer;
209
68
        connect(m_transfer, SIGNAL(selectionTypeChanged()), SIGNAL(multipleItemsChanged()));
210
69
    } else {
211
70
        qWarning() << "Transfer pointer is null in handle_export";
212
71
    }
213
72
    Q_EMIT contactRequested();
214
73
    Q_EMIT activeChanged();
215
74
    Q_EMIT multipleItemsChanged();
216
75
}
217
76
218
77
/*!
219
78
 * \brief \reimp
220
79
 */
221
80
void ContentCommunicator::handle_share(content::Transfer *)
222
81
{
223
82
    qDebug() << Q_FUNC_INFO << "address book app does not share content";
224
83
}
225
84
226
85
/*!
227
86
 * \brief ContentCommunicator::cancelTransfer aborts the current transfer
228
87
 */
229
88
void ContentCommunicator::cancelTransfer()
230
89
{
231
90
    if (!m_transfer) {
232
91
        qWarning() << "No ongoing transfer to cancel";
233
92
        return;
234
93
    }
235
94
236
95
    m_transfer->abort();
237
96
    m_transfer = 0;
238
97
    Q_EMIT activeChanged();
239
98
}
240
99
241
100
/*!
242
101
 * \brief ContentCommunicator::returnContacts returns the given contacts
243
102
 * via content hub to the requester
244
103
 * \param urls
245
104
 */
246
105
void ContentCommunicator::returnContacts(const QUrl &contactsFile)
247
106
{
248
107
    if (!m_transfer) {
249
108
        qWarning() << "No ongoing transfer to return a contact";
250
109
        return;
251
110
    }
252
111
253
112
    QVector<Item> items;
254
113
    items << contactsFile;
255
114
    m_transfer->charge(items);
256
115
    m_transfer = 0;
257
116
    Q_EMIT activeChanged();
258
117
}
259
118
260
119
bool ContentCommunicator::isActive() const
261
120
{
262
121
    return (m_transfer != 0);
263
122
}
264
123
265
124
bool ContentCommunicator::isMultipleItems() const
266
125
{
267
126
    return (m_transfer && m_transfer->selectionType() == Transfer::multiple);
268
127
}
269
128
270
129
QUrl ContentCommunicator::createTemporaryFile() const
271
130
{
272
131
    QTemporaryFile tmp(QDir::tempPath() + "/vcard_XXXXXX.vcf");
273
132
    tmp.setAutoRemove(false);
274
133
    if (!tmp.open()) {
275
134
        qWarning() << "Fail to create temporary file for vcard.";
276
135
        return QUrl();
277
136
    }
278
137
    QString tmpFileName = tmp.fileName();
279
138
    tmp.close();
280
139
    return QUrl::fromLocalFile(tmpFileName);
281
140
}
282
141
0
283
=== removed file 'src/app/contentcommunicator.h'
284
--- src/app/contentcommunicator.h	2014-03-12 00:58:11 +0000
285
+++ src/app/contentcommunicator.h	1970-01-01 00:00:00 +0000
286
@@ -1,61 +0,0 @@
287
1
/*
288
2
 * Copyright (C) 2013 Canonical, Ltd.
289
3
 *
290
4
 * This program is free software; you can redistribute it and/or modify
291
5
 * it under the terms of the GNU General Public License as published by
292
6
 * the Free Software Foundation; version 3.
293
7
 *
294
8
 * This program is distributed in the hope that it will be useful,
295
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
296
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
297
11
 * GNU General Public License for more details.
298
12
 *
299
13
 * You should have received a copy of the GNU General Public License
300
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
301
15
 *
302
16
 */
303
17
304
18
#ifndef CONTENTCOMMUNICATOR_H
305
19
#define CONTENTCOMMUNICATOR_H
306
20
307
21
#include <com/ubuntu/content/import_export_handler.h>
308
22
#include <com/ubuntu/content/transfer.h>
309
23
310
24
#include <QStringList>
311
25
312
26
using namespace com::ubuntu;
313
27
314
28
/*!
315
29
 * Class to handle the communication with the content manager
316
30
 */
317
31
class ContentCommunicator : public content::ImportExportHandler
318
32
{
319
33
    Q_OBJECT
320
34
    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
321
35
    Q_PROPERTY(bool multipleItems READ isMultipleItems NOTIFY multipleItemsChanged)
322
36
323
37
public:
324
38
    ContentCommunicator(QObject *parent = 0);
325
39
326
40
    virtual void handle_import(content::Transfer*);
327
41
    virtual void handle_export(content::Transfer *transfer);
328
42
    virtual void handle_share(content::Transfer*);
329
43
330
44
    bool isActive() const;
331
45
    bool isMultipleItems() const;
332
46
333
47
public Q_SLOTS:
334
48
    void cancelTransfer();
335
49
    void returnContacts(const QUrl &contactsFile);
336
50
    QUrl createTemporaryFile() const;
337
51
338
52
Q_SIGNALS:
339
53
    void contactRequested();
340
54
    void activeChanged();
341
55
    void multipleItemsChanged();
342
56
343
57
private:
344
58
    content::Transfer *m_transfer;
345
59
};
346
60
347
61
#endif // CONTENTCOMMUNICATOR_H
348
62
0
349
=== modified file 'src/imports/CMakeLists.txt'
350
--- src/imports/CMakeLists.txt	2013-11-12 15:52:18 +0000
351
+++ src/imports/CMakeLists.txt	2014-06-12 12:40:31 +0000
352
@@ -13,4 +13,5 @@
353
13
add_subdirectory(ContactList)
13
add_subdirectory(ContactList)
354
14
add_subdirectory(ContactView)
14
add_subdirectory(ContactView)
355
15
add_subdirectory(ContactEdit)
15
add_subdirectory(ContactEdit)
356
16
add_subdirectory(ContactShare)
357
16
add_subdirectory(Ubuntu)
17
add_subdirectory(Ubuntu)
358
17
18
359
=== modified file 'src/imports/ContactList/ContactListPage.qml'
360
--- src/imports/ContactList/ContactListPage.qml	2014-06-11 22:05:50 +0000
361
+++ src/imports/ContactList/ContactListPage.qml	2014-06-12 12:40:31 +0000
362
@@ -21,6 +21,7 @@
363
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
364
22
import Ubuntu.Contacts 0.1 as ContactsUI
22
import Ubuntu.Contacts 0.1 as ContactsUI
365
23
import Ubuntu.Components.Popups 0.1 as Popups
23
import Ubuntu.Components.Popups 0.1 as Popups
366
24
import Ubuntu.Content 0.1 as ContentHub
367
24
import "../ContactEdit"
25
import "../ContactEdit"
368
25
import "../Common"
26
import "../Common"
369
26
27
370
@@ -29,6 +30,7 @@
371
29
    objectName: "contactListPage"
30
    objectName: "contactListPage"
372
30
31
373
31
    property bool pickMode: false
32
    property bool pickMode: false
374
33
    property alias contentHubTransfer: contactExporter.activeTransfer
375
32
    property bool pickMultipleContacts: false
34
    property bool pickMultipleContacts: false
376
33
    property var onlineAccountsMessageDialog: null
35
    property var onlineAccountsMessageDialog: null
377
34
    property QtObject contactIndex: null
36
    property QtObject contactIndex: null
378
@@ -126,7 +128,7 @@
379
126
        detailToPick: ContactDetail.PhoneNumber
128
        detailToPick: ContactDetail.PhoneNumber
380
127
        multiSelectionEnabled: true
129
        multiSelectionEnabled: true
381
128
        multipleSelection: !pickMode ||
130
        multipleSelection: !pickMode ||
383
129
                           ((contactContentHub && contactContentHub.multipleItems) || mainPage.pickMultipleContacts)
131
                           mainPage.pickMultipleContacts || (contactExporter.active && contactExporter.isMultiple)
384
130
132
385
131
        anchors.fill: parent
133
        anchors.fill: parent
386
132
134
387
@@ -181,9 +183,7 @@
388
181
                for (var i=0; i < items.count; i++) {
183
                for (var i=0; i < items.count; i++) {
389
182
                    contacts.push(items.get(i).model.contact)
184
                    contacts.push(items.get(i).model.contact)
390
183
                }
185
                }
394
184
                exporter.contactModel = contactList.listModel
186
                contactExporter.exportContacts(contacts)
392
185
                exporter.contacts = contacts
393
186
                exporter.start()
395
187
            } else {
187
            } else {
396
188
                var contacts = []
188
                var contacts = []
397
189
189
398
@@ -198,8 +198,8 @@
399
198
198
400
199
        onSelectionCanceled: {
199
        onSelectionCanceled: {
401
200
            if (pickMode) {
200
            if (pickMode) {
404
201
                if (contactContentHub) {
201
                if (contentHubTransfer) {
405
202
                    contactContentHub.cancelTransfer()
202
                    contentHubTransfer.state = ContentTransfer.Aborted
406
203
                }
203
                }
407
204
                pageStack.pop()
204
                pageStack.pop()
408
205
                application.returnVcard("")
205
                application.returnVcard("")
409
@@ -430,20 +430,37 @@
410
430
        }
430
        }
411
431
    }
431
    }
412
432
432
424
433
    ContactExporter {
433
425
434
        id: exporter
434
    QtObject {
426
435
        contactModel: contactList.listModel ? contactList.listModel : null
435
        id: contactExporter
427
436
        outputFile: contactContentHub ? contactContentHub.createTemporaryFile() : "/tmp/vcard_address_book_app.vcf"
436
428
437
        onCompleted: {
437
        property var activeTransfer: null
429
438
            if (contactContentHub) {
438
        readonly property bool active: activeTransfer && (activeTransfer.state === ContentHub.ContentTransfer.InProgress && activeTransfer.direction === ContentHub.ContentTransfer.Import)
430
439
                if (error == ContactModel.ExportNoError) {
439
        readonly property bool isMultiple: activeTransfer && (activeTransfer.selectionType === ContentHub.ContentTransfer.Multiple)
431
440
                    contactContentHub.returnContacts(exporter.outputFile)
440
432
441
                } else {
441
        function exportContacts(contacts)
433
442
                    contactContentHub.cancelTransfer()
442
        {
434
443
                }
443
            if (activeTransfer) {
435
444
                var exportUrl = "file:///tmp/address_book_app_export.vcf"
436
445
                mainPage.contactModel.exportCompleted.connect(contactExporter.onExportCompleted)
437
446
                mainPage.contactModel.exportContacts(exportUrl, [], contacts)
438
447
            } else {
439
448
                console.error("Export requested with noo active transfer")
440
449
            }
441
450
        }
442
451
443
452
        function onExportCompleted(error, url)
444
453
        {
445
454
            mainPage.contactModel.exportCompleted.disconnect(contactExporter.onExportCompleted)
446
455
            if (error === ContactModel.ExportNoError) {
447
456
                var obj = Qt.createQmlObject("import Ubuntu.Content 0.1;  ContentItem { url: '" + url + "' }", contactExporter)
448
457
                activeTransfer.items = [obj]
449
458
                activeTransfer.state = ContentHub.ContentTransfer.Charged
450
459
            } else {
451
460
                console.error("Fail to export contacts:" + error)
452
444
            }
461
            }
453
445
            pageStack.pop()
462
            pageStack.pop()
455
446
            application.returnVcard(exporter.outputFile)
463
            application.returnVcard(url)
456
447
        }
464
        }
457
448
    }
465
    }
458
449
466
459
@@ -459,5 +476,13 @@
460
459
        if (TEST_DATA != "") {
476
        if (TEST_DATA != "") {
461
460
            contactList.listModel.importContacts("file://" + TEST_DATA)
477
            contactList.listModel.importContacts("file://" + TEST_DATA)
462
461
        }
478
        }
463
479
464
480
        if (!pickMode) {
465
481
            mainPage.setBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
466
482
                                       {model: contactList.listModel,
467
483
                                        contact: mainPage.createEmptyContact(""),
468
484
                                        active: false,
469
485
                                        enabled: false})
470
486
        }
471
462
    }
487
    }
472
463
}
488
}
473
464
489
474
=== added directory 'src/imports/ContactShare'
475
=== added file 'src/imports/ContactShare/CMakeLists.txt'
476
--- src/imports/ContactShare/CMakeLists.txt	1970-01-01 00:00:00 +0000
477
+++ src/imports/ContactShare/CMakeLists.txt	2014-06-12 12:40:31 +0000
478
@@ -0,0 +1,10 @@
479
1
set(CONTACT_SHARE_QMLS
480
2
    ContactSharePage.qml
481
3
)
482
4
483
5
install(FILES ${CONTACT_SHARE_QMLS}
484
6
    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/ContactShare
485
7
)
486
8
487
9
# make the files visible on qtcreator
488
10
add_custom_target(contact_share_QmlFiles ALL SOURCES ${CONTACT_SHARE_QMLS})
489
0
11
490
=== added file 'src/imports/ContactShare/ContactSharePage.qml'
491
--- src/imports/ContactShare/ContactSharePage.qml	1970-01-01 00:00:00 +0000
492
+++ src/imports/ContactShare/ContactSharePage.qml	2014-06-12 12:40:31 +0000
493
@@ -0,0 +1,62 @@
494
1
/*
495
2
 * Copyright (C) 2012-2014 Canonical, Ltd.
496
3
 *
497
4
 * This program is free software; you can redistribute it and/or modify
498
5
 * it under the terms of the GNU General Public License as published by
499
6
 * the Free Software Foundation; version 3.
500
7
 *
501
8
 * This program is distributed in the hope that it will be useful,
502
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
503
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
504
11
 * GNU General Public License for more details.
505
12
 *
506
13
 * You should have received a copy of the GNU General Public License
507
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
508
15
 */
509
16
510
17
import QtQuick 2.2
511
18
import QtContacts 5.0
512
19
import Ubuntu.Components 0.1
513
20
import Ubuntu.Content 0.1 as ContentHub
514
21
515
22
Page {
516
23
    id: picker
517
24
518
25
    property var contactModel
519
26
    property var contact
520
27
    property var curTransfer
521
28
522
29
    ContentHub.ContentPeerPicker {
523
30
        visible: true
524
31
        anchors.fill: parent
525
32
        contentType: ContentHub.ContentType.Contacts
526
33
        handler: ContentHub.ContentHandler.Share
527
34
528
35
        onPeerSelected: {
529
36
            picker.curTransfer = peer.request();
530
37
            if (picker.curTransfer.state === ContentHub.ContentTransfer.InProgress) {
531
38
                var vCardUrl = "file:///tmp/vcard_" + encodeURIComponent(contact.contactId) + ".vcf"
532
39
                picker.contactModel.exportContacts(vCardUrl, [], [picker.contact])
533
40
            }
534
41
        }
535
42
536
43
        onCancelPressed: pageStack.pop()
537
44
    }
538
45
539
46
    Connections {
540
47
        target: picker.contactModel
541
48
        onExportCompleted: {
542
49
            if (picker.curTransfer && (picker.curTransfer.state === ContentHub.ContentTransfer.InProgress)) {
543
50
                if (error === ContactModel.ExportNoError) {
544
51
                    var obj = Qt.createQmlObject("import Ubuntu.Content 0.1;  ContentItem { url: '" + url + "' }", picker)
545
52
                    picker.curTransfer.items = [ obj ]
546
53
                    picker.curTransfer.state = ContentHub.ContentTransfer.Charged
547
54
                } else {
548
55
                    picker.curTransfer = ContentHub.ContentTransfer.Aborted
549
56
                    console.error("Fail to export contact:" + error)
550
57
                }
551
58
            }
552
59
            pageStack.pop()
553
60
        }
554
61
    }
555
62
}
556
0
63
557
=== modified file 'src/imports/ContactView/ContactView.qml'
558
--- src/imports/ContactView/ContactView.qml	2014-06-10 12:27:54 +0000
559
+++ src/imports/ContactView/ContactView.qml	2014-06-12 12:40:31 +0000
560
@@ -202,6 +202,17 @@
561
202
    tools: ToolbarItems {
202
    tools: ToolbarItems {
562
203
        ToolbarButton {
203
        ToolbarButton {
563
204
            action: Action {
204
            action: Action {
564
205
                objectName: "share"
565
206
                text: i18n.tr("Share")
566
207
                iconName: "share"
567
208
                onTriggered: {
568
209
                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
569
210
                                   { contactModel: root.model, contact: root.contact})
570
211
                }
571
212
            }
572
213
        }
573
214
        ToolbarButton {
574
215
            action: Action {
575
205
                objectName: "edit"
216
                objectName: "edit"
576
206
                text: i18n.tr("Edit")
217
                text: i18n.tr("Edit")
577
207
                iconSource: "artwork:/edit.png"
218
                iconSource: "artwork:/edit.png"
578
208
219
579
=== modified file 'src/imports/MainWindow.qml'
580
--- src/imports/MainWindow.qml	2014-06-05 19:20:12 +0000
581
+++ src/imports/MainWindow.qml	2014-06-12 12:40:31 +0000
582
@@ -18,6 +18,7 @@
583
18
import QtContacts 5.0
18
import QtContacts 5.0
584
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
585
20
import Ubuntu.Components.Popups 0.1 as Popups
20
import Ubuntu.Components.Popups 0.1 as Popups
586
21
import Ubuntu.Content 0.1 as ContentHub
587
21
22
588
22
MainView {
23
MainView {
589
23
    id: mainWindow
24
    id: mainWindow
590
@@ -110,12 +111,12 @@
591
110
    }
111
    }
592
111
112
593
112
    Connections {
113
    Connections {
600
113
        target: contactContentHub
114
        target: ContentHub.ContentHub
601
114
        onActiveChanged: {
115
        onExportRequested: {
602
115
            if (contactContentHub && contactContentHub.active) {
116
            // enter in pick mode
603
116
                // enter in pick mode
117
            mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"),
604
117
                mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"), {pickMode: true})
118
                           {pickMode: true,
605
118
            }
119
                            contentHubTransfer: transfer})
606
119
        }
120
        }
607
120
    }
121
    }
608
121
}
122
}
Status:	Merged
Merged at revision:	185
Proposed branch:	lp:~renatofilho/address-book-app/contact-share
Merge into:	lp:~phablet-team/address-book-app/staging
Diff against target:	608 lines (+137/-247) 14 files modified CMakeLists.txt (+0/-1) click/address-book-content.json (+3/-0) debian/control (+0/-1) src/app/CMakeLists.txt (+0/-7) src/app/addressbookapp.cpp (+0/-10) src/app/addressbookapp.h (+0/-3) src/app/contentcommunicator.cpp (+0/-140) src/app/contentcommunicator.h (+0/-61) src/imports/CMakeLists.txt (+1/-0) src/imports/ContactList/ContactListPage.qml (+43/-18) src/imports/ContactShare/CMakeLists.txt (+10/-0) src/imports/ContactShare/ContactSharePage.qml (+62/-0) src/imports/ContactView/ContactView.qml (+11/-0) src/imports/MainWindow.qml (+7/-6)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/contact-share
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-06-11	Needs Fixing on 2014-06-12
Michael Sheldon (community)		2014-06-11	Approve on 2014-06-11
Review via email: mp+222879@code.launchpad.net