diff options
author | Nedim Hadzic <nhadzic@blackberry.com> | 2014-02-26 12:09:23 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-27 14:56:08 +0100 |
commit | eb632012c2cf13922b08f4e2606d1452da9aaacb (patch) | |
tree | 78433495f7811e6f89054afe38b125a4e96c671b /examples/bluetooth/lowenergyscanner/assets | |
parent | 6de4ff7b44d32d2f0fea277d856ce4d3fe321c7e (diff) |
Lowenergyscanner example improved
Error handling improved, code styling improved.
Change-Id: I1f35c6a6ef9641cb445fdbe55e0127b554e50ebc
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'examples/bluetooth/lowenergyscanner/assets')
5 files changed, 19 insertions, 4 deletions
diff --git a/examples/bluetooth/lowenergyscanner/assets/Dialog.qml b/examples/bluetooth/lowenergyscanner/assets/Dialog.qml index 002055f4..f374d762 100644 --- a/examples/bluetooth/lowenergyscanner/assets/Dialog.qml +++ b/examples/bluetooth/lowenergyscanner/assets/Dialog.qml @@ -50,7 +50,10 @@ Rectangle { radius: 10 Text { - anchors.centerIn: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + anchors.fill: parent + elide: Text.ElideMiddle text: dialogText color: "#363636" } diff --git a/examples/bluetooth/lowenergyscanner/assets/Header.qml b/examples/bluetooth/lowenergyscanner/assets/Header.qml index c33a0692..654fda34 100644 --- a/examples/bluetooth/lowenergyscanner/assets/Header.qml +++ b/examples/bluetooth/lowenergyscanner/assets/Header.qml @@ -45,13 +45,17 @@ Rectangle { height: 70 border.width: 1 border.color: "#363636" + radius: 5 property string headerText: "" Text { - anchors.centerIn: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + anchors.fill: parent text: headerText font.bold: true font.pixelSize: 30 + elide: Text.ElideMiddle color: "#363636" } } diff --git a/examples/bluetooth/lowenergyscanner/assets/Label.qml b/examples/bluetooth/lowenergyscanner/assets/Label.qml index e22bca26..7576ffb7 100644 --- a/examples/bluetooth/lowenergyscanner/assets/Label.qml +++ b/examples/bluetooth/lowenergyscanner/assets/Label.qml @@ -45,5 +45,6 @@ Text { font.pixelSize: 30 anchors.horizontalCenter: parent.horizontalCenter color: "#363636" + elide: Text.ElideMiddle text: textContent } diff --git a/examples/bluetooth/lowenergyscanner/assets/Menu.qml b/examples/bluetooth/lowenergyscanner/assets/Menu.qml index ee608664..796c27be 100644 --- a/examples/bluetooth/lowenergyscanner/assets/Menu.qml +++ b/examples/bluetooth/lowenergyscanner/assets/Menu.qml @@ -60,8 +60,11 @@ Rectangle { radius: 10 Text { id: searchText - anchors.centerIn: parent + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + anchors.fill: parent text: menuText + elide: Text.ElideMiddle color: "#E3E3E3" } @@ -78,7 +81,6 @@ Rectangle { } onClicked: { - ColorAnimation: { to: "#4D4C4C"; duration: 200 } buttonClick() } } diff --git a/examples/bluetooth/lowenergyscanner/assets/main.qml b/examples/bluetooth/lowenergyscanner/assets/main.qml index 3c4e27ea..cdef49a5 100644 --- a/examples/bluetooth/lowenergyscanner/assets/main.qml +++ b/examples/bluetooth/lowenergyscanner/assets/main.qml @@ -44,6 +44,11 @@ Rectangle { id: back width: 300 height: 600 + property string message: device.update + onMessageChanged: { + if (device.update != "Scanning for devices..." && device.update != "Search") + info.visible = false; + } Header { id: header |