Merge lp:~ken-vandine/ubuntu-system-settings/lp1535827 into lp:ubuntu-system-settings

[Ken VanDine]

Don't display the ActivityIndicator while searching, causes to much load.

Don't display the ActivityIndicator while searching, causes to much load.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1584
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2577/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/760
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6091
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6091/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26804

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2577/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM and works. Thanks!

review: Approve

[lp:~ken-vandine/ubuntu-system-settings/lp1535827]

1585. By Ken VanDine on 2016-01-21

Display Searching text when discovering, not discoverable

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2015-11-20 08:47:27 +0000
+++ plugins/bluetooth/PageComponent.qml	2016-01-21 14:21:33 +0000
@@ -266,14 +266,15 @@
                         enabled: false
                     }
 
-                    ActivityIndicator {
+                    Label {
                         anchors {
                             top: parent.top
                             right: parent.right
                             topMargin: units.gu(1)
                         }
+                        color: "darkgrey"
                         visible: backend.powered && !backend.discoverable
-                        running: visible
+                        text: i18n.tr("Searching…")
                     }
                 }
             }
@@ -319,9 +320,15 @@
                 id: disconnectedHeader
                 text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:")
                 enabled: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false
-                control: ActivityIndicator {
+                control: Label {
+                    anchors {
+                        top: parent.top
+                        right: parent.right
+                        topMargin: units.gu(1)
+                    }
+                    color: "darkgrey"
                     visible: backend.powered && backend.discovering
-                    running: visible
+                    text: i18n.tr("Searching…")
                 }
             }