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

Proposed by Olivier Tilloy
Status: Merged
Approved by: Ugo Riboni
Approved revision: 1280
Merged at revision: 1286
Proposed branch: lp:~osomon/webbrowser-app/capture-device-displayname
Merge into: lp:webbrowser-app
Diff against target: 13 lines (+3/-1)
1 file modified
src/app/webbrowser/SettingsDeviceSelector.qml (+3/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/capture-device-displayname
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ugo Riboni (community) Approve
Review via email: mp+278308@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Ugo Riboni (uriboni) wrote :

Great fix, much more human readable

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/webbrowser/SettingsDeviceSelector.qml'
2--- src/app/webbrowser/SettingsDeviceSelector.qml 2015-10-19 12:13:29 +0000
3+++ src/app/webbrowser/SettingsDeviceSelector.qml 2015-11-23 11:32:07 +0000
4@@ -39,7 +39,9 @@
5 containerHeight: itemHeight * model.length
6
7 model: internal.devices
8- delegate: OptionSelectorDelegate { text: modelData.id }
9+ delegate: OptionSelectorDelegate {
10+ text: modelData.displayName || i18n.tr("Default")
11+ }
12 onDelegateClicked: deviceSelected(model[index].id)
13 }
14

Subscribers

People subscribed via source and target branches

to status/vote changes: