diff options
| -rw-r--r-- | app/qml/pages/ManagerPage.qml | 82 | ||||
| -rw-r--r-- | app/translations/pebble-es.ts | 125 | ||||
| -rw-r--r-- | app/translations/pebble-pl.ts | 126 | ||||
| -rw-r--r-- | app/translations/pebble.ts | 117 | ||||
| -rw-r--r-- | daemon/manager.cpp | 36 | ||||
| -rw-r--r-- | daemon/manager.h | 3 | ||||
| -rw-r--r-- | daemon/settings.h | 9 | ||||
| -rw-r--r-- | rpm/pebble.spec | 1 | ||||
| -rw-r--r-- | rpm/pebble.yaml | 1 |
9 files changed, 295 insertions, 205 deletions
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index 7fb7369..b989c64 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -2,6 +2,7 @@ import QtQuick 2.0 import QtQml 2.1 import Sailfish.Silica 1.0 import org.nemomobile.configuration 1.0 +import org.nemomobile.dbus 2.0 Page { id: page @@ -9,7 +10,8 @@ Page { ConfigurationGroup { id: settings path: "/org/pebbled/settings" - property bool silentWhenConnected: false + property string profileWhenConnected: "" + property string profileWhenDisconnected: "" property bool transliterateMessage: false property bool useSystemVolume: true property bool incomingCallNotification: true @@ -23,6 +25,25 @@ Page { property bool notificationsAll: false } + DBusInterface { + id: profiled + + service: 'com.nokia.profiled' + iface: 'com.nokia.profiled' + path: '/com/nokia/profiled' + + property var profiles + } + + Component.onCompleted: { + profiled.typedCall('get_profiles', [], function (result) { + console.log('Got profiles: ' + result); + profiled.profiles = result; + }); + } + + + SilicaFlickable { id: flickable anchors.fill: parent @@ -125,15 +146,6 @@ Page { } } TextSwitch { - text: qsTr("Silent when connected") - description: qsTr("Sets phone profile to \"silent\" when Pebble is connected") - checked: settings.silentWhenConnected - automaticCheck: false - onClicked: { - settings.silentWhenConnected = !settings.silentWhenConnected; - } - } - TextSwitch { text: qsTr("Control main volume") description: qsTr("Pebble music volume buttons change the main phone volume directly instead of through the music player.") checked: settings.useSystemVolume @@ -234,6 +246,56 @@ Page { settings.notificationsAll = !settings.notificationsAll; } } + + Label { + text: qsTr("Profiles") + font.family: Theme.fontFamilyHeading + color: Theme.highlightColor + anchors.right: parent.right + anchors.rightMargin: Theme.paddingMedium + } + + ComboBox { + label: qsTr("Connected") + menu: ContextMenu { + MenuItem { + text: qsTr("no change") + font.capitalization: Font.SmallCaps + } + Repeater { + model: profiled.profiles + delegate: MenuItem { + text: modelData + down: modelData === settings.profileWhenConnected + } + } + } + value: settings.profileWhenConnected || qsTr("no change") + onCurrentIndexChanged: { + settings.profileWhenConnected = currentIndex ? currentItem.text : "" + } + } + + ComboBox { + label: qsTr("Disconnected") + menu: ContextMenu { + MenuItem { + text: qsTr("no change") + font.capitalization: Font.SmallCaps + } + Repeater { + model: profiled.profiles + delegate: MenuItem { + text: modelData + down: modelData === settings.profileWhenDisconnected + } + } + } + value: settings.profileWhenDisconnected || qsTr("no change") + onCurrentIndexChanged: { + settings.profileWhenDisconnected = currentIndex ? currentItem.text : "" + } + } } } } diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index fa2c566..bbe2e61 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -65,32 +65,47 @@ <context> <name>AppStorePage</name> <message> - <location filename="../qml/pages/AppStorePage.qml" line="25"/> + <location filename="../qml/pages/AppStorePage.qml" line="27"/> <source>Logout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="38"/> + <location filename="../qml/pages/AppStorePage.qml" line="29"/> + <source>Logging out...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="36"/> + <source>Hide search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="36"/> + <source>Show search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="49"/> <source>Pebble Appstore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="45"/> - <source>WatchApps</source> + <location filename="../qml/pages/AppStorePage.qml" line="78"/> + <source>Apps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="51"/> - <source>WatchFaces</source> + <location filename="../qml/pages/AppStorePage.qml" line="86"/> + <source>Faces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="66"/> + <location filename="../qml/pages/AppStorePage.qml" line="109"/> <source>Downloading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="94"/> + <location filename="../qml/pages/AppStorePage.qml" line="141"/> <source>Downloading %1...</source> <translation type="unfinished"></translation> </message> @@ -150,19 +165,6 @@ </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> @@ -192,164 +194,177 @@ <context> <name>ManagerPage</name> <message> - <location filename="../qml/pages/ManagerPage.qml" line="35"/> + <location filename="../qml/pages/ManagerPage.qml" line="56"/> <source>Pebble Appstore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="39"/> + <location filename="../qml/pages/ManagerPage.qml" line="60"/> <source>About</source> <translation>Acerca de</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="50"/> + <location filename="../qml/pages/ManagerPage.qml" line="71"/> <source>Pebble Manager</source> <translation></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="57"/> + <location filename="../qml/pages/ManagerPage.qml" line="78"/> <source>Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings.</source> <translation>Buscando el reloj Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="78"/> + <location filename="../qml/pages/ManagerPage.qml" line="99"/> <source>Service</source> <translation>Servicio</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="106"/> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="86"/> + <location filename="../qml/pages/ManagerPage.qml" line="107"/> <source>Automatic startup</source> <translation>Inicio automático</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="86"/> + <location filename="../qml/pages/ManagerPage.qml" line="107"/> <source>Manual startup</source> <translation>Inicio manual</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="113"/> <source>Active</source> <translation>Activo</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="93"/> + <location filename="../qml/pages/ManagerPage.qml" line="114"/> <source>Running</source> <translation>Ejecutándose</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="93"/> + <location filename="../qml/pages/ManagerPage.qml" line="114"/> <source>Dead</source> <translation>Detenido</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="120"/> <source>Connection</source> <translation>Conexión</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="100"/> + <location filename="../qml/pages/ManagerPage.qml" line="121"/> + <location filename="../qml/pages/ManagerPage.qml" line="259"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="100"/> + <location filename="../qml/pages/ManagerPage.qml" line="121"/> + <location filename="../qml/pages/ManagerPage.qml" line="280"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="113"/> + <location filename="../qml/pages/ManagerPage.qml" line="134"/> <source>Settings</source> <translation>Configuración</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="120"/> + <location filename="../qml/pages/ManagerPage.qml" line="141"/> <source>Forward phone calls</source> <translation>Transferir llamadas</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="128"/> + <location filename="../qml/pages/ManagerPage.qml" line="251"/> + <source>Profiles</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManagerPage.qml" line="262"/> + <location filename="../qml/pages/ManagerPage.qml" line="273"/> + <location filename="../qml/pages/ManagerPage.qml" line="283"/> + <location filename="../qml/pages/ManagerPage.qml" line="294"/> + <source>no change</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Silent when connected</source> - <translation>Modo silencio automático</translation> + <translation type="vanished">Modo silencio automático</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="129"/> <source>Sets phone profile to "silent" when Pebble is connected</source> - <translation>Activa el modo silencio cuando se conecte un Pebble</translation> + <translation type="vanished">Activa el modo silencio cuando se conecte un Pebble</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <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="138"/> + <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="146"/> + <location filename="../qml/pages/ManagerPage.qml" line="158"/> <source>Transliterate messages</source> <translation>Transliterar mensajes</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="147"/> + <location filename="../qml/pages/ManagerPage.qml" line="159"/> <source>Messages are transliterated to ASCII before sending to Pebble</source> <translation>Codifica los mensajes entrates a ASCII antes de enviarlos a Pebble</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="156"/> + <location filename="../qml/pages/ManagerPage.qml" line="168"/> <source>Notifications</source> <translation>Notificaciones</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="164"/> + <location filename="../qml/pages/ManagerPage.qml" line="176"/> <source>Messaging</source> <translation>Mensajería</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="165"/> + <location filename="../qml/pages/ManagerPage.qml" line="177"/> <source>SMS and IM</source> <translation>SMS y chat</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="174"/> + <location filename="../qml/pages/ManagerPage.qml" line="186"/> <source>Missed call</source> <translation>Llamadas perdidas</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="183"/> + <location filename="../qml/pages/ManagerPage.qml" line="195"/> <source>Emails</source> <translation>Correos electrónicos</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="192"/> + <location filename="../qml/pages/ManagerPage.qml" line="204"/> <source>Mitakuuluu</source> <translation></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="201"/> + <location filename="../qml/pages/ManagerPage.qml" line="213"/> <source>Twitter</source> <translation>Twitter</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="211"/> + <location filename="../qml/pages/ManagerPage.qml" line="223"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="220"/> + <location filename="../qml/pages/ManagerPage.qml" line="232"/> <source>Other notifications</source> <translation>Resto de notificaciones</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="229"/> + <location filename="../qml/pages/ManagerPage.qml" line="241"/> <source>All notifications</source> <translation>Todas las notificaciones</translation> </message> diff --git a/app/translations/pebble-pl.ts b/app/translations/pebble-pl.ts index 407c5e9..7163310 100644 --- a/app/translations/pebble-pl.ts +++ b/app/translations/pebble-pl.ts @@ -65,32 +65,55 @@ <context> <name>AppStorePage</name> <message> - <location filename="../qml/pages/AppStorePage.qml" line="25"/> + <location filename="../qml/pages/AppStorePage.qml" line="27"/> <source>Logout</source> <translation>Wyloguj</translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="38"/> + <location filename="../qml/pages/AppStorePage.qml" line="29"/> + <source>Logging out...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="36"/> + <source>Hide search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="36"/> + <source>Show search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="49"/> <source>Pebble Appstore</source> <translation>Pebble Appstore</translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="45"/> + <location filename="../qml/pages/AppStorePage.qml" line="78"/> + <source>Apps</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="86"/> + <source>Faces</source> + <translation type="unfinished"></translation> + </message> + <message> <source>WatchApps</source> - <translation>Aplikacje</translation> + <translation type="vanished">Aplikacje</translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="51"/> <source>WatchFaces</source> - <translation>Cyferblaty</translation> + <translation type="vanished">Cyferblaty</translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="66"/> + <location filename="../qml/pages/AppStorePage.qml" line="109"/> <source>Downloading...</source> <translation>Pobieranie...</translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="94"/> + <location filename="../qml/pages/AppStorePage.qml" line="141"/> <source>Downloading %1...</source> <translation>Pobieranie %1...</translation> </message> @@ -176,14 +199,12 @@ <context> <name>FirmwareUpgrade</name> <message> - <location filename="../qml/pages/FirmwareUpgrade.qml" line="30"/> <source>Firmware upgrade</source> - <translation>Aktualizacja firmware</translation> + <translation type="vanished">Aktualizacja firmware</translation> </message> <message> - <location filename="../qml/pages/FirmwareUpgrade.qml" line="66"/> <source>Begin upgrade</source> - <translation>Rozpocznij aktualizację</translation> + <translation type="vanished">Rozpocznij aktualizację</translation> </message> </context> <context> @@ -212,164 +233,177 @@ <context> <name>ManagerPage</name> <message> - <location filename="../qml/pages/ManagerPage.qml" line="35"/> + <location filename="../qml/pages/ManagerPage.qml" line="56"/> <source>Pebble Appstore</source> <translation>Pebble Appstore</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="39"/> + <location filename="../qml/pages/ManagerPage.qml" line="60"/> <source>About</source> <translation>Informacje</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="50"/> + <location filename="../qml/pages/ManagerPage.qml" line="71"/> <source>Pebble Manager</source> <translation>Pebble Manager</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="57"/> + <location filename="../qml/pages/ManagerPage.qml" line="78"/> <source>Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings.</source> <translation>Oczekiwanie na zegarek... Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany w ustawieniach Bluetooth.</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="78"/> + <location filename="../qml/pages/ManagerPage.qml" line="99"/> <source>Service</source> <translation>Usługa</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="106"/> <source>Enabled</source> <translation>Włączona</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="86"/> + <location filename="../qml/pages/ManagerPage.qml" line="107"/> <source>Automatic startup</source> <translation>Start automatyczny</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="86"/> + <location filename="../qml/pages/ManagerPage.qml" line="107"/> <source>Manual startup</source> <translation>Start ręczny</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="113"/> <source>Active</source> <translation>Aktywna</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="93"/> + <location filename="../qml/pages/ManagerPage.qml" line="114"/> <source>Running</source> <translation>Pracuje</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="93"/> + <location filename="../qml/pages/ManagerPage.qml" line="114"/> <source>Dead</source> <translation>Martwa</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="120"/> <source>Connection</source> <translation>Połączenie</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="100"/> + <location filename="../qml/pages/ManagerPage.qml" line="121"/> + <location filename="../qml/pages/ManagerPage.qml" line="259"/> <source>Connected</source> <translation>Połączony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="100"/> + <location filename="../qml/pages/ManagerPage.qml" line="121"/> + <location filename="../qml/pages/ManagerPage.qml" line="280"/> <source>Disconnected</source> <translation>Rozłączony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="113"/> + <location filename="../qml/pages/ManagerPage.qml" line="134"/> <source>Settings</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="120"/> + <location filename="../qml/pages/ManagerPage.qml" line="141"/> <source>Forward phone calls</source> <translation>Przekazuj telefony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="128"/> + <location filename="../qml/pages/ManagerPage.qml" line="251"/> + <source>Profiles</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManagerPage.qml" line="262"/> + <location filename="../qml/pages/ManagerPage.qml" line="273"/> + <location filename="../qml/pages/ManagerPage.qml" line="283"/> + <location filename="../qml/pages/ManagerPage.qml" line="294"/> + <source>no change</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Silent when connected</source> - <translation>Cichy gdy połączony</translation> + <translation type="vanished">Cichy gdy połączony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="129"/> <source>Sets phone profile to "silent" when Pebble is connected</source> - <translation>Ustawia "cichy" profil telefonu gdy Pebble jest połączony</translation> + <translation type="vanished">Ustawia "cichy" profil telefonu gdy Pebble jest połączony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <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="138"/> + <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="146"/> + <location filename="../qml/pages/ManagerPage.qml" line="158"/> <source>Transliterate messages</source> <translation>Transliteracja wiadomości</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="147"/> + <location filename="../qml/pages/ManagerPage.qml" line="159"/> <source>Messages are transliterated to ASCII before sending to Pebble</source> <translation>Wiadomości są transliterowane do ASCII przed wysłaniem do Pebble</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="156"/> + <location filename="../qml/pages/ManagerPage.qml" line="168"/> <source>Notifications</source> <translation>Powiadomienia</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="164"/> + <location filename="../qml/pages/ManagerPage.qml" line="176"/> <source>Messaging</source> <translation>Wiadomości</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="165"/> + <location filename="../qml/pages/ManagerPage.qml" line="177"/> <source>SMS and IM</source> <translation>SMS i IM</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="174"/> + <location filename="../qml/pages/ManagerPage.qml" line="186"/> <source>Missed call</source> <translation>Ominięte telefony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="183"/> + <location filename="../qml/pages/ManagerPage.qml" line="195"/> <source>Emails</source> <translation>Emaile</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="192"/> + <location filename="../qml/pages/ManagerPage.qml" line="204"/> <source>Mitakuuluu</source> <translation>Mitakuuluu</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="201"/> + <location filename="../qml/pages/ManagerPage.qml" line="213"/> <source>Twitter</source> <translation>Twitter</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="211"/> + <location filename="../qml/pages/ManagerPage.qml" line="223"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="220"/> + <location filename="../qml/pages/ManagerPage.qml" line="232"/> <source>Other notifications</source> <translation>Pozostałe powiadomienia</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="229"/> + <location filename="../qml/pages/ManagerPage.qml" line="241"/> <source>All notifications</source> <translation>Wszystkie powiadomienia</translation> </message> diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index f1679e1..755956e 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -65,32 +65,47 @@ <context> <name>AppStorePage</name> <message> - <location filename="../qml/pages/AppStorePage.qml" line="25"/> + <location filename="../qml/pages/AppStorePage.qml" line="27"/> <source>Logout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="38"/> + <location filename="../qml/pages/AppStorePage.qml" line="29"/> + <source>Logging out...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="36"/> + <source>Hide search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="36"/> + <source>Show search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/AppStorePage.qml" line="49"/> <source>Pebble Appstore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="45"/> - <source>WatchApps</source> + <location filename="../qml/pages/AppStorePage.qml" line="78"/> + <source>Apps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="51"/> - <source>WatchFaces</source> + <location filename="../qml/pages/AppStorePage.qml" line="86"/> + <source>Faces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="66"/> + <location filename="../qml/pages/AppStorePage.qml" line="109"/> <source>Downloading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/AppStorePage.qml" line="94"/> + <location filename="../qml/pages/AppStorePage.qml" line="141"/> <source>Downloading %1...</source> <translation type="unfinished"></translation> </message> @@ -142,19 +157,6 @@ </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"/> @@ -180,163 +182,168 @@ <context> <name>ManagerPage</name> <message> - <location filename="../qml/pages/ManagerPage.qml" line="35"/> + <location filename="../qml/pages/ManagerPage.qml" line="56"/> <source>Pebble Appstore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="39"/> + <location filename="../qml/pages/ManagerPage.qml" line="60"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="50"/> + <location filename="../qml/pages/ManagerPage.qml" line="71"/> <source>Pebble Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="57"/> + <location filename="../qml/pages/ManagerPage.qml" line="78"/> <source>Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="78"/> + <location filename="../qml/pages/ManagerPage.qml" line="99"/> <source>Service</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="106"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="86"/> + <location filename="../qml/pages/ManagerPage.qml" line="107"/> <source>Automatic startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="86"/> + <location filename="../qml/pages/ManagerPage.qml" line="107"/> <source>Manual startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="113"/> <source>Active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="93"/> + <location filename="../qml/pages/ManagerPage.qml" line="114"/> <source>Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="93"/> + <location filename="../qml/pages/ManagerPage.qml" line="114"/> <source>Dead</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="120"/> <source>Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="100"/> + <location filename="../qml/pages/ManagerPage.qml" line="121"/> + <location filename="../qml/pages/ManagerPage.qml" line="259"/> <source>Connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="100"/> + <location filename="../qml/pages/ManagerPage.qml" line="121"/> + <location filename="../qml/pages/ManagerPage.qml" line="280"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="113"/> + <location filename="../qml/pages/ManagerPage.qml" line="134"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="120"/> + <location filename="../qml/pages/ManagerPage.qml" line="141"/> <source>Forward phone calls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="128"/> - <source>Silent when connected</source> + <location filename="../qml/pages/ManagerPage.qml" line="251"/> + <source>Profiles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="129"/> - <source>Sets phone profile to "silent" when Pebble is connected</source> + <location filename="../qml/pages/ManagerPage.qml" line="262"/> + <location filename="../qml/pages/ManagerPage.qml" line="273"/> + <location filename="../qml/pages/ManagerPage.qml" line="283"/> + <location filename="../qml/pages/ManagerPage.qml" line="294"/> + <source>no change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <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="138"/> + <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="146"/> + <location filename="../qml/pages/ManagerPage.qml" line="158"/> <source>Transliterate messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="147"/> + <location filename="../qml/pages/ManagerPage.qml" line="159"/> <source>Messages are transliterated to ASCII before sending to Pebble</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="156"/> + <location filename="../qml/pages/ManagerPage.qml" line="168"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="164"/> + <location filename="../qml/pages/ManagerPage.qml" line="176"/> <source>Messaging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="165"/> + <location filename="../qml/pages/ManagerPage.qml" line="177"/> <source>SMS and IM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="174"/> + <location filename="../qml/pages/ManagerPage.qml" line="186"/> <source>Missed call</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="183"/> + <location filename="../qml/pages/ManagerPage.qml" line="195"/> <source>Emails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="192"/> + <location filename="../qml/pages/ManagerPage.qml" line="204"/> <source>Mitakuuluu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="201"/> + <location filename="../qml/pages/ManagerPage.qml" line="213"/> <source>Twitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="211"/> + <location filename="../qml/pages/ManagerPage.qml" line="223"/> <source>Facebook</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="220"/> + <location filename="../qml/pages/ManagerPage.qml" line="232"/> <source>Other notifications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="229"/> + <location filename="../qml/pages/ManagerPage.qml" line="241"/> <source>All notifications</source> <translation type="unfinished"></translation> </message> diff --git a/daemon/manager.cpp b/daemon/manager.cpp index 567316e..262fb4b 100644 --- a/daemon/manager.cpp +++ b/daemon/manager.cpp @@ -24,7 +24,6 @@ Manager::Manager(Settings *settings, QObject *parent) : { connect(settings, SIGNAL(valueChanged(QString)), SLOT(onSettingChanged(const QString&))); connect(settings, SIGNAL(valuesChanged()), SLOT(onSettingsChanged())); - //connect(settings, SIGNAL(silentWhenConnectedChanged(bool)), SLOT(onSilentWhenConnectedChanged(bool))); // We don't need to handle presence changes, so report them separately and ignore them QMap<QString, QString> parameters; @@ -75,8 +74,6 @@ Manager::Manager(Settings *settings, QObject *parent) : connect(bank, &BankManager::slotsChanged, proxy, &PebbledProxy::AppSlotsChanged); connect(apps, &AppManager::appsChanged, proxy, &PebbledProxy::AllAppsChanged); - QString currentProfile = getCurrentProfile(); - defaultProfile = currentProfile.isEmpty() ? "ambience" : currentProfile; connect(watch, SIGNAL(connectedChanged()), SLOT(applyProfile())); // Set BT icon for notification @@ -259,38 +256,11 @@ void Manager::onEmailNotify(const QString &sender, const QString &data,const QSt watch->sendEmailNotification(sender, data, subject); } -QString Manager::getCurrentProfile() const -{ - QDBusReply<QString> profile = QDBusConnection::sessionBus().call( - QDBusMessage::createMethodCall("com.nokia.profiled", "/com/nokia/profiled", "com.nokia.profiled", "get_profile")); - if (profile.isValid()) { - QString currentProfile = profile.value(); - qCDebug(l) << "Got profile" << currentProfile; - return currentProfile; - } - - qCCritical(l) << profile.error().message(); - return QString(); -} - void Manager::applyProfile() { - QString currentProfile = getCurrentProfile(); - QString newProfile; - - if (settings->property("silentWhenConnected").toBool()) { - if (watch->isConnected() && currentProfile != "silent") { - newProfile = "silent"; - defaultProfile = currentProfile; - } - if (!watch->isConnected() && currentProfile == "silent" && defaultProfile != "silent") { - newProfile = defaultProfile; - } - } - else if (currentProfile != defaultProfile) { - newProfile = defaultProfile; - } - + QString newProfile = settings->property( + watch->isConnected() ? "profileWhenConnected" + : "profileWhenDisconnected").toString(); if (!newProfile.isEmpty()) { QDBusReply<bool> res = QDBusConnection::sessionBus().call( QDBusMessage::createMethodCall("com.nokia.profiled", "/com/nokia/profiled", "com.nokia.profiled", "set_profile") diff --git a/daemon/manager.h b/daemon/manager.h index de01dbb..2079de0 100644 --- a/daemon/manager.h +++ b/daemon/manager.h @@ -58,8 +58,6 @@ class Manager : public QObject, protected QDBusContext QContactManager *contacts; QContactDetailFilter numberFilter; - QString defaultProfile; - QUuid currentAppUuid; QScopedPointer<icu::Transliterator> transliterator; @@ -69,7 +67,6 @@ public: ~Manager(); QString findPersonByNumber(QString number); - QString getCurrentProfile() const; bool uploadFirmware(bool recovery, const QString &file); diff --git a/daemon/settings.h b/daemon/settings.h index 688b211..3c38473 100644 --- a/daemon/settings.h +++ b/daemon/settings.h @@ -7,7 +7,8 @@ class Settings : public MDConfGroup { Q_OBJECT - Q_PROPERTY(bool silentWhenConnected MEMBER silentWhenConnected NOTIFY silentWhenConnectedChanged) + Q_PROPERTY(QString profileWhenConnected MEMBER profileWhenConnected NOTIFY profileWhenConnectedChanged) + Q_PROPERTY(QString profileWhenDisconnected MEMBER profileWhenDisconnected NOTIFY profileWhenDisconnectedChanged) Q_PROPERTY(bool transliterateMessage MEMBER transliterateMessage NOTIFY transliterateMessageChanged) Q_PROPERTY(bool useSystemVolume MEMBER useSystemVolume NOTIFY useSystemVolumeChanged) Q_PROPERTY(bool incomingCallNotification MEMBER incomingCallNotification NOTIFY incomingCallNotificationChanged) @@ -21,7 +22,8 @@ class Settings : public MDConfGroup Q_PROPERTY(bool notificationsAll MEMBER notificationsAll NOTIFY notificationsAllChanged) Q_PROPERTY(QString accountToken MEMBER accountToken NOTIFY accountTokenChanged) - bool silentWhenConnected; + QString profileWhenConnected; + QString profileWhenDisconnected; bool transliterateMessage; bool useSystemVolume; bool incomingCallNotification; @@ -41,7 +43,8 @@ public: { resolveMetaObject(); } signals: - void silentWhenConnectedChanged(); + void profileWhenConnectedChanged(); + void profileWhenDisconnectedChanged(); void transliterateMessageChanged(); void useSystemVolumeChanged(); void incomingCallNotificationChanged(); diff --git a/rpm/pebble.spec b/rpm/pebble.spec index 4e99c28..790e11d 100644 --- a/rpm/pebble.spec +++ b/rpm/pebble.spec @@ -22,6 +22,7 @@ Source0: %{name}-%{version}.tar.xz Source100: pebble.yaml Requires: sailfishsilica-qt5 >= 0.10.9 Requires: systemd-user-session-targets +Requires: nemo-qml-plugin-dbus-qt5 BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Bluetooth) BuildRequires: pkgconfig(Qt5Contacts) diff --git a/rpm/pebble.yaml b/rpm/pebble.yaml index 60e02e6..8184281 100644 --- a/rpm/pebble.yaml +++ b/rpm/pebble.yaml @@ -27,6 +27,7 @@ PkgConfigBR: Requires: - sailfishsilica-qt5 >= 0.10.9 - systemd-user-session-targets +- nemo-qml-plugin-dbus-qt5 Files: - '%{_bindir}' - '%{_datadir}/%{name}/qml' |