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

[Renato Araujo Oliveira Filho]

Disable save button if the field name is empty.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/169/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/170
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1373
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3857
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3857/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1375
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1168

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
--- src/imports/ContactEdit/ContactDetailNameEditor.qml	2013-09-12 22:52:37 +0000
+++ src/imports/ContactEdit/ContactDetailNameEditor.qml	2013-09-23 14:50:17 +0000
@@ -23,6 +23,9 @@
 ContactDetailItem {
     id: root
 
+    property bool isEmpty: (fields == -1) || (emptyFields.length === fields.length)
+    property variant emptyFields: []
+
     function save() {
         var changed = false;
 
@@ -49,11 +52,31 @@
     fields: [ QtContacts.Name.FirstName, QtContacts.Name.LastName ]
 
     fieldDelegate: TextInputDetail {
+        id: textInputDetail
+
+        function checkIsEmpty() {
+            if (field == -1) {
+                return;
+            }
+
+            var newEmtpyFields = root.emptyFields
+            var indexOf = newEmtpyFields.indexOf(field)
+
+            if ((text.length > 0) && (indexOf !== -1)) {
+                newEmtpyFields.splice(indexOf, 1)
+            } else if ((text.length === 0) && (indexOf === -1)){
+                newEmtpyFields.push(field)
+            }
+            root.emptyFields = newEmtpyFields
+        }
+
         width: root.width - units.gu(4)
         x: units.gu(2)
         detail: root.detail
         height: units.gu(4)
         placeholderText: field == QtContacts.Name.FirstName ? i18n.tr("First name") : i18n.tr("Last name")
+        onTextChanged: checkIsEmpty()
+        onFieldChanged: checkIsEmpty()
 
         //style
         font.pixelSize: FontUtils.sizeToPixels("x-large")

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-09-19 03:02:46 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2013-09-23 14:50:17 +0000
@@ -285,6 +285,7 @@
         height: units.gu(6)
         acceptAction: Action {
             text: i18n.tr("Save")
+            enabled: !nameEditor.isEmpty
             onTriggered: {
                 // wait for contact to be saved or cause a error
                 contactSaveLock.saving = true