diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2019-10-06 01:44:02 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2019-11-23 20:06:15 +0100 |
| commit | 425d534e225a956fefb3bc2e8d2c8d26152f6353 (patch) | |
| tree | df3ff64fe9d9d2306b3c33e2a6f07d9cf0969990 /resources | |
| parent | 67d255a2de7ca85b35a67bff25ef9b6770b453a0 (diff) | |
Enable Sticker and Emote messages
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/TimelineView.qml | 4 | ||||
| -rw-r--r-- | resources/qml/delegates/ImageMessage.qml | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 4d8c22b8..b641992d 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -110,7 +110,9 @@ Rectangle { //case MtxEvent.Topic: return "delegates/Topic.qml" case MtxEvent.NoticeMessage: return "delegates/NoticeMessage.qml" case MtxEvent.TextMessage: return "delegates/TextMessage.qml" + case MtxEvent.EmoteMessage: return "delegates/TextMessage.qml" case MtxEvent.ImageMessage: return "delegates/ImageMessage.qml" + case MtxEvent.Sticker: return "delegates/ImageMessage.qml" case MtxEvent.FileMessage: return "delegates/FileMessage.qml" case MtxEvent.VideoMessage: return "delegates/PlayableMediaMessage.qml" case MtxEvent.AudioMessage: return "delegates/PlayableMediaMessage.qml" @@ -204,7 +206,7 @@ Rectangle { onTriggered: chat.model.redactEvent(model.id) } MenuItem { - visible: model.type == MtxEvent.ImageMessage || model.type == MtxEvent.VideoMessage || model.type == MtxEvent.AudioMessage || model.type == MtxEvent.FileMessage + visible: model.type == MtxEvent.ImageMessage || model.type == MtxEvent.VideoMessage || model.type == MtxEvent.AudioMessage || model.type == MtxEvent.FileMessage || model.type == MtxEvent.Sticker text: qsTr("Save as") onTriggered: timelineManager.saveMedia(model.url, model.filename, model.mimetype, model.type) } diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index 3f5c00bf..2ed41a17 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml @@ -1,5 +1,7 @@ import QtQuick 2.6 +import com.github.nheko 1.0 + Item { width: 300 height: 300 * eventData.proportionalHeight @@ -13,6 +15,7 @@ Item { fillMode: Image.PreserveAspectFit MouseArea { + enabled: eventData.type == MtxEvent.ImageMessage anchors.fill: parent onClicked: timelineManager.openImageOverlay(eventData.url, eventData.filename, eventData.mimetype, eventData.type) } |