Ubuntu Music App

Merge lp:~ahayzen/music-app/fix-1538838-export-long-press into lp:music-app

  1. fix-1538838-export-long-press
  2. Merge into trunk
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 978
Merged at revision: 977
Proposed branch: lp:~ahayzen/music-app/fix-1538838-export-long-press
Merge into: lp:music-app
Diff against target: 57 lines (+12/-5)
3 files modified
app/components/Delegates/MusicListItem.qml (+8/-5)
app/ui/ContentHubExport.qml (+1/-0)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp:~ahayzen/music-app/fix-1538838-export-long-press
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Review via email: mp+287260@code.launchpad.net

Commit message

* Fix for bug 1538838 so that a press and hold cannot disable selection in the ContentHubExport.qml

Description of the change

* Fix for bug 1538838 so that a press and hold cannot disable selection in the ContentHubExport.qml

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:978
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1071/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/627/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1071/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

lgtm! Thanks! :)

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/Delegates/MusicListItem.qml'
2--- app/components/Delegates/MusicListItem.qml 2016-02-26 00:17:02 +0000
3+++ app/components/Delegates/MusicListItem.qml 2016-02-26 03:18:42 +0000
4@@ -32,6 +32,7 @@
5 property alias imageSource: image.imageSource
6
7 property bool multiselectable: false
8+ property bool pressAndHoldEnabled: true
9 property bool reorderable: false
10
11 property alias subtitle: listItemLayout.subtitle
12@@ -48,12 +49,14 @@
13 }
14
15 onPressAndHold: {
16- if (reorderable) {
17- ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
18- }
19+ if (pressAndHoldEnabled) {
20+ if (reorderable) {
21+ ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
22+ }
23
24- if (multiselectable) {
25- ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
26+ if (multiselectable) {
27+ ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
28+ }
29 }
30 }
31
32
33=== modified file 'app/ui/ContentHubExport.qml'
34--- app/ui/ContentHubExport.qml 2016-01-29 04:05:56 +0000
35+++ app/ui/ContentHubExport.qml 2016-02-26 03:18:42 +0000
36@@ -140,6 +140,7 @@
37 height: units.gu(7)
38 imageSource: {"art": model.art}
39 multiselectable: true
40+ pressAndHoldEnabled: false // Block PressAndHold from working
41 subtitle {
42 text: model.author
43 }
44
45=== modified file 'debian/changelog'
46--- debian/changelog 2016-02-26 00:17:02 +0000
47+++ debian/changelog 2016-02-26 03:18:42 +0000
48@@ -7,6 +7,9 @@
49 * Ensure that only one ContentHubExport page is open (LP: #1538863).
50 * Fix fallback image path in MusicListItem (LP: #1549580).
51
52+ [ Andrew Hayzen ]
53+ * Fix so that a press and hold cannot disable selection in the ContentHubExport.qml (LP: #1538838)
54+
55 -- Victor <victor@victor-virtual-machine> Wed, 27 Jan 2016 19:40:55 -0600
56
57 music-app (2.3) vivid; urgency=medium

Subscribers

People subscribed via source and target branches