1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2015-09-03 17:15:32 +0000
3
+++ CMakeLists.txt	2016-01-07 13:19:12 +0000
4
@@ -83,6 +83,17 @@
5
83
set(ADDRESS_BOOK_APP_DESKTOP_FILE address-book-app.desktop)
83
set(ADDRESS_BOOK_APP_DESKTOP_FILE address-book-app.desktop)
6
84
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
84
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
7
85
85
8
86
#find unity8 qml libraries
9
87
find_path(LIB_UNITY_QML_EXISTS  NAMES libUnity-qml.so
10
88
    HINTS "/usr/lib/x86_64-linux-gnu/unity8/qml/Unity/"
11
89
    NO_CMAKE_PATH
12
90
    NO_CMAKE_ENVIRONMENT_PATH
13
91
    NO_SYSTEM_ENVIRONMENT_PATH
14
92
)
15
93
if(!LIB_UNITY_QML_EXISTS)
16
94
    MESSAGE(FATAL_ERROR "unity8 private package not-found")
17
95
endif()
18
96
19
86
add_subdirectory(data)
97
add_subdirectory(data)
20
87
add_subdirectory(src)
98
add_subdirectory(src)
21
88
add_subdirectory(po)
99
add_subdirectory(po)
22
89
100
23
=== modified file 'config.h.in'
24
--- config.h.in	2015-09-29 19:03:44 +0000
25
+++ config.h.in	2016-01-07 13:19:12 +0000
26
@@ -10,6 +10,7 @@
27
10
#define QT_EXTRA_IMPORTS_DIR                "@QT_EXTRA_IMPORTS_DIR@"
10
#define QT_EXTRA_IMPORTS_DIR                "@QT_EXTRA_IMPORTS_DIR@"
28
11
#define ADDRESS_BOOK_APP_CLICK_PACKAGE      "@CLICK_MODE@"
11
#define ADDRESS_BOOK_APP_CLICK_PACKAGE      "@CLICK_MODE@"
29
12
#define I18N_DIRECTORY                      "@CMAKE_INSTALL_PREFIX@/share/locale"
12
#define I18N_DIRECTORY                      "@CMAKE_INSTALL_PREFIX@/share/locale"
30
13
#define UNITY8_QML_PATH                     "/usr/lib/@CMAKE_C_LIBRARY_ARCHITECTURE@/unity8/qml/"
31
13
14
32
14
#define SETTINGS_ORGANIZATION_NAME          "com.ubuntu.address-book"
15
#define SETTINGS_ORGANIZATION_NAME          "com.ubuntu.address-book"
33
15
#define SETTINGS_ORGANIZATION_DOMAIN         "canonical.com"
16
#define SETTINGS_ORGANIZATION_DOMAIN         "canonical.com"
34
16
17
35
=== modified file 'debian/control'
36
--- debian/control	2015-10-16 13:37:25 +0000
37
+++ debian/control	2016-01-07 13:19:12 +0000
38
@@ -52,6 +52,7 @@
39
52
         qtdeclarative5-ubuntu-history0.1,
52
         qtdeclarative5-ubuntu-history0.1,
40
53
         qtdeclarative5-ubuntu-keyboard-extensions0.1,
53
         qtdeclarative5-ubuntu-keyboard-extensions0.1,
41
54
         qtdeclarative5-ubuntu-telephony-phonenumber0.1 (>= 0.1+14.10.20140715.1),
54
         qtdeclarative5-ubuntu-telephony-phonenumber0.1 (>= 0.1+14.10.20140715.1),
42
55
         unity8-private,
43
55
         ${misc:Depends},
56
         ${misc:Depends},
44
56
         ${shlibs:Depends},
57
         ${shlibs:Depends},
45
57
Description: Address Book application
58
Description: Address Book application
46
58
59
47
=== modified file 'src/app/addressbookapp.cpp'
48
--- src/app/addressbookapp.cpp	2015-12-18 13:48:47 +0000
49
+++ src/app/addressbookapp.cpp	2016-01-07 13:19:12 +0000
50
@@ -44,8 +44,6 @@
51
44
{
44
{
52
45
    qDebug() << "usage:"
45
    qDebug() << "usage:"
53
46
             << arguments.at(0).toUtf8().constData()
46
             << arguments.at(0).toUtf8().constData()
54
47
             << "[addressbook:///addphone?id=<contact-id>&phone=<phone-number>]"
55
48
             << "[addressbook:///addnewphone?phone=<phone-number>]"
56
49
             << "[addressbook:///contact?id=<contact-id>]"
47
             << "[addressbook:///contact?id=<contact-id>]"
57
50
             << "[addressbook:///create?phone=<phone-number>]"
48
             << "[addressbook:///create?phone=<phone-number>]"
58
51
             << "[addressbook:///pick?single=<true/false>]"
49
             << "[addressbook:///pick?single=<true/false>]"
59
@@ -104,8 +102,7 @@
60
104
      m_netManager(new QNetworkConfigurationManager),
102
      m_netManager(new QNetworkConfigurationManager),
61
105
      m_pickingMode(false),
103
      m_pickingMode(false),
62
106
      m_testMode(false),
104
      m_testMode(false),
65
107
      m_withArgs(false),
105
      m_withArgs(false)
64
108
      m_withKeyboard(false)
66
109
{
106
{
67
110
    s_elapsed.start();
107
    s_elapsed.start();
68
111
    setOrganizationName(SETTINGS_ORGANIZATION_NAME);
108
    setOrganizationName(SETTINGS_ORGANIZATION_NAME);
69
@@ -194,10 +191,13 @@
70
194
                     this, SLOT(onViewStatusChanged(QQuickView::Status)));
191
                     this, SLOT(onViewStatusChanged(QQuickView::Status)));
71
195
    QObject::connect(m_view->engine(), SIGNAL(quit()), SLOT(quit()));
192
    QObject::connect(m_view->engine(), SIGNAL(quit()), SLOT(quit()));
72
196
193
73
194
    m_view->setMinimumWidth(300);
74
195
    m_view->setMinimumHeight(500);
75
197
    m_view->setResizeMode(QQuickView::SizeRootObjectToView);
196
    m_view->setResizeMode(QQuickView::SizeRootObjectToView);
76
198
    m_view->setTitle("AddressBook");
197
    m_view->setTitle("AddressBook");
77
199
    qDebug() << "New import path:" << QCoreApplication::applicationDirPath() + "/" + importPath("");
198
    qDebug() << "New import path:" << QCoreApplication::applicationDirPath() + "/" + importPath("");
78
200
    m_view->engine()->addImportPath(QCoreApplication::applicationDirPath() + "/" + importPath(""));
199
    m_view->engine()->addImportPath(QCoreApplication::applicationDirPath() + "/" + importPath(""));
79
200
    m_view->engine()->addImportPath(UNITY8_QML_PATH);
80
201
    m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", defaultManager);
201
    m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", defaultManager);
81
202
    m_view->rootContext()->setContextProperty("application", this);
202
    m_view->rootContext()->setContextProperty("application", this);
82
203
    m_view->rootContext()->setContextProperty("contactKey", contactKey);
203
    m_view->rootContext()->setContextProperty("contactKey", contactKey);
83
@@ -318,17 +318,12 @@
84
318
318
85
319
    if (methodsMetaData.isEmpty()) {
319
    if (methodsMetaData.isEmpty()) {
86
320
        QStringList args;
320
        QStringList args;
87
321
        //edit
88
322
        args << "id" << "phone";
89
323
        methodsMetaData.insert("addphone", args);
90
324
        args.clear();
91
325
92
326
        //view
321
        //view
93
327
        args << "id";
322
        args << "id";
94
328
        methodsMetaData.insert("contact", args);
323
        methodsMetaData.insert("contact", args);
95
329
        args.clear();
324
        args.clear();
96
330
325
98
331
        //add
326
        //create
99
332
        args << "phone";
327
        args << "phone";
100
333
        methodsMetaData.insert("create", args);
328
        methodsMetaData.insert("create", args);
101
334
        args.clear();
329
        args.clear();
102
@@ -342,11 +337,6 @@
103
342
        args << "url";
337
        args << "url";
104
343
        methodsMetaData.insert("importvcard", args);
338
        methodsMetaData.insert("importvcard", args);
105
344
        args.clear();
339
        args.clear();
106
345
107
346
        //addnewphone
108
347
        args << "phone";
109
348
        methodsMetaData.insert("addnewphone", args);
110
349
        args.clear();
111
350
    }
340
    }
112
351
341
113
352
    QUrlQuery query(url);
342
    QUrlQuery query(url);
114
@@ -448,26 +438,6 @@
115
448
    qDebug() << "ELAPSED:" << s_elapsed.elapsed() / 1000.0;
438
    qDebug() << "ELAPSED:" << s_elapsed.elapsed() / 1000.0;
116
449
}
439
}
117
450
440
118
451
bool AddressBookApp::notify(QObject *obj, QEvent *event)
119
452
{
120
453
    switch(event->type())
121
454
    {
122
455
    case QEvent::KeyPress:
123
456
        // we have no way to detect when a physical keyboard is connected, so we
124
457
        // assume there is one when the down key is pressed
125
458
        if (!m_withKeyboard && (static_cast<QKeyEvent*>(event)->key() == Qt::Key_Down)) {
126
459
            m_withKeyboard = true;
127
460
            Q_EMIT usingKeyboardChanged();
128
461
            return false;
129
462
        }
130
463
        break;
131
464
    default:
132
465
        break;
133
466
    }
134
467
135
468
    return QGuiApplication::notify(obj, event);
136
469
}
137
470
138
471
QString AddressBookApp::callbackApplication() const
441
QString AddressBookApp::callbackApplication() const
139
472
{
442
{
140
473
    return m_callbackApplication;
443
    return m_callbackApplication;
141
@@ -497,7 +467,3 @@
142
497
    return !m_updateWatcher.isNull();
467
    return !m_updateWatcher.isNull();
143
498
}
468
}
144
499
469
145
500
bool AddressBookApp::usingKeyboard() const
146
501
{
147
502
    return m_withKeyboard;
148
503
}
149
504
470
150
=== modified file 'src/app/addressbookapp.h'
151
--- src/app/addressbookapp.h	2015-12-16 18:35:33 +0000
152
+++ src/app/addressbookapp.h	2016-01-07 13:19:12 +0000
153
@@ -32,7 +32,6 @@
154
32
    Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
32
    Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
155
33
    Q_PROPERTY(bool serverSafeMode READ serverSafeMode NOTIFY serverSafeModeChanged)
33
    Q_PROPERTY(bool serverSafeMode READ serverSafeMode NOTIFY serverSafeModeChanged)
156
34
    Q_PROPERTY(bool updating READ updating NOTIFY updatingChanged)
34
    Q_PROPERTY(bool updating READ updating NOTIFY updatingChanged)
157
35
    Q_PROPERTY(bool usingKeyboard READ usingKeyboard NOTIFY usingKeyboardChanged)
158
36
35
159
37
public:
36
public:
160
38
    AddressBookApp(int &argc, char **argv);
37
    AddressBookApp(int &argc, char **argv);
161
@@ -46,14 +45,12 @@
162
46
    bool isOnline() const;
45
    bool isOnline() const;
163
47
    bool serverSafeMode() const;
46
    bool serverSafeMode() const;
164
48
    bool updating() const;
47
    bool updating() const;
165
49
    bool usingKeyboard() const;
166
50
48
167
51
Q_SIGNALS:
49
Q_SIGNALS:
168
52
    void callbackApplicationChanged();
50
    void callbackApplicationChanged();
169
53
    void isOnlineChanged();
51
    void isOnlineChanged();
170
54
    void serverSafeModeChanged();
52
    void serverSafeModeChanged();
171
55
    void updatingChanged();
53
    void updatingChanged();
172
56
    void usingKeyboardChanged();
173
57
    void sourcesChanged();
54
    void sourcesChanged();
174
58
55
175
59
public Q_SLOTS:
56
public Q_SLOTS:
176
@@ -69,8 +66,6 @@
177
69
    // debug
66
    // debug
178
70
    void elapsed() const;
67
    void elapsed() const;
179
71
68
180
72
protected:
181
73
    bool notify(QObject *obj, QEvent *event);
182
74
69
183
75
private Q_SLOTS:
70
private Q_SLOTS:
184
76
    void onUpdateCallFinished(QDBusPendingCallWatcher *watcher);
71
    void onUpdateCallFinished(QDBusPendingCallWatcher *watcher);
185
@@ -90,7 +85,6 @@
186
90
    bool m_pickingMode;
85
    bool m_pickingMode;
187
91
    bool m_testMode;
86
    bool m_testMode;
188
92
    bool m_withArgs;
87
    bool m_withArgs;
189
93
    bool m_withKeyboard;
190
94
};
88
};
191
95
89
192
96
#endif
90
#endif
193
97
91
194
=== modified file 'src/imports/ABContactEditorPage.qml'
195
--- src/imports/ABContactEditorPage.qml	2015-12-16 18:35:33 +0000
196
+++ src/imports/ABContactEditorPage.qml	2016-01-07 13:19:12 +0000
197
@@ -26,31 +26,33 @@
198
26
    objectName: "contactEditorPage"
26
    objectName: "contactEditorPage"
199
27
27
200
28
    property alias backIconName: backAction.iconName
28
    property alias backIconName: backAction.iconName
201
29
202
30
    // Property used on unit tests
29
    // Property used on unit tests
203
31
    readonly property alias saveActionEnabled: saveAction.enabled
30
    readonly property alias saveActionEnabled: saveAction.enabled
