ubuntu-touch-coreapps-reviewers team mailing list archive

[Andrew Hayzen <ahayzen@xxxxxxxxx>]

Andrew Hayzen has proposed merging lp:~ahayzen/music-app/fix-1538838-export-long-press into lp:music-app.

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

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Music App Developers (music-app-dev)
Related bugs:
  Bug #1538838 in Ubuntu Music App: "Exporting a song allows the user to long press to cancel the selection"
  https://bugs.launchpad.net/music-app/+bug/1538838

For more details, see:
https://code.launchpad.net/~ahayzen/music-app/fix-1538838-export-long-press/+merge/287260

* Fix for bug 1538838 so that a press and hold cannot disable selection in the ContentHubExport.qml
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~ahayzen/music-app/fix-1538838-export-long-press into lp:music-app.

=== 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