Merge lp:~renatofilho/address-book-app/avoid-edit-readonly-contacts into lp:address-book-app

[Renato Araujo Oliveira Filho]

Block edit read-only contacts.
Does not allow select read-only sources while creating a new contact;

[lp:~renatofilho/address-book-app/avoid-edit-readonly-contacts]

528. By Renato Araujo Oliveira Filho on 2015-12-18

Remove debug messages.

529. By Renato Araujo Oliveira Filho on 2015-12-18

Revert unnecessary changes.

530. By Renato Araujo Oliveira Filho on 2015-12-18

Add comments.

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:528
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1078/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/381
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5865
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5876
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5876/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26239

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/1078/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2015-12-16 18:35:33 +0000
+++ src/app/addressbookapp.cpp	2015-12-18 13:49:02 +0000
@@ -450,11 +450,21 @@
 
 bool AddressBookApp::notify(QObject *obj, QEvent *event)
 {
-    if ((event->type() == QEvent::KeyPress) && !m_withKeyboard) {
-        m_withKeyboard = true;
-        Q_EMIT usingKeyboardChanged();
-        return true;
+    switch(event->type())
+    {
+    case QEvent::KeyPress:
+        // we have no way to detect when a physical keyboard is connected, so we
+        // assume there is one when the down key is pressed
+        if (!m_withKeyboard && (static_cast<QKeyEvent*>(event)->key() == Qt::Key_Down)) {
+            m_withKeyboard = true;
+            Q_EMIT usingKeyboardChanged();
+            return false;
+        }
+        break;
+    default:
+        break;
     }
+
     return QGuiApplication::notify(obj, event);
 }
 

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-12-16 18:35:33 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-12-18 13:49:02 +0000
@@ -66,7 +66,8 @@
         var contactSyncTarget = contact.syncTarget.value(SyncTarget.SyncTarget + 1)
 
         for (var i = 0; i < writableSources.count; i++) {
-            if (writableSources.get(i).contact.guid.guid === contactSyncTarget) {
+            var source = writableSources.get(i)
+            if (source.sourceId === contactSyncTarget) {
                 return false
             }
         }
@@ -132,7 +133,7 @@
             var data = []
             for(var i in contacts) {
                 var sourceMetaData = getSourceMetaData(contacts[i])
-                if (!sourceMetaData['readOnly']) {
+                if (!sourceMetaData['read-only']) {
                     data.push({'sourceId': contacts[i].guid.guid,
                                'sourceName': contacts[i].displayLabel.label,
                                'accountId': sourceMetaData['account-id'],

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-12-10 19:08:19 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-12-18 13:49:02 +0000
@@ -454,7 +454,7 @@
             }
 
             Component.onCompleted: Qt.inputMethod.hide()
-            Component.onDestruction: contactEditor.pageStack.pop()
+            Component.onDestruction: contactEditor.pageStack.removePages(contactEditor)
         }
     }