diff options
| author | Andrew Branson <abranson@users.noreply.github.com> | 2015-06-10 00:31:11 +0200 |
|---|---|---|
| committer | Andrew Branson <abranson@users.noreply.github.com> | 2015-06-10 00:31:11 +0200 |
| commit | 9f19addbe51a1ceb2967b737843dab0e262343c0 (patch) | |
| tree | 0f3d3d30289256f9485774822d354bb5d5f50f3b /app/qml | |
| parent | 2d50346f06e5be31557cb4718ff94cd650c1a210 (diff) | |
| parent | 882b7b9327edb3dd73fa3e82eba83c0405f91b83 (diff) | |
Merge pull request #1 from smokku/master
Pull
Diffstat (limited to 'app/qml')
| -rw-r--r-- | app/qml/pages/ManagerPage.qml | 22 | ||||
| -rw-r--r-- | app/qml/pages/WatchInfo.qml | 10 | ||||
| -rw-r--r-- | app/qml/pebble.qml | 2 |
3 files changed, 18 insertions, 16 deletions
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index b989c64..a69bc89 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -12,17 +12,17 @@ Page { path: "/org/pebbled/settings" property string profileWhenConnected: "" property string profileWhenDisconnected: "" - property bool transliterateMessage: false - property bool useSystemVolume: true - property bool incomingCallNotification: true - property bool notificationsCommhistoryd: true - property bool notificationsMissedCall: true - property bool notificationsEmails: false - property bool notificationsMitakuuluu: true - property bool notificationsTwitter: true - property bool notificationsFacebook: true - property bool notificationsOther: true - property bool notificationsAll: false + property bool transliterateMessage + property bool useSystemVolume + property bool incomingCallNotification + property bool notificationsCommhistoryd + property bool notificationsMissedCall + property bool notificationsEmails + property bool notificationsMitakuuluu + property bool notificationsTwitter + property bool notificationsFacebook + property bool notificationsOther + property bool notificationsAll } DBusInterface { 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 } }) |