From 8e6f27b0b16c3b9f54dc7423d9a3f0b880304038 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Sun, 19 Apr 2015 17:32:27 +0200 Subject: AboutPage and translation update --- README.md | 1 + app/qml/pages/AboutPage.qml | 15 ++++++++++++++- app/qml/pages/Disclaimer.qml | 16 +++++++++++++++- app/translations/pebble-es.ts | 40 +++++++++++++++++++++++++++++----------- app/translations/pebble-pl.ts | 40 +++++++++++++++++++++++++++++----------- app/translations/pebble.ts | 40 +++++++++++++++++++++++++++++----------- 6 files changed, 117 insertions(+), 35 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/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 6bdb778..1eb9c75 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -24,27 +24,32 @@ - + + Thank you for your support!!! + + + + PayPal Donate - + Bugs? ¿Errores? - + Open Bug Tracker - + Forum Thread - + Send issue e-mail to developer @@ -106,27 +111,27 @@ Disclaimer - + Feature unavailable - + This feature is available for supporters only. - + Supporter? - + Send me my code! - + Activation code @@ -135,7 +140,7 @@ Versión - + PayPal Donate @@ -144,6 +149,19 @@ ¿Errores? + + FirmwareUpgrade + + + Firmware upgrade + + + + + Begin upgrade + + + InstallAppDialog diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts index ebe4f1a..98f3f49 100644 --- a/app/translations/pebble-pl.ts +++ b/app/translations/pebble-pl.ts @@ -24,27 +24,32 @@ Dotacje pomagają uzasadnić czas poświęcony na rozwój aplikacji. - + + Thank you for your support!!! + + + + PayPal Donate Dotacja PayPal - + Bugs? Błędy? - + Open Bug Tracker Otwórz Bug Tracker - + Forum Thread Wątek na forum - + Send issue e-mail to developer Wyślij zgłoszenie e-mail do developera @@ -106,27 +111,27 @@ Disclaimer - + Feature unavailable - + This feature is available for supporters only. - + Supporter? - + Send me my code! - + Activation code @@ -147,7 +152,7 @@ Dotacje pomagają uzasadnić czas poświęcony na rozwój aplikacji. - + PayPal Donate Dotacja PayPal @@ -168,6 +173,19 @@ Wyślij zgłoszenie e-mail do developera + + FirmwareUpgrade + + + Firmware upgrade + + + + + Begin upgrade + + + InstallAppDialog diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index 24f2352..0e7e892 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -24,27 +24,32 @@ - + + Thank you for your support!!! + + + + PayPal Donate - + Bugs? - + Open Bug Tracker - + Forum Thread - + Send issue e-mail to developer @@ -106,36 +111,49 @@ Disclaimer - + Feature unavailable - + This feature is available for supporters only. - + Supporter? - + Send me my code! - + Activation code - + PayPal Donate + + FirmwareUpgrade + + + Firmware upgrade + + + + + Begin upgrade + + + InstallAppDialog -- cgit v1.2.3