diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2015-06-09 16:14:42 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2015-06-09 16:14:42 +0200 |
| commit | 882b7b9327edb3dd73fa3e82eba83c0405f91b83 (patch) | |
| tree | 0f3d3d30289256f9485774822d354bb5d5f50f3b /app/qml | |
| parent | 7d7dd8aae50816e86d32b5c5c3b34391131b3607 (diff) | |
Handle multiple paired Pebbles882b7b9327smokku/master
Moved Pebble discovery to WatchConnector.
Removed empty DBusConnector.
Minor firmware handling fixes.
Diffstat (limited to 'app/qml')
| -rw-r--r-- | app/qml/pages/WatchInfo.qml | 10 | ||||
| -rw-r--r-- | app/qml/pebble.qml | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/qml/pages/WatchInfo.qml b/app/qml/pages/WatchInfo.qml index af4a740..a1c421c 100644 --- a/app/qml/pages/WatchInfo.qml +++ b/app/qml/pages/WatchInfo.qml @@ -28,7 +28,7 @@ Page { text: qsTr("Address") } Label { - text: pebbled.info.address + text: pebbled.info.address || "" } Label { @@ -36,7 +36,7 @@ Page { text: qsTr("Serial Number") } Label { - text: pebbled.info.serial + text: pebbled.info.serial || "" } Label { @@ -69,7 +69,7 @@ Page { text: qsTr("Recovery") } Label { - text: app.recoveryVersion + text: app.recoveryVersion || qsTr("unknown") } Label { @@ -77,7 +77,7 @@ Page { text: qsTr("Running") } Label { - text: app.firmwareVersion + text: app.firmwareVersion || qsTr("unknown") } Label { @@ -89,7 +89,7 @@ Page { } } Button { - visible: app.firmwareLatest && app.firmwareVersion && app.firmwareVersion !== app.firmwareLatest + visible: app.firmwareLatest && app.firmwareVersion !== app.firmwareLatest text: qsTr("Upgrade Firmware") anchors { left: parent.left diff --git a/app/qml/pebble.qml b/app/qml/pebble.qml index 380ff7e..0643f79 100644 --- a/app/qml/pebble.qml +++ b/app/qml/pebble.qml @@ -22,6 +22,8 @@ ApplicationWindow recoveryVersion = firmware.version } else { firmwareVersion = firmware.version + } + if (firmware.hardware) { hardwareVersion = firmware.hardware } }) |