summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md1
-rw-r--r--app/pebblefirmware.cpp11
-rw-r--r--app/pebblefirmware.h2
-rw-r--r--app/qml/pages/AboutPage.qml15
-rw-r--r--app/qml/pages/Disclaimer.qml16
-rw-r--r--app/translations/pebble-es.ts40
-rw-r--r--app/translations/pebble-pl.ts40
-rw-r--r--app/translations/pebble.ts40
8 files changed, 124 insertions, 41 deletions
diff --git a/README.md b/README.md
index ef606c0..dc010b5 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Features
* PebbleKit JS application partial support
(including Pebble object, XMLHTTPRequest, localStorage, geolocation)
* Pebble AppStore preliminary support
+* Firmware check and upgrade
diff --git a/app/pebblefirmware.cpp b/app/pebblefirmware.cpp
index 95294f7..f42c29b 100644
--- a/app/pebblefirmware.cpp
+++ b/app/pebblefirmware.cpp
@@ -26,6 +26,7 @@ void PebbleFirmware::fetchFirmware(QString type)
QNetworkRequest req;
req.setUrl(_latest.value(type).toObject().value("url").toString());
req.setRawHeader("Cache-Control", "no-cache");
+ qDebug() << "Fetching firmware" << req.url();
nm->get(req);
}
@@ -35,15 +36,15 @@ void PebbleFirmware::onNetworkReplyFinished(QNetworkReply* rep)
if (rep->request().url().toString().endsWith("/latest.json")) {
QJsonDocument jsonResponse = QJsonDocument::fromJson(rep->readAll());
- QJsonObject jsonObject = jsonResponse.object();
- if (!jsonObject.isEmpty()) {
- qDebug() << "Latest firmware" << jsonObject;
- _latest = jsonObject.value("normal").toObject();
+ _latest = jsonResponse.object();
+ if (!_latest.isEmpty()) {
+ qDebug() << "Latest firmware" << _latest;
emit latestChanged();
}
} else if (rep->url().toString().endsWith(".pbz")) {
QDir downDir(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
- QFileInfo name(rep->url().toLocalFile());
+ QFileInfo name(rep->url().toString(QUrl::FullyDecoded|QUrl::NormalizePathSegments|
+ QUrl::RemoveQuery|QUrl::RemoveFragment));
QFile file(downDir.absoluteFilePath(name.fileName()));
file.open(QIODevice::WriteOnly|QIODevice::Truncate);
if (file.write(rep->readAll()) == -1) {
diff --git a/app/pebblefirmware.h b/app/pebblefirmware.h
index 3890048..5e6bd65 100644
--- a/app/pebblefirmware.h
+++ b/app/pebblefirmware.h
@@ -11,7 +11,7 @@ class PebbleFirmware : public QObject
Q_OBJECT
Q_PROPERTY(QJsonObject latest READ latest NOTIFY latestChanged)
- QJsonObject latest() { return _latest; }
+ QJsonObject latest() { return _latest.value("normal").toObject(); }
public:
explicit PebbleFirmware(QObject *parent = 0);
diff --git a/app/qml/pages/AboutPage.qml b/app/qml/pages/AboutPage.qml
index 86a05c5..fec0fb5 100644
--- a/app/qml/pages/AboutPage.qml
+++ b/app/qml/pages/AboutPage.qml
@@ -33,7 +33,7 @@ Page {
color: Theme.highlightColor
width: parent.width
horizontalAlignment: Text.AlignHCenter
- text: "© 2014 Tomasz Sterna / Xiaoka.com\n" + qsTr("All Rights Reserved.")
+ text: "© 2014-2015 Tomasz Sterna / Xiaoka.com\n" + qsTr("All Rights Reserved.")
}
Label {
wrapMode: Text.Wrap
@@ -73,6 +73,19 @@ Page {
wrapMode: Text.Wrap
text: qsTr("Your donations help justify development time.")
}
+ Label {
+ visible: !!donate.active
+ anchors {
+ left: parent.left
+ right: parent.right
+ margins: Theme.paddingLarge
+ }
+ font.pixelSize: Theme.fontSizeLarge
+ font.italic: true
+ color: Theme.highlightColor
+ wrapMode: Text.Wrap
+ text: qsTr("Thank you for your support!!!")
+ }
Button {
text: qsTr("PayPal Donate")
anchors {
diff --git a/app/qml/pages/Disclaimer.qml b/app/qml/pages/Disclaimer.qml
index baf5cd0..57511fd 100644
--- a/app/qml/pages/Disclaimer.qml
+++ b/app/qml/pages/Disclaimer.qml
@@ -1,10 +1,17 @@
import QtQuick 2.0
import QtQml 2.1
import Sailfish.Silica 1.0
+import org.nemomobile.configuration 1.0
Page {
id: page
+ ConfigurationGroup {
+ id: settings
+ path: "/org/pebbled/settings"
+ property string donationCode: ""
+ }
+
SilicaFlickable {
id: flickable
anchors.fill: parent
@@ -54,7 +61,7 @@ Page {
right: parent.right
margins: Theme.paddingLarge * 2
}
- onClicked: Qt.openUrlExternally("mailto:support@xiaoka.com?subject=pebbled code request - "+
+ onClicked: Qt.openUrlExternally("mailto:support@pebbled.org?subject=pebbled code request - "+
donate.id + "&body=My paypal id is: ")
}
Label {
@@ -72,7 +79,14 @@ Page {
margins: Theme.paddingMedium
}
focus: true
+ text: settings.donationCode
+ onTextChanged: settings.donationCode = text
}
}
}
+
+ Connections {
+ target: donate
+ onActiveChanged: if(donate.active) pageStack.pop()
+ }
}
diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index 38a8cc4..fa2c566 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -24,27 +24,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="77"/>
+ <location filename="../qml/pages/AboutPage.qml" line="87"/>
+ <source>Thank you for your support!!!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/AboutPage.qml" line="90"/>
<source>PayPal Donate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="87"/>
+ <location filename="../qml/pages/AboutPage.qml" line="100"/>
<source>Bugs?</source>
<translation>¿Errores?</translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="94"/>
+ <location filename="../qml/pages/AboutPage.qml" line="107"/>
<source>Open Bug Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="103"/>
+ <location filename="../qml/pages/AboutPage.qml" line="116"/>
<source>Forum Thread</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="112"/>
+ <location filename="../qml/pages/AboutPage.qml" line="125"/>
<source>Send issue e-mail to developer</source>
<translation type="unfinished"></translation>
</message>
@@ -106,27 +111,27 @@
<context>
<name>Disclaimer</name>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="21"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="28"/>
<source>Feature unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="31"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="38"/>
<source>This feature is available for supporters only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="44"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="51"/>
<source>Supporter?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="51"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="58"/>
<source>Send me my code!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="61"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="68"/>
<source>Activation code</source>
<translation type="unfinished"></translation>
</message>
@@ -135,7 +140,7 @@
<translation type="obsolete">Versión</translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="34"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="41"/>
<source>PayPal Donate</source>
<translation type="unfinished"></translation>
</message>
@@ -145,6 +150,19 @@
</message>
</context>
<context>
+ <name>FirmwareUpgrade</name>
+ <message>
+ <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
+ <source>Firmware upgrade</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
+ <source>Begin upgrade</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InstallAppDialog</name>
<message>
<source>Install app</source>
diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts
index 11285ee..dfa4357 100644
--- a/app/translations/pebble-pl.ts
+++ b/app/translations/pebble-pl.ts
@@ -24,27 +24,32 @@
<translation>Dotacje pomagają uzasadnić czas poświęcony na rozwój aplikacji.</translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="77"/>
+ <location filename="../qml/pages/AboutPage.qml" line="87"/>
+ <source>Thank you for your support!!!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/AboutPage.qml" line="90"/>
<source>PayPal Donate</source>
<translation>Dotacja PayPal</translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="87"/>
+ <location filename="../qml/pages/AboutPage.qml" line="100"/>
<source>Bugs?</source>
<translation>Błędy?</translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="94"/>
+ <location filename="../qml/pages/AboutPage.qml" line="107"/>
<source>Open Bug Tracker</source>
<translation>Otwórz Bug Tracker</translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="103"/>
+ <location filename="../qml/pages/AboutPage.qml" line="116"/>
<source>Forum Thread</source>
<translation>Wątek na forum</translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="112"/>
+ <location filename="../qml/pages/AboutPage.qml" line="125"/>
<source>Send issue e-mail to developer</source>
<translation>Wyślij zgłoszenie e-mail do developera</translation>
</message>
@@ -106,27 +111,27 @@
<context>
<name>Disclaimer</name>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="21"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="28"/>
<source>Feature unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="31"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="38"/>
<source>This feature is available for supporters only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="44"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="51"/>
<source>Supporter?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="51"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="58"/>
<source>Send me my code!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="61"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="68"/>
<source>Activation code</source>
<translation type="unfinished"></translation>
</message>
@@ -147,7 +152,7 @@
<translation type="obsolete">Dotacje pomagają uzasadnić czas poświęcony na rozwój aplikacji.</translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="34"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="41"/>
<source>PayPal Donate</source>
<translation type="unfinished">Dotacja PayPal</translation>
</message>
@@ -169,6 +174,19 @@
</message>
</context>
<context>
+ <name>FirmwareUpgrade</name>
+ <message>
+ <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
+ <source>Firmware upgrade</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
+ <source>Begin upgrade</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InstallAppDialog</name>
<message>
<location filename="../qml/pages/InstallAppDialog.qml" line="17"/>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index cd7ba8b..f1679e1 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -24,27 +24,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="77"/>
+ <location filename="../qml/pages/AboutPage.qml" line="87"/>
+ <source>Thank you for your support!!!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/AboutPage.qml" line="90"/>
<source>PayPal Donate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="87"/>
+ <location filename="../qml/pages/AboutPage.qml" line="100"/>
<source>Bugs?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="94"/>
+ <location filename="../qml/pages/AboutPage.qml" line="107"/>
<source>Open Bug Tracker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="103"/>
+ <location filename="../qml/pages/AboutPage.qml" line="116"/>
<source>Forum Thread</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/AboutPage.qml" line="112"/>
+ <location filename="../qml/pages/AboutPage.qml" line="125"/>
<source>Send issue e-mail to developer</source>
<translation type="unfinished"></translation>
</message>
@@ -106,37 +111,50 @@
<context>
<name>Disclaimer</name>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="21"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="28"/>
<source>Feature unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="31"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="38"/>
<source>This feature is available for supporters only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="44"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="51"/>
<source>Supporter?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="51"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="58"/>
<source>Send me my code!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="61"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="68"/>
<source>Activation code</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/Disclaimer.qml" line="34"/>
+ <location filename="../qml/pages/Disclaimer.qml" line="41"/>
<source>PayPal Donate</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>FirmwareUpgrade</name>
+ <message>
+ <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/>
+ <source>Firmware upgrade</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/>
+ <source>Begin upgrade</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InstallAppDialog</name>
<message>
<location filename="../qml/pages/InstallAppDialog.qml" line="17"/>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-15 04:45:40 +0000