diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/pebblefirmware.cpp | 3 | ||||
| -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 | ||||
| -rw-r--r-- | app/translations/pebble-es.ts | 2 | ||||
| -rw-r--r-- | app/translations/pebble-pl.ts | 2 | ||||
| -rw-r--r-- | app/translations/pebble-zh_CN.ts | 4 | ||||
| -rw-r--r-- | app/translations/pebble.ts | 2 |
8 files changed, 29 insertions, 18 deletions
diff --git a/app/pebblefirmware.cpp b/app/pebblefirmware.cpp index f42c29b..33460e5 100644 --- a/app/pebblefirmware.cpp +++ b/app/pebblefirmware.cpp @@ -16,8 +16,9 @@ PebbleFirmware::PebbleFirmware(QObject *parent) : void PebbleFirmware::updateLatest(QString hw) { QNetworkRequest req; - req.setUrl(firmwareURL.arg(hw).arg("release-v2")); + req.setUrl(firmwareURL.arg(hw).arg(hw.startsWith("snowy_") ? "release-v3" : "release-v2")); req.setRawHeader("Cache-Control", "no-cache"); + qDebug() << "Getting latest firmware" << req.url(); nm->get(req); } 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 } }) diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index 417c1e1..0775925 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -412,6 +412,8 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra <translation type="unfinished"></translation> </message> <message> + <location filename="../qml/pages/WatchInfo.qml" line="72"/> + <location filename="../qml/pages/WatchInfo.qml" line="80"/> <location filename="../qml/pages/WatchInfo.qml" line="88"/> <source>unknown</source> <translation type="unfinished"></translation> diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts index cf5133e..4efc24b 100644 --- a/app/translations/pebble-pl.ts +++ b/app/translations/pebble-pl.ts @@ -451,6 +451,8 @@ Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany <translation>Najnowszy</translation> </message> <message> + <location filename="../qml/pages/WatchInfo.qml" line="72"/> + <location filename="../qml/pages/WatchInfo.qml" line="80"/> <location filename="../qml/pages/WatchInfo.qml" line="88"/> <source>unknown</source> <translation>nie wiadomo</translation> diff --git a/app/translations/pebble-zh_CN.ts b/app/translations/pebble-zh_CN.ts index c360d97..5cb6750 100644 --- a/app/translations/pebble-zh_CN.ts +++ b/app/translations/pebble-zh_CN.ts @@ -403,6 +403,8 @@ If it can't be found please check it's available and paired in Bluetoo <translation>最新</translation> </message> <message> + <location filename="../qml/pages/WatchInfo.qml" line="72"/> + <location filename="../qml/pages/WatchInfo.qml" line="80"/> <location filename="../qml/pages/WatchInfo.qml" line="88"/> <source>unknown</source> <translation>未知</translation> @@ -438,7 +440,7 @@ If it can't be found please check it's available and paired in Bluetoo <message> <location filename="../qml/pages/WatchPage.qml" line="188"/> <source>(slot in use by unknown app)</source> - <translation>(槽在被未知应用使用中)</translation> + <translation>(插槽在被不明应用程序使用中)</translation> </message> <message> <location filename="../qml/pages/WatchPage.qml" line="68"/> diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index a031315..36dc298 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -391,6 +391,8 @@ If it can't be found please check it's available and paired in Bluetoo <translation type="unfinished"></translation> </message> <message> + <location filename="../qml/pages/WatchInfo.qml" line="72"/> + <location filename="../qml/pages/WatchInfo.qml" line="80"/> <location filename="../qml/pages/WatchInfo.qml" line="88"/> <source>unknown</source> <translation type="unfinished"></translation> |