From 882b7b9327edb3dd73fa3e82eba83c0405f91b83 Mon Sep 17 00:00:00 2001
From: Tomasz Sterna <tomek@xiaoka.com>
Date: Tue, 9 Jun 2015 16:14:42 +0200
Subject: Handle multiple paired Pebbles

Moved Pebble discovery to WatchConnector.
Removed empty DBusConnector.
Minor firmware handling fixes.
---
 app/qml/pages/WatchInfo.qml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/qml/pages')

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
-- 
cgit v1.2.3