204
32
31
221
33
    head.backAction: Action {
32
    leadingActions: [
222
34
        id: backAction
33
        Action {
223
35
34
            id: backAction
224
36
        objectName: "cancel"
35
225
37
        name: "cancel"
36
            objectName: "cancel"
226
38
37
            name: "cancel"
227
39
        text: i18n.tr("Cancel")
38
            text: i18n.tr("Cancel")
228
40
        iconName: "back"
39
            iconName: "down"
229
41
        // WORKAROUND: SDK does not unregister shortcut on object destruction
40
            enabled: root.active && root.enabled
230
42
        // we need to do it manually. (bug #1518420)
41
            shortcut: "Esc"
231
43
        enabled: root.active && root.enabled
42
            onTriggered: {
232
44
        shortcut: enabled ? "Esc" : undefined
43
                root.cancel()
233
45
        onTriggered: root.cancel()
44
                if (root.pageStack.contactListPage)
234
46
    }
45
                    root.pageStack.contactListPage.forceActiveFocus()
235
47
46
            }
236
48
    head.actions: [
47
        }
237
48
    ]
238
49
239
50
    headerActions: [
240
49
        Action {
51
        Action {
241
50
            id: saveAction
52
            id: saveAction
242
53
243
51
            objectName: "save"
54
            objectName: "save"
244
52
            name: "save"
55
            name: "save"
245
53
246
54
            text: i18n.tr("Save")
56
            text: i18n.tr("Save")
247
55
            iconName: "ok"
57
            iconName: "ok"
248
56
            enabled: root.isContactValid && root.active && root.enabled
58
            enabled: root.isContactValid && root.active && root.enabled
249
@@ -62,6 +64,7 @@
250
62
    onContactSaved: {
64
    onContactSaved: {
251
63
        if (pageStack.contactListPage) {
65
        if (pageStack.contactListPage) {
252
64
            pageStack.contactListPage.moveListToContact(contact)
66
            pageStack.contactListPage.moveListToContact(contact)
253
67
            pageStack.contactListPage.forceActiveFocus()
254
65
        }
68
        }
255
66
    }
69
    }
256
67
}
70
}
257
68
71
258
=== modified file 'src/imports/ABContactListPage.qml'
259
--- src/imports/ABContactListPage.qml	2015-12-14 18:29:23 +0000
260
+++ src/imports/ABContactListPage.qml	2016-01-07 13:19:12 +0000
261
@@ -1,4 +1,4 @@
263
1
/*
1
/*
264
2
 * Copyright (C) 2012-2015 Canonical, Ltd.
2
 * Copyright (C) 2012-2015 Canonical, Ltd.
265
3
 *
3
 *
266
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
267
@@ -26,71 +26,73 @@
268
26
import Ubuntu.AddressBook.Base 0.1
26
import Ubuntu.AddressBook.Base 0.1
269
27
import Ubuntu.AddressBook.ContactShare 0.1
27
import Ubuntu.AddressBook.ContactShare 0.1
270
28
28
271
29
import "." as AB
272
30
29
273
31
Page {
30
Page {
274
32
    id: mainPage
31
    id: mainPage
275
33
    objectName: "contactListPage"
32
    objectName: "contactListPage"
276
34
33
277
34
    property var viewPage: null
278
35
    property bool pickMode: false
35
    property bool pickMode: false
279
36
    property alias contentHubTransfer: contactExporter.activeTransfer
36
    property alias contentHubTransfer: contactExporter.activeTransfer
280
37
    property bool pickMultipleContacts: false
37
    property bool pickMultipleContacts: false
281
38
    property QtObject contactIndex: null
38
    property QtObject contactIndex: null
282
39
    property string newPhoneToAdd: ""
283
40
    property alias contactManager: contactList.manager
39
    property alias contactManager: contactList.manager
286
41
    property alias contactViewPage: contactViewPageConnections.target
40
285
42
    property alias contactEditorPage: contactEditorPageConnections.target
287
43
    property var _busyDialog: null
41
    property var _busyDialog: null
288
44
    property bool _importingTestData: false
42
    property bool _importingTestData: false
289
45
    property bool _creatingContact: false
43
    property bool _creatingContact: false
290
46
44
292
47
    readonly property bool bottomEdgePageOpened: bottomEdge.opened && bottomEdge.fullLoaded
45
    readonly property string currentViewContactId: viewPage && viewPage.contact ? viewPage.contact.contactId : ""
293
48
    readonly property bool isEmpty: (contactList.count === 0)
46
    readonly property bool isEmpty: (contactList.count === 0)
294
49
    readonly property bool allowToQuit: (application.callbackApplication.length > 0)
47
    readonly property bool allowToQuit: (application.callbackApplication.length > 0)
295
50
    readonly property var contactModel: contactList.listModel ? contactList.listModel : null
48
    readonly property var contactModel: contactList.listModel ? contactList.listModel : null
297
51
    readonly property bool searching: (state === "searching" || state === "newphoneSearching")
49
    readonly property bool searching: state === "searching"
298
50
    readonly property string headerTitle: pageHeader.title
299
52
51
300
53
    // this function is used to reset the contact list page to the default state if it was called
52
    // this function is used to reset the contact list page to the default state if it was called
301
54
    // from the uri. For example when called to add a new contact
53
    // from the uri. For example when called to add a new contact
302
55
    function returnToNormalState()
54
    function returnToNormalState()
303
56
    {
55
    {
304
57
        // these two states are the only state that need to be reset
305
58
        if (state == "newphoneSearching" || state == "newphone") {
306
59
            state = "default"
307
60
        }
308
61
        application.callbackApplication = ""
56
        application.callbackApplication = ""
309
62
    }
57
    }
310
63
58
311
64
    function createContactWithPhoneNumber(phoneNumber)
59
    function createContactWithPhoneNumber(phoneNumber)
312
65
    {
60
    {
313
66
        var newContact = ContactsJS.createEmptyContact(phoneNumber, mainPage);
61
        var newContact = ContactsJS.createEmptyContact(phoneNumber, mainPage);
325
67
        openEditPage({model: contactList.listModel,
62
        if (bottomEdgeLoader.status == Loader.Ready) {
326
68
                      contact: newContact,
63
            bottomEdgeLoader.editContact(newContact)
327
69
                      initialFocusSection: "name"},
64
        } else {
328
70
                     mainPage);
65
            contactList.currentIndex = -1
329
71
    }
66
            var incubator = pageStack.addPageToNextColumn(mainPage,
330
72
67
                                                         Qt.resolvedUrl("ABContactEditorPage.qml"),
331
73
    function openEditPage(editPageProperties, sourcePage) {
68
                                                        { model: mainPage.contactModel,
332
74
        var component = Qt.createComponent(Qt.resolvedUrl("ABContactEditorPage.qml"))
69
                                                          contact: newContact,
333
75
        if (component.status === Component.Ready) {
70
                                                          backIconName: 'back',
334
76
            mainPage.contactEditorPage = component.createObject(mainPage, editPageProperties)
71
                                                          enabled: false
335
77
            pageStack.addPageToNextColumn(sourcePage, mainPage.contactEditorPage)
72
                                                          })
336
78
        }
73
        }
337
79
    }
74
    }
338
80
75
339
81
    function openViewPage(viewPageProperties) {
76
    function openViewPage(viewPageProperties) {
340
82
        var component = Qt.createComponent(Qt.resolvedUrl("ABContactViewPage.qml"))
77
        var component = Qt.createComponent(Qt.resolvedUrl("ABContactViewPage.qml"))
344
83
        if (component.status === Component.Ready) {
78
        var incubator = pageStack.addPageToNextColumn(mainPage, component, viewPageProperties)
345
84
            mainPage.contactViewPage = component.createObject(mainPage, viewPageProperties)
79
        if (incubator && (incubator.status === Component.Loading)) {
346
85
            pageStack.addPageToNextColumn(mainPage, mainPage.contactViewPage)
80
            incubator.onStatusChanged = function(status) {
347
81
                if (status === Component.Ready)
348
82
                    mainPage.viewPage =  incubator.object
349
83
            }
350
84
        } else if (incubator && incubator.status ===- Component.Ready) {
351
85
            mainPage.viewPage =  incubator.object
352
86
        } else {
353
87
            mainPage.viewPage =  null
354
86
        }
88
        }
355
87
    }
89
    }
356
88
90
357
89
    function showContact(contact)
91
    function showContact(contact)
358
90
    {
92
    {
359
91
        var currentContact = contactList.listModel.contacts[contactList.currentIndex]
93
        var currentContact = contactList.listModel.contacts[contactList.currentIndex]
362
92
        if (currentContact && contactViewPage && contactViewPage.contact && (contactViewPage.contact.contactId === currentContact.contactId)) {
94
        if (currentContact && (mainPage.currentViewContactId === currentContact.contactId)) {
363
93
            console.debug("Skip show contact")
95
            // contact view already opened with this contact
364
94
            return
96
            return
365
95
        }
97
        }
366
96
98
367
@@ -109,13 +111,6 @@
368
109
                      contactId: contactId});
111
                      contactId: contactId});
369
110
    }
112
    }
370
111
113
371
112
    function addPhoneToContact(contactId, phoneNumber)
372
113
    {
373
114
        openViewPage({model: contactList.listModel,
374
115
                      contactId: contactId,
375
116
                      addPhoneToContact: phoneNumber});
376
117
    }
377
118
378
119
    function importContact(urls)
114
    function importContact(urls)
379
120
    {
115
    {
380
121
        mainPage._busyDialog = PopupUtils.open(busyDialogComponent, mainPage)
116
        mainPage._busyDialog = PopupUtils.open(busyDialogComponent, mainPage)
381
@@ -157,20 +152,6 @@
382
157
        }
152
        }
383
158
    }
153
    }
384
159
154
385
160
    function addNewPhone(phoneNumber)
386
161
    {
387
162
        newPhoneToAdd = phoneNumber
388
163
        state = "newphone"
389
164
        contactList.reset()
390
165
    }
391
166
392
167
    function showContactEditorPage(editorPage) {
393
168
        contactList.currentIndex = -1;
394
169
        mainPage.contactEditorPage = editorPage;
395
170
        pageStack.addPageToNextColumn(mainPage, editorPage);
396
171
        editorPage.contactSaved.connect(onNewContactSaved);
397
172
        editorPage.enabled = true
398
173
    }
399
174
155
400
175
    function onNewContactSaved(contact) {
156
    function onNewContactSaved(contact) {
401
176
        _creatingContact = true
157
        _creatingContact = true
402
@@ -190,13 +171,57 @@
403
190
    {
171
    {
404
191
        if ((contactList.currentIndex >= 0) && (pageStack.columns > 1)) {
172
        if ((contactList.currentIndex >= 0) && (pageStack.columns > 1)) {
405
192
            var currentContact = contactList.listModel.contacts[contactList.currentIndex]
173
            var currentContact = contactList.listModel.contacts[contactList.currentIndex]
407
193
            if (contactViewPage && contactViewPage.contact && (contactViewPage.contact.contactId === currentContact.contactId))
174
            if (!currentContact) {
408
175
                var component = Qt.createComponent(Qt.resolvedUrl("ABMultiColumnEmptyState.qml"))
409
176
                var searching = contactList.filterTerm !== ""
410
177
                pageStack.addPageToNextColumn(mainPage, component,
411
178
                                              { headerTitle: searching ? i18n.tr("No contact found") : i18n.tr("No contacts") })
412
179
                return
413
180
            }
414
181
            if (currentContact && (mainPage.currentViewContactId === currentContact.contactId))
415
194
                return
182
                return
416
195
183
417
196
            contactList.view._fetchContact(contactList.currentIndex, currentContact)
184
            contactList.view._fetchContact(contactList.currentIndex, currentContact)
418
197
        }
185
        }
419
198
    }
186
    }
420
199
187
421
188
    header: PageHeader {
422
189
        id: pageHeader
423
190
424
191
        property alias leadingActions: leadingBar.actions
425
192
        property alias trailingActions: trailingBar.actions
426
193
        property alias sectionsModel: sections.model
427
194
428
195
        title: i18n.tr("Contacts")
429
196
        //flickable: contactList.view
430
197
        trailingActionBar {
431
198
            id: trailingBar
432
199
        }
433
200
        leadingActionBar {
434
201
            id: leadingBar
435
202
        }
436
203
        extension: Sections {
437
204
            id: sections
438
205
            anchors {
439
206
                left: parent.left
440
207
                leftMargin: units.gu(2)
441
208
                bottom: parent.bottom
442
209
            }
443
210
            onSelectedIndexChanged: {
444
211
                switch (selectedIndex) {
445
212
                case 0:
446
213
                    contactList.showAllContacts()
447
214
                    break;
448
215
                case 1:
449
216
                    contactList.showFavoritesContacts()
450
217
                    break;
451
218
                default:
452
219
                    break;
453
220
                }
454
221
            }
455
222
        }
456
223
    }
457
224
458
200
    // This timer is to avoid fetch unecessary contact if the user select the contacts too fast
225
    // This timer is to avoid fetch unecessary contact if the user select the contacts too fast
459
201
    // while navigating on contact list with keyboard
226
    // while navigating on contact list with keyboard
460
202
    Timer {
227
    Timer {
461
@@ -215,23 +240,23 @@
462
215
        objectName: "contactListView"
240
        objectName: "contactListView"
463
216
241
464
217
        focus: true
242
        focus: true
468
218
        showImportOptions:  !mainPage.pickMode &&
243
        showImportOptions: !mainPage.pickMode &&
469
219
                            mainPage.newPhoneToAdd === "" &&
244
                           pageStack.bottomEdge &&
470
220
                            (!mainPage.contactEditorPage || !mainPage.contactEditorPage.active)
245
                           (pageStack.bottomEdge.status === BottomEdge.Hidden)
471
221
        anchors {
246
        anchors {
472
222
            top: parent.top
247
            top: parent.top
473
248
            topMargin: pageHeader.height
474
223
            left: parent.left
249
            left: parent.left
475
224
            bottom: keyboard.top
250
            bottom: keyboard.top
476
225
            right: parent.right
251
            right: parent.right
477
226
        }
252
        }
479
227
        currentIndex: 0
253
        currentIndex: -1
480
228
        filterTerm: searchField.text
254
        filterTerm: searchField.text
481
229
        multiSelectionEnabled: true
255
        multiSelectionEnabled: true
482
230
        multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
256
        multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
484
231
        highlightSelected: application.usingKeyboard && !mainPage._creatingContact
257
        showNewContact: (pageStack.columns > 1) && pageStack.bottomEdge && (pageStack.bottomEdge.status === BottomEdge.Committed)
485
258
        highlightSelected: pageStack.hasKeyboard && !mainPage._creatingContact
486
232
        onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
259
        onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
487
233
        onAddNewContactClicked: mainPage.createContactWithPhoneNumber(mainPage.newPhoneToAdd)
488
234
489
235
        onContactClicked: mainPage.showContact(contact)
260
        onContactClicked: mainPage.showContact(contact)
490
236
        onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
261
        onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
491
237
        onSelectionCanceled: {
262
        onSelectionCanceled: {
492
@@ -252,14 +277,17 @@
493
252
                contactList.currentIndex = 0
277
                contactList.currentIndex = 0
494
253
            }
278
            }
495
254
        }
279
        }
496
280
497
255
        onCountChanged: {
281
        onCountChanged: {
498
256
            if (mainPage.active &&
282
            if (mainPage.active &&
499
257
                (pageStack.columns > 1) &&
283
                (pageStack.columns > 1) &&
501
258
                (contactList.currentIndex === -1)) {
284
                (contactList.currentIndex === -1) &&
502
285
                (pageStack.bottomEdge.status === BottomEdge.Hidden)) {
503
259
                contactList.currentIndex = 0
286
                contactList.currentIndex = 0
504
260
            }
287
            }
505
261
            mainPage.delayFetchContact()
288
            mainPage.delayFetchContact()
506
262
        }
289
        }
507
290
508
263
        onCurrentIndexChanged: {
291
        onCurrentIndexChanged: {
509
264
            if (!mainPage.contactIndex)
292
            if (!mainPage.contactIndex)
510
265
                mainPage.delayFetchContact()
293
                mainPage.delayFetchContact()
511
@@ -267,7 +295,7 @@
512
267
295
513
268
        Keys.onReturnPressed: {
296
        Keys.onReturnPressed: {
514
269
            var currentContact = contactList.listModel.contacts[contactList.currentIndex]
297
            var currentContact = contactList.listModel.contacts[contactList.currentIndex]
516
270
            if (contactViewPage && contactViewPage.contact && (contactViewPage.contact.contactId === currentContact.contactId))
298
            if (mainPage.currentViewContactId === currentContact.contactId)
517
271
                return
299
                return
518
272
300
519
273
            contactList.view._fetchContact(contactList.currentIndex, currentContact)
301
            contactList.view._fetchContact(contactList.currentIndex, currentContact)
520
@@ -277,7 +305,7 @@
521
277
        //because of that we need this
305
        //because of that we need this
522
278
        Keys.onRightPressed: {
306
        Keys.onRightPressed: {
523
279
            // only move focus away when in edit mode
307
            // only move focus away when in edit mode
525
280
            if (mainPage.contactEditorPage) {
308
            if (pageStack.bottomEdge.status === BottomEdge.Committed) {
526
281
                var next = pageStack._nextItemInFocusChain(view, true)
309
                var next = pageStack._nextItemInFocusChain(view, true)
527
282
                if (next === searchField) {
310
                if (next === searchField) {
528
283
                    pageStack._nextItemInFocusChain(next, true)
311
                    pageStack._nextItemInFocusChain(next, true)
529
@@ -292,8 +320,6 @@
530
292
        }
320
        }
531
293
    }
321
    }
532
294
322
533
295
534
296
535
297
    TextField {
323
    TextField {
536
298
        id: searchField
324
        id: searchField
537
299
325
538
@@ -302,58 +328,57 @@
539
302
        readonly property bool _allowFocus: true
328
        readonly property bool _allowFocus: true
540
303
329
541
304
        anchors {
330
        anchors {
542
331
            top: parent ? parent.top : undefined
543
305
            left: parent ? parent.left : undefined
332
            left: parent ? parent.left : undefined
544
306
            right: parent ? parent.right : undefined
333
            right: parent ? parent.right : undefined
545
334
            margins: units.gu(1)
546
307
            rightMargin: units.gu(2)
335
            rightMargin: units.gu(2)
547
308
        }
336
        }
548
309
337
549
310
        visible: false
338
        visible: false
550
311
        inputMethodHints: Qt.ImhNoPredictiveText
339
        inputMethodHints: Qt.ImhNoPredictiveText
551
312
        placeholderText: i18n.tr("Search...")
340
        placeholderText: i18n.tr("Search...")
552
341
        onVisibleChanged: {
553
342
            if (visible) {
554
343
                if (activeFocus) {
555
344
                    Qt.inputMethod.show()
556
345
                } else {
557
346
                    searchField.forceActiveFocus()
558
347
                }
559
348
            }
560
349
        }
561
350
562
313
        Keys.onTabPressed: contactList.forceActiveFocus()
351
        Keys.onTabPressed: contactList.forceActiveFocus()
563
314
        Keys.onDownPressed: contactList.forceActiveFocus()
352
        Keys.onDownPressed: contactList.forceActiveFocus()
564
315
    }
353
    }
565
316
354
566
317
    Connections {
567
318
        target: mainPage.head.sections
568
319
        onSelectedIndexChanged: {
569
320
            switch (mainPage.head.sections.selectedIndex) {
570
321
            case 0:
571
322
                contactList.showAllContacts()
572
323
                break;
573
324
            case 1:
574
325
                contactList.showFavoritesContacts()
575
326
                break;
576
327
            default:
577
328
                break;
578
329
            }
579
330
        }
580
331
    }
581
332
582
333
    state: "default"
355
    state: "default"
583
334
    states: [
356
    states: [
585
335
        PageHeadState {
357
        State {
586
336
            id: defaultState
358
            id: defaultState
587
337
588
338
            name: "default"
359
            name: "default"
596
339
            backAction: Action {
360
597
340
                visible: mainPage.allowToQuit
361
            property list<QtObject> leadingActions: [
598
341
                iconName: "back"
362
                Action {
599
342
                text: i18n.tr("Quit")
363
                    visible: mainPage.allowToQuit
600
343
                onTriggered: {
364
                    iconName: "back"
601
344
                    application.goBackToSourceApp()
365
                    text: i18n.tr("Quit")
602
345
                    mainPage.returnToNormalState()
366
                    onTriggered: {
603
367
                        application.goBackToSourceApp()
604
368
                        mainPage.returnToNormalState()
605
369
                    }
606
346
                }
370
                }
609
347
            }
371
            ]
610
348
            actions: [
372
611
373
            property list<QtObject> trailingActions:  [
612
349
                Action {
374
                Action {
613
350
                    text: i18n.tr("Search")
375
                    text: i18n.tr("Search")
614
351
                    iconName: "search"
376
                    iconName: "search"
615
352
                    visible: !mainPage.isEmpty
377
                    visible: !mainPage.isEmpty
617
353
                    enabled: mainPage.state === "default"
378
                    enabled: visible && (mainPage.state === "default")
618
354
                    shortcut: "Ctrl+F"
379
                    shortcut: "Ctrl+F"
619
355
                    onTriggered: {
380
                    onTriggered: {
621
356
                        mainPage.state = (mainPage.state === "newphone" ? "newphoneSearching" : "searching")
381
                        mainPage.state = "searching"
622
357
                        contactList.showAllContacts()
382
                        contactList.showAllContacts()
623
358
                        searchField.forceActiveFocus()
383
                        searchField.forceActiveFocus()
624
359
                    }
384
                    }
625
@@ -391,73 +416,85 @@
626
391
                    }
416
                    }
627
392
                }
417
                }
628
393
            ]
418
            ]
629
419
630
394
            PropertyChanges {
420
            PropertyChanges {
634
395
                target: mainPage.head
421
                target: pageHeader
635
396
                backAction: defaultState.backAction
422
633
397
                actions: defaultState.actions
636
398
                // TRANSLATORS: this refers to all contacts
423
                // TRANSLATORS: this refers to all contacts
638
399
                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
424
                sectionsModel:  [i18n.tr("All"), i18n.tr("Favorites")]
639
425
                leadingActions: defaultState.leadingActions
640
426
                trailingActions: defaultState.trailingActions
641
400
            }
427
            }
642
401
            PropertyChanges {
428
            PropertyChanges {
643
402
                target: searchField
429
                target: searchField
644
403
                text: ""
430
                text: ""
645
404
            }
431
            }
646
405
            PropertyChanges {
432
            PropertyChanges {
648
406
                target: bottomEdge
433
                target: bottomEdgeLoader
649
407
                enabled: true
434
                enabled: true
650
408
            }
435
            }
651
409
        },
436
        },
653
410
        PageHeadState {
437
        State {
654
411
            id: searchingState
438
            id: searchingState
655
412
656
413
            name: "searching"
439
            name: "searching"
666
414
            backAction: Action {
440
667
415
                iconName: "back"
441
            property list<QtObject> leadingActions: [
668
416
                text: i18n.tr("Cancel")
442
                Action {
669
417
                enabled: mainPage.state === "searching" && !mainPage.contactEditorPage && mainPage.active
443
                    iconName: "back"
670
418
                shortcut: "Esc"
444
                    text: i18n.tr("Cancel")
671
419
                onTriggered: {
445
                    enabled: (mainPage.state === "searching") &&
672
420
                    mainPage.head.sections.selectedIndex = 0
446
                             mainPage.active &&
673
421
                    mainPage.state = (mainPage.state === "newphoneSearching" ? "newphone" : "default")
447
                             (!pageStack.bottomEdge ||
674
422
                    contactList.forceActiveFocus()
448
                              (pageStack.bottomEdge && (pageStack.bottomEdge.status === BottomEdge.Hidden))) &&
675
449
                             ((pageStack.columns === 1) ||
676
450
                              (mainPage.viewPage && mainPage.viewPage.active))
677
451
                    shortcut:"Esc"
678
452
                    onTriggered: {
679
453
                        mainPage.head.sections.selectedIndex = 0
680
454
                        mainPage.state = "default"
681
455
                        contactList.forceActiveFocus()
682
456
                    }
683
423
                }
457
                }
694
424
            }
458
            ]
695
425
459
696
426
            PropertyChanges {
460
            PropertyChanges {
697
427
                target: bottomEdge
461
                target: pageHeader
698
428
                enabled: false
462
689
429
            }
690
430
691
431
            PropertyChanges {
692
432
                target: mainPage.head
693
433
                backAction: searchingState.backAction
699
434
                contents: searchField
463
                contents: searchField
700
464
                leadingActions: searchingState.leadingActions
701
465
702
435
            }
466
            }
703
436
467
704
437
            PropertyChanges {
468
            PropertyChanges {
707
438
                target: searchField
469
                target: bottomEdgeLoader
708
439
                text: ""
470
                enabled: false
709
440
            }
471
            }
710
441
472
711
442
            PropertyChanges {
473
            PropertyChanges {
712
443
                target: searchField
474
                target: searchField
713
444
                visible: true
475
                visible: true
714
445
                focus: true
476
                focus: true
715
477
                text: ""
716
446
            }
478
            }
717
447
        },
479
        },
719
448
        PageHeadState {
480
        State {
720
449
            id: selectionState
481
            id: selectionState
721
450
722
451
            name: "selection"
482
            name: "selection"
731
452
            backAction: Action {
483
732
453
                text: i18n.tr("Cancel selection")
484
            property list<QtObject> leadingActions: [
725
454
                iconName: "back"
726
455
                enabled: mainPage.state === "selection"
727
456
                shortcut: "Esc"
728
457
                onTriggered: contactList.cancelSelection()
729
458
            }
730
459
            actions: [
733
460
                Action {
485
                Action {
734
486
                    objectName: "cancel"
735
487
                    name: "cancel"
736
488
                    text: i18n.tr("Cancel selection")
737
489
                    iconName: "back"
738
490
                    enabled: mainPage.state === "selection"
739
491
                    onTriggered: contactList.cancelSelection()
740
492
                    shortcut: "Esc"
741
493
                }
742
494
            ]
743
495
744
496
            property list<QtObject> trailingActions: [
745
497
                 Action {
746
461
                    text: (contactList.selectedItems.count === contactList.count) ? i18n.tr("Unselect All") : i18n.tr("Select All")
498
                    text: (contactList.selectedItems.count === contactList.count) ? i18n.tr("Unselect All") : i18n.tr("Select All")
747
462
                    iconName: "select"
499
                    iconName: "select"
748
463
                    onTriggered: {
500
                    onTriggered: {
749
@@ -506,76 +543,48 @@
750
506
                    }
543
                    }
751
507
                }
544
                }
752
508
            ]
545
            ]
799
509
            PropertyChanges {
546
800
510
                target: mainPage.head
547
            PropertyChanges {
801
511
                backAction: selectionState.backAction
548
                target: pageHeader
802
512
                actions: selectionState.actions
549
803
513
            }
550
                leadingActions: selectionState.leadingActions
804
514
            PropertyChanges {
551
                trailingActions: selectionState.trailingActions
805
515
                target: bottomEdge
552
            }
806
516
                enabled: false
553
807
517
            }
554
            PropertyChanges {
808
518
        },
555
                target: bottomEdgeLoader
809
519
        PageHeadState {
556
                enabled: false
810
520
            name: "newphone"
557
            }
811
521
            extend: "default"
558
        },
812
522
            head: mainPage.head
559
        State {
767
523
            PropertyChanges {
768
524
                target: contactList
769
525
                showAddNewButton: true
770
526
            }
771
527
            PropertyChanges {
772
528
                target: mainPage
773
529
                title: i18n.tr("Add contact")
774
530
            }
775
531
            PropertyChanges {
776
532
                target: bottomEdge
777
533
                enabled: false
778
534
            }
779
535
            PropertyChanges {
780
536
                target: contactList
781
537
                detailToPick: -1
782
538
            }
783
539
        },
784
540
        PageHeadState {
785
541
            name: "newphoneSearching"
786
542
            extend: "searching"
787
543
            head: mainPage.head
788
544
            PropertyChanges {
789
545
                target: contactList
790
546
                detailToPick: -1
791
547
                showAddNewButton: true
792
548
            }
793
549
            PropertyChanges {
794
550
                target: bottomEdge
795
551
                enabled: false
796
552
            }
797
553
        },
798
554
        PageHeadState {
813
555
            id: vcardImportedState
560
            id: vcardImportedState
814
556
815
557
            name: "vcardImported"
561
            name: "vcardImported"
823
558
            backAction: Action {
562
824
559
                iconName: "back"
563
            property list<QtObject> leadingActions: [
825
560
                text: i18n.tr("Back")
564
                Action {
826
561
                onTriggered: {
565
                    objectName: "cancel"
827
562
                    contactList.forceActiveFocus()
566
                    name: "cancel"
828
563
                    mainPage.state = "default"
567
                    iconName: "back"
829
564
                    importedIdsFilter.ids = []
568
                    text: i18n.tr("Back")
830
569
                    onTriggered: {
831
570
                        contactList.forceActiveFocus()
832
571
                        mainPage.state = "default"
833
572
                        importedIdsFilter.ids = []
834
573
                    }
835
565
                }
574
                }
847
566
            }
575
            ]
848
567
            PropertyChanges {
576
849
568
                target: mainPage.head
577
            PropertyChanges {
850
569
                backAction: vcardImportedState.backAction
578
                target: pageHeader
851
570
            }
579
852
571
            PropertyChanges {
580
                leadingActions: vcardImportedState.leadingActions
842
572
                target: bottomEdge
843
573
                enabled: false
844
574
            }
845
575
            PropertyChanges {
846
576
                target: mainPage
853
577
                title: i18n.tr("Imported contacts")
581
                title: i18n.tr("Imported contacts")
854
578
            }
582
            }
855
583
856
584
            PropertyChanges {
857
585
                target: bottomEdgeLoader
858
586
                enabled: false
859
587
            }
860
579
        }
588
        }
861
580
    ]
589
    ]
862
581
590
863
@@ -614,54 +623,30 @@
864
614
623
865
615
    KeyboardRectangle {
624
    KeyboardRectangle {
866
616
        id: keyboard
625
        id: keyboard
867
626
        active: mainPage.active &&
868
627
                (pageStack.bottomEdge && (pageStack.bottomEdge.status === BottomEdge.Hidden))
869
617
    }
628
    }
870
618
629
872
619
    Column {
630
    ABEmptyState {
873
620
        id: emptyStateScreen
631
        id: emptyStateScreen
874
621
632
876
622
        anchors.centerIn: parent
633
        anchors {
877
634
            verticalCenter: parent.verticalCenter
878
635
            left: parent.left
879
636
            right: parent.right
880
637
            leftMargin: units.gu(6)
881
638
            rightMargin: units.gu(6)
882
639
        }
883
640
884
623
        height: childrenRect.height
641
        height: childrenRect.height
888
624
        width: childrenRect.width
642
        visible: ((pageStack.columns === 1) &&
889
625
        spacing: units.gu(2)
643
                  !contactList.busy &&
887
626
        visible: (!contactList.busy &&
890
627
                  !contactList.favouritesIsSelected &&
644
                  !contactList.favouritesIsSelected &&
891
628
                  mainPage.isEmpty &&
645
                  mainPage.isEmpty &&
928
629
                  (mainPage.newPhoneToAdd === "") &&
646
                  !(contactList.filterTerm && contactList.filterTerm !== ""))
929
630
                  !(contactList.filterTerm && contactList.filterTerm !== "")) &&
647
        text: mainPage.pickMode ?
930
631
                  bottomEdge.visible
648
                  i18n.tr("You have no contacts.") :
931
632
649
                  i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
896
633
        Behavior on visible {
897
634
            SequentialAnimation {
898
635
                 PauseAnimation {
899
636
                     duration: !emptyStateScreen.visible ? 500 : 0
900
637
                 }
901
638
                 PropertyAction {
902
639
                     target: emptyStateScreen
903
640
                     property: "visible"
904
641
                 }
905
642
            }
906
643
        }
907
644
908
645
        Icon {
909
646
            id: emptyStateIcon
910
647
            anchors.horizontalCenter: emptyStateLabel.horizontalCenter
911
648
            height: units.gu(5)
912
649
            width: units.gu(5)
913
650
            opacity: 0.3
914
651
            name: "contact"
915
652
        }
916
653
        Label {
917
654
            id: emptyStateLabel
918
655
            width: mainPage.width - units.gu(12)
919
656
            height: paintedHeight
920
657
            text: mainPage.pickMode ?
921
658
                      i18n.tr("You have no contacts.") :
922
659
                      i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
923
660
            color: "#5d5d5d"
924
661
            fontSize: "x-large"
925
662
            wrapMode: Text.WordWrap
926
663
            horizontalAlignment: Text.AlignHCenter
927
664
        }
932
665
    }
650
    }
933
666
651
934
667
    ContactExporter {
652
    ContactExporter {
935
@@ -753,103 +738,26 @@
936
753
        }
738
        }
937
754
    }
739
    }
938
755
740
1036
756
    Component {
741
    Loader {
1037
757
        id: editorPageBottomEdge
742
        id: bottomEdgeLoader
1038
758
        ABContactEditorPage {
743
1039
759
            backIconName: "down"
744
        enabled: false
1040
760
            implicitWidth: mainPage.width
745
        active: (pageStack.columns === 1) && bottomEdgeLoader.enabled
1041
761
            implicitHeight: mainPage.height
746
        asynchronous: true
1042
762
            model: contactList.listModel
747
        sourceComponent: ABNewContactBottomEdge {
1043
763
            contact: ContactsJS.createEmptyContact("", mainPage)
748
            parent: mainPage
1044
764
            initialFocusSection: "name"
749
            modelToEdit: mainPage.contactModel
1045
765
            enabled: false
750
            hint.flickable: contactList.view
1046
766
        }
751
            pageStack: mainPage.pageStack
1047
767
    }
752
            enabled: mainPage.active
1048
768
753
        }
1049
769
    Component {
754
    }
1050
770
        id: emptyContact
755
1051
771
        ContactsUI.ContactDelegate {
756
    Binding {
1052
772
            property Contact contact: Contact {
757
        target: pageStack
1053
773
                Name {
758
        property: 'bottomEdge'
1054
774
                    firstName: i18n.tr("New contact")
759
        value: bottomEdgeLoader.item
1055
775
                }
760
        when: bottomEdgeLoader.status == Loader.Ready
959
776
                Avatar {
960
777
                    imageUrl: "image://theme/contact"
961
778
                }
962
779
            }
963
780
            width: mainPage.width
964
781
        }
965
782
    }
966
783
967
784
    AB.BottomEdge {
968
785
        id: bottomEdge
969
786
        objectName: "bottomEdge"
970
787
971
788
        property var incubator
972
789
973
790
        // FIXME: this is a workaround for the lack of fully asynchronous loading
974
791
        // of Pages in AdaptativePageLayout
975
792
        function createObjectAsynchronously(url, properties, callback) {
976
793
            var component = Qt.createComponent(url, Component.Asynchronous);
977
794
            if (component.status == Component.Ready) {
978
795
                incubateObject(component, properties, callback);
979
796
            } else {
980
797
                component.onStatusChanged.connect(function(status) {
981
798
                    if (status == Component.Ready) {
982
799
                        incubateObject(component, properties, callback);
983
800
                    }
984
801
                });
985
802
            }
986
803
        }
987
804
988
805
        function incubateObject(component, properties, callback) {
989
806
            if (component.status == Component.Ready) {
990
807
                incubator = component.incubateObject(null,
991
808
                                                     properties,
992
809
                                                     Qt.Asynchronous);
993
810
                incubator.onStatusChanged = function(status) {
994
811
                    if (status == Component.Ready) {
995
812
                        callback(incubator.object);
996
813
                        incubator = null;
997
814
                    }
998
815
                }
999
816
            }
1000
817
        }
1001
818
1002
819
        function loadEditorPage() {
1003
820
            var newContact = ContactsJS.createEmptyContact("", mainPage);
1004
821
            createObjectAsynchronously(Qt.resolvedUrl("ABContactEditorPage.qml"),
1005
822
                                       {model: contactList.listModel,
1006
823
                                        enabled: false,
1007
824
                                        contact: newContact,
1008
825
                                        initialFocusSection: "name"},
1009
826
                                        showContactEditorPage);
1010
827
        }
1011
828
1012
829
        anchors.fill: parent
1013
830
        contentComponent: pageStack.columns === 1 ? editorPageBottomEdge : emptyContact
1014
831
        flickable: contactList
1015
832
        iconName: "contact-new"
1016
833
        backGroundEffectEnabled: pageStack.columns === 1
1017
834
1018
835
        onBottomEdgeLoaded: contactList.forceActiveFocus()
1019
836
        onOpenBegin: {
1020
837
            contactList.prepareNewContact = true;
1021
838
            contactList.positionViewAtBeginning();
1022
839
            if (pageStack.columns > 1) {
1023
840
                loadEditorPage();
1024
841
            }
1025
842
        }
1026
843
        onOpenEnd: {
1027
844
            contactList.showNewContact = true;
1028
845
            if (pageStack.columns <= 1) {
1029
846
                showContactEditorPage(bottomEdge.content);
1030
847
            }
1031
848
        }
1032
849
1033
850
        onClicked: {
1034
851
            bottomEdge.open();
1035
852
        }
1056
853
    }
761
    }
1057
854
762
1058
855
    Connections {
763
    Connections {
1059
@@ -861,6 +769,7 @@
1060
861
                mainPage.contactIndex = null
769
                mainPage.contactIndex = null
1061
862
                // at this point the operation has finished already
770
                // at this point the operation has finished already
1062
863
                mainPage._creatingContact = false
771
                mainPage._creatingContact = false
1063
772
                fetchNewContactTimer.restart()
1064
864
            }
773
            }
1065
865
        }
774
        }
1066
866
        onImportCompleted: {
775
        onImportCompleted: {
1067
@@ -890,34 +799,20 @@
1068
890
    }
799
    }
1069
891
800
1070
892
    Connections {
801
    Connections {
1080
893
        id: contactViewPageConnections
802
        target: pageStack.bottomEdge
1081
894
803
        onCommitCompleted: {
1082
895
        ignoreUnknownSignals: true
804
            if (mainPage.state !== "default") {
1083
896
        onEditContact: openEditPage(editPageProperties, mainPage.contactViewPage);
805
                mainPage.head.sections.selectedIndex = 0
1084
897
        onActiveChanged: {
806
                mainPage.state = "default"
1076
898
            if (mainPage.contactViewPage &&
1077
899
                !mainPage.contactViewPage.active &&
1078
900
                (mainPage.contactEditorPage == null)) { // not editing
1079
901
                mainPage.contactViewPage = null
1085
902
            }
807
            }
1086
903
        }
808
        }
1103
904
    }
809
        onCollapseCompleted: {
1104
905
810
            if (!mainPage._creatingContact) {
1105
906
    Connections {
811
                if (contactList.currentIndex === -1)
1106
907
        id: contactEditorPageConnections
812
                    contactList.currentIndex = 0
1107
908
813
                mainPage.delayFetchContact()
1092
909
        ignoreUnknownSignals: true
1093
910
        onActiveChanged: {
1094
911
            if (mainPage.contactEditorPage && !mainPage.contactEditorPage.active) {
1095
912
                contactList.prepareNewContact = false;
1096
913
                contactList.showNewContact = false;
1097
914
                bottomEdge.close();
1098
915
                mainPage.contactEditorPage = null
1099
916
                contactList.forceActiveFocus()
1100
917
                bottomEdge.enabled = true
1101
918
            } else if (mainPage.contactEditorPage && !mainPage.contactEditorPage.active) {
1102
919
                bottomEdge.enabled = false
1108
920
            }
814
            }
1109
815
            contactList.forceActiveFocus()
1110
921
        }
816
        }
1111
922
    }
817
    }
1112
923
}
818
}
1113
924
819
1114
=== modified file 'src/imports/ABContactViewPage.qml'
1115
--- src/imports/ABContactViewPage.qml	2015-12-14 18:29:23 +0000
1116
+++ src/imports/ABContactViewPage.qml	2016-01-07 13:19:12 +0000
1117
@@ -1,4 +1,4 @@
1119
1
/*
1
/*
1120
2
 * Copyright (C) 2012-2015 Canonical, Ltd.
2
 * Copyright (C) 2012-2015 Canonical, Ltd.
1121
3
 *
3
 *
1122
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1123
@@ -27,10 +27,35 @@
1124
27
    id: root
27
    id: root
1125
28
    objectName: "contactViewPage"
28
    objectName: "contactViewPage"
1126
29
29
1131
30
    property string addPhoneToContact: ""
30
    property bool editing: false
1132
31
    signal editContact(var editPageProperties)
31
    // used by autopilot test
1133
32
32
    readonly property string headerTitle: header.title
1134
33
    // Override Action buttom to add shortcut to it
33
1135
34
    function editContact(contact)
1136
35
    {
1137
36
        if (editing)
1138
37
            return
1139
38
        editing = true
1140
39
        var component = Qt.createComponent(Qt.resolvedUrl("ABContactEditorPage.qml"))
1141
40
        var incubator = pageStack.addPageToCurrentColumn(root,
1142
41
                                                         component,
1143
42
                                                         { model: root.model,
1144
43
                                                           contact: contact,
1145
44
                                                           backIconName: 'back'})
1146
45
        if (incubator && (incubator.status === Component.Loading)) {
1147
46
            incubator.onStatusChanged = function(status) {
1148
47
                if (status === Component.Ready) {
1149
48
                    incubator.object.Component.destruction.connect(function() {
1150
49
                        root.editing = false;
1151
50
                    });
1152
51
                }
1153
52
            }
1154
53
        } else {
1155
54
            editing = false
1156
55
        }
1157
56
    }
1158
57
1159
58
    // Shortcut in case of single column
1160
34
     Action {
59
     Action {
1161
35
        id: backAction
60
        id: backAction
1162
36
61
1163
@@ -40,7 +65,8 @@
1164
40
        onTriggered: pageStack.removePages(root)
65
        onTriggered: pageStack.removePages(root)
1165
41
    }
66
    }
1166
42
67
1168
43
    head.actions: [
68
1169
69
    headerActions: [
1170
44
        Action {
70
        Action {
1171
45
            objectName: "share"
71
            objectName: "share"
1172
46
            name: "share"
72
            name: "share"
1173
@@ -60,12 +86,9 @@
1174
60
86
1175
61
            text: i18n.tr("Edit")
87
            text: i18n.tr("Edit")
1176
62
            iconName: "edit"
88
            iconName: "edit"
1178
63
            enabled: root.active
89
            enabled: root.active && !editing
1179
64
            shortcut: "Ctrl+e"
90
            shortcut: "Ctrl+e"
1184
65
            onTriggered: {
91
            onTriggered: root.editContact(root.contact)
1181
66
                editContact({model: root.model,
1182
67
                             contact: root.contact});
1183
68
            }
1185
69
        }
92
        }
1186
70
    ]
93
    ]
1187
71
94
1188
@@ -80,23 +103,6 @@
1189
80
        height: implicitHeight
103
        height: implicitHeight
1190
81
    }
104
    }
1191
82
105
1192
83
    // This will load the contact information when the app was launched with
1193
84
    // the URI: addressbook:///contact?id=<id>
1194
85
    onContactFetched: {
1195
86
        if (root.addPhoneToContact != "") {
1196
87
            var detailSourceTemplate = "import QtContacts 5.0; PhoneNumber{ number: \"" + root.addPhoneToContact.trim() + "\" }"
1197
88
            var newDetail = Qt.createQmlObject(detailSourceTemplate, contact)
1198
89
            if (newDetail) {
1199
90
                contact.addDetail(newDetail)
1200
91
                editContact({ model: root.model,
1201
92
                              contact: contact,
1202
93
                              initialFocusSection: "phones",
1203
94
                              newDetails: [newDetail] })
1204
95
                root.addPhoneToContact = ""
1205
96
            }
1206
97
        }
1207
98
    }
1208
99
1209
100
    onActionTrigerred: {
106
    onActionTrigerred: {
1210
101
        // "default" action is used inside of the apps (dialer, messaging) to trigger
107
        // "default" action is used inside of the apps (dialer, messaging) to trigger
1211
102
        // actions based on context.
108
        // actions based on context.
1212
@@ -112,4 +118,27 @@
1213
112
        id: contactShareComponent
118
        id: contactShareComponent
1214
113
        ContactSharePage {}
119
        ContactSharePage {}
1215
114
    }
120
    }
1216
121
1217
122
    Loader {
1218
123
        id: bottomEdgeLoader
1219
124
1220
125
        active: (pageStack.columns > 1)
1221
126
        asynchronous: true
1222
127
        sourceComponent: ABNewContactBottomEdge {
1223
128
            id: bottomEdge
1224
129
1225
130
            parent: root
1226
131
            height: root.height
1227
132
            modelToEdit: root.model
1228
133
            hint.flickable: root.flickable
1229
134
            pageStack: root.pageStack
1230
135
        }
1231
136
    }
1232
137
1233
138
    Binding {
1234
139
        target: pageStack
1235
140
        property: 'bottomEdge'
1236
141
        value: bottomEdgeLoader.item
1237
142
        when: bottomEdgeLoader.status === Loader.Ready
1238
143
    }
1239
115
}
144
}
1240
116
145
1241
=== added file 'src/imports/ABEmptyState.qml'
1242
--- src/imports/ABEmptyState.qml	1970-01-01 00:00:00 +0000
1243
+++ src/imports/ABEmptyState.qml	2016-01-07 13:19:12 +0000
1244
@@ -0,0 +1,61 @@
1245
1
/*
1246
2
 * Copyright (C) 2012-2016 Canonical, Ltd.
1247
3
 *
1248
4
 * This program is free software; you can redistribute it and/or modify
1249
5
 * it under the terms of the GNU General Public License as published by
1250
6
 * the Free Software Foundation; version 3.
1251
7
 *
1252
8
 * This program is distributed in the hope that it will be useful,
1253
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1254
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1255
11
 * GNU General Public License for more details.
1256
12
 *
1257
13
 * You should have received a copy of the GNU General Public License
1258
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1259
15
 */
1260
16
1261
17
import QtQuick 2.4
1262
18
import Ubuntu.Components 1.3
1263
19
1264
20
Column {
1265
21
    id: root
1266
22
1267
23
    property alias text: emptyStateLabel.text
1268
24
1269
25
    spacing: units.gu(2)
1270
26
    //implicitHeight: childrenRect.height
1271
27
1272
28
    Behavior on visible {
1273
29
        SequentialAnimation {
1274
30
             PauseAnimation {
1275
31
                 duration: !root.visible ? 500 : 0
1276
32
             }
1277
33
             PropertyAction {
1278
34
                 target: root
1279
35
                 property: "visible"
1280
36
             }
1281
37
        }
1282
38
    }
1283
39
1284
40
    Icon {
1285
41
        id: emptyStateIcon
1286
42
        anchors.horizontalCenter: emptyStateLabel.horizontalCenter
1287
43
        height: units.gu(5)
1288
44
        width: units.gu(5)
1289
45
        opacity: 0.3
1290
46
        name: "contact"
1291
47
    }
1292
48
    Label {
1293
49
        id: emptyStateLabel
1294
50
        anchors {
1295
51
            left: parent.left
1296
52
            right: parent.right
1297
53
        }
1298
54
        height: paintedHeight
1299
55
        text: i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
1300
56
        color: "#5d5d5d"
1301
57
        fontSize: "x-large"
1302
58
        wrapMode: Text.WordWrap
1303
59
        horizontalAlignment: Text.AlignHCenter
1304
60
    }
1305
61
}
1306
0
62
1307
=== added file 'src/imports/ABMultiColumnEmptyState.qml'
1308
--- src/imports/ABMultiColumnEmptyState.qml	1970-01-01 00:00:00 +0000
1309
+++ src/imports/ABMultiColumnEmptyState.qml	2016-01-07 13:19:12 +0000
1310
@@ -0,0 +1,75 @@
1311
1
/*
1312
2
 * Copyright (C) 2012-2016 Canonical, Ltd.
1313
3
 *
1314
4
 * This program is free software; you can redistribute it and/or modify
1315
5
 * it under the terms of the GNU General Public License as published by
1316
6
 * the Free Software Foundation; version 3.
1317
7
 *
1318
8
 * This program is distributed in the hope that it will be useful,
1319
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1320
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1321
11
 * GNU General Public License for more details.
1322
12
 *
1323
13
 * You should have received a copy of the GNU General Public License
1324
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1325
15
 */
1326
16
1327
17
import QtQuick 2.4
1328
18
import Ubuntu.Components 1.3
1329
19
1330
20
1331
21
Page {
1332
22
    id: root
1333
23
1334
24
    property string headerTitle: i18n.tr("No contacts")
1335
25
1336
26
    header: PageHeader {
1337
27
        title: root.headerTitle
1338
28
    }
1339
29
1340
30
    ABEmptyState {
1341
31
        id: emptyStateScreen
1342
32
1343
33
        anchors {
1344
34
            verticalCenter: parent.verticalCenter
1345
35
            left: parent.left
1346
36
            right: parent.right
1347
37
            leftMargin: units.gu(6)
1348
38
            rightMargin: units.gu(6)
1349
39
        }
1350
40
        height: childrenRect.height
1351
41
        text: i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
1352
42
    }
1353
43
1354
44
    Loader {
1355
45
        id: bottomEdgeLoader
1356
46
1357
47
        active: (pageStack.columns > 1)
1358
48
        asynchronous: true
1359
49
        sourceComponent: ABNewContactBottomEdge {
1360
50
            id: bottomEdge
1361
51
1362
52
            parent: root
1363
53
            height: root.height
1364
54
            modelToEdit: root.pageStack.contactListPage.contactModel
1365
55
            hint.flickable: root.flickable
1366
56
            pageStack: root.pageStack
1367
57
        }
1368
58
    }
1369
59
1370
60
    Binding {
1371
61
        target: pageStack
1372
62
        property: 'bottomEdge'
1373
63
        value: bottomEdgeLoader.item
1374
64
        when: bottomEdgeLoader.status === Loader.Ready
1375
65
    }
1376
66
1377
67
    Connections {
1378
68
        target: pageStack
1379
69
        onColumnsChanged: {
1380
70
            if (pageStack.columns === 1) {
1381
71
                pageStack.removePages(root)
1382
72
            }
1383
73
        }
1384
74
    }
1385
75
}
1386
0
76
1387
=== added file 'src/imports/ABNewContactBottomEdge.qml'
1388
--- src/imports/ABNewContactBottomEdge.qml	1970-01-01 00:00:00 +0000
1389
+++ src/imports/ABNewContactBottomEdge.qml	2016-01-07 13:19:12 +0000
1390
@@ -0,0 +1,89 @@
1391
1
/*
1392
2
 * Copyright (C) 2012-2015 Canonical, Ltd.
1393
3
 *
1394
4
 * This program is free software; you can redistribute it and/or modify
1395
5
 * it under the terms of the GNU General Public License as published by
1396
6
 * the Free Software Foundation; version 3.
1397
7
 *
1398
8
 * This program is distributed in the hope that it will be useful,
1399
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1400
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1401
11
 * GNU General Public License for more details.
1402
12
 *
1403
13
 * You should have received a copy of the GNU General Public License
1404
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1405
15
 */
1406
16
1407
17
import QtQuick 2.4
1408
18
import Ubuntu.Components 1.3
1409
19
import Ubuntu.Contacts 0.1 as ContactsUI
1410
20
1411
21
BottomEdge {
1412
22
    id: bottomEdge
1413
23
    objectName: "bottomEdge"
1414
24
1415
25
    property var modelToEdit: null
1416
26
    property var pageStack: null
1417
27
    property var _contactToEdit: null
1418
28
    // WORKAROUND: BottomEdge component loads the page async while draging it
1419
29
    // this cause a very bad visual.
1420
30
    // To avoid that we create it as soon as the component is ready and keep
1421
31
    // it invisible until the user start to drag it.
1422
32
    property var _realPage: null
1423
33
1424
34
    function editContact(contact)
1425
35
    {
1426
36
        _contactToEdit = contact
1427
37
        commit()
1428
38
    }
1429
39
1430
40
    hint {
1431
41
        action: Action {
1432
42
            iconName: "contact-new"
1433
43
            shortcut: "ctrl+n"
1434
44
            enabled: bottomEdge.enabled
1435
45
1436
46
            onTriggered: bottomEdge.commit()
1437
47
        }
1438
48
    }
1439
49
1440
50
    contentComponent: Item {
1441
51
        id: pageContent
1442
52
1443
53
        implicitWidth: bottomEdge.width
1444
54
        implicitHeight: bottomEdge.height
1445
55
        children: bottomEdge._realPage
1446
56
    }
1447
57
1448
58
1449
59
    onCommitCompleted: {
1450
60
        if (bottomEdge._contactToEdit)
1451
61
            editorPage.contact = bottomEdge._contactToEdit
1452
62
        bottomEdge._contactToEdit = null
1453
63
    }
1454
64
1455
65
    onCollapseCompleted: {
1456
66
        _realPage = editorPageBottomEdge.createObject(null)
1457
67
    }
1458
68
1459
69
    Component.onCompleted:  {
1460
70
        _realPage = editorPageBottomEdge.createObject(null)
1461
71
    }
1462
72
1463
73
    Component {
1464
74
        id: editorPageBottomEdge
1465
75
1466
76
        ABContactEditorPage {
1467
77
            implicitWidth: bottomEdge.width
1468
78
            implicitHeight: bottomEdge.height
1469
79
            contact: ContactsUI.ContactsJS.createEmptyContact("", bottomEdge)
1470
80
            model: bottomEdge.modelToEdit
1471
81
            enabled: bottomEdge.status === BottomEdge.Committed
1472
82
            active: bottomEdge.status === BottomEdge.Committed
1473
83
            visible: bottomEdge.status !== BottomEdge.Hidden
1474
84
            onCanceled: bottomEdge.collapse()
1475
85
            onContactSaved: bottomEdge.collapse()
1476
86
            pageStack: bottomEdge.pageStack
1477
87
        }
1478
88
    }
1479
89
}
1480
0
90
1481
=== removed file 'src/imports/BottomEdge.qml'
1482
--- src/imports/BottomEdge.qml	2015-12-14 15:31:50 +0000
1483
+++ src/imports/BottomEdge.qml	1970-01-01 00:00:00 +0000
1484
@@ -1,338 +0,0 @@
1485
1
/*
1486
2
 * Copyright (C) 2015 Canonical, Ltd.
1487
3
 *
1488
4
 * This program is free software; you can redistribute it and/or modify
1489
5
 * it under the terms of the GNU General Public License as published by
1490
6
 * the Free Software Foundation; version 3.
1491
7
 *
1492
8
 * This program is distributed in the hope that it will be useful,
1493
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1494
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1495
11
 * GNU General Public License for more details.
1496
12
 *
1497
13
 * You should have received a copy of the GNU General Public License
1498
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1499
15
 */
1500
16
1501
17
import QtQuick 2.4
1502
18
import Ubuntu.Components 1.3
1503
19
1504
20
Item {
1505
21
    id: bottomEdge
1506
22
1507
23
    readonly property alias content: bottomEdgeLoader.item
1508
24
    readonly property bool fullLoaded: bottomEdgeLoader.status == Loader.Ready
1509
25
1510
26
    property bool opened: false
1511
27
    property Component contentComponent
1512
28
    property string iconName
1513
29
    property Item flickable
1514
30
    property alias backGroundEffectEnabled: darkBg.visible
1515
31
1516
32
    signal openBegin
1517
33
    signal openEnd
1518
34
    signal clicked
1519
35
    signal bottomEdgeLoaded
1520
36
1521
37
    function open() {
1522
38
        bottomEdge.state = "expanded";
1523
39
    }
1524
40
1525
41
    function close() {
1526
42
        bottomEdge.state = "collapsed";
1527
43
    }
1528
44
1529
45
    Action {
1530
46
        text: i18n.tr("New contact")
1531
47
        enabled: bottomEdge.visible
1532
48
        shortcut: "Ctrl+N"
1533
49
        onTriggered: bottomEdge.clicked()
1534
50
    }
1535
51
1536
52
    Rectangle {
1537
53
        id: darkBg
1538
54
1539
55
        anchors.fill: parent
1540
56
        color: "black"
1541
57
        opacity: 0.0
1542
58
    }
1543
59
1544
60
    Item {
1545
61
        id: bottomEdgeBody
1546
62
        anchors {
1547
63
            left: parent.left
1548
64
            right: parent.right
1549
65
        }
1550
66
        height: bottomEdgeContent.height
1551
67
1552
68
        Item {
1553
69
            id: bottomEdgeContent
1554
70
            anchors {
1555
71
                left: parent.left
1556
72
                right: parent.right
1557
73
            }
1558
74
            height: bottomEdgeLoader.height
1559
75
1560
76
            Item {
1561
77
                id: bottomEdgeShadows
1562
78
                anchors.fill: bottomEdgeContent
1563
79
1564
80
                BottomEdgeShadow {
1565
81
                    anchors.bottom: parent.top
1566
82
                }
1567
83
1568
84
                BottomEdgeShadow {
1569
85
                    anchors.top: parent.bottom
1570
86
                    rotation: 180
1571
87
                }
1572
88
            }
1573
89
1574
90
            Rectangle {
1575
91
                anchors.fill: parent
1576
92
                color: Theme.palette.normal.background
1577
93
            }
1578
94
1579
95
            Loader {
1580
96
                id: bottomEdgeLoader
1581
97
                sourceComponent: bottomEdge.contentComponent
1582
98
                asynchronous: true
1583
99
                active: bottomEdge.enabled
1584
100
                onStatusChanged: {
1585
101
                    if (status === Loader.Ready)
1586
102
                        bottomEdge.bottomEdgeLoaded()
1587
103
                }
1588
104
            }
1589
105
        }
1590
106
1591
107
        BottomEdgeHint {
1592
108
            id: bottomEdgeHint
1593
109
1594
110
            anchors.bottom: bottomEdgeBody.top
1595
111
            iconName: bottomEdge.iconName
1596
112
            onClicked: bottomEdge.clicked()
1597
113
1598
114
            Connections {
1599
115
                target: bottomEdgeDragArea
1600
116
                onClosedChanged: {
1601
117
                    if (!bottomEdgeDragArea.closed) {
1602
118
                        bottomEdgeHint.state = "Visible";
1603
119
                    }
1604
120
                }
1605
121
            }
1606
122
1607
123
            Connections {
1608
124
                target: flickable
1609
125
                onVerticalVelocityChanged: {
1610
126
                    if (!bottomEdgeDragArea.closed) {
1611
127
                        return;
1612
128
                    }
1613
129
1614
130
                    if (flickable.verticalVelocity > 0) {
1615
131
                        bottomEdgeHint.state = "Hidden";
1616
132
                    } else if (flickable.verticalVelocity < 0) {
1617
133
                        bottomEdgeHint.state = "Visible";
1618
134
                    }
1619
135
                }
1620
136
            }
1621
137
        }
1622
138
    }
1623
139
1624
140
1625
141
    state: "collapsed"
1626
142
    states: [
1627
143
        State {
1628
144
            name: "collapsed"
1629
145
            ParentChange {
1630
146
                target: bottomEdgeContent
1631
147
                parent: bottomEdgeBody
1632
148
                x: 0
1633
149
                y: 0
1634
150
            }
1635
151
            PropertyChanges {
1636
152
                target: bottomEdgeBody
1637
153
                y: bottomEdgeDragArea.drag.maximumY
1638
154
            }
1639
155
            PropertyChanges {
1640
156
                target: bottomEdgeContent
1641
157
                opacity: 0.0
1642
158
            }
1643
159
            PropertyChanges {
1644
160
                target: darkBg
1645
161
                opacity: 0.0
1646
162
            }
1647
163
        },
1648
164
        State {
1649
165
            name: "expanded"
1650
166
            ParentChange {
1651
167
                target: bottomEdgeContent
1652
168
                parent: bottomEdge
1653
169
                x: 0
1654
170
                y: 0
1655
171
            }
1656
172
            PropertyChanges {
1657
173
                target: bottomEdgeContent
1658
174
                opacity: 1.0
1659
175
            }
1660
176
            PropertyChanges {
1661
177
                target: bottomEdgeBody
1662
178
                y: 0
1663
179
            }
1664
180
            PropertyChanges {
1665
181
                target: bottomEdgeShadows
1666
182
                opacity: 0.0
1667
183
                visible: true
1668
184
            }
1669
185
            PropertyChanges {
1670
186
                target: darkBg
1671
187
                opacity: 0.8
1672
188
            }
1673
189
        },
1674
190
        State {
1675
191
            name: "floating"
1676
192
            when: bottomEdgeDragArea.drag.active
1677
193
            PropertyChanges {
1678
194
                target: bottomEdgeContent
1679
195
                opacity: 1.0
1680
196
            }
1681
197
            PropertyChanges {
1682
198
                target: darkBg
1683
199
                opacity: bottomEdgeBody.y > 0 ? 0.8 - (bottomEdgeBody.y / bottomEdgeDragArea.drag.maximumY) : 0.8
1684
200
            }
1685
201
        }
1686
202
    ]
1687
203
1688
204
    transitions: [
1689
205
        Transition {
1690
206
            to: "collapsed"
1691
207
            SequentialAnimation {
1692
208
                alwaysRunToEnd: true
1693
209
                ParallelAnimation {
1694
210
                    ParentAnimation {
1695
211
                        UbuntuNumberAnimation {
1696
212
                            properties: "x,y"
1697
213
                            duration: UbuntuAnimation.SlowDuration
1698
214
                            target: bottomEdgeContent
1699
215
                        }
1700
216
                    }
1701
217
                    UbuntuNumberAnimation {
1702
218
                        target: bottomEdgeBody
1703
219
                        property: "y"
1704
220
                        duration: UbuntuAnimation.SlowDuration
1705
221
                    }
1706
222
                    UbuntuNumberAnimation {
1707
223
                        target: darkBg
1708
224
                        property: "opacity"
1709
225
                        duration: UbuntuAnimation.SlowDuration
1710
226
                    }
1711
227
                }
1712
228
                PropertyAction {
1713
229
                    target: bottomEdgeContent
1714
230
                    property: "opacity"
1715
231
                }
1716
232
                ScriptAction {
1717
233
                    script: {
1718
234
                        bottomEdgeLoader.active = false
1719
235
                        bottomEdgeLoader.active = true
1720
236
                        bottomEdge.opened = false
1721
237
                    }
1722
238
                }
1723
239
            }
1724
240
        },
1725
241
        Transition {
1726
242
            to: "expanded"
1727
243
            SequentialAnimation {
1728
244
                alwaysRunToEnd: true
1729
245
                ParallelAnimation {
1730
246
                    ScriptAction {
1731
247
                        script: bottomEdge.openBegin()
1732
248
                    }
1733
249
                    ParentAnimation {
1734
250
                        UbuntuNumberAnimation {
1735
251
                            properties: "x,y"
1736
252
                            duration: UbuntuAnimation.SlowDuration
1737
253
                            target: bottomEdgeContent
1738
254
                        }
1739
255
                    }
1740
256
                    UbuntuNumberAnimation {
1741
257
                        target: bottomEdgeShadows
1742
258
                        property: "opacity"
1743
259
                        duration: UbuntuAnimation.SlowDuration
1744
260
                    }
1745
261
                    UbuntuNumberAnimation {
1746
262
                        target: darkBg
1747
263
                        property: "opacity"
1748
264
                        duration: UbuntuAnimation.SlowDuration
1749
265
                    }
1750
266
                }
1751
267
                UbuntuNumberAnimation {
1752
268
                    target: bottomEdgeContent
1753
269
                    property: "opacity"
1754
270
                    duration: UbuntuAnimation.FastDuration
1755
271
                }
1756
272
                ScriptAction {
1757
273
                    script: {
1758
274
                        bottomEdge.opened = true
1759
275
                        bottomEdge.openEnd()
1760
276
                    }
1761
277
1762
278
                }
1763
279
            }
1764
280
        }
1765
281
    ]
1766
282
1767
283
    MouseArea {
1768
284
        id: bottomEdgeDragArea
1769
285
        objectName: "bottomEdgeDragArea"
1770
286
1771
287
        property real previousY: -1
1772
288
        property string dragDirection: "None"
1773
289
        property bool closed: drag.target.y == bottomEdgeDragArea.drag.maximumY
1774
290
                            && !bottomEdgeDragArea.pressed
1775
291
1776
292
        preventStealing: true
1777
293
        propagateComposedEvents: true
1778
294
        drag {
1779
295
            axis: Drag.YAxis
1780
296
            target: bottomEdgeBody
1781
297
            minimumY: 0
1782
298
            maximumY: bottomEdge.height
1783
299
        }
1784
300
1785
301
        anchors {
1786
302
            left: parent.left
1787
303
            right: parent.right
1788
304
            bottom: parent.bottom
1789
305
        }
1790
306
        height: bottomEdgeHint.height
1791
307
1792
308
        onPressed: {
1793
309
            previousY = mouse.y;
1794
310
        }
1795
311
1796
312
        onReleased: {
1797
313
            if (dragDirection === "BottomToTop") {
1798
314
                bottomEdge.state = "expanded";
1799
315
            } else {
1800
316
                bottomEdge.state = "collapsed";
1801
317
            }
1802
318
            previousY = -1;
1803
319
            dragDirection = "None";
1804
320
        }
1805
321
1806
322
        onMouseYChanged: {
1807
323
            var yOffset = previousY - mouseY;
1808
324
            // skip if was a small move
1809
325
            if (Math.abs(yOffset) <= units.gu(2)) {
1810
326
                return;
1811
327
            }
1812
328
            previousY = mouseY;
1813
329
            dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom";
1814
330
        }
1815
331
    }
1816
332
1817
333
    Binding {
1818
334
        target: bottomEdge
1819
335
        property: 'visible'
1820
336
        value: bottomEdge.enabled && !bottomEdge.opened
1821
337
    }
1822
338
}
1823
339
0
1824
=== removed file 'src/imports/BottomEdgeShadow.qml'
1825
--- src/imports/BottomEdgeShadow.qml	2015-09-10 14:47:38 +0000
1826
+++ src/imports/BottomEdgeShadow.qml	1970-01-01 00:00:00 +0000
1827
@@ -1,31 +0,0 @@
1828
1
/*
1829
2
 * Copyright (C) 2015 Canonical, Ltd.
1830
3
 *
1831
4
 * This program is free software; you can redistribute it and/or modify
1832
5
 * it under the terms of the GNU General Public License as published by
1833
6
 * the Free Software Foundation; version 3.
1834
7
 *
1835
8
 * This program is distributed in the hope that it will be useful,
1836
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1837
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1838
11
 * GNU General Public License for more details.
1839
12
 *
1840
13
 * You should have received a copy of the GNU General Public License
1841
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1842
15
 */
1843
16
1844
17
import QtQuick 2.4
1845
18
import Ubuntu.Components 1.3
1846
19
1847
20
Rectangle {
1848
21
    id: bottomEdgeShadow
1849
22
    anchors {
1850
23
        left: parent.left
1851
24
        right: parent.right
1852
25
    }
1853
26
    height: units.gu(1)
1854
27
    gradient: Gradient {
1855
28
        GradientStop { position: 0.0; color: Qt.rgba(0.0, 0.0, 0.0, 0.0) }
1856
29
        GradientStop { position: 1.0; color: Qt.rgba(0.0, 0.0, 0.0, 0.3) }
1857
30
    }
1858
31
}
1859
32
0
1860
=== modified file 'src/imports/CMakeLists.txt'
1861
--- src/imports/CMakeLists.txt	2015-11-19 14:41:18 +0000
1862
+++ src/imports/CMakeLists.txt	2016-01-07 13:19:12 +0000
1863
@@ -4,10 +4,11 @@
1864
4
    ABContactListPage.qml
4
    ABContactListPage.qml
1865
5
    ABContactEditorPage.qml
5
    ABContactEditorPage.qml
1866
6
    ABContactViewPage.qml
6
    ABContactViewPage.qml
1867
7
    ABEmptyState.qml
1868
8
    ABNewContactBottomEdge.qml
1869
9
    ABMultiColumnEmptyState.qml
1870
7
    ContentHubProxy.qml
10
    ContentHubProxy.qml
1871
8
    MainWindow.qml
11
    MainWindow.qml
1872
9
    BottomEdgeShadow.qml
1873
10
    BottomEdge.qml
1874
11
)
12
)
1875
12
13
1876
13
install(FILES ${ADDRESS_BOOK_APP_QMLS}
14
install(FILES ${ADDRESS_BOOK_APP_QMLS}
1877
14
15
1878
=== modified file 'src/imports/MainWindow.qml'
1879
--- src/imports/MainWindow.qml	2015-12-10 19:13:20 +0000
1880
+++ src/imports/MainWindow.qml	2016-01-07 13:19:12 +0000
1881
@@ -18,6 +18,8 @@
1882
18
import Ubuntu.Components 1.3
18
import Ubuntu.Components 1.3
1883
19
import Ubuntu.Components.Popups 1.3 as Popups
19
import Ubuntu.Components.Popups 1.3 as Popups
1884
20
20
1885
21
import Unity.InputInfo 0.1
1886
22
1887
21
MainView {
23
MainView {
1888
22
    id: mainWindow
24
    id: mainWindow
1889
23
    objectName: "addressBookAppMainWindow"
25
    objectName: "addressBookAppMainWindow"
1890
@@ -47,16 +49,6 @@
1891
47
        }
49
        }
1892
48
    }
50
    }
