Merge lp:~seb128/phone-app/ringtone-in-gsettings into lp:phone-app

[Sebastien Bacher]

store the ringtone and new message sounds in gsettings

store the ringtone and new message sounds in gsettings

[Sebastien Bacher (seb128)]

Those changes are making the sounds to use for call/messages to be read from gsettings/customizable, see https://bugs.launchpad.net/phone-app/+bug/1202253 for some details

Note that I've not been able to actual test the runtime behaviour, because I don't have a working phone with a SIM ... is there any way to simulate phone calls on a desktop? The code build and is working fine in a standalone test application.

[lp:~seb128/phone-app/ringtone-in-gsettings]

717. By Sebastien Bacher on 2013-07-25

store the ringtone and new message sounds in gsettings

[Lars Karlitski (larsu)]

> +find_library(QGSETTINGS_LIB gsettings-qt)

The cmake-foo is not strong with me, but I think you should use something like find_package here to pick up the pkg-config file.

> +#include <QGSettings/QGSettings>

This should only be "#include <QGSettings>". The pkgconfig file already points to the QGSettings directory, so that should work as soon as you pull in its cflags.

schemas/com.ubuntu.touch.phone-app.gschema.xml.in:
  * the summary and description for incoming-call-sound and incoming-message-sound are the same
  * the absolute paths are a bit weird - don't we have sound themes based on xdg dirs like we do for icons?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:717
http://jenkins.qa.ubuntu.com/job/phone-app-ci/171/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1548/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-i386-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1552/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/171/rebuild

review: Needs Fixing (continuous-integration)

[lp:~seb128/phone-app/ringtone-in-gsettings]

718. By Sebastien Bacher on 2013-07-25

use correct include

[Sebastien Bacher (seb128)]

> The cmake-foo is not strong with me, but I think you should use something like find_package here to pick up > the pkg-config file.

Thanks ... the new gsettings-qt (which features a .pc) was not available in saucy yet when I started and I though there was no .pc to use ... fixed that in r719

> This should only be "#include <QGSettings>". The pkgconfig file already points to the QGSettings directory, so that should work as soon as you pull in its cflags.

Thanks, that was a side-effect of not having the pkgconfig, fixed in r718

> schemas/com.ubuntu.touch.phone-app.gschema.xml.in:
> * the summary and description for incoming-call-sound and incoming-message-sound are the same

Fixed that one as well

> * the absolute paths are a bit weird - don't we have sound themes based on xdg dirs like we do for icons?

I've no strong opinion, I went with the current approch since it allows to set a file anywhere on disk (e.g a music from your xdg music dir), I'm not sure if you can do that with the theme spec.

I think the spec makes sense for system effects for example, maybe not in that "custom sound" case

[lp:~seb128/phone-app/ringtone-in-gsettings]

719. By Sebastien Bacher on 2013-07-25

use pkgconfig since gsettings-qt just got one

[Lars Karlitski (larsu)]

> I've no strong opinion, I went with the current approch since it allows to set
> a file anywhere on disk (e.g a music from your xdg music dir), I'm not sure if
> you can do that with the theme spec.
>
> I think the spec makes sense for system effects for example, maybe not in that
> "custom sound" case

Okay, that makes sense.

Thanks for the quick fixes. Looks good to me now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:719
http://jenkins.qa.ubuntu.com/job/phone-app-ci/172/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1555/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-i386-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1559/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/172/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

719. By Sebastien Bacher on 2013-07-25

use pkgconfig since gsettings-qt just got one

718. By Sebastien Bacher on 2013-07-25

use correct include

717. By Sebastien Bacher on 2013-07-25

store the ringtone and new message sounds in gsettings

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-24 13:08:32 +0000
+++ CMakeLists.txt	2013-07-25 16:20:35 +0000
@@ -62,6 +62,7 @@
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(NOTIFY REQUIRED libnotify)
 pkg_check_modules(MESSAGING_MENU REQUIRED messaging-menu)
+pkg_check_modules(GSETTINGS REQUIRED gsettings-qt)
 
 # Check if the messaging menu has the message header
 set(CMAKE_REQUIRED_INCLUDES ${MESSAGING_MENU_INCLUDE_DIRS})
@@ -89,3 +90,4 @@
 add_subdirectory(icons)
 add_subdirectory(tests)
 add_subdirectory(po)
+add_subdirectory(schemas)

