diff --git a/src/app/commoncomponents/DataTransferMessageDelegate.qml b/src/app/commoncomponents/DataTransferMessageDelegate.qml index bbf2c49948884e40904bb7a2fcfe8f4c81f66b2f..f06a02724771297dde220fefc9bc8e60b365b71a 100644 --- a/src/app/commoncomponents/DataTransferMessageDelegate.qml +++ b/src/app/commoncomponents/DataTransferMessageDelegate.qml @@ -40,12 +40,12 @@ Loader { property int seq: MsgSeq.single property string author: Author property string body: Body - property var status: Status + property var transferStatus: Status width: ListView.view ? ListView.view.width : 0 sourceComponent: { - if (root.status === Interaction.Status.TRANSFER_FINISHED) { + if (root.transferStatus === Interaction.Status.TRANSFER_FINISHED) { mediaInfo = MessagesAdapter.getMediaInfo(root.body) if (Object.keys(mediaInfo).length !== 0 && WITH_WEBENGINE) return localMediaMsgComp @@ -64,8 +64,8 @@ Loader { id: dataTransferItem transferId: Id - property var transferStats: MessagesAdapter.getTransferStats(transferId, root.Status) - property bool canOpen: root.status === Interaction.Status.TRANSFER_FINISHED || isOutgoing + property var transferStats: MessagesAdapter.getTransferStats(transferId, root.transferStatus) + property bool canOpen: root.transferStatus === Interaction.Status.TRANSFER_FINISHED || isOutgoing property real maxMsgWidth: root.width - senderMargin - 2 * hPadding - avatarBlockWidth - buttonsLoader.width - 24 - 6 - 24 @@ -110,7 +110,7 @@ Loader { Layout.margins: 8 sourceComponent: { - switch (root.status) { + switch (root.transferStatus) { case Interaction.Status.TRANSFER_CREATED: case Interaction.Status.TRANSFER_FINISHED: iconSource = JamiResources.link_black_24dp_svg @@ -157,7 +157,7 @@ Loader { normalColor: JamiTheme.chatviewBgColor imageColor: JamiTheme.chatviewButtonColor onClicked: { - if (root.status === Interaction.Status.TRANSFER_ONGOING) { + if (root.transferStatus === Interaction.Status.TRANSFER_ONGOING) { return MessagesAdapter.cancelFile(transferId) } else { return MessagesAdapter.acceptFile(transferId) @@ -226,7 +226,7 @@ Loader { ,ProgressBar { id: progressBar - visible: root.status === Interaction.Status.TRANSFER_ONGOING + visible: root.transferStatus === Interaction.Status.TRANSFER_ONGOING height: visible * implicitHeight value: transferStats.progress / transferStats.totalSize width: transferItem.width @@ -244,7 +244,7 @@ Loader { isOutgoing: Author === CurrentAccount.uri transferId: Id - property var transferStats: MessagesAdapter.getTransferStats(transferId, root.status) + property var transferStats: MessagesAdapter.getTransferStats(transferId, root.transferStatus) showTime: root.showTime seq: root.seq author: Author @@ -398,7 +398,7 @@ Loader { readonly property real aspectRatio: paintedWidth / paintedHeight readonly property real idealWidth: innerContent.width - senderMargin onStatusChanged: { - if (root.status == Image.Ready && aspectRatio) { + if (img.status == Image.Ready && aspectRatio) { height = Qt.binding(() => JamiQmlUtils.clamp(idealWidth / aspectRatio, 64, 256)) width = Qt.binding(() => height * aspectRatio) diff --git a/tests/qml/src/tst_DataTransferMessageDelegate.qml b/tests/qml/src/tst_DataTransferMessageDelegate.qml index 91d9553b2cc79c16447ffb0f74978c4c09e6a2c1..8842267552a1b826870616e697333efb01505018 100644 --- a/tests/qml/src/tst_DataTransferMessageDelegate.qml +++ b/tests/qml/src/tst_DataTransferMessageDelegate.qml @@ -31,7 +31,7 @@ import "../../../src/app/commoncomponents" DataTransferMessageDelegate { id: uut timestamp: 0 - status: Interaction.Status.TRANSFER_FINISHED + transferStatus: Interaction.Status.TRANSFER_FINISHED author: "" body: "" @@ -39,9 +39,9 @@ DataTransferMessageDelegate { name: "Check basic visibility for header buttons" function test_checkBasicVisibility() { var buttonsLoader = findChild(uut, "buttonsLoader") - uut.status = Interaction.Status.TRANSFER_AWAITING_HOST + uut.transferStatus = Interaction.Status.TRANSFER_AWAITING_HOST compare(buttonsLoader.iconSource, JamiResources.download_black_24dp_svg) - uut.status = Interaction.Status.TRANSFER_FINISHED + uut.transferStatus = Interaction.Status.TRANSFER_FINISHED compare(buttonsLoader.iconSource, JamiResources.link_black_24dp_svg) } }