1893
49
51
1894
50
    function addphone(contactId, phoneNumber)
1895
51
    {
1896
52
        mainStack.resetStack()
1897
53
        if (mainStack.contactListPage) {
1898
54
            mainStack.contactListPage.addPhoneToContact(contactId, phoneNumber)
1899
55
        } else {
1900
56
            console.error("Add phone to contact requested but ContactListPage not loaded")
1901
57
        }
1902
58
    }
1903
59
1904
60
    function pick(single)
52
    function pick(single)
1905
61
    {
53
    {
1906
62
        console.debug("Pick mode:" + single)
54
        console.debug("Pick mode:" + single)
1907
@@ -88,24 +80,35 @@
1908
88
        }
80
        }
1909
89
    }
81
    }
1910
90
82
1911
91
    function addnewphone(phoneNumer)
1912
92
    {
1913
93
        mainStack.resetStack()
1914
94
        if (mainStack.contactListPage) {
1915
95
            mainStack.contactListPage.addNewPhone(phoneNumer)
1916
96
        } else {
1917
97
            console.error("Add new phone requested but ContactListPage not loaded")
1918
98
        }
1919
99
    }
1920
100
1921
101
    width: units.gu(90)
83
    width: units.gu(90)
1922
102
    height: units.gu(71)
84
    height: units.gu(71)
