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

[Andrew Hayzen]

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

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Victor Thompson (vthompson)]

lgtm! Thanks! :)

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/components/Delegates/MusicListItem.qml'
--- app/components/Delegates/MusicListItem.qml	2016-02-26 00:17:02 +0000
+++ app/components/Delegates/MusicListItem.qml	2016-02-26 03:18:42 +0000
@@ -32,6 +32,7 @@
     property alias imageSource: image.imageSource
 
     property bool multiselectable: false
+    property bool pressAndHoldEnabled: true
     property bool reorderable: false
 
     property alias subtitle: listItemLayout.subtitle
@@ -48,12 +49,14 @@
     }
 
     onPressAndHold: {
-        if (reorderable) {
-            ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
-        }
+        if (pressAndHoldEnabled) {
+            if (reorderable) {
+                ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
+            }
 
-        if (multiselectable) {
-            ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
+            if (multiselectable) {
+                ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
+            }
         }
     }
 
 
=== modified file 'app/ui/ContentHubExport.qml'
--- app/ui/ContentHubExport.qml	2016-01-29 04:05:56 +0000
+++ app/ui/ContentHubExport.qml	2016-02-26 03:18:42 +0000
@@ -140,6 +140,7 @@
             height: units.gu(7)
             imageSource: {"art": model.art}
             multiselectable: true
+            pressAndHoldEnabled: false  // Block PressAndHold from working
             subtitle {
                 text: model.author
             }
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-02-26 00:17:02 +0000
+++ debian/changelog	2016-02-26 03:18:42 +0000
@@ -7,6 +7,9 @@
   * Ensure that only one ContentHubExport page is open (LP: #1538863).
   * Fix fallback image path in MusicListItem (LP: #1549580).
 
+  [ Andrew Hayzen ]
+  * Fix so that a press and hold cannot disable selection in the ContentHubExport.qml (LP: #1538838)
+
  -- Victor <victor@victor-virtual-machine>  Wed, 27 Jan 2016 19:40:55 -0600
 
 music-app (2.3) vivid; urgency=medium