Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noReadOnlyClearance into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Read-only text fields mustn't have a clear button

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1268
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1075/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5373
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/907
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/907
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/907
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6625
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6625/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13997

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1075/rebuild

review: Approve (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noReadOnlyClearance]

1269. By Cris Dywan on 2014-10-01

Unit test that the clear button is hidden when the textField is readOnly

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1269
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1077/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/909
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/909
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6637
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14017

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1077/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Nice'n'clear fix, thank you!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-09-18 15:27:16 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-10-01 15:11:07 +0000
@@ -914,6 +914,7 @@
         }
         width: visible ? icon.width : 0
         visible: control.hasClearButton &&
+                 !control.readOnly &&
                     (control.activeFocus && ((editor.text != "") || editor.inputMethodComposing))
 
         Icon {
@@ -922,7 +923,7 @@
             width: units.gu(2.5)
             height: width
             // use icon from icon-theme
-            name: control.hasClearButton ? "clear-search" : ""
+            name: control.hasClearButton && !control.readOnly ? "clear-search" : ""
         }
 
         onClicked: editor.text = ""

=== modified file 'tests/unit_x11/tst_components/tst_textfield.qml'
--- tests/unit_x11/tst_components/tst_textfield.qml	2014-08-31 19:24:19 +0000
+++ tests/unit_x11/tst_components/tst_textfield.qml	2014-10-01 15:11:07 +0000
@@ -260,6 +260,8 @@
             compare(textField.readOnly, false, "readOnly is false by default")
             textField.readOnly = true
             compare(textField.readOnly, true, "set/get")
+            var clearButton = findChild(textField, "clear_button")
+            compare(clearButton.visible, false, "readOnly must not provide a clear button")
         }
 
         function test_0_secondaryItem() {