summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/pebbledinterface.cpp11
-rw-r--r--app/pebbledinterface.h2
-rw-r--r--app/qml/pages/WatchPage.qml11
-rw-r--r--app/qml/pebble.qml4
-rw-r--r--app/translations/pebble-es.ts24
-rw-r--r--app/translations/pebble-pl.ts24
-rw-r--r--app/translations/pebble.ts24
7 files changed, 46 insertions, 54 deletions
diff --git a/app/pebbledinterface.cpp b/app/pebbledinterface.cpp
index 28f0581..2099c9e 100644
--- a/app/pebbledinterface.cpp
+++ b/app/pebbledinterface.cpp
@@ -304,6 +304,12 @@ QVariantMap PebbledInterface::appInfoByUuid(const QString &uuid) const
}
}
+void PebbledInterface::notifyFirmware(bool ok)
+{
+ qDebug() << Q_FUNC_INFO << ok;
+ watch->NotifyFirmware(ok);
+}
+
void PebbledInterface::uploadFirmware(const QString &file)
{
qDebug() << Q_FUNC_INFO << file;
@@ -311,11 +317,6 @@ void PebbledInterface::uploadFirmware(const QString &file)
reply.waitForFinished();
}
-void PebbledInterface::notifyFirmware(const QString &version)
-{
- qDebug() << Q_FUNC_INFO << version;
-}
-
void PebbledInterface::onWatchConnectedChanged()
{
qDebug() << Q_FUNC_INFO;
diff --git a/app/pebbledinterface.h b/app/pebbledinterface.h
index 740df75..df0b722 100644
--- a/app/pebbledinterface.h
+++ b/app/pebbledinterface.h
@@ -73,8 +73,8 @@ public slots:
void uploadApp(const QString &uuid, int slot);
void unloadApp(int slot);
+ void notifyFirmware(bool ok);
void uploadFirmware(const QString &file);
- void notifyFirmware(const QString &version);
private slots:
void onWatchConnectedChanged();
diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml
index 6c24ef0..55f4db0 100644
--- a/app/qml/pages/WatchPage.qml
+++ b/app/qml/pages/WatchPage.qml
@@ -5,15 +5,7 @@ import Sailfish.Silica 1.0
Page {
id: watchPage
- property bool firmwareVersionOK: false
-
- Component.onCompleted: {
- pebbled.info.firmware.forEach(function(firmware){
- if (!firmware.recovery) {
- firmwareVersionOK = (firmware.version.indexOf("v1.") !== 0)
- }
- })
- }
+ property bool firmwareVersionOK: app.firmwareVersion && app.firmwareVersion.indexOf("v1.") !== 0
SilicaFlickable {
id: flickable
@@ -78,7 +70,6 @@ Page {
from: Theme.primaryColor; to: Theme.highlightColor
duration: 2500
loops: Animation.Infinite
- easing: { type: Easing.InOutQuint }
}
}
diff --git a/app/qml/pebble.qml b/app/qml/pebble.qml
index a4b8b1f..380ff7e 100644
--- a/app/qml/pebble.qml
+++ b/app/qml/pebble.qml
@@ -32,8 +32,8 @@ ApplicationWindow
function notifyNewFirmware() {
firmwareLatest = pebbleFirmware.latest.friendlyVersion || ""
- if (firmwareLatest && firmwareVersion && firmwareVersion !== firmwareLatest) {
- pebbled.notifyFirmware(firmwareLatest);
+ if (firmwareLatest && firmwareVersion) {
+ pebbled.notifyFirmware(firmwareVersion === firmwareLatest);
}
}
diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index 013942e..005bfe3 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -332,62 +332,62 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra
<context>
<name>WatchPage</name>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="42"/>
+ <location filename="../qml/pages/WatchPage.qml" line="34"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="48"/>
+ <location filename="../qml/pages/WatchPage.qml" line="40"/>
<source>Ping</source>
<translation>Ping</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="54"/>
+ <location filename="../qml/pages/WatchPage.qml" line="46"/>
<source>Sync Time</source>
<translation>Ajustar hora</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="87"/>
+ <location filename="../qml/pages/WatchPage.qml" line="78"/>
<source>Installed applications</source>
<translation>Aplicaciones instaladas</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="76"/>
+ <location filename="../qml/pages/WatchPage.qml" line="68"/>
<source>Your firmware is too old to support SDKv2 applications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="124"/>
+ <location filename="../qml/pages/WatchPage.qml" line="115"/>
<source>Uninstalling</source>
<translation>Desinstalando</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="196"/>
+ <location filename="../qml/pages/WatchPage.qml" line="187"/>
<source>(empty slot)</source>
<translation>(hueco libre)</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="196"/>
+ <location filename="../qml/pages/WatchPage.qml" line="187"/>
<source>(slot in use by unknown app)</source>
<translation>(hueco en uso)</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="205"/>
+ <location filename="../qml/pages/WatchPage.qml" line="196"/>
<source>Install app...</source>
<translation>Instalar app...</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="210"/>
+ <location filename="../qml/pages/WatchPage.qml" line="201"/>
<source>Companion app missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="223"/>
+ <location filename="../qml/pages/WatchPage.qml" line="214"/>
<source>Configure...</source>
<translation>Configurar...</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="228"/>
+ <location filename="../qml/pages/WatchPage.qml" line="219"/>
<source>Uninstall</source>
<translation>Desinstalar</translation>
</message>
diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts
index 0291ab8..facc044 100644
--- a/app/translations/pebble-pl.ts
+++ b/app/translations/pebble-pl.ts
@@ -328,62 +328,62 @@ Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany
<context>
<name>WatchPage</name>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="42"/>
+ <location filename="../qml/pages/WatchPage.qml" line="34"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="48"/>
+ <location filename="../qml/pages/WatchPage.qml" line="40"/>
<source>Ping</source>
<translation>Ping</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="54"/>
+ <location filename="../qml/pages/WatchPage.qml" line="46"/>
<source>Sync Time</source>
<translation>Synch.Czas</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="87"/>
+ <location filename="../qml/pages/WatchPage.qml" line="78"/>
<source>Installed applications</source>
<translation>Zainstalowane aplikacje</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="76"/>
+ <location filename="../qml/pages/WatchPage.qml" line="68"/>
<source>Your firmware is too old to support SDKv2 applications</source>
<translation>Twój firmware jest zbyt stary aby obsłużyć aplikacje SDKv2</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="124"/>
+ <location filename="../qml/pages/WatchPage.qml" line="115"/>
<source>Uninstalling</source>
<translation>Odinstalowywanie</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="196"/>
+ <location filename="../qml/pages/WatchPage.qml" line="187"/>
<source>(empty slot)</source>
<translation>(pusty slot)</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="196"/>
+ <location filename="../qml/pages/WatchPage.qml" line="187"/>
<source>(slot in use by unknown app)</source>
<translation>(slot w użyciu przez nieznaną aplikację)</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="205"/>
+ <location filename="../qml/pages/WatchPage.qml" line="196"/>
<source>Install app...</source>
<translation>Zainstaluj aplikację...</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="210"/>
+ <location filename="../qml/pages/WatchPage.qml" line="201"/>
<source>Companion app missing</source>
<translation>Brakuje companion app</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="223"/>
+ <location filename="../qml/pages/WatchPage.qml" line="214"/>
<source>Configure...</source>
<translation>Konfiguruj...</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="228"/>
+ <location filename="../qml/pages/WatchPage.qml" line="219"/>
<source>Uninstall</source>
<translation>Odinstaluj</translation>
</message>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index dcb9a34..b9c74d3 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -327,62 +327,62 @@ If it can&apos;t be found please check it&apos;s available and paired in Bluetoo
<context>
<name>WatchPage</name>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="42"/>
+ <location filename="../qml/pages/WatchPage.qml" line="34"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="48"/>
+ <location filename="../qml/pages/WatchPage.qml" line="40"/>
<source>Ping</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="54"/>
+ <location filename="../qml/pages/WatchPage.qml" line="46"/>
<source>Sync Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="87"/>
+ <location filename="../qml/pages/WatchPage.qml" line="78"/>
<source>Installed applications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="76"/>
+ <location filename="../qml/pages/WatchPage.qml" line="68"/>
<source>Your firmware is too old to support SDKv2 applications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="124"/>
+ <location filename="../qml/pages/WatchPage.qml" line="115"/>
<source>Uninstalling</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="196"/>
+ <location filename="../qml/pages/WatchPage.qml" line="187"/>
<source>(empty slot)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="196"/>
+ <location filename="../qml/pages/WatchPage.qml" line="187"/>
<source>(slot in use by unknown app)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="205"/>
+ <location filename="../qml/pages/WatchPage.qml" line="196"/>
<source>Install app...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="210"/>
+ <location filename="../qml/pages/WatchPage.qml" line="201"/>
<source>Companion app missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="223"/>
+ <location filename="../qml/pages/WatchPage.qml" line="214"/>
<source>Configure...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="228"/>
+ <location filename="../qml/pages/WatchPage.qml" line="219"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-15 04:42:18 +0000