1923
103
    anchorToKeyboard: false
85
    anchorToKeyboard: false
1924
104
86
1925
87
    InputDeviceModel {
1926
88
        id: miceModel
1927
89
        deviceFilter: InputInfo.Mouse
1928
90
    }
1929
91
1930
92
    InputDeviceModel {
1931
93
        id: touchPadModel
1932
94
        deviceFilter: InputInfo.TouchPad
1933
95
    }
1934
96
1935
97
    InputDeviceModel {
1936
98
        id: keyboardsModel
1937
99
        deviceFilter: InputInfo.Keyboard
1938
100
    }
1939
101
1940
102
1941
105
    AdaptivePageLayout {
103
    AdaptivePageLayout {
1942
106
        id: mainStack
104
        id: mainStack
1943
105
        objectName: "mainStack"
1944
107
106
1945
108
        property var contactListPage: null
107
        property var contactListPage: null
1946
108
        property var bottomEdge: null
1947
109
        readonly property bool bottomEdgeOpened: (bottomEdge && bottomEdge.status === BottomEdge.Committed)
1948
110
        readonly property bool hasMouse: ((miceModel.count > 0) || (touchPadModel.count > 0))
1949
111
        readonly property bool hasKeyboard: (keyboardsModel.count > 0)
1950
109
112
1951
110
        function resetStack()
113
        function resetStack()
1952
111
        {
114
        {
1953
@@ -145,7 +148,7 @@
1954
145
        anchors.fill: parent
148
        anchors.fill: parent
1955
146
        layouts: [
149
        layouts: [
1956
147
            PageColumnsLayout {
150
            PageColumnsLayout {
1958
148
                when: mainStack.width >= units.gu(80)
151
                when: mainStack.width >= units.gu(70)
1959
149
                PageColumn {
152
                PageColumn {
1960
150
                    maximumWidth: units.gu(50)
153
                    maximumWidth: units.gu(50)
1961
151
                    minimumWidth: units.gu(40)
154
                    minimumWidth: units.gu(40)
1962
@@ -163,6 +166,14 @@
1963
163
            }
166
            }
1964
164
        ]
167
        ]
1965
165
168
1966
169
        onColumnsChanged: {
1967
170
            if (mainStack.columns > 1) {
1968
171
                if (mainStack.contactListPage)
1969
172
                    mainStack.contactListPage.fetchContact()
1970
173
                else
1971
174
                    mainStack.addPageToNextColumn(contactPage, Qt.resolvedUrl("./ABMultiColumnEmptyState.qml"))
1972
175
            }
1973
176
        }
1974
166
    }
177
    }
1975
167
178
1976
168
    ABContactListPage {
179
    ABContactListPage {
1977
@@ -177,6 +188,16 @@
1978
177
        mainWindow.applicationReady()
188
        mainWindow.applicationReady()
1979
178
    }
189
    }
1980
179
190
1981
191
    // WORKAROUND: Due the missing feature on SDK, they can not detect if
1982
192
    // there is a mouse attached to device or not. And this will cause the
1983
193
    // bootom edge component to not work correct on desktop.
1984
194
    // We will consider that  a mouse is always attached until it get implement on SDK.
1985
195
    Binding {
1986
196
        target:  QuickUtils
1987
197
        property: "mouseAttached"
1988
198
        value: mainStack.hasMouse
1989
199
    }
1990
200
1991
180
    Component {
201
    Component {
1992
181
        id: errorDialog
202
        id: errorDialog
1993
182
203
1994
183
204
1995
=== modified file 'src/imports/Settings/SettingsPage.qml'
1996
--- src/imports/Settings/SettingsPage.qml	2015-12-16 18:35:33 +0000
1997
+++ src/imports/Settings/SettingsPage.qml	2016-01-07 13:19:12 +0000
1998
@@ -87,12 +87,12 @@
1999
87
                // FIXME: Using a private property here. This uses the old list item and the only way to change the text
87
                // FIXME: Using a private property here. This uses the old list item and the only way to change the text
2000
88
                // color is with this property.
88
                // color is with this property.
2001
89
                // We should remove it when update the app to the new ListItem.
89
                // We should remove it when update the app to the new ListItem.
2004
90
                __foregroundColor: (activeFocus && (pageStack.columns > 1)) ? Theme.palette.normal.foregroundText :
90
                __foregroundColor: (activeFocus && pageStack.hasKeyboard) ? Theme.palette.normal.foregroundText :
2005
91
                                                                              Theme.palette.normal.foreground
91
                                                                                Theme.palette.normal.foreground
2006
92
                Rectangle {
92
                Rectangle {
2007
93
                    color: UbuntuColors.orange
93
                    color: UbuntuColors.orange
2008
94
                    anchors.fill: parent
94
                    anchors.fill: parent
2010
95
                    visible:addGoogleAccountItem.activeFocus
95
                    visible:addGoogleAccountItem.activeFocus && pageStack.hasKeyboard
2011
96
                    z: -1
96
                    z: -1
2012
97
                }
97
                }
2013
98
            }
98
            }
2014
99
99
2015
=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml'
2016
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml	2015-11-19 16:38:36 +0000
2017
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml	2016-01-07 13:19:12 +0000
2018
@@ -33,9 +33,8 @@
2019
33
    property int minimumHeight: 0
33
    property int minimumHeight: 0
2020
34
    property bool loaded: false
34
    property bool loaded: false
2021
35
    property bool showEmpty: true
35
    property bool showEmpty: true
2022
36
    property bool forceFocusOnFieldCreation: false
2023
37
36
2025
38
    signal newFieldAdded(var index)
37
    signal newFieldAdded(int fieldIndex, QtObject field)
2026
39
38
2027
40
    function reloadDetails(clearFields)
39
    function reloadDetails(clearFields)
2028
41
    {
40
    {
2029
@@ -145,10 +144,10 @@
2030
145
                    if (status === Loader.Ready) {
144
                    if (status === Loader.Ready) {
2031
146
                        var newFields = root.inputFields
145
                        var newFields = root.inputFields
2032
147
                        newFields.push(detailItem.item)
146
                        newFields.push(detailItem.item)
2034
148
                        root.newFieldAdded(detailItem.item)
147
2035
149
                        root.inputFields = newFields
148
                        root.inputFields = newFields
2038
150
                        if (root.loaded && root.forceFocusOnFieldCreation) {
149
                        if (root.loaded) {
2039
151
                            item.forceActiveFocus()
150
                            root.newFieldAdded(detailItem.item, item)
2040
152
                        }
151
                        }
2041
153
                    }
152
                    }
2042
154
                }
153
                }
2043
155
154
2044
=== modified file 'src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml'
2045
--- src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml	2015-10-26 13:18:11 +0000
2046
+++ src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml	2016-01-07 13:19:12 +0000
2047
@@ -18,10 +18,13 @@
2048
18
18
2049
19
Item {
19
Item {
2050
20
    id: keyboardRect
20
    id: keyboardRect
2051
21
2052
22
    property bool active: true
2053
23
2054
21
    anchors.left: parent.left
24
    anchors.left: parent.left
2055
22
    anchors.right: parent.right
25
    anchors.right: parent.right
2056
23
    anchors.bottom: parent.bottom
26
    anchors.bottom: parent.bottom
2058
24
    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
27
    height: active && Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
2059
25
28
2060
26
    states: [
29
    states: [
2061
27
        State {
30
        State {
2062
28
31
2063
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml'
2064
--- src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml	2015-10-26 13:18:11 +0000
2065
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml	2016-01-07 13:19:12 +0000
2066
@@ -106,8 +106,8 @@
2067
106
    // make sure that the signal will be fired after the item collapse
106
    // make sure that the signal will be fired after the item collapse
2068
107
    onHeightChanged: {
107
    onHeightChanged: {
2069
108
        if (!expanded && (selectedDetail !== -1) && (height === collapsedHeight)) {
108
        if (!expanded && (selectedDetail !== -1) && (height === collapsedHeight)) {
2072
109
            fieldSelected(root.nameFromEnum(selectedDetail), root.qmlTypeFromEnum(selectedDetail))
109
            root.fieldSelected(root.nameFromEnum(root.selectedDetail), root.qmlTypeFromEnum(root.selectedDetail))
2073
110
            selectedDetail = -1
110
            root.selectedDetail = -1
2074
111
        }
111
        }
2075
112
    }
112
    }
2076
113
113
2077
114
114
2078
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml'
2079
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-11-24 12:18:17 +0000
2080
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2016-01-07 13:19:12 +0000
2081
@@ -144,7 +144,6 @@
2082
144
    }
144
    }
2083
145
145
2084
146
    Component.onDestruction: {
146
    Component.onDestruction: {
2085
147
        console.debug("Delete temporary avatar image:" + root.temporaryAvatar)
2086
148
        Contacts.removeFile("file:///" + root.temporaryAvatar)
147
        Contacts.removeFile("file:///" + root.temporaryAvatar)
2087
149
        root.temporaryAvatar = ""
148
        root.temporaryAvatar = ""
2088
150
    }
149
    }
2089
151
150
2090
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml'
2091
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml	2015-11-19 16:38:36 +0000
2092
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml	2016-01-07 13:19:12 +0000
2093
@@ -98,7 +98,6 @@
2094
98
        return changed
98
        return changed
2095
99
    }
99
    }
2096
100
100
2097
101
    forceFocusOnFieldCreation: true
2098
102
    headerDelegate: Label {
101
    headerDelegate: Label {
2099
103
        id: header
102
        id: header
2100
104
103
2101
105
104
2102
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml'
2103
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml	2015-11-10 19:03:36 +0000
2104
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml	2016-01-07 13:19:12 +0000
2105
@@ -33,6 +33,7 @@
2106
33
    property variant placeholderTexts: []
33
    property variant placeholderTexts: []
2107
34
    property int inputMethodHints: Qt.ImhNone
34
    property int inputMethodHints: Qt.ImhNone
2108
35
    property bool usePhoneFormat: false
35
    property bool usePhoneFormat: false
2109
36
    readonly property alias repeater: fieldRepeater
2110
36
37
2111
37
    function selectType(type) {
38
    function selectType(type) {
2112
38
        detailTypeSelector.selectItem(type)
39
        detailTypeSelector.selectItem(type)
2113
@@ -96,7 +97,6 @@
2114
96
97
2115
97
                detail: root.detail
98
                detail: root.detail
2116
98
                field: modelData
99
                field: modelData
2117
99
                focus: true
2118
100
                placeholderText: root.placeholderTexts[index]
100
                placeholderText: root.placeholderTexts[index]
2119
101
                inputMethodHints: root.inputMethodHints
101
                inputMethodHints: root.inputMethodHints
2120
102
                autoFormat: root.usePhoneFormat
102
                autoFormat: root.usePhoneFormat
2121
103
103
2122
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
2123
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-12-18 13:16:55 +0000
2124
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2016-01-07 13:19:12 +0000
2125
@@ -33,11 +33,15 @@
2126
33
33
2127
34
    property string initialFocusSection: ""
34
    property string initialFocusSection: ""
2128
35
    property var newDetails: []
35
    property var newDetails: []
2129
36
    property list<QtObject> leadingActions
2130
37
    property alias headerActions: trailingBar.actions
2131
36
38
2132
37
    readonly property bool isNewContact: contact && (contact.contactId === "qtcontacts:::")
39
    readonly property bool isNewContact: contact && (contact.contactId === "qtcontacts:::")
2133
38
    readonly property bool isContactValid: !avatarEditor.busy && (!nameEditor.isEmpty() || !phonesEditor.isEmpty())
40
    readonly property bool isContactValid: !avatarEditor.busy && (!nameEditor.isEmpty() || !phonesEditor.isEmpty())
2134
41
    readonly property alias editorFlickable: scrollArea
2135
39
42
2136
40
    signal contactSaved(var contact);
43
    signal contactSaved(var contact);
2137
44
    signal canceled()
2138
41
45
2139
42
    function cancel() {
46
    function cancel() {
2140
43
        for (var i = 0; i < contactEditor.newDetails.length; ++i) {
47
        for (var i = 0; i < contactEditor.newDetails.length; ++i) {
2141
@@ -51,11 +55,12 @@
2142
51
                field.cancel()
55
                field.cancel()
2143
52
            }
56
            }
2144
53
        }
57
        }
2146
54
        if (pageStack.removePages) {
58
        if (pageStack && pageStack.removePages) {
2147
55
            pageStack.removePages(contactEditor)
59
            pageStack.removePages(contactEditor)
2149
56
        } else {
60
        } else if (pageStack) {
2150
57
            pageStack.pop()
61
            pageStack.pop()
2151
58
        }
62
        }
2152
63
        contactEditor.canceled()
2153
59
    }
64
    }
2154
60
65
2155
61
    function save() {
66
    function save() {
2156
@@ -100,18 +105,25 @@
2157
100
        }
105
        }
2158
101
    }
106
    }
2159
102
107
2161
103
    function makeMeVisible(item) {
108
    function idleMakeMeVisible(item) {
2162
104
        if (!enabled || !item) {
109
        if (!enabled || !item) {
2163
105
            return
110
            return
2164
106
        }
111
        }
2165
107
112
2166
108
        activeItem = item
113
        activeItem = item
2169
109
        var position = scrollArea.contentItem.mapFromItem(item, 0, activeItem.y);
114
        timerMakemakeMeVisible.restart()
2170
110
115
    }
2171
116
2172
117
    function makeMeVisible(item) {
2173
118
        if (!item)
2174
119
            return
2175
120
2176
121
        var position = activeItem.mapToItem(editEditor, item.x, item.y);
2177
111
        // check if the item is already visible
122
        // check if the item is already visible
2178
112
        var bottomY = scrollArea.contentY + scrollArea.height
123
        var bottomY = scrollArea.contentY + scrollArea.height
2179
113
        var itemBottom = position.y + (item.height * 3) // extra margin
124
        var itemBottom = position.y + (item.height * 3) // extra margin
2180
114
        if (position.y >= scrollArea.contentY && itemBottom <= bottomY) {
125
        if (position.y >= scrollArea.contentY && itemBottom <= bottomY) {
2181
126
            Qt.inputMethod.show()
2182
115
            return;
127
            return;
2183
116
        }
128
        }
2184
117
129
2185
@@ -123,7 +135,9 @@
2186
123
            // if it is hidden at the top, also show it
135
            // if it is hidden at the top, also show it
2187
124
            scrollArea.contentY = position.y;
136
            scrollArea.contentY = position.y;
2188
125
        }
137
        }
2189
138
2190
126
        scrollArea.returnToBounds()
139
        scrollArea.returnToBounds()
2191
140
        Qt.inputMethod.show()
2192
127
    }
141
    }
2193
128
142
2194
129
    function ready()
143
    function ready()
2195
@@ -135,6 +149,7 @@
2196
135
            contactEditor.focusToLastPhoneField()
149
            contactEditor.focusToLastPhoneField()
2197
136
            break;
150
            break;
2198
137
        case "name":
151
        case "name":
2199
152
        default:
2200
138
            nameEditor.fieldDelegates[0].forceActiveFocus()
153
            nameEditor.fieldDelegates[0].forceActiveFocus()
2201
139
            break;
154
            break;
2202
140
        }
155
        }
2203
@@ -146,9 +161,42 @@
2204
146
        lastPhoneField.forceActiveFocus()
161
        lastPhoneField.forceActiveFocus()
2205
147
    }
162
    }
