Merge lp:~renatofilho/address-book-app/fix-1373196 into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

[ContactEditor] disable save button while avatar scale still running

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3826
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4999
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6528
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13872
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4137
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4137/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

review: Approve

=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-09-29 13:21:24 +0000
@@ -23,6 +23,7 @@
 ContactDetailBase {
     id: root
 
+    readonly property alias busy: activityIndicator.running
     readonly property string defaultAvatar: "image://theme/add"
 
     function isEmpty() {
@@ -90,6 +91,8 @@
     }
 
     ActivityIndicator {
+        id: activityIndicator
+
         anchors.centerIn: avatar
         running: (avatarImport.importDialog != null)
         visible: running

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2014-09-03 19:09:15 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2014-09-29 13:21:24 +0000
@@ -409,7 +409,8 @@
 
                 iconName: "ok"
                 text: i18n.tr("Save")
-                enabled: !nameEditor.isEmpty() || !phonesEditor.isEmpty()
+                // disable save button while avatar scale still running
+                enabled: !avatarEditor.busy && (!nameEditor.isEmpty() || !phonesEditor.isEmpty())
                 onTriggered: contactEditor.save()
             }
         }