diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /examples/bluetooth/scanner/scanner.qml | |
parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'examples/bluetooth/scanner/scanner.qml')
-rw-r--r-- | examples/bluetooth/scanner/scanner.qml | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/examples/bluetooth/scanner/scanner.qml b/examples/bluetooth/scanner/scanner.qml index 48b2ee53..67aaecf0 100644 --- a/examples/bluetooth/scanner/scanner.qml +++ b/examples/bluetooth/scanner/scanner.qml @@ -54,6 +54,18 @@ Item { onDiscoveryModeChanged: console.log("Discovery mode: " + discoveryMode) onServiceDiscovered: console.log("Found new service " + service.deviceAddress + " " + service.deviceName + " " + service.serviceName); onDeviceDiscovered: console.log("New device: " + device) + onErrorChanged: { + switch (btModel.error) { + case BluetoothDiscoveryModel.PoweredOffError: + console.log("Error: Bluetooth device not turned on"); break; + case BluetoothDiscoveryModel.InputOutputError: + console.log("Error: Bluetooth I/O Error"); break; + case BluetoothDiscoveryModel.NoError: + break; + default: + console.log("Error: Unknown Error"); break; + } + } } Rectangle { @@ -62,7 +74,7 @@ Item { width: top.width * 0.7; anchors.horizontalCenter: parent.horizontalCenter anchors.top: top.top; - height: 30; + height: text.height*1.2; radius: 5 color: "#1c56f3" visible: btModel.running @@ -71,6 +83,7 @@ Item { id: text text: "Scanning" font.bold: true + font.pointSize: 20 anchors.centerIn: parent } @@ -115,9 +128,9 @@ Item { anchors.leftMargin: 5 Text { id: bttext - text: name; + text: deviceName ? deviceName : name font.family: "FreeSerif" - font.pointSize: 12 + font.pointSize: 16 } Text { @@ -138,7 +151,8 @@ Item { visible: opacity !== 0 opacity: btDelegate.expended ? 1 : 0.0 text: get_details(service) - font: bttext.font + font.family: "FreeSerif" + font.pointSize: 14 Behavior on opacity { NumberAnimation { duration: 200} } @@ -160,20 +174,28 @@ Item { anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter - spacing: 20 + anchors.bottomMargin: 5 + spacing: 10 Button { id: fdButton + width: top.width/3*0.9 + //mdButton has longest text + height: mdButton.height text: "Full Discovery" onClicked: btModel.discoveryMode = BluetoothDiscoveryModel.FullServiceDiscovery } Button { id: mdButton + width: top.width/3*0.9 text: "Minimal Discovery" onClicked: btModel.discoveryMode = BluetoothDiscoveryModel.MinimalServiceDiscovery } Button { id: devButton + width: top.width/3*0.9 + //mdButton has longest text + height: mdButton.height text: "Device Discovery" onClicked: btModel.discoveryMode = BluetoothDiscoveryModel.DeviceDiscovery } |