Merge lp:~osomon/webbrowser-app/capture-device-displayname into lp:webbrowser-app

[Olivier Tilloy]

Use the capture device display names instead of their unique ID.

[Ugo Riboni (uriboni)]

Great fix, much more human readable

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1280
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2487/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1241
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5343/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25404

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2487/rebuild

review: Approve (continuous-integration)

=== modified file 'src/app/webbrowser/SettingsDeviceSelector.qml'
--- src/app/webbrowser/SettingsDeviceSelector.qml	2015-10-19 12:13:29 +0000
+++ src/app/webbrowser/SettingsDeviceSelector.qml	2015-11-23 11:32:07 +0000
@@ -39,7 +39,9 @@
         containerHeight: itemHeight * model.length
 
         model: internal.devices
-        delegate: OptionSelectorDelegate { text: modelData.id }
+        delegate: OptionSelectorDelegate {
+            text: modelData.displayName || i18n.tr("Default")
+        }
         onDelegateClicked: deviceSelected(model[index].id)
     }