Context Menu Related Improvement

qml/component/DownloadableContent.qml

@@ -22,7 +22,6 @@ Item {
         selectFolder: true
 
         onAccepted: currentRoom.downloadFile(eventId, folder + "/" + currentRoom.fileNameToDownload(eventId))
-
     }
 
     onDownloadedChanged: downloaded && openOnFinished ? openSavedFile() : {}

qml/component/ImageBubble.qml

@@ -3,6 +3,9 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 
 AvatarContainer {
+    readonly property var downloadAndOpen: downloadable.downloadAndOpen
+    readonly property var saveFileAs: downloadable.saveFileAs
+
     Rectangle {
         id: messageRect
 
@@ -33,20 +36,6 @@ AvatarContainer {
                     ToolTip.text: content.body
 
                     onClicked: downloadable.downloadAndOpen()
-                    onPressAndHold: messageImageMenu.popup()
-                }
-
-                Menu {
-                    id: messageImageMenu
-
-                    MenuItem {
-                        text: "View"
-                        onTriggered: downloadable.downloadAndOpen()
-                    }
-                    MenuItem {
-                        text: "Save as..."
-                        onTriggered: downloadable.saveFileAs()
-                    }
                 }
             }
         }

qml/component/MessageDelegate.qml

@@ -24,13 +24,41 @@ Item {
 
     MouseArea {
         anchors.fill: parent
-        onPressAndHold: messageContextMenu.popup()
+        onPressAndHold: menuComponent.createObject(this)
 
-        Menu {
-            id: messageContextMenu
-            MenuItem {
-                text: "Redact"
-                onTriggered: currentRoom.redactEvent(eventId)
+        Component {
+            id: menuComponent
+            Menu {
+                id: messageContextMenu
+
+                MenuItem {
+                    text: "Copy"
+                    onTriggered: matriqueController.copyToClipboard(plainText)
+                }
+                MenuItem {
+                    text: "Copy Source"
+                    onTriggered: matriqueController.copyToClipboard(toolTip)
+                }
+                MenuItem {
+                    visible: isFile
+                    height: visible ? undefined : 0
+                    text: "Open Externally"
+                    onTriggered: delegateLoader.item.downloadAndOpen()
+                }
+                MenuItem {
+                    visible: isFile
+                    height: visible ? undefined : 0
+                    text: "Save As"
+                    onTriggered: delegateLoader.item.saveFileAs()
+                }
+                MenuItem {
+                    visible: sentByMe
+                    height: visible ? undefined : 0
+                    text: "Redact"
+                    onTriggered: currentRoom.redactEvent(eventId)
+                }
+
+                Component.onCompleted: popup()
             }
         }
     }