summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2015-03-31 16:37:51 +0200
committerTomasz Sterna <tomek@xiaoka.com>2015-03-31 16:37:51 +0200
commitb1b6331bc8f739cd9d541d17b3b7478fbb4124c7 (patch)
tree7cdc15192aea1afabd76960f0ea090339e232d8b
parent5481f054ccd53d401bcc6763c01d5e217663b2b4 (diff)
Show Error message for firmware v1.x
-rw-r--r--app/qml/pages/WatchPage.qml63
-rw-r--r--app/translations/pebble-es.ts23
-rw-r--r--app/translations/pebble.ts23
3 files changed, 60 insertions, 49 deletions
diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml
index 7d4375c..7ccf12a 100644
--- a/app/qml/pages/WatchPage.qml
+++ b/app/qml/pages/WatchPage.qml
@@ -1,34 +1,3 @@
-/*
- Copyright (C) 2014 Jouni Roivas
- Copyright (C) 2013 Jolla Ltd.
- Contact: Thomas Perl <thomas.perl@jollamobile.com>
- All rights reserved.
-
- You may use this file under the terms of BSD license as follows:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the authors nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
import QtQuick 2.0
import QtQml 2.1
import Sailfish.Silica 1.0
@@ -36,6 +5,16 @@ 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)
+ }
+ })
+ }
+
SilicaFlickable {
id: flickable
anchors.fill: parent
@@ -84,6 +63,27 @@ Page {
}
Label {
+ visible: !firmwareVersionOK
+
+ anchors {
+ left: parent.left
+ right: parent.right
+ margins: Theme.paddingLarge
+ }
+ font.pixelSize: Theme.fontSizeMedium
+ wrapMode: Text.WordWrap
+ horizontalAlignment: Text.Center
+ text: qsTr("Your firmware is too old to support SDKv2 applications")
+ ColorAnimation on color {
+ from: Theme.primaryColor; to: Theme.highlightColor
+ duration: 2500
+ loops: Animation.Infinite
+ easing: { type: Easing.InOutQuint }
+ }
+ }
+
+ Label {
+ visible: firmwareVersionOK
text: qsTr("Installed applications")
font.family: Theme.fontFamilyHeading
color: Theme.highlightColor
@@ -92,6 +92,7 @@ Page {
}
Repeater {
+ visible: firmwareVersionOK
id: slotsRepeater
model: pebbled.appSlots
diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index 53f6d13..2b9b6a3 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -286,17 +286,17 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra
<context>
<name>WatchPage</name>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="63"/>
+ <location filename="../qml/pages/WatchPage.qml" line="42"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="69"/>
+ <location filename="../qml/pages/WatchPage.qml" line="48"/>
<source>Ping</source>
<translation>Ping</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="75"/>
+ <location filename="../qml/pages/WatchPage.qml" line="54"/>
<source>Sync Time</source>
<translation>Ajustar hora</translation>
</message>
@@ -306,32 +306,37 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra
<translation>Aplicaciones instaladas</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="123"/>
+ <location filename="../qml/pages/WatchPage.qml" line="76"/>
+ <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"/>
<source>Uninstalling</source>
<translation>Desinstalando</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="195"/>
+ <location filename="../qml/pages/WatchPage.qml" line="196"/>
<source>(empty slot)</source>
<translation>(hueco libre)</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="195"/>
+ <location filename="../qml/pages/WatchPage.qml" line="196"/>
<source>(slot in use by unknown app)</source>
<translation>(hueco en uso)</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="204"/>
+ <location filename="../qml/pages/WatchPage.qml" line="205"/>
<source>Install app...</source>
<translation>Instalar app...</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="209"/>
+ <location filename="../qml/pages/WatchPage.qml" line="210"/>
<source>Configure...</source>
<translation>Configurar...</translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="214"/>
+ <location filename="../qml/pages/WatchPage.qml" line="215"/>
<source>Uninstall</source>
<translation>Desinstalar</translation>
</message>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index 66a914d..b3ff872 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -281,17 +281,17 @@ 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="63"/>
+ <location filename="../qml/pages/WatchPage.qml" line="42"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="69"/>
+ <location filename="../qml/pages/WatchPage.qml" line="48"/>
<source>Ping</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="75"/>
+ <location filename="../qml/pages/WatchPage.qml" line="54"/>
<source>Sync Time</source>
<translation type="unfinished"></translation>
</message>
@@ -301,32 +301,37 @@ If it can&apos;t be found please check it&apos;s available and paired in Bluetoo
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="123"/>
+ <location filename="../qml/pages/WatchPage.qml" line="76"/>
+ <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"/>
<source>Uninstalling</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="195"/>
+ <location filename="../qml/pages/WatchPage.qml" line="196"/>
<source>(empty slot)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="195"/>
+ <location filename="../qml/pages/WatchPage.qml" line="196"/>
<source>(slot in use by unknown app)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="204"/>
+ <location filename="../qml/pages/WatchPage.qml" line="205"/>
<source>Install app...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="209"/>
+ <location filename="../qml/pages/WatchPage.qml" line="210"/>
<source>Configure...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/WatchPage.qml" line="214"/>
+ <location filename="../qml/pages/WatchPage.qml" line="215"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>