2206
148
163
2208
149
    title: isNewContact ? i18n.dtr("address-book-app", "New contact") : i18n.dtr("address-book-app", "Edit")
164
    function focusToFirstEntry(field)
2209
165
    {
2210
166
        var itemToFocus = field
2211
167
        if (field.repeater)
2212
168
            itemToFocus = field.repeater.itemAt(0)
2213
169
2214
170
        if (itemToFocus) {
2215
171
            root.idleMakeMeVisible(itemToFocus)
2216
172
            itemToFocus.forceActiveFocus()
2217
173
        }
2218
174
    }
2219
175
2220
176
    Timer {
2221
177
        id: timerMakemakeMeVisible
2222
178
2223
179
        interval: 100
2224
180
        repeat: false
2225
181
        running: false
2226
182
        onTriggered: root.makeMeVisible(root.activeItem)
2227
183
    }
2228
184
2229
185
    header: PageHeader {
2230
186
        id: pageHeader
2231
187
2232
188
        title: isNewContact ? i18n.dtr("address-book-app", "New contact") : i18n.dtr("address-book-app", "Edit")
2233
189
        trailingActionBar {
2234
190
            id: trailingBar
2235
191
        }
2236
192
        leadingActionBar {
2237
193
            id: leadingBar
2238
194
            actions: contactEditor.leadingActions
2239
195
        }
2240
196
    }