=== added file 'cmake/modules/UseGSettings.cmake'
--- cmake/modules/UseGSettings.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/UseGSettings.cmake	2013-07-25 16:20:35 +0000
@@ -0,0 +1,23 @@
+# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
+
+macro(add_schema SCHEMA_NAME)
+
+    set(PKG_CONFIG_EXECUTABLE pkg-config)
+    set(GSETTINGS_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/glib-2.0/schemas")
+
+    # Run the validator and error if it fails
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_compile_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process (COMMAND ${_glib_compile_schemas} --dry-run --schema-file=${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if (_schemas_invalid)
+      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
+    endif (_schemas_invalid)
+
+    # Actually install and recomple schemas
+    message (STATUS "${GSETTINGS_DIR} is the GSettings install dir")
+    install (FILES ${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
+
+    install (CODE "message (STATUS \"Compiling GSettings schemas\")")
+    install (CODE "execute_process (COMMAND ${_glib_compile_schemas} ${GSETTINGS_DIR})")
+endmacro()
+

=== modified file 'debian/control'
--- debian/control	2013-06-27 13:27:53 +0000
+++ debian/control	2013-07-25 16:20:35 +0000
@@ -7,6 +7,8 @@
                dh-translations,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
+               libglib2.0-dev,
+               libgsettings-qt-dev,
                libicu-dev,
                libmessaging-menu-dev,
                libnotify-dev,

=== modified file 'debian/phone-app.install'
--- debian/phone-app.install	2013-05-24 13:08:32 +0000
+++ debian/phone-app.install	2013-07-25 16:20:35 +0000
@@ -2,6 +2,7 @@
 etc/xdg/autostart/phone-app-approver.desktop
 usr/share/icons/hicolor/*/apps/phone-app*.png
 usr/share/icons/ubuntu-mono-dark/status/*/indicator-call.svg
+usr/share/glib-2.0
 usr/share/applications/phone-app*.desktop
 usr/share/dbus-1/services/*PhoneApp*.service
 usr/share/notify-osd/icons/gnome/scalable/status/notification-unknown-call.svg

=== modified file 'libphoneapp/CMakeLists.txt'
--- libphoneapp/CMakeLists.txt	2013-04-03 19:25:46 +0000
+++ libphoneapp/CMakeLists.txt	2013-07-25 16:20:35 +0000
@@ -21,11 +21,12 @@
     ${TPL_QT5_INCLUDE_DIRS}
     ${QTGLIB_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
+    ${GSETTINGS_INCLUDE_DIRS}
     )
 
 
 add_library(phoneapp STATIC ${library_SRCS} ${library_HDRS})
-target_link_libraries(phoneapp ${TP_QT5_LIBRARIES})
+target_link_libraries(phoneapp ${TP_QT5_LIBRARIES} ${GSETTINGS_LIBRARIES})
 
 qt5_use_modules(phoneapp Contacts Core DBus Multimedia Qml Quick)
 

=== modified file 'libphoneapp/ringtone.cpp'
--- libphoneapp/ringtone.cpp	2013-03-11 22:22:35 +0000
+++ libphoneapp/ringtone.cpp	2013-07-25 16:20:35 +0000
@@ -22,12 +22,11 @@
 #include "ringtone.h"
 #include <QDebug>
 
-#define SOUND_PATH "/usr/share/sounds/ubuntu/stereo/"
 Ringtone::Ringtone(QObject *parent) :
     QObject(parent),
-    mCallAudioPlayer(this), mCallAudioPlaylist(this), mMessageAudioPlayer(this)
+    mCallAudioPlayer(this), mCallAudioPlaylist(this), mMessageAudioPlayer(this), mSoundSettings("com.ubuntu.touch.phone-app")
 {
-    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(SOUND_PATH "phone-incoming-call.ogg"));
+    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(mSoundSettings.get("incomingCallSound").toString()));
     mCallAudioPlaylist.setPlaybackMode(QMediaPlaylist::Loop);
     mCallAudioPlaylist.setCurrentIndex(0);
 }
@@ -60,7 +59,7 @@
         return;
     }
 
-    mMessageAudioPlayer.setMedia(QUrl::fromLocalFile(SOUND_PATH "message-new-instant.ogg"));
+    mMessageAudioPlayer.setMedia(QUrl::fromLocalFile(mSoundSettings.get("incomingMessageSound").toString()));
     mMessageAudioPlayer.play();
 }
 

=== modified file 'libphoneapp/ringtone.h'
--- libphoneapp/ringtone.h	2013-03-11 22:22:35 +0000
+++ libphoneapp/ringtone.h	2013-07-25 16:20:35 +0000
@@ -22,6 +22,7 @@
 #ifndef RINGTONE_H
 #define RINGTONE_H
 
+#include <QGSettings>
 #include <QObject>
 #include <QMediaPlayer>
 #include <QMediaPlaylist>
@@ -47,6 +48,7 @@
     QMediaPlaylist mCallAudioPlaylist;
 
     QMediaPlayer mMessageAudioPlayer;
+    QGSettings mSoundSettings;
 };
 
 #endif // RINGTONE_H

=== added directory 'schemas'
=== added file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ schemas/CMakeLists.txt	2013-07-25 16:20:35 +0000
@@ -0,0 +1,18 @@
+include (UseGSettings)
+
+##
+##  GSettings schema
+##
+
+set (SCHEMA_NAME "com.ubuntu.touch.phone-app.gschema.xml")
+set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
+set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
+
+# generate the .xml file using intltool
+set (ENV{LC_ALL} "C") 
+execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}")
+
+# let UseGSettings do the rest
+add_schema (${SCHEMA_FILE})
+
+

=== added file 'schemas/com.ubuntu.touch.phone-app.gschema.xml.in'
--- schemas/com.ubuntu.touch.phone-app.gschema.xml.in	1970-01-01 00:00:00 +0000
+++ schemas/com.ubuntu.touch.phone-app.gschema.xml.in	2013-07-25 16:20:35 +0000
@@ -0,0 +1,15 @@
+<schemalist>
+    <schema id="com.ubuntu.touch.phone-app" path="/com/ubuntu/touch/phone-app/">
+        <key name="incoming-call-sound" type="s">
+            <default>"/usr/share/sounds/ubuntu/stereo/phone-incoming-call.ogg"</default>
+            <_summary>Ringtone sound for the phone application.</_summary>
+            <_description>This sound file is played, on incoming calls, by the phone application.</_description>
+        </key>
+        <key name="incoming-message-sound" type="s">
+            <default>"/usr/share/sounds/ubuntu/stereo/message-new-instant.ogg"</default>
+            <_summary>Incoming message sound for the phone application.</_summary>
+            <_description>This sound file is played, on incoming messages, by the phone application.</_description>
+        </key>
+    </schema>
+</schemalist>
+