Merge lp:~seb128/ubuntu-system-settings/sound-custom-ringtones into lp:ubuntu-system-settings

[Sebastien Bacher]

[sound] list custom ringtones as well

[sound] list custom ringtones as well

[lp:~seb128/ubuntu-system-settings/sound-custom-ringtones]

1134. By Sebastien Bacher on 2014-10-16

typo fix

[Iain Lane (laney)]

Ok, I did my suggested fix which I'll propose as a branch on top and you can take or not

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1647/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7253
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4450
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4450/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1647/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/sound/SoundsList.qml'
--- plugins/sound/SoundsList.qml	2014-09-05 20:17:34 +0000
+++ plugins/sound/SoundsList.qml	2014-10-16 16:55:16 +0000
@@ -11,10 +11,7 @@
 ItemPage {
     property variant soundDisplayNames:
         Utilities.buildSoundValues(soundFileNames)
-    property variant soundFileNames:
-        backendInfo.listSounds(soundsDir).map(function (sound) {
-            return soundsDir+sound
-        })
+    property variant soundFileNames: backendInfo.listSounds(soundsDir)
     property bool showStopButton: false
     property int soundType // 0: ringtone, 1: message
     property string soundsDir

=== modified file 'plugins/sound/sound.cpp'
--- plugins/sound/sound.cpp	2014-08-28 17:33:40 +0000
+++ plugins/sound/sound.cpp	2014-10-16 16:55:16 +0000
@@ -210,13 +210,40 @@
     Q_EMIT(dialpadSoundsEnabledChanged());
 }
 
+QStringList soundsListFromDir(const QString &dirString)
+{
+    QDir soundsDir(dirString);
+
+    if (soundsDir.exists())
+    {
+        QStringList soundsList;
+
+        soundsDir.setFilter(QDir::Files | QDir::NoSymLinks);
+
+        for (uint i=0; i < soundsDir.count(); i++)
+            soundsList.append(soundsDir.absoluteFilePath(soundsDir[i])) ;
+        return soundsList;
+    }
+    return QStringList();
+}
+
+bool sortSoundsList(const QString &s1, const QString &s2)
+ {
+    return QFileInfo(s1).fileName() < QFileInfo(s2).fileName();
+}
+
+/* List soundfiles in a directory and the corresponding /custom one,
+ * which is what is used for oem customization, return a list of
+ * the fullpaths to those sounds, sorted by name */
 QStringList Sound::listSounds(const QString &dirString)
 {
     if (m_soundsList.isEmpty())
     {
-        QDir soundsDir(dirString);
-        soundsDir.setFilter(QDir::Files | QDir::NoSymLinks);
-        m_soundsList = soundsDir.entryList();
+        m_soundsList = soundsListFromDir(dirString);
+        m_soundsList.append(soundsListFromDir("/custom" + dirString));
+
+        qSort(m_soundsList.begin(), m_soundsList.end(), sortSoundsList);
     }
+
     return m_soundsList;
 }