2241
197
2242
150
    enabled: false
198
    enabled: false
2244
151
199
    flickable: null
2245
152
    Timer {
200
    Timer {
2246
153
        id: focusTimer
201
        id: focusTimer
2247
154
202
2248
@@ -158,7 +206,6 @@
2249
158
        onTriggered: contactEditor.ready()
206
        onTriggered: contactEditor.ready()
2250
159
    }
207
    }
2251
160
208
2252
161
    flickable: null
2253
162
    Flickable {
209
    Flickable {
2254
163
        id: scrollArea
210
        id: scrollArea
2255
164
        objectName: "scrollArea"
211
        objectName: "scrollArea"
2256
@@ -169,17 +216,13 @@
2257
169
        anchors{
216
        anchors{
2258
170
            left: parent.left
217
            left: parent.left
2259
171
            top: parent.top
218
            top: parent.top
2260
219
            topMargin: pageHeader.height
2261
172
            right: parent.right
220
            right: parent.right
2262
173
            bottom: keyboardRectangle.top
221
            bottom: keyboardRectangle.top
2263
174
        }
222
        }
2264
175
        contentHeight: contents.height + units.gu(2)
223
        contentHeight: contents.height + units.gu(2)
2265
176
        contentWidth: parent.width
224
        contentWidth: parent.width
2266
177
225
2267
178
        //after add a new field we need to wait for the contentHeight to change to scroll to the correct position
2268
179
        onContentHeightChanged: {
2269
180
            contactEditor.makeMeVisible(contactEditor.activeItem)
2270
181
        }
2271
182
2272
183
        Column {
226
        Column {
2273
184
            id: contents
227
            id: contents
2274
185
228
2275
@@ -242,6 +285,7 @@
2276
242
                    right: parent.right
285
                    right: parent.right
2277
243
                }
286
                }
2278
244
                height: implicitHeight
287
                height: implicitHeight
2279
288
                onNewFieldAdded: root.focusToFirstEntry(field)
2280
245
            }
289
            }
