diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/pebbledinterface.cpp | 4 | ||||
| -rw-r--r-- | app/pebbledinterface.h | 2 | ||||
| -rw-r--r-- | app/qml/pages/AboutPage.qml | 16 | ||||
| -rw-r--r-- | app/qml/pages/ManagerPage.qml | 2 | ||||
| -rw-r--r-- | app/qml/pages/WatchPage.qml | 41 | ||||
| -rw-r--r-- | app/translations/pebble-es.ts | 54 | ||||
| -rw-r--r-- | app/translations/pebble-pl.ts | 56 | ||||
| -rw-r--r-- | app/translations/pebble-zh_CN.ts | 40 | ||||
| -rw-r--r-- | app/translations/pebble.ts | 40 |
9 files changed, 162 insertions, 93 deletions
diff --git a/app/pebbledinterface.cpp b/app/pebbledinterface.cpp index 84a4ae2..1fb0cd1 100644 --- a/app/pebbledinterface.cpp +++ b/app/pebbledinterface.cpp @@ -175,10 +175,10 @@ QString PebbledInterface::appUuid() const return watch->appUuid(); } -void PebbledInterface::ping() +void PebbledInterface::ping(uint cookie) { qDebug() << Q_FUNC_INFO; - watch->Ping(66); + watch->Ping(cookie); } void PebbledInterface::time() diff --git a/app/pebbledinterface.h b/app/pebbledinterface.h index 281ada7..f0b3619 100644 --- a/app/pebbledinterface.h +++ b/app/pebbledinterface.h @@ -63,7 +63,7 @@ signals: public slots: void setEnabled(bool); void setActive(bool); - void ping(); + void ping(uint cookie = 66); void time(); void disconnect(); void reconnect(); diff --git a/app/qml/pages/AboutPage.qml b/app/qml/pages/AboutPage.qml index fec0fb5..a674b65 100644 --- a/app/qml/pages/AboutPage.qml +++ b/app/qml/pages/AboutPage.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 bool debug + } + SilicaFlickable { id: flickable anchors.fill: parent @@ -130,6 +137,15 @@ Page { } onClicked: Qt.openUrlExternally("mailto:bugs@xiaoka.com?subject=pebbled issue&body=describe your issue here") } + TextSwitch { + text: qsTr("Debug Mode") + description: qsTr("Enable daemon and app debugging") + checked: settings.debug + automaticCheck: true + onClicked: { + settings.debug = !settings.debug; + } + } } } } diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index a69bc89..8ff0db2 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -147,7 +147,7 @@ Page { } TextSwitch { text: qsTr("Control main volume") - description: qsTr("Pebble music volume buttons change the main phone volume directly instead of through the music player.") + description: qsTr("Pebble music volume buttons change the main phone volume directly instead of through the music player") checked: settings.useSystemVolume automaticCheck: true onClicked: { diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml index 730f850..3f5a5d6 100644 --- a/app/qml/pages/WatchPage.qml +++ b/app/qml/pages/WatchPage.qml @@ -1,12 +1,19 @@ import QtQuick 2.0 import QtQml 2.1 import Sailfish.Silica 1.0 +import org.nemomobile.configuration 1.0 Page { id: watchPage property bool firmwareVersionOK: app.firmwareVersion && app.firmwareVersion.indexOf("v1.") !== 0 + ConfigurationGroup { + id: settings + path: "/org/pebbled/settings" + property bool debug + } + SilicaFlickable { id: flickable anchors.fill: parent @@ -48,6 +55,40 @@ Page { onClicked: pebbled.time() } } + Row { + anchors { + left: parent.left + right: parent.right + margins: Theme.paddingLarge + } + + visible: settings.debug + Button { + text: qsTr("SMS") + width: parent.width / 5 + onClicked: pebbled.ping(128) + } + Button { + text: qsTr("E-Mail") + width: parent.width / 5 + onClicked: pebbled.ping(129) + } + Button { + text: qsTr("FB") + width: parent.width / 5 + onClicked: pebbled.ping(130) + } + Button { + text: qsTr("Twt") + width: parent.width / 5 + onClicked: pebbled.ping(131) + } + Button { + text: qsTr("Music") + width: parent.width / 5 + onClicked: pebbled.ping(132) + } + } Item { width: parent.width diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index 0775925..6b667e4 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -4,55 +4,65 @@ <context> <name>AboutPage</name> <message> - <location filename="../qml/pages/AboutPage.qml" line="24"/> + <location filename="../qml/pages/AboutPage.qml" line="31"/> <source>Version</source> <translation>Versión</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="36"/> + <location filename="../qml/pages/AboutPage.qml" line="43"/> <source>All Rights Reserved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="60"/> + <location filename="../qml/pages/AboutPage.qml" line="67"/> <source>Support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="74"/> + <location filename="../qml/pages/AboutPage.qml" line="81"/> <source>Your donations help justify development time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="87"/> + <location filename="../qml/pages/AboutPage.qml" line="94"/> <source>Thank you for your support!!!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="90"/> + <location filename="../qml/pages/AboutPage.qml" line="97"/> <source>PayPal Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="100"/> + <location filename="../qml/pages/AboutPage.qml" line="107"/> <source>Bugs?</source> <translation>¿Errores?</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="107"/> + <location filename="../qml/pages/AboutPage.qml" line="114"/> <source>Open Bug Tracker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="116"/> + <location filename="../qml/pages/AboutPage.qml" line="123"/> <source>Forum Thread</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="125"/> + <location filename="../qml/pages/AboutPage.qml" line="132"/> <source>Send issue e-mail to developer</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="141"/> + <source>Debug Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="142"/> + <source>Enable daemon and app debugging</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AppConfigDialog</name> @@ -167,10 +177,6 @@ <context> <name>InstallAppDialog</name> <message> - <source>Install app</source> - <translation type="vanished">Instalar app</translation> - </message> - <message> <location filename="../qml/pages/InstallAppDialog.qml" line="18"/> <source>Select App files</source> <translation type="unfinished"></translation> @@ -178,7 +184,7 @@ <message> <location filename="../qml/pages/InstallAppDialog.qml" line="65"/> <source>Install App</source> - <translation type="unfinished"></translation> + <translation>Instalar App</translation> </message> <message> <location filename="../qml/pages/InstallAppDialog.qml" line="66"/> @@ -283,6 +289,11 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra <translation>Transferir llamadas</translation> </message> <message> + <location filename="../qml/pages/ManagerPage.qml" line="150"/> + <source>Pebble music volume buttons change the main phone volume directly instead of through the music player</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../qml/pages/ManagerPage.qml" line="251"/> <source>Profiles</source> <translation type="unfinished"></translation> @@ -296,24 +307,11 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra <translation type="unfinished"></translation> </message> <message> - <source>Silent when connected</source> - <translation type="vanished">Modo silencio automático</translation> - </message> - <message> - <source>Sets phone profile to "silent" when Pebble is connected</source> - <translation type="vanished">Activa el modo silencio cuando se conecte un Pebble</translation> - </message> - <message> <location filename="../qml/pages/ManagerPage.qml" line="149"/> <source>Control main volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="150"/> - <source>Pebble music volume buttons change the main phone volume directly instead of through the music player.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qml/pages/ManagerPage.qml" line="158"/> <source>Transliterate messages</source> <translation>Transliterar mensajes</translation> diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts index 4efc24b..12970b3 100644 --- a/app/translations/pebble-pl.ts +++ b/app/translations/pebble-pl.ts @@ -4,55 +4,65 @@ <context> <name>AboutPage</name> <message> - <location filename="../qml/pages/AboutPage.qml" line="24"/> + <location filename="../qml/pages/AboutPage.qml" line="31"/> <source>Version</source> <translation>Wersja</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="36"/> + <location filename="../qml/pages/AboutPage.qml" line="43"/> <source>All Rights Reserved.</source> <translation>Wszelkie prawa zastrzeżone.</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="60"/> + <location filename="../qml/pages/AboutPage.qml" line="67"/> <source>Support</source> <translation>Wsparcie</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="74"/> + <location filename="../qml/pages/AboutPage.qml" line="81"/> <source>Your donations help justify development time.</source> <translation>Dotacje pomagają uzasadnić czas poświęcony na rozwój aplikacji.</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="87"/> + <location filename="../qml/pages/AboutPage.qml" line="94"/> <source>Thank you for your support!!!</source> <translation>Dziękuję za twoje wsparcie!!!</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="90"/> + <location filename="../qml/pages/AboutPage.qml" line="97"/> <source>PayPal Donate</source> <translation>Dotacja PayPal</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="100"/> + <location filename="../qml/pages/AboutPage.qml" line="107"/> <source>Bugs?</source> <translation>Błędy?</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="107"/> + <location filename="../qml/pages/AboutPage.qml" line="114"/> <source>Open Bug Tracker</source> <translation>Otwórz Bug Tracker</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="116"/> + <location filename="../qml/pages/AboutPage.qml" line="123"/> <source>Forum Thread</source> <translation>Wątek na forum</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="125"/> + <location filename="../qml/pages/AboutPage.qml" line="132"/> <source>Send issue e-mail to developer</source> <translation>Wyślij zgłoszenie e-mail do developera</translation> </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="141"/> + <source>Debug Mode</source> + <translation>Tryb Debug</translation> + </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="142"/> + <source>Enable daemon and app debugging</source> + <translation>Włącz debugowanie demona i appki</translation> + </message> </context> <context> <name>AppConfigDialog</name> @@ -100,14 +110,6 @@ <translation>Cyferblaty</translation> </message> <message> - <source>WatchApps</source> - <translation type="vanished">Aplikacje</translation> - </message> - <message> - <source>WatchFaces</source> - <translation type="vanished">Cyferblaty</translation> - </message> - <message> <location filename="../qml/pages/AppStorePage.qml" line="109"/> <source>Downloading...</source> <translation>Pobieranie...</translation> @@ -322,6 +324,11 @@ Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany <translation>Przekazuj telefony</translation> </message> <message> + <location filename="../qml/pages/ManagerPage.qml" line="150"/> + <source>Pebble music volume buttons change the main phone volume directly instead of through the music player</source> + <translation>Guziki zmiany głośności na Pebble będą zmieniać głośność bezpośrednio, a nie za pomocą odtwarzacza muzyki</translation> + </message> + <message> <location filename="../qml/pages/ManagerPage.qml" line="251"/> <source>Profiles</source> <translation>Profile</translation> @@ -335,24 +342,11 @@ Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany <translation>bez zmiany</translation> </message> <message> - <source>Silent when connected</source> - <translation type="vanished">Cichy gdy połączony</translation> - </message> - <message> - <source>Sets phone profile to "silent" when Pebble is connected</source> - <translation type="vanished">Ustawia "cichy" profil telefonu gdy Pebble jest połączony</translation> - </message> - <message> <location filename="../qml/pages/ManagerPage.qml" line="149"/> <source>Control main volume</source> <translation>Steruj głośnością główną</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="150"/> - <source>Pebble music volume buttons change the main phone volume directly instead of through the music player.</source> - <translation>Guziki zmiany głośności na Pebble będą zmieniać głośność bezpośrednio, a nie za pomocą odtwarzacza muzyki.</translation> - </message> - <message> <location filename="../qml/pages/ManagerPage.qml" line="158"/> <source>Transliterate messages</source> <translation>Transliteracja wiadomości</translation> diff --git a/app/translations/pebble-zh_CN.ts b/app/translations/pebble-zh_CN.ts index 5cb6750..43cdcd7 100644 --- a/app/translations/pebble-zh_CN.ts +++ b/app/translations/pebble-zh_CN.ts @@ -4,55 +4,65 @@ <context> <name>AboutPage</name> <message> - <location filename="../qml/pages/AboutPage.qml" line="24"/> + <location filename="../qml/pages/AboutPage.qml" line="31"/> <source>Version</source> <translation>版本</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="36"/> + <location filename="../qml/pages/AboutPage.qml" line="43"/> <source>All Rights Reserved.</source> <translation>版权所有.</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="60"/> + <location filename="../qml/pages/AboutPage.qml" line="67"/> <source>Support</source> <translation>支持</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="74"/> + <location filename="../qml/pages/AboutPage.qml" line="81"/> <source>Your donations help justify development time.</source> <translation>你的捐款帮助合理开发时间.</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="87"/> + <location filename="../qml/pages/AboutPage.qml" line="94"/> <source>Thank you for your support!!!</source> <translation>感谢你的支持!!!</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="90"/> + <location filename="../qml/pages/AboutPage.qml" line="97"/> <source>PayPal Donate</source> <translation>Paypal捐助</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="100"/> + <location filename="../qml/pages/AboutPage.qml" line="107"/> <source>Bugs?</source> <translation>Bugs?</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="107"/> + <location filename="../qml/pages/AboutPage.qml" line="114"/> <source>Open Bug Tracker</source> <translation>打开的Bug追踪器</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="116"/> + <location filename="../qml/pages/AboutPage.qml" line="123"/> <source>Forum Thread</source> <translation>论坛主题</translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="125"/> + <location filename="../qml/pages/AboutPage.qml" line="132"/> <source>Send issue e-mail to developer</source> <translation>给开发者发送问题邮件</translation> </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="141"/> + <source>Debug Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="142"/> + <source>Enable daemon and app debugging</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AppConfigDialog</name> @@ -282,6 +292,11 @@ If it can't be found please check it's available and paired in Bluetoo <translation>前置通话</translation> </message> <message> + <location filename="../qml/pages/ManagerPage.qml" line="150"/> + <source>Pebble music volume buttons change the main phone volume directly instead of through the music player</source> + <translation>Pebble音量键直接改变手机主音量，而不是通过音乐播放器</translation> + </message> + <message> <location filename="../qml/pages/ManagerPage.qml" line="251"/> <source>Profiles</source> <translation>个性化</translation> @@ -300,11 +315,6 @@ If it can't be found please check it's available and paired in Bluetoo <translation>控制主音量</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="150"/> - <source>Pebble music volume buttons change the main phone volume directly instead of through the music player.</source> - <translation>Pebble音量键直接改变手机主音量，而不是通过音乐播放器</translation> - </message> - <message> <location filename="../qml/pages/ManagerPage.qml" line="158"/> <source>Transliterate messages</source> <translation>转译消息</translation> diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index 36dc298..e6ae583 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -4,55 +4,65 @@ <context> <name>AboutPage</name> <message> - <location filename="../qml/pages/AboutPage.qml" line="24"/> + <location filename="../qml/pages/AboutPage.qml" line="31"/> <source>Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="36"/> + <location filename="../qml/pages/AboutPage.qml" line="43"/> <source>All Rights Reserved.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="60"/> + <location filename="../qml/pages/AboutPage.qml" line="67"/> <source>Support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="74"/> + <location filename="../qml/pages/AboutPage.qml" line="81"/> <source>Your donations help justify development time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="87"/> + <location filename="../qml/pages/AboutPage.qml" line="94"/> <source>Thank you for your support!!!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="90"/> + <location filename="../qml/pages/AboutPage.qml" line="97"/> <source>PayPal Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="100"/> + <location filename="../qml/pages/AboutPage.qml" line="107"/> <source>Bugs?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="107"/> + <location filename="../qml/pages/AboutPage.qml" line="114"/> <source>Open Bug Tracker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="116"/> + <location filename="../qml/pages/AboutPage.qml" line="123"/> <source>Forum Thread</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AboutPage.qml" line="125"/> + <location filename="../qml/pages/AboutPage.qml" line="132"/> <source>Send issue e-mail to developer</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="141"/> + <source>Debug Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AboutPage.qml" line="142"/> + <source>Enable daemon and app debugging</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AppConfigDialog</name> @@ -270,6 +280,11 @@ 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/ManagerPage.qml" line="150"/> + <source>Pebble music volume buttons change the main phone volume directly instead of through the music player</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../qml/pages/ManagerPage.qml" line="251"/> <source>Profiles</source> <translation type="unfinished"></translation> @@ -288,11 +303,6 @@ 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/ManagerPage.qml" line="150"/> - <source>Pebble music volume buttons change the main phone volume directly instead of through the music player.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qml/pages/ManagerPage.qml" line="158"/> <source>Transliterate messages</source> <translation type="unfinished"></translation> |