Merge lp:~seb128/ubuntu-system-settings/sound-display-names into lp:ubuntu-system-settings

[Sebastien Bacher]

sound: display the sounds names in a nicer way

sound: display the sounds names in a nicer way

Review comments:

That feels a bit hackish but I didn't find a better way, if somebody knows how to do that better please let me know ;-)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/110

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

Thanks, to summarise

  - It's not ideal that we have to use C++ here - there's a Qt/QML module Qt.labs.folderlistmodel which we could use, but ...
  - ValueSelector doesn't take a model and there's no good way to convert one to a list of strings
  - ValueSelector is going away to be replaced with OptionSelector

I shortened the JS here a bit in a branch: lp:~laney/ubuntu-system-settings/sound-display-names - could you take a look and review/merge? I'd have preferred to use a map but QML's support there doesn't seem very good.

review: Needs Fixing

[lp:~seb128/ubuntu-system-settings/sound-display-names]

153. By Sebastien Bacher on 2013-07-17

simplify and clean the code a bit, thanks Laney

[Sebastien Bacher (seb128)]

Thanks for the improvements, I merged your changes (just reverted the .slice().join()-> .push() since we want to truncate before the last dot not the first one), verified that it still works as it should ;-)

[Iain Lane (laney)]

Cheers, lgtm

review: Approve

=== modified file 'plugins/sound/SoundsList.qml'
--- plugins/sound/SoundsList.qml	2013-07-16 17:04:35 +0000
+++ plugins/sound/SoundsList.qml	2013-07-17 13:22:30 +0000
@@ -5,17 +5,33 @@
 import Ubuntu.SystemSettings.Sound 1.0
 
 ItemPage {
-    property string title;
+    property string title
+    property variant soundDisplayNames
+    property variant soundFileNames
 
+    id: soundsPage
     title: title
 
     UbuntuSoundPanel {
         id: backendInfo
-    }
+        Component.onCompleted:
+            buildSoundValues(listSounds("/usr/share/sounds/ubuntu/stereo"))
+    }
+
+    function buildSoundValues(sounds)
+    {
+        soundDisplayNames = sounds.map(function (sound) {
+            return sound.split('/').pop().split('.').slice(0,-1).join(" ");
+        })
+        soundFileNames = sounds
+    }
+
     ListItem.ValueSelector {
         expanded: true
         // TODO: There is no way to have a ValueSelector always expanded
         onExpandedChanged: expanded = true
-        values: backendInfo.listSounds("/usr/share/sounds/ubuntu/stereo")
+        values: soundDisplayNames
+        onSelectedIndexChanged:
+            print(soundFileNames[selectedIndex]) // TODO: write configuration
     }
 }