2281
246
290
2282
247
            ContactDetailEmailsEditor {
291
            ContactDetailEmailsEditor {
2283
@@ -254,6 +298,7 @@
2284
254
                    right: parent.right
298
                    right: parent.right
2285
255
                }
299
                }
2286
256
                height: implicitHeight
300
                height: implicitHeight
2287
301
                onNewFieldAdded: root.focusToFirstEntry(field)
2288
257
            }
302
            }
2289
258
303
2290
259
            ContactDetailOnlineAccountsEditor {
304
            ContactDetailOnlineAccountsEditor {
2291
@@ -266,6 +311,7 @@
2292
266
                    right: parent.right
311
                    right: parent.right
2293
267
                }
312
                }
2294
268
                height: implicitHeight
313
                height: implicitHeight
2295
314
                onNewFieldAdded: root.focusToFirstEntry(field)
2296
269
            }
315
            }
2297
270
316
2298
271
            ContactDetailAddressesEditor {
317
            ContactDetailAddressesEditor {
2299
@@ -278,6 +324,7 @@
2300
278
                    right: parent.right
324
                    right: parent.right
2301
279
                }
325
                }
2302
280
                height: implicitHeight
326
                height: implicitHeight
2303
327
                onNewFieldAdded: root.focusToFirstEntry(field)
2304
281
            }
328
            }
2305
282
329
2306
283
            ContactDetailOrganizationsEditor {
330
            ContactDetailOrganizationsEditor {
2307
@@ -290,6 +337,7 @@
2308
290
                    right: parent.right
337
                    right: parent.right
2309
291
                }
338
                }
2310
292
                height: implicitHeight
339
                height: implicitHeight
2311
340
                onNewFieldAdded: root.focusToFirstEntry(field)
2312
293
            }
341
            }
2313
294
342
2314
295
            ContactDetailSyncTargetEditor {
343
            ContactDetailSyncTargetEditor {
2315
@@ -332,6 +380,7 @@
2316
332
                    margins: units.gu(2)
380
                    margins: units.gu(2)
2317
333
                }
381
                }
2318
334
                height: implicitHeight
382
                height: implicitHeight
2319
383
                activeFocusOnPress: false
2320
335
                onHeightChanged: {
384
                onHeightChanged: {
2321
336
                    if (expanded && (height === expandedHeight) && !scrollArea.atYEnd) {
385
                    if (expanded && (height === expandedHeight) && !scrollArea.atYEnd) {
2322
337
                        moveToBottom.start()
386
                        moveToBottom.start()
2323
@@ -343,9 +392,11 @@
2324
343
392
2325
344
                    target: scrollArea
393
                    target: scrollArea
2326
345
                    property: "contentY"
394
                    property: "contentY"
2330
346
                    from: scrollArea.contentY
395
                    to: scrollArea.contentHeight - scrollArea.height
2331
347
                    to: Math.min(scrollArea.contentHeight - scrollArea.height,
396
                    onStopped: {
2332
348
                                 scrollArea.contentY + (addNewFieldButton.height - addNewFieldButton.collapsedHeight - units.gu(3)))
397
                        scrollArea.returnToBounds()
2333
398
                        addNewFieldButton.forceActiveFocus()
2334
399
                    }
2335
349
                }
400
                }
2336
350
401
2337
351
                onFieldSelected: {
402
                onFieldSelected: {
2338
@@ -406,8 +457,11 @@
2339
406
        id: keyboardRectangle
457
        id: keyboardRectangle
2340
407
458
2341
408
        onHeightChanged: {
459
        onHeightChanged: {
2344
409
            if (activeItem) {
460
            if (addNewFieldButton.expanded) {
2345
410
                makeMeVisible(activeItem)
461
                scrollArea.contentY = scrollArea.contentHeight - scrollArea.height
2346
462
                scrollArea.returnToBounds()
2347
463
            } else if (activeItem) {
2348
464
                idleMakeMeVisible(activeItem)
2349
411
            }
465
            }
2350
412
        }
466
        }
2351
413
    }
467
    }
2352
@@ -493,6 +547,8 @@
2353
493
                        contactEditor.pageStack.pop() // view page
547
                        contactEditor.pageStack.pop() // view page
2354
494
                    }
548
                    }
2355
495
                }
549
                }
2356
550
                if (contactEditor.pageStack.primaryPage)
2357
551
                    contactEditor.pageStack.primaryPage.forceActiveFocus()
2358
496
            }
552
            }
2359
497
        }
553
        }
2360
498
    }
554
    }
2361
499
555
2362
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
2363
--- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-11-25 17:31:33 +0000
2364
+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2016-01-07 13:19:12 +0000
2365
@@ -47,27 +47,18 @@
2366
47
47
2367
48
    //FIXME: Move this property to TextField as soon as the SDK get ported to QtQuick 2.2
48
    //FIXME: Move this property to TextField as soon as the SDK get ported to QtQuick 2.2
2368
49
    activeFocusOnTab: true
49
    activeFocusOnTab: true
2369
50
2370
51
    // WORKAROUND: For some reason TextField.focus property get reset to false
2371
52
    // we need do a deep investigation on that
2372
53
    Binding {
2373
54
        target: field
2374
55
        property: "focus"
2375
56
        value: visible
2376
57
    }
2377
58
2378
59
    onActiveFocusChanged:  {
2379
60
        if (activeFocus && field.visible) {
2380
61
            field.forceActiveFocus()
2381
62
        }
2382
63
    }
2383
64
2384
65
    onOriginalValueChanged: {
50
    onOriginalValueChanged: {
2385
66
        if (originalValue && (originalValue !== "")) {
51
        if (originalValue && (originalValue !== "")) {
2386
67
            field.text = originalValue
52
            field.text = originalValue
2387
68
        }
53
        }
2388
69
    }
54
    }
2389
70
55
2390
56
    // propage focus to text field
2391
57
    onActiveFocusChanged: {
2392
58
        if (activeFocus)
2393
59
            field.forceActiveFocus()
2394
60
    }
2395
61
2396
71
    PhoneNumberField {
62
    PhoneNumberField {
2397
72
        id: field
63
        id: field
2398
73
64
2399
74
65
2400
=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
2401
--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-10-26 13:18:11 +0000
2402
+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2016-01-07 13:19:12 +0000
2403
@@ -50,13 +50,21 @@
2404
50
            if (exporter.activeTransfer) {
50
            if (exporter.activeTransfer) {
2405
51
                exporter.activeTransfer.state = ContentHub.ContentTransfer.Aborted
51
                exporter.activeTransfer.state = ContentHub.ContentTransfer.Aborted
2406
52
            }
52
            }
2408
53
            pageStack.removePages(root)
53
            if (root.pageStack.removePages)
2409
54
                root.pageStack.removePages(root)
2410
55
            else
2411
56
                root.pageStack.pop()
2412
54
        }
57
        }
2413
55
    }
58
    }
2414
56
59
2415
57
    ContactExporter {
60
    ContactExporter {
2416
58
        id: exporter
61
        id: exporter
2417
59
62
2419
60
        onDone: pageStack.removePages(root)
63
        onDone: {
2420
64
            if (root.pageStack.removePages)
2421
65
                root.pageStack.removePages(root)
2422
66
            else
2423
67
                root.pageStack.pop()
2424
68
        }
2425
61
    }
69
    }
2426
62
}
70
}
2427
63
71
2428
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml'
2429
--- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2015-12-10 19:13:20 +0000
2430
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2016-01-07 13:19:12 +0000
2431
@@ -29,6 +29,7 @@
2432
29
    property alias extensions: extensionsContents.children
29
    property alias extensions: extensionsContents.children
2433
30
    property alias model: contactFetch.model
30
    property alias model: contactFetch.model
2434
31
    property alias editable: contactDetailAvatar.editable
31
    property alias editable: contactDetailAvatar.editable
2435
32
    property alias headerActions: trailingBar.actions
2436
32
33
2437
33
    signal contactFetched(QtObject contact)
34
    signal contactFetched(QtObject contact)
2438
34
    signal contactRemoved()
35
    signal contactRemoved()
2439
@@ -41,12 +42,20 @@
2440
41
        }
42
        }
2441
42
    }
43
    }
2442
43
44
2444
44
    title: contact ? ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name")) : ""
45
    header: PageHeader {
2445
46
        id: pageHeader
2446
47
2447
48
        flickable: flickable
2448
49
        title: contact ? ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name")) : ""
2449
50
        trailingActionBar {
2450
51
            id: trailingBar
2451
52
        }
2452
53
    }
2453
45
54
2454
46
    Connections {
55
    Connections {
2455
47
        target: contact
56
        target: contact
2456
48
        onContactChanged: {
57
        onContactChanged: {
2458
49
            root.title = ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name"))
58
            pageHeader.title = ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name"))
2459
50
        }
59
        }
2460
51
    }
60
    }
2461
52
61
2462
@@ -88,11 +97,13 @@
2463
88
        }
97
        }
2464
89
    }
98
    }
