From 6da5f1039ed113dcf11b0347e6d2dbd5432c3d33 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Sun, 19 Apr 2015 18:17:02 +0200 Subject: 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. --- app/qml/pages/ManagerPage.qml | 10 +++++++ app/translations/pebble-es.ts | 70 ++++++++++++++++++++++++------------------- app/translations/pebble-pl.ts | 70 ++++++++++++++++++++++++------------------- app/translations/pebble.ts | 70 ++++++++++++++++++++++++------------------- 4 files changed, 130 insertions(+), 90 deletions(-) (limited to 'app') 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 @@ -132,6 +133,15 @@ Page { 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 + automaticCheck: true + onClicked: { + settings.useSystemVolume = !settings.useSystemVolume; + } + } TextSwitch { text: qsTr("Transliterate messages") description: qsTr("Messages are transliterated to ASCII before sending to Pebble") 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 @@ ManagerPage - + Pebble Appstore - + About Acerca de - + Pebble Manager - + Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings. Buscando el reloj Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente. - + Service Servicio - + Enabled Habilitado - + Automatic startup Inicio automático - + Manual startup Inicio manual - + Active Activo - + Running Ejecutándose - + Dead Detenido - + Connection Conexión - + Connected Conectado - + Disconnected Desconectado - + Settings Configuración - + Forward phone calls Transferir llamadas - + Silent when connected Modo silencio automático - + Sets phone profile to "silent" when Pebble is connected Activa el modo silencio cuando se conecte un Pebble - + + Control main volume + + + + + Pebble music volume buttons change the main phone volume directly instead of through the music player. + + + + Transliterate messages Transliterar mensajes - + Messages are transliterated to ASCII before sending to Pebble Codifica los mensajes entrates a ASCII antes de enviarlos a Pebble - + Notifications Notificaciones - + Messaging Mensajería - + SMS and IM SMS y chat - + Missed call Llamadas perdidas - + Emails Correos electrónicos - + Mitakuuluu - + Twitter Twitter - + Facebook Facebook - + Other notifications Resto de notificaciones - + All notifications Todas las notificaciones 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 @@ ManagerPage - + Pebble Appstore Pebble Appstore - + About Informacje - + Pebble Manager Pebble Manager - + Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings. Oczekiwanie na zegarek... Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany w ustawieniach Bluetooth. - + Service Usługa - + Enabled Włączona - + Automatic startup Start automatyczny - + Manual startup Start ręczny - + Active Aktywna - + Running Pracuje - + Dead Martwa - + Connection Połączenie - + Connected Połączony - + Disconnected Rozłączony - + Settings Ustawienia - + Forward phone calls Przekazuj telefony - + Silent when connected Cichy gdy połączony - + Sets phone profile to "silent" when Pebble is connected Ustawia "cichy" profil telefonu gdy Pebble jest połączony - + + Control main volume + + + + + Pebble music volume buttons change the main phone volume directly instead of through the music player. + + + + Transliterate messages Transliteracja wiadomości - + Messages are transliterated to ASCII before sending to Pebble Wiadomości są transliterowane do ASCII przed wysłaniem do Pebble - + Notifications Powiadomienia - + Messaging Wiadomości - + SMS and IM SMS i IM - + Missed call Ominięte telefony - + Emails Emaile - + Mitakuuluu Mitakuuluu - + Twitter Twitter - + Facebook Facebook - + Other notifications Pozostałe powiadomienia - + All notifications Wszystkie powiadomienia 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 @@ ManagerPage - + Pebble Appstore - + About - + Pebble Manager - + Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings. - + Service - + Enabled - + Automatic startup - + Manual startup - + Active - + Running - + Dead - + Connection - + Connected - + Disconnected - + Settings - + Forward phone calls - + Silent when connected - + Sets phone profile to "silent" when Pebble is connected - + + Control main volume + + + + + Pebble music volume buttons change the main phone volume directly instead of through the music player. + + + + Transliterate messages - + Messages are transliterated to ASCII before sending to Pebble - + Notifications - + Messaging - + SMS and IM - + Missed call - + Emails - + Mitakuuluu - + Twitter - + Facebook - + Other notifications - + All notifications -- cgit v1.2.3