aboutsummaryrefslogtreecommitdiff
path: root/qml/Message.qml
diff options
context:
space:
mode:
authorlink2xt <link2xt@testrun.org>2021-10-02 23:30:45 +0000
committerlink2xt <link2xt@testrun.org>2021-10-02 23:30:45 +0000
commit2936a854df9f1a1202fda08cd71773a95c727603 (patch)
tree063e23801381e88d4b421884168c9e199166896c /qml/Message.qml
parent40092aa096bac7e279eb5a4cc97758bac484236c (diff)
downloadkdeltachat-2936a854df9f1a1202fda08cd71773a95c727603.tar.gz
kdeltachat-2936a854df9f1a1202fda08cd71773a95c727603.zip
Fix QML code style
Mostly qmlformat, also rename root "id"s.
Diffstat (limited to 'qml/Message.qml')
-rw-r--r--qml/Message.qml124
1 files changed, 74 insertions, 50 deletions
diff --git a/qml/Message.qml b/qml/Message.qml
index f5ed398..b68f793 100644
--- a/qml/Message.qml
+++ b/qml/Message.qml
@@ -1,39 +1,35 @@
+import DeltaChat 1.0
+import QtMultimedia 5.8
+import QtQml.Models 2.1
import QtQuick 2.12
import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
-import QtQml.Models 2.1
import QtQuick.Dialogs 1.1
-import QtMultimedia 5.8
+import QtQuick.Layouts 1.12
import org.kde.kirigami 2.12 as Kirigami
-import DeltaChat 1.0
-
RowLayout {
- id: messageObject
+ id: root
property DcMessage message
property DcContext context
-
readonly property DcContact from: context.getContact(message.fromId)
readonly property DcMessage quoteMessage: message.quotedMessage
readonly property DcContact quoteFrom: quoteMessage ? context.getContact(quoteMessage.fromId) : null
-
- layoutDirection: message.fromId == 1 ? Qt.RightToLeft : Qt.LeftToRight
-
readonly property string overrideName: message.getOverrideSenderName()
readonly property string displayName: overrideName != "" ? ("~" + overrideName)
- : messageObject.message.fromId > 0 ? messageObject.from.displayName
+ : root.message.fromId > 0 ? root.from.displayName
: ""
+ layoutDirection: message.fromId == 1 ? Qt.RightToLeft : Qt.LeftToRight
Component.onCompleted: {
// Only try to mark fresh and noticed messages as seen to
// avoid unnecessary database calls when viewing an already read chat.
- if ([10, 13].includes(messageObject.message.state)) {
+ if ([10, 13].includes(root.message.state)) {
// Do not mark DC_CHAT_ID_DEADDROP messages as seen to
// avoid contact request chat disappearing from chatlist.
- if (messageObject.chatId != 1) {
- messageObject.context.markseenMsgs([messageObject.message.id])
- }
+ if (root.chatId != 1)
+ root.context.markseenMsgs([root.message.id]);
+
}
}
@@ -49,22 +45,25 @@ RowLayout {
ColumnLayout {
Image {
- source: "file:" + messageObject.message.file
- sourceSize.width: messageObject.message.width
- sourceSize.height: messageObject.message.height
+ source: "file:" + root.message.file
+ sourceSize.width: root.message.width
+ sourceSize.height: root.message.height
fillMode: Image.PreserveAspectCrop
- Layout.preferredWidth: messageObject.width
+ Layout.preferredWidth: root.width
Layout.maximumWidth: Kirigami.Units.gridUnit * 30
Layout.maximumHeight: Kirigami.Units.gridUnit * 20
asynchronous: true
}
+
Label {
font.bold: true
- color: messageObject.message.fromId > 0 ? messageObject.from.color : "black"
- text: messageObject.displayName
+ color: root.message.fromId > 0 ? root.from.color : "black"
+ text: root.displayName
textFormat: Text.PlainText
}
+
}
+
}
Component {
@@ -73,19 +72,24 @@ RowLayout {
ColumnLayout {
MediaPlayer {
id: player
- source: Qt.resolvedUrl("file:" + messageObject.message.file)
+
+ source: Qt.resolvedUrl("file:" + root.message.file)
onError: console.log("Audio MediaPlayer error: " + errorString)
}
+
Label {
font.bold: true
text: "Audio"
textFormat: Text.PlainText
}
+
Button {
text: "play"
onPressed: player.play()
}
+
}
+
}
Component {
@@ -94,22 +98,28 @@ RowLayout {
ColumnLayout {
MediaPlayer {
id: videoplayer
- source: Qt.resolvedUrl("file:" + messageObject.message.file)
+
+ source: Qt.resolvedUrl("file:" + root.message.file)
onError: console.log("Video MediaPlayer error: " + errorString)
}
+
VideoOutput {
source: videoplayer
}
+
Label {
font.bold: true
text: "Video"
textFormat: Text.PlainText
}
+
Button {
text: "play"
onPressed: videoplayer.play()
}
+
}
+
}
Component {
@@ -117,66 +127,76 @@ RowLayout {
Label {
font.bold: true
- color: messageObject.message.fromId > 0 ? messageObject.from.color : "black"
- text: messageObject.displayName
+ color: root.message.fromId > 0 ? root.from.color : "black"
+ text: root.displayName
textFormat: Text.PlainText
}
+
}
MouseArea {
anchors.fill: parent
-
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: function(mouse) {
if (mouse.button === Qt.RightButton)
- contextMenu.popup()
+ contextMenu.popup();
+
}
onPressAndHold: function(mouse) {
if (mouse.source === Qt.MouseEventNotSynthesized)
- contextMenu.popup()
+ contextMenu.popup();
+
}
MessageDialog {
id: messageDialog
+
title: "Message info"
- text: messageObject.context.getMessageInfo(messageObject.message.id)
- onAccepted: { }
+ text: root.context.getMessageInfo(root.message.id)
+ onAccepted: {
+ }
}
Menu {
id: contextMenu
+
Action {
text: "Info"
onTriggered: messageDialog.open()
}
+
}
+
}
ColumnLayout {
id: messageContents
Loader {
- sourceComponent: [20, 21, 23].includes(messageObject.message.viewtype) ? imageMessageView
- : [40, 41].includes(messageObject.message.viewtype) ? audioMessageView
- : [50].includes(messageObject.message.viewtype) ? videoMessageView
+ sourceComponent: [20, 21, 23].includes(root.message.viewtype) ? imageMessageView
+ : [40, 41].includes(root.message.viewtype) ? audioMessageView
+ : [50].includes(root.message.viewtype) ? videoMessageView
: textMessageView
}
// Quote
RowLayout {
Layout.leftMargin: Kirigami.Units.smallSpacing
- visible: messageObject.message.quotedText
+ visible: root.message.quotedText
implicitHeight: quoteTextEdit.height
spacing: Kirigami.Units.smallSpacing
+
Rectangle {
width: Kirigami.Units.smallSpacing
- color: messageObject.quoteFrom ? messageObject.quoteFrom.color : "black"
+ color: root.quoteFrom ? root.quoteFrom.color : "black"
Layout.fillHeight: true
}
+
TextEdit {
id: quoteTextEdit
+
Layout.maximumWidth: Kirigami.Units.gridUnit * 30
- text: messageObject.message.quotedText ? messageObject.message.quotedText : ""
+ text: root.message.quotedText ? root.message.quotedText : ""
textFormat: Text.PlainText
selectByMouse: true
readOnly: true
@@ -184,30 +204,30 @@ RowLayout {
wrapMode: Text.Wrap
font.pixelSize: 14
}
+
}
// Message
TextEdit {
- Layout.maximumWidth: Math.min(messageObject.width, Kirigami.Units.gridUnit * 30)
+ Layout.maximumWidth: Math.min(root.width, Kirigami.Units.gridUnit * 30)
textFormat: Text.PlainText
selectByMouse: true
readOnly: true
color: "black"
wrapMode: Text.Wrap
font.pixelSize: 14
-
Component.onCompleted: {
- text = messageObject.message.text
+ text = root.message.text;
}
}
Button {
text: "Show full message"
- visible: messageObject.message.hasHtml
+ visible: root.message.hasHtml
onPressed: {
- htmlSheet.subject = messageObject.message.subject
- htmlSheet.html = messageObject.context.getMessageHtml(messageObject.message.id)
- htmlSheet.open()
+ htmlSheet.subject = root.message.subject;
+ htmlSheet.html = root.context.getMessageHtml(root.message.id);
+ htmlSheet.open();
}
}
@@ -216,20 +236,20 @@ RowLayout {
HtmlViewSheet {
id: htmlSheet
+
subject: ""
html: ""
}
-
Kirigami.Icon {
source: "computer"
- visible: messageObject.message.isBot
+ visible: root.message.isBot
Layout.preferredHeight: Kirigami.Units.gridUnit
Layout.preferredWidth: Kirigami.Units.gridUnit
}
Kirigami.Icon {
- source: messageObject.message.showPadlock ? "lock" : "unlock"
+ source: root.message.showPadlock ? "lock" : "unlock"
Layout.preferredHeight: Kirigami.Units.gridUnit
Layout.preferredWidth: Kirigami.Units.gridUnit
}
@@ -237,13 +257,17 @@ RowLayout {
Label {
font.pixelSize: 14
color: Kirigami.Theme.disabledTextColor
- text: Qt.formatDateTime(messageObject.message.timestamp, "dd. MMM yyyy, hh:mm")
- + (messageObject.message.state == 26 ? "✓"
- : messageObject.message.state == 28 ? "✓✓"
- : messageObject.message.state == 24 ? "✗"
+ text: Qt.formatDateTime(root.message.timestamp, "dd. MMM yyyy, hh:mm")
+ + (root.message.state == 26 ? "✓"
+ : root.message.state == 28 ? "✓✓"
+ : root.message.state == 24 ? "✗"
: "");
}
+
}
+
}
+
}
+
}