2465
90
99
2466
100
2467
91
    Flickable {
101
    Flickable {
2468
92
        id: flickable
102
        id: flickable
2469
93
103
2470
94
        flickableDirection: Flickable.VerticalFlick
104
        flickableDirection: Flickable.VerticalFlick
2471
95
        anchors.fill: parent
105
        anchors.fill: parent
2472
106
        clip: true
2473
96
        //WORKAROUND: There is a bug on SDK page that causes the page to appear flicked with small contents
107
        //WORKAROUND: There is a bug on SDK page that causes the page to appear flicked with small contents
2474
97
        // see bug #1223050
108
        // see bug #1223050
2475
98
        contentHeight: Math.max(contents.height, parent.height) + units.gu(2)
109
        contentHeight: Math.max(contents.height, parent.height) + units.gu(2)
2476
99
110
2477
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
2478
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2015-12-02 17:10:53 +0000
2479
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2016-01-07 13:19:12 +0000
2480
@@ -202,12 +202,6 @@
2481
202
    */
202
    */
2482
203
    property bool showAddNewButton: false
203
    property bool showAddNewButton: false
2483
204
    /*!
204
    /*!
2484
205
      \qmlproperty bool prepareNewContact
2485
206
2486
207
      This property holds if space for a draft new contact should be made available or not
2487
208
    */
2488
209
    property bool prepareNewContact: false
2489
210
    /*!
2490
211
      \qmlproperty bool showNewContact
205
      \qmlproperty bool showNewContact
2491
212
206
2492
213
      This property holds if a draft new contact should be visible or not
207
      This property holds if a draft new contact should be visible or not
2493
@@ -407,6 +401,7 @@
2494
407
        }
401
        }
2495
408
        anchors.fill: parent
402
        anchors.fill: parent
2496
409
403
2497
404
2498
410
        // WORKAROUND: The SDK header causes the contactY to move to a wrong postion
405
        // WORKAROUND: The SDK header causes the contactY to move to a wrong postion
2499
411
        // calling the positionViewAtBeginning after the list created fix that
406
        // calling the positionViewAtBeginning after the list created fix that
2500
412
        Timer {
407
        Timer {
2501
@@ -424,15 +419,18 @@
2502
424
                right: parent.right
419
                right: parent.right
2503
425
            }
420
            }
2504
426
421
2514
427
            Connections {
422
            Binding {
2515
428
                target: root
423
                target: view
2516
429
                onPrepareNewContactChanged: {
424
                property: 'contentY'
2517
430
                    if (root.prepareNewContact) {
425
                value: -view.headerItem.height
2518
431
                        view.contentY = Qt.binding(function() {return -view.headerItem.height});
426
                when: root.showNewContact
2519
432
                    } else {
427
            }
2520
433
                        view.contentY = view.contentY;
428
2521
434
                    }
429
            Binding {
2522
435
                }
430
                target: view
2523
431
                property: 'currentIndex'
2524
432
                value: -1
2525
433
                when: root.showNewContact
2526
436
            }
434
            }
2527
437
435
2528
438
            // AddNewButton
436
            // AddNewButton
2529
@@ -461,10 +459,9 @@
2530
461
                    }
459
                    }
2531
462
                }
460
                }
2532
463
                selected: true
461
                selected: true
2535
464
                visible: root.prepareNewContact
462
                visible: root.showNewContact
2536
465
                height: root.prepareNewContact ? defaultHeight : 0
463
                height: root.showNewContact ? defaultHeight : 0
2537
466
                Behavior on height {UbuntuNumberAnimation {}}
464
                Behavior on height {UbuntuNumberAnimation {}}
2538
467
                opacity: root.showNewContact ? 1.0 : 0.0
2539
468
            }
465
            }
2540
469
466
2541
470
            Column {
467
            Column {
2542
471
468
2543
=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
2544
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-12-10 19:13:29 +0000
2545
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2016-01-07 13:19:12 +0000
2546
@@ -270,9 +270,9 @@
2547
270
        flicking: contactListView.flicking
270
        flicking: contactListView.flicking
2548
271
        width: parent.width
271
        width: parent.width
2549
272
        selected: (contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate))
272
        selected: (contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate))
2553
273
                  || (contactListView.highlightSelected && (contactListView.currentIndex == index))
273
                  || (!contactListView.isInSelectionMode && contactListView.highlightSelected && (contactListView.currentIndex == index))
2554
274
        selectedColor: contactListView.parent.activeFocus && !contactListView.isInSelectionMode ? UbuntuColors.orange :
274
        selectedColor: contactListView.parent.activeFocus && !contactListView.isInSelectionMode && contactListView.highlightSelected ?
2555
275
                                                                                                  Theme.palette.selected.background
275
                           UbuntuColors.orange : Theme.palette.selected.background
2556
276
        selectionMode: contactListView.isInSelectionMode
276
        selectionMode: contactListView.isInSelectionMode
2557
277
        defaultAvatarUrl: contactListView.defaultAvatarImageUrl
277
        defaultAvatarUrl: contactListView.defaultAvatarImageUrl
2558
278
        isCurrentItem: ListView.isCurrentItem
278
        isCurrentItem: ListView.isCurrentItem
2559
279
279
2560
=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
2561
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2015-11-10 19:51:19 +0000
2562
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2016-01-07 13:19:12 +0000
2563
@@ -314,6 +314,23 @@
2564
314
    }
314
    }
2565
315
315
2566
316
    SequentialAnimation {
316
    SequentialAnimation {
2567
317
        id: clickAnimation
2568
318
2569
319
        running: false
2570
320
        alwaysRunToEnd: true
2571
321
        PropertyAnimation {
2572
322
            target: main
2573
323
            property: "color"
2574
324
            to: root.selectedColor
2575
325
        }
2576
326
        PropertyAction {
2577
327
            target: main
2578
328
            property: "color"
2579
329
            value: root.selected ? root.selectedColor : root.color
2580
330
        }
2581
331
    }
2582
332
2583
333
    SequentialAnimation {
2584
317
        id: triggerAction
334
        id: triggerAction
2585
318
335
2586
319
        property var currentItem: root.activeItem ? root.activeItem.image : null
336
        property var currentItem: root.activeItem ? root.activeItem.image : null
2587
@@ -424,6 +441,8 @@
2588
424
        onClicked: {
441
        onClicked: {
2589
425
            if (main.x === 0) {
442
            if (main.x === 0) {
2590
426
                root.itemClicked(mouse)
443
                root.itemClicked(mouse)
2591
444
                if (!root.selected)
2592
445
                    clickAnimation.start()
2593
427
            } else if (main.x > 0) {
446
            } else if (main.x > 0) {
2594
428
                var action = getActionAt(Qt.point(mouse.x, mouse.y))
447
                var action = getActionAt(Qt.point(mouse.x, mouse.y))
2595
429
                if (action && action !== -1) {
448
                if (action && action !== -1) {
2596
430
449
2597
=== modified file 'tests/autopilot/address_book_app/__init__.py'
2598
--- tests/autopilot/address_book_app/__init__.py	2015-10-28 13:27:33 +0000
2599
+++ tests/autopilot/address_book_app/__init__.py	2016-01-07 13:19:12 +0000
2600
@@ -125,14 +125,13 @@
2601
125
        return None
125
        return None
2602
126
126
2603
127
    def click_action_button(self, action_name):
127
    def click_action_button(self, action_name):
2612
128
        actionbars = self.select_many('ActionBar', objectName='headerActionBar')
128
        actions = self.select_many(objectName='%s_button'%action_name)
2613
129
        for actionbar in actionbars:
129
        for action in actions:
2614
130
            try:
130
           if action.enabled:
2615
131
                actionbar.click_action_button(action_name)
131
               self.pointing_device.click_object(action)
2616
132
                return
132
               return
2617
133
            except ubuntuuitoolkit.ToolkitException:
133
2618
134
                continue
134
        raise exceptions.StateNotFoundError(action_name)
2611
135
        raise exceptions.StateNotFoundError('Action %s not found.' % action_name)
2619
136
135
2620
137
    def open_header(self):
136
    def open_header(self):
2621
138
        header = self.get_header()
137
        header = self.get_header()
2622
@@ -155,6 +154,25 @@
2623
155
154
2624
156
        return header
155
        return header
2625
157
156
2626
157
    def wait_bottom_edge(self, opened):
2627
158
        # wait bottom edge to fully appear
2628
159
        mainStack = self.wait_select_single(objectName='mainStack')
2629
160
        mainStack.bottomEdgeOpened.wait_for(opened)
2630
161
2631
162
    def reveal_bottom_edge_page(self):
2632
163
        flickable = self.get_contact_list_view()
2633
164
2634
165
        globalRect = flickable.globalRect
2635
166
        start_x = globalRect.x + (globalRect.width * 0.5)
2636
167
        start_y = globalRect.y + (flickable.height * 0.98)
2637
168
        stop_y = globalRect.y + (flickable.height * 0.4)
2638
169
2639
170
        self.pointing_device.drag(
2640
171
            start_x, start_y, start_x, stop_y, rate=5)
2641
172
2642
173
        # wait bottom edge to fully appear
2643
174
        self.wait_bottom_edge(True)
2644
175
2645
158
    def cancel(self):
176
    def cancel(self):
2646
159
        """
177
        """
2647
160
        Press the 'Cancel' button
178
        Press the 'Cancel' button
2648
@@ -165,6 +183,7 @@
2649
165
                self.pointing_device.click_object(button)
183
                self.pointing_device.click_object(button)
2650
166
                return
184
                return
2651
167
185
2652
186
        self.click_action_button('cancel')
2653
168
        #self.click_action_button("customBackButton")
187
        #self.click_action_button("customBackButton")
2654
169
188
2655
170
    def save(self):
189
    def save(self):
2656
@@ -200,7 +219,6 @@
2657
200
        """
219
        """
2658
201
        Press the 'Add' button and return the contact editor page
220
        Press the 'Add' button and return the contact editor page
2659
202
        """
221
        """
2662
203
        bottom_swipe_page = self.get_contact_list_page()
222
        self.reveal_bottom_edge_page()
2661
204
        bottom_swipe_page.reveal_bottom_edge_page()
2663
205
223
2664
206
        return self.get_contact_edit_page()
224
        return self.get_contact_edit_page()
2665
207
225
2666
=== modified file 'tests/autopilot/address_book_app/pages/_ab_contact_list_page.py'
2667
--- tests/autopilot/address_book_app/pages/_ab_contact_list_page.py	2015-10-20 03:38:07 +0000
2668
+++ tests/autopilot/address_book_app/pages/_ab_contact_list_page.py	2016-01-07 13:19:12 +0000
2669
@@ -112,7 +112,7 @@
2670
112
    @log_action_info
112
    @log_action_info
2671
113
    def delete_selected_contacts(self, main_window):
113
    def delete_selected_contacts(self, main_window):
2672
114
        main_window.delete()
114
        main_window.delete()
2674
115
        self.bottomEdgePageOpened.wait_for(False)
115
        main_window.wait_bottom_edge(False)
2675
116
        dialog = self.get_root_instance().wait_select_single(
116
        dialog = self.get_root_instance().wait_select_single(
2676
117
            address_book.RemoveContactsDialog, objectName='removeContactsDialog')
117
            address_book.RemoveContactsDialog, objectName='removeContactsDialog')
2677
118
        dialog.confirm_removal()
118
        dialog.confirm_removal()
2678
@@ -137,21 +137,3 @@
2679
137
            'ContactListButtonDelegate',
137
            'ContactListButtonDelegate',
2680
138
            objectName='contactListView.importFromSimCardButton')
138
            objectName='contactListView.importFromSimCardButton')
2681
139
        return import_from_sim_button.visible
139
        return import_from_sim_button.visible
2682
140
2683
141
    def reveal_bottom_edge_page(self):
2684
142
        """Bring the bottom edge page to the screen"""
2685
143
        self.bottomEdgePageOpened.wait_for(False)
2686
144
        try:
2687
145
            action_item = self.wait_select_single(objectName='bottomEdgeDragArea')
2688
146
            action_item.enabled.wait_for(True)
2689
147
            start_x = (action_item.globalRect.x +
2690
148
                       (action_item.globalRect.width * 0.5))
2691
149
            start_y = action_item.globalRect.y + (action_item.height * 0.2)
2692
150
            stop_y = start_y - (self.height * 0.7)
2693
151
            self.pointing_device.drag(
2694
152
                start_x, start_y, start_x, stop_y, rate=2)
2695
153
            #self pointer became invalid at this point
2696
154
            #self.bottomEdgePageOpened.wait_for(True)
2697
155
        except dbus.StateNotFoundError:
2698
156
            logger.error('ButtomEdge element not found.')
2699
157
            raise
2700
158
140
2701
=== modified file 'tests/autopilot/address_book_app/tests/test_add_contact.py'
2702
--- tests/autopilot/address_book_app/tests/test_add_contact.py	2015-10-20 03:38:07 +0000
2703
+++ tests/autopilot/address_book_app/tests/test_add_contact.py	2016-01-07 13:19:12 +0000
2704
@@ -36,8 +36,6 @@
2705
36
        contact_editor = self.app.main_window.go_to_add_contact()
36
        contact_editor = self.app.main_window.go_to_add_contact()
2706
37
37
2707
38
        # Check if the contact list disapear and contact editor appears
38
        # Check if the contact list disapear and contact editor appears
2708
39
        #FIXME: list_page became an invalid pointer after push a new page
2709
40
        #self.assertThat(list_page.bottomEdgePageOpened, Eventually(Equals(True)))
2710
41
        self.assertThat(contact_editor.visible, Eventually(Equals(True)))
39
        self.assertThat(contact_editor.visible, Eventually(Equals(True)))
2711
42
        self.assertThat(contact_editor.active, Eventually(Equals(True)))
40
        self.assertThat(contact_editor.active, Eventually(Equals(True)))
2712
43
41
2713
@@ -46,7 +44,7 @@
2714
46
44
2715
47
        # Check if the contact list is visible again
45
        # Check if the contact list is visible again
2716
48
        self.assertThat(list_page.visible, Eventually(Equals(True)))
46
        self.assertThat(list_page.visible, Eventually(Equals(True)))
2718
49
        self.assertThat(list_page.bottomEdgePageOpened, Eventually(Equals(False)))
47
        self.app.main_window.wait_bottom_edge(False)
2719
50
48
2720
51
        # Check if the contact list still empty
49
        # Check if the contact list still empty
2721
52
        list_view = self.app.main_window.get_contact_list_view()
50
        list_view = self.app.main_window.get_contact_list_view()
2722
53
51
2723
=== modified file 'tests/autopilot/address_book_app/tests/test_create_new_from_uri.py'
2724
--- tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2015-10-20 03:38:07 +0000
2725
+++ tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2016-01-07 13:19:12 +0000
2726
@@ -23,8 +23,6 @@
2727
23
23
2728
24
    def test_save_new_contact(self):
24
    def test_save_new_contact(self):
2729
25
        list_page = self.app.main_window.get_contact_list_page()
25
        list_page = self.app.main_window.get_contact_list_page()
2730
26
        #FIXME: contacts list object became invalid after push a new page
2731
27
        #list_page.bottomEdgePageOpened.wait_for(True)
2732
28
26
2733
29
        edit_page = self.app.main_window.get_contact_edit_page()
27
        edit_page = self.app.main_window.get_contact_edit_page()
2734
30
        self.assertThat(edit_page.visible, Eventually(Equals(True)))
28
        self.assertThat(edit_page.visible, Eventually(Equals(True)))
2735
31
29
2736
=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
2737
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2015-10-20 03:38:07 +0000
2738
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2016-01-07 13:19:12 +0000
2739
@@ -167,16 +167,14 @@
2740
167
        self.clear_text_on_field(last_name_field)
167
        self.clear_text_on_field(last_name_field)
2741
168
168
2742
169
        # check if is possible to save a contact without name
169
        # check if is possible to save a contact without name
2746
170
        self.app.main_window.save()
170
        self.assertThat(edit_page.saveActionEnabled, Eventually(Equals(False)))
2744
171
        accept_button = self.app.main_window.get_action("save")
2745
172
        self.assertThat(accept_button.enabled, Eventually(Equals(False)))
2747
173
171
2748
174
        # Cancel edit
172
        # Cancel edit
2749
175
        self.app.main_window.cancel()
173
        self.app.main_window.cancel()
2750
176
174
2751
177
        # Check if the names still there
175
        # Check if the names still there
2752
178
        view_page = self.app.main_window.get_contact_view_page()
176
        view_page = self.app.main_window.get_contact_view_page()
2754
179
        self.assertThat(view_page.title, Eventually(Equals("Fulano de Tal")))
177
        self.assertThat(view_page.headerTitle, Eventually(Equals("Fulano de Tal")))
2755
180
178
2756
181
    def test_im_type(self):
179
    def test_im_type(self):
2757
182
        contact_editor = self.app.main_window.go_to_add_contact()
180
        contact_editor = self.app.main_window.go_to_add_contact()
2758
183
181
2759
=== modified file 'tests/autopilot/address_book_app/tests/test_import_vcard.py'
2760
--- tests/autopilot/address_book_app/tests/test_import_vcard.py	2015-11-24 18:18:31 +0000
2761
+++ tests/autopilot/address_book_app/tests/test_import_vcard.py	2016-01-07 13:19:12 +0000
2762
@@ -30,7 +30,7 @@
2763
30
        # check if app enter on import state
30
        # check if app enter on import state
2764
31
        list_page = self.app.main_window.get_contact_list_page()
31
        list_page = self.app.main_window.get_contact_list_page()
2765
32
        self.assertThat(list_page.state, Eventually(Equals('vcardImported')))
32
        self.assertThat(list_page.state, Eventually(Equals('vcardImported')))
2767
33
        self.assertThat(list_page.title, Eventually(Equals('Imported contacts')))
33
        self.assertThat(list_page.headerTitle, Eventually(Equals('Imported contacts')))
2768
34
        self.assertThat(len(list_page.get_contacts()), Equals(3))
34
        self.assertThat(len(list_page.get_contacts()), Equals(3))
2769
35
35
2770
36
        #leave import state and show full contact list
36
        #leave import state and show full contact list
2771
37
37
2772
=== modified file 'tests/autopilot/address_book_app/tests/test_single_pick_mode.py'
2773
--- tests/autopilot/address_book_app/tests/test_single_pick_mode.py	2015-04-17 15:22:08 +0000
2774
+++ tests/autopilot/address_book_app/tests/test_single_pick_mode.py	2016-01-07 13:19:12 +0000
2775
@@ -32,6 +32,7 @@
2776
32
            if (contact.visible):
32
            if (contact.visible):
2777
33
                item = contact.select_single("QQuickRectangle",
33
                item = contact.select_single("QQuickRectangle",
2778
34
                                             objectName="mainItem")
34
                                             objectName="mainItem")
2779
35
                self.assertThat(contact.selected, Eventually(Equals(False)))
2780
35
                self.assertThat(item.color, Eventually(Equals(contact.color)))
36
                self.assertThat(item.color, Eventually(Equals(contact.color)))
2781
36
                selected_items.append(item)
37
                selected_items.append(item)
2782
37
                item_to_contacts[item] = contact
38
                item_to_contacts[item] = contact
2783
38
39
2784
=== modified file 'tests/qml/tst_ContactPreviewPage.qml'
2785
--- tests/qml/tst_ContactPreviewPage.qml	2015-11-16 15:44:43 +0000
2786
+++ tests/qml/tst_ContactPreviewPage.qml	2016-01-07 13:19:12 +0000
2787
@@ -104,13 +104,13 @@
2788
104
        function test_preview_contact_with_name()
104
        function test_preview_contact_with_name()
2789
105
        {
105
        {
2790
106
            contactPreviewPage.contact = createContactWithName()
106
            contactPreviewPage.contact = createContactWithName()
2792
107
            tryCompare(contactPreviewPage, "title", "Fulano")
107
            tryCompare(contactPreviewPage.header, "title", "Fulano")
2793
108
        }
108
        }
2794
109
109
2795
110
        function test_preview_contact_with_name_and_avatar()
110
        function test_preview_contact_with_name_and_avatar()
2796
111
        {
111
        {
2797
112
            contactPreviewPage.contact = createContactWithNameAndAvatar()
112
            contactPreviewPage.contact = createContactWithNameAndAvatar()
2799
113
            tryCompare(contactPreviewPage, "title", "Fulano")
113
            tryCompare(contactPreviewPage.header, "title", "Fulano")
2800
114
            var avatarField = findChild(root, "contactAvatarDetail")
114
            var avatarField = findChild(root, "contactAvatarDetail")
2801
115
            tryCompare(avatarField, "avatarUrl", "image://theme/address-book-app")
115
            tryCompare(avatarField, "avatarUrl", "image://theme/address-book-app")
2802
116
        }
116
        }
2803
@@ -120,7 +120,7 @@
2804
120
            compare(vcardParser.contacts.length, 1)
120
            compare(vcardParser.contacts.length, 1)
2805
121
            var contact =  vcardParser.contacts[0]
121
            var contact =  vcardParser.contacts[0]
2806
122
            contactPreviewPage.contact = contact
122
            contactPreviewPage.contact = contact
2808
123
            tryCompare(contactPreviewPage, "title", "Forrest Gump")
123
            tryCompare(contactPreviewPage.header, "title", "Forrest Gump")
2809
124
            // PhoneNumbers
124
            // PhoneNumbers
2810
125
            // TEL;TYPE=WORK,VOICE:(111) 555-12121
125
            // TEL;TYPE=WORK,VOICE:(111) 555-12121
2811
126
            // TEL;TYPE=HOME,VOICE:(404) 555-1212
126
            // TEL;TYPE=HOME,VOICE:(404) 555-1212
2812
@@ -263,8 +263,7 @@
2813
263
            compare(vcardParser.contacts.length, 1)
263
            compare(vcardParser.contacts.length, 1)
2814
264
            var contact =  vcardParser.contacts[0]
264
            var contact =  vcardParser.contacts[0]
2815
265
            contactPreviewPage.contact = contact
265
            contactPreviewPage.contact = contact
2818
266
            tryCompare(contactPreviewPage, "title", "Forrest Gump")
266
            tryCompare(contactPreviewPage.header, "title", "Forrest Gump")
2817
267
2819
268
267
2820
269
            // page is enabled by default
268
            // page is enabled by default
2821
270
            var avatar = findChild(contactPreviewPage, "avatar")
269
            var avatar = findChild(contactPreviewPage, "avatar")
Status:	Merged
Approved by:	Bill Filler on 2016-01-07
Approved revision:	596
Merged at revision:	528
Proposed branch:	lp:~renatofilho/address-book-app/new-bottom-edge
Merge into:	lp:address-book-app
Prerequisite:	lp:~renatofilho/address-book-app/keyboard-navigation
Diff against target:	2821 lines (+809/-955) 37 files modified CMakeLists.txt (+11/-0) config.h.in (+1/-0) debian/control (+1/-0) src/app/addressbookapp.cpp (+5/-39) src/app/addressbookapp.h (+0/-6) src/imports/ABContactEditorPage.qml (+21/-18) src/imports/ABContactListPage.qml (+251/-356) src/imports/ABContactViewPage.qml (+57/-28) src/imports/ABEmptyState.qml (+61/-0) src/imports/ABMultiColumnEmptyState.qml (+75/-0) src/imports/ABNewContactBottomEdge.qml (+89/-0) src/imports/BottomEdge.qml (+0/-338) src/imports/BottomEdgeShadow.qml (+0/-31) src/imports/CMakeLists.txt (+3/-2) src/imports/MainWindow.qml (+42/-21) src/imports/Settings/SettingsPage.qml (+3/-3) src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml (+4/-5) src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml (+4/-1) src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+0/-1) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+0/-1) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+74/-18) src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+6/-15) src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+10/-2) src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+13/-2) src/imports/Ubuntu/Contacts/ContactListView.qml (+15/-18) src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+3/-3) src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+19/-0) tests/autopilot/address_book_app/__init__.py (+28/-10) tests/autopilot/address_book_app/pages/_ab_contact_list_page.py (+1/-19) tests/autopilot/address_book_app/tests/test_add_contact.py (+1/-3) tests/autopilot/address_book_app/tests/test_create_new_from_uri.py (+0/-2) tests/autopilot/address_book_app/tests/test_edit_contact.py (+2/-4) tests/autopilot/address_book_app/tests/test_import_vcard.py (+1/-1) tests/autopilot/address_book_app/tests/test_single_pick_mode.py (+1/-0) tests/qml/tst_ContactPreviewPage.qml (+4/-5)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/new-bottom-edge
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2015-12-04	Approve on 2016-01-07
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-01-07
Review via email: mp+279613@code.launchpad.net