diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2015-04-19 18:17:02 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2015-04-19 18:17:02 +0200 |
| commit | 6da5f1039ed113dcf11b0347e6d2dbd5432c3d33 (patch) | |
| tree | dd48e39b01ff098c9e1059acceb0b36127f15b37 /app | |
| parent | 8bb7a35eedd431f707ca6fb9134c35bace8e4b24 (diff) | |
Support option for system volume control
Add support for direct PulseAudio volume control instead of through
MPRIS, which doesn't currently work. Default enabled, added setting to
disable.
Diffstat (limited to 'app')
| -rw-r--r-- | app/qml/pages/ManagerPage.qml | 10 | ||||
| -rw-r--r-- | app/translations/pebble-es.ts | 70 | ||||
| -rw-r--r-- | app/translations/pebble-pl.ts | 70 | ||||
| -rw-r--r-- | app/translations/pebble.ts | 70 |
4 files changed, 130 insertions, 90 deletions
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index 894797d..7fb7369 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -11,6 +11,7 @@ Page { path: "/org/pebbled/settings" property bool silentWhenConnected: false property bool transliterateMessage: false + property bool useSystemVolume: true property bool incomingCallNotification: true property bool notificationsCommhistoryd: true property bool notificationsMissedCall: true @@ -133,6 +134,15 @@ 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.") + checked: settings.useSystemVolume + automaticCheck: true + onClicked: { + settings.useSystemVolume = !settings.useSystemVolume; + } + } + TextSwitch { text: qsTr("Transliterate messages") description: qsTr("Messages are transliterated to ASCII before sending to Pebble") checked: settings.transliterateMessage diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index 6bdb778..38a8cc4 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -174,154 +174,164 @@ <context> <name>ManagerPage</name> <message> - <location filename="../qml/pages/ManagerPage.qml" line="34"/> + <location filename="../qml/pages/ManagerPage.qml" line="35"/> <source>Pebble Appstore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="38"/> + <location filename="../qml/pages/ManagerPage.qml" line="39"/> <source>About</source> <translation>Acerca de</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="49"/> + <location filename="../qml/pages/ManagerPage.qml" line="50"/> <source>Pebble Manager</source> <translation></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="56"/> + <location filename="../qml/pages/ManagerPage.qml" line="57"/> <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="77"/> + <location filename="../qml/pages/ManagerPage.qml" line="78"/> <source>Service</source> <translation>Servicio</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="84"/> + <location filename="../qml/pages/ManagerPage.qml" line="85"/> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="86"/> <source>Automatic startup</source> <translation>Inicio automático</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="86"/> <source>Manual startup</source> <translation>Inicio manual</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="91"/> + <location filename="../qml/pages/ManagerPage.qml" line="92"/> <source>Active</source> <translation>Activo</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="93"/> <source>Running</source> <translation>Ejecutándose</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="93"/> <source>Dead</source> <translation>Detenido</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="98"/> + <location filename="../qml/pages/ManagerPage.qml" line="99"/> <source>Connection</source> <translation>Conexión</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="100"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="100"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="112"/> + <location filename="../qml/pages/ManagerPage.qml" line="113"/> <source>Settings</source> <translation>Configuración</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="119"/> + <location filename="../qml/pages/ManagerPage.qml" line="120"/> <source>Forward phone calls</source> <translation>Transferir llamadas</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="127"/> + <location filename="../qml/pages/ManagerPage.qml" line="128"/> <source>Silent when connected</source> <translation>Modo silencio automático</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="128"/> + <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> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="136"/> + <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <source>Control main volume</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManagerPage.qml" line="138"/> + <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"/> <source>Transliterate messages</source> <translation>Transliterar mensajes</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <location filename="../qml/pages/ManagerPage.qml" line="147"/> <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="146"/> + <location filename="../qml/pages/ManagerPage.qml" line="156"/> <source>Notifications</source> <translation>Notificaciones</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="154"/> + <location filename="../qml/pages/ManagerPage.qml" line="164"/> <source>Messaging</source> <translation>Mensajería</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="155"/> + <location filename="../qml/pages/ManagerPage.qml" line="165"/> <source>SMS and IM</source> <translation>SMS y chat</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="164"/> + <location filename="../qml/pages/ManagerPage.qml" line="174"/> <source>Missed call</source> <translation>Llamadas perdidas</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="173"/> + <location filename="../qml/pages/ManagerPage.qml" line="183"/> <source>Emails</source> <translation>Correos electrónicos</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="182"/> + <location filename="../qml/pages/ManagerPage.qml" line="192"/> <source>Mitakuuluu</source> <translation></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="191"/> + <location filename="../qml/pages/ManagerPage.qml" line="201"/> <source>Twitter</source> <translation>Twitter</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="201"/> + <location filename="../qml/pages/ManagerPage.qml" line="211"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="210"/> + <location filename="../qml/pages/ManagerPage.qml" line="220"/> <source>Other notifications</source> <translation>Resto de notificaciones</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="219"/> + <location filename="../qml/pages/ManagerPage.qml" line="229"/> <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 ebe4f1a..11285ee 100644 --- a/app/translations/pebble-pl.ts +++ b/app/translations/pebble-pl.ts @@ -194,154 +194,164 @@ <context> <name>ManagerPage</name> <message> - <location filename="../qml/pages/ManagerPage.qml" line="34"/> + <location filename="../qml/pages/ManagerPage.qml" line="35"/> <source>Pebble Appstore</source> <translation>Pebble Appstore</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="38"/> + <location filename="../qml/pages/ManagerPage.qml" line="39"/> <source>About</source> <translation>Informacje</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="49"/> + <location filename="../qml/pages/ManagerPage.qml" line="50"/> <source>Pebble Manager</source> <translation>Pebble Manager</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="56"/> + <location filename="../qml/pages/ManagerPage.qml" line="57"/> <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="77"/> + <location filename="../qml/pages/ManagerPage.qml" line="78"/> <source>Service</source> <translation>Usługa</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="84"/> + <location filename="../qml/pages/ManagerPage.qml" line="85"/> <source>Enabled</source> <translation>Włączona</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="86"/> <source>Automatic startup</source> <translation>Start automatyczny</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="86"/> <source>Manual startup</source> <translation>Start ręczny</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="91"/> + <location filename="../qml/pages/ManagerPage.qml" line="92"/> <source>Active</source> <translation>Aktywna</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="93"/> <source>Running</source> <translation>Pracuje</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="93"/> <source>Dead</source> <translation>Martwa</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="98"/> + <location filename="../qml/pages/ManagerPage.qml" line="99"/> <source>Connection</source> <translation>Połączenie</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="100"/> <source>Connected</source> <translation>Połączony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="100"/> <source>Disconnected</source> <translation>Rozłączony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="112"/> + <location filename="../qml/pages/ManagerPage.qml" line="113"/> <source>Settings</source> <translation>Ustawienia</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="119"/> + <location filename="../qml/pages/ManagerPage.qml" line="120"/> <source>Forward phone calls</source> <translation>Przekazuj telefony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="127"/> + <location filename="../qml/pages/ManagerPage.qml" line="128"/> <source>Silent when connected</source> <translation>Cichy gdy połączony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="128"/> + <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> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="136"/> + <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <source>Control main volume</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManagerPage.qml" line="138"/> + <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"/> <source>Transliterate messages</source> <translation>Transliteracja wiadomości</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <location filename="../qml/pages/ManagerPage.qml" line="147"/> <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="146"/> + <location filename="../qml/pages/ManagerPage.qml" line="156"/> <source>Notifications</source> <translation>Powiadomienia</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="154"/> + <location filename="../qml/pages/ManagerPage.qml" line="164"/> <source>Messaging</source> <translation>Wiadomości</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="155"/> + <location filename="../qml/pages/ManagerPage.qml" line="165"/> <source>SMS and IM</source> <translation>SMS i IM</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="164"/> + <location filename="../qml/pages/ManagerPage.qml" line="174"/> <source>Missed call</source> <translation>Ominięte telefony</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="173"/> + <location filename="../qml/pages/ManagerPage.qml" line="183"/> <source>Emails</source> <translation>Emaile</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="182"/> + <location filename="../qml/pages/ManagerPage.qml" line="192"/> <source>Mitakuuluu</source> <translation>Mitakuuluu</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="191"/> + <location filename="../qml/pages/ManagerPage.qml" line="201"/> <source>Twitter</source> <translation>Twitter</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="201"/> + <location filename="../qml/pages/ManagerPage.qml" line="211"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="210"/> + <location filename="../qml/pages/ManagerPage.qml" line="220"/> <source>Other notifications</source> <translation>Pozostałe powiadomienia</translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="219"/> + <location filename="../qml/pages/ManagerPage.qml" line="229"/> <source>All notifications</source> <translation>Wszystkie powiadomienia</translation> </message> diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index 24f2352..cd7ba8b 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -162,153 +162,163 @@ <context> <name>ManagerPage</name> <message> - <location filename="../qml/pages/ManagerPage.qml" line="34"/> + <location filename="../qml/pages/ManagerPage.qml" line="35"/> <source>Pebble Appstore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="38"/> + <location filename="../qml/pages/ManagerPage.qml" line="39"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="49"/> + <location filename="../qml/pages/ManagerPage.qml" line="50"/> <source>Pebble Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="56"/> + <location filename="../qml/pages/ManagerPage.qml" line="57"/> <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="77"/> + <location filename="../qml/pages/ManagerPage.qml" line="78"/> <source>Service</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="84"/> + <location filename="../qml/pages/ManagerPage.qml" line="85"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="86"/> <source>Automatic startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="85"/> + <location filename="../qml/pages/ManagerPage.qml" line="86"/> <source>Manual startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="91"/> + <location filename="../qml/pages/ManagerPage.qml" line="92"/> <source>Active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="93"/> <source>Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="92"/> + <location filename="../qml/pages/ManagerPage.qml" line="93"/> <source>Dead</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="98"/> + <location filename="../qml/pages/ManagerPage.qml" line="99"/> <source>Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="100"/> <source>Connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="99"/> + <location filename="../qml/pages/ManagerPage.qml" line="100"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="112"/> + <location filename="../qml/pages/ManagerPage.qml" line="113"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="119"/> + <location filename="../qml/pages/ManagerPage.qml" line="120"/> <source>Forward phone calls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="127"/> + <location filename="../qml/pages/ManagerPage.qml" line="128"/> <source>Silent when connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="128"/> + <location filename="../qml/pages/ManagerPage.qml" line="129"/> <source>Sets phone profile to "silent" when Pebble is connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="136"/> + <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <source>Control main volume</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/pages/ManagerPage.qml" line="138"/> + <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"/> <source>Transliterate messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="137"/> + <location filename="../qml/pages/ManagerPage.qml" line="147"/> <source>Messages are transliterated to ASCII before sending to Pebble</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="146"/> + <location filename="../qml/pages/ManagerPage.qml" line="156"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="154"/> + <location filename="../qml/pages/ManagerPage.qml" line="164"/> <source>Messaging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="155"/> + <location filename="../qml/pages/ManagerPage.qml" line="165"/> <source>SMS and IM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="164"/> + <location filename="../qml/pages/ManagerPage.qml" line="174"/> <source>Missed call</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="173"/> + <location filename="../qml/pages/ManagerPage.qml" line="183"/> <source>Emails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="182"/> + <location filename="../qml/pages/ManagerPage.qml" line="192"/> <source>Mitakuuluu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="191"/> + <location filename="../qml/pages/ManagerPage.qml" line="201"/> <source>Twitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="201"/> + <location filename="../qml/pages/ManagerPage.qml" line="211"/> <source>Facebook</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="210"/> + <location filename="../qml/pages/ManagerPage.qml" line="220"/> <source>Other notifications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ManagerPage.qml" line="219"/> + <location filename="../qml/pages/ManagerPage.qml" line="229"/> <source>All notifications</source> <translation type="unfinished"></translation> </message> |
