Merge lp:~renatofilho/address-book-app/fix-1233785 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Handle read-only fields.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/378/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/88
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2728
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2997
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2997/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2729
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2729/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5148
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3728

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/391/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3168
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2852
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5260
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3877

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes) YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/address-book-app) on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you subscribe a core-dev to this MP? NO PACKAGE CHANGE

=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2013-11-22 01:05:52 +0000
+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-02-06 22:32:59 +0000
@@ -71,13 +71,14 @@
     focus: true
     // disable listview mouse area
     __mouseArea.visible: false
-
+    enabled: root.detail ? !root.detail.readOnly : false
     implicitHeight: detailTypeSelector.height + fieldValues.height + units.gu(2)
-
+    opacity: enabled ? 1.0 : 0.5
     ValueSelector {
         id: detailTypeSelector
         objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + index : ""
 
+        readOnly: root.detail ? root.detail.readOnly : false
         visible: (currentIndex != -1)
         active: root.active
         anchors {

=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2013-10-08 12:58:44 +0000
+++ src/imports/ContactEdit/TextInputDetail.qml	2014-02-06 22:32:59 +0000
@@ -31,6 +31,7 @@
 
     Component.onCompleted: makeMeVisible(root)
 
+    readOnly: detail ? detail.readOnly : true
     focus: true
     text: originalValue ? originalValue : ""
     style: TextFieldStyle {

=== modified file 'src/imports/ContactEdit/ValueSelector.qml'
--- src/imports/ContactEdit/ValueSelector.qml	2013-11-22 00:47:10 +0000
+++ src/imports/ContactEdit/ValueSelector.qml	2014-02-06 22:32:59 +0000
@@ -20,6 +20,7 @@
 Item {
     id: root
 
+    property bool readOnly: false
     property bool active: false
     property alias values: listView.model
     property alias currentIndex: listView.currentIndex
@@ -120,7 +121,7 @@
     MouseArea {
         anchors.fill: parent
         propagateComposedEvents: true
-        onClicked: root.state = "expanded"
+        onClicked: if (!readOnly) root.state = "expanded"
     }
 
     ListView {