Enable right click

Author: sandsmark

gui/controls2/Alarms.qml

@@ -113,7 +113,7 @@ MusicPage {
                 signal editNew
                 onEditNew: dialogAlarm.open(model, true, index)
 
-                onClicked: {
+                onClick: {
                     alarmList.focusIndex = index;
                     dialogAlarm.open(model);
                 }

gui/controls2/Index.qml

@@ -57,7 +57,7 @@ MusicPage {
             property bool held: false
             onPressAndHold: held = true
             onReleased: held = false
-            onClicked: clickItem(model)
+            onClick: clickItem(model)
 
             color: listItem.held ? "lightgrey" : "transparent"
             noCover: ""

gui/controls2/MusicServices.qml

@@ -70,7 +70,7 @@ MusicPage {
             imageSources: [{art: model.type === "65031" ? "qrc:/images/tunein.png" : model.icon}]
             description: qsTr("Service")
 
-            onClicked: {
+            onClick: {
                 stackView.push("qrc:/controls2/Service.qml",
                                    {
                                        "isListView": isListView,

gui/controls2/Service.qml

@@ -156,7 +156,7 @@ MusicPage {
             property bool held: false
             onPressAndHold: held = true
             onReleased: held = false
-            onClicked: {
+            onClick: {
                 clickItem(model)
             }
 

gui/controls2/ThisDevice.qml

@@ -77,7 +77,7 @@ MusicPage {
             property bool held: false
             onPressAndHold: held = true
             onReleased: held = false
-            onClicked: clickItem(model)
+            onClick: clickItem(model)
 
             color: listItem.held ? "lightgrey" : "transparent"
             noCover: ""

gui/controls2/Zones.qml

@@ -93,7 +93,7 @@ MusicPage {
                 color: "transparent"
                 description: qsTr("Zone")
 
-                onClicked: {
+                onClick: {
                     connectZone(model.name)
                 }
                 onAction3Pressed: {

gui/controls2/components/Delegates/DragMusicListItem.qml

@@ -79,17 +79,31 @@ MouseArea {
     property real lastX: -1
     property real lastY: -1
 
+    acceptedButtons: Qt.RightButton | Qt.LeftButton
+
     onPressed: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
+
         lastX = mouse.x
         lastY = mouse.y
     }
 
     onPressAndHold: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
+
         dragArea.sourceIndex = DelegateModel.itemsIndex
         if (reorderable)
             held = true
     }
     onReleased: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
+
         if (held) {
             held = false;
         } else {
@@ -101,6 +115,14 @@ MouseArea {
             }
         }
     }
+    onClicked: {
+        if (mouse.button == Qt.RightButton) {
+            row.openMenu(this, mouse.x, mouse.y);
+            mouse.accepted = true;
+            return;
+        }
+        mouse.accepted = false;
+    }
 
     Rectangle {
         id: content

gui/controls2/components/Delegates/MusicListItem.qml

@@ -70,19 +70,35 @@ MouseArea {
     property real lastX: -1
     property real lastY: -1
 
+    acceptedButtons: Qt.RightButton | Qt.LeftButton
+
     onPressed: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
         lastX = mouse.x
         lastY = mouse.y
     }
 
     onReleased: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
         var diffX = mouse.x - lastX;
         if (Math.abs(diffX) > units.gu(15)) {
             swipe();
         } else {
             click();
         }
     }
+    onClicked: {
+        if (mouse.button == Qt.RightButton) {
+            row.openMenu(this, mouse.x, mouse.y);
+            mouse.accepted = true;
+            return;
+        }
+        mouse.accepted = false;
+    }
 
     Rectangle {
         id: content

gui/controls2/components/Delegates/SelectMusicListItem.qml

@@ -109,19 +109,30 @@ MouseArea {
     property real lastX: -1
     property real lastY: -1
 
+    acceptedButtons: Qt.RightButton | Qt.LeftButton
+
     onPressed: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
         lastX = mouse.x
         lastY = mouse.y
     }
 
     onPressAndHold: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
         if (state !== "selection") {
             dragArea.sourceIndex = DelegateModel.itemsIndex
             if (reorderable)
                 held = true
         }
     }
     onReleased: {
+        if (mouse.button == Qt.RightButton) {
+            return;
+        }
         if (state !== "selection") {
             if (held) {
                 held = false;
@@ -133,6 +144,8 @@ MouseArea {
                     click();
                 }
             }
+        } else {
+            click();
         }
     }
 
@@ -191,6 +204,15 @@ MouseArea {
         }
     }
 
+    onClicked: {
+        if (mouse.button === Qt.RightButton) {
+            row.openMenu(this, mouse.x, mouse.y);
+            mouse.accepted = true;
+            return;
+        }
+        mouse.accepted = false;
+    }
+
     onHeldChanged: {
         if (!held && sourceIndex !== targetIndex) {
             reorder(sourceIndex, targetIndex);

gui/controls2/components/MusicRow.qml

@@ -54,6 +54,24 @@ Row {
 
     signal imageError(var index)
 
+    function openMenu(parent, x, y) {
+        if (optionsMenu.count === 0) {
+            return;
+        }
+        var isEmpty = true;
+        for (var i=0; i<optionsMenu.count; i++) {
+            if (optionsMenu.contentData[i].enabled) {
+                isEmpty = false;
+                break;
+            }
+        }
+        if (isEmpty) {
+            return;
+        }
+
+        optionsMenu.popup(parent, x, y);
+    }
+
     spacing: units.gu(1)
 
     state: "default"
@@ -261,14 +279,7 @@ Row {
                 anchors.centerIn: parent
                 source: "qrc:/images/contextual-menu.svg"
 
-                onClicked: optionsMenu.open()
-
-                Menu {
-                    id: optionsMenu
-                    width: implicitWidth * units.scaleFactor
-                    x: parent.width - width
-                    transformOrigin: Menu.TopRight
-                }
+                onClicked: optionsMenu.popup(this, 0, 0)
             }
         }
 
@@ -309,4 +320,10 @@ Row {
         }
     }
 
+    Menu {
+        id: optionsMenu
+        width: implicitWidth * units.scaleFactor
+        x: parent.width - width
+        transformOrigin: Menu.TopRight
+    }
 }