tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add externally open image support & file download support && more code 

cleanup.
This commit is contained in:
Black Hat 2018-07-10 14:34:17 +08:00
parent 31d435e6f4
commit 0b2f252c42
8 changed files with 132 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
qml/component/AvatarContainer.qml Normal file
View File

@ -0,0 +1,32 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
Row {
spacing: 6
ImageStatus {
id: avatar
width: height
height: 40
round: false
visible: !sentByMe && aboveAuthor !== author
source: author.avatarUrl != "" ? "image://mxc/" + author.avatarUrl : null
displayText: author.displayName
MouseArea {
anchors.fill: parent
hoverEnabled: true
ToolTip.visible: containsMouse
ToolTip.text: author.displayName
}
}
Rectangle {
width: height
height: 40
color: "transparent"
visible: !sentByMe && aboveAuthor === author
}
}

35
qml/component/DownloadableContent.qml Normal file
View File

@ -0,0 +1,35 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
Item {
width: parent.width
height: visible ? childrenRect.height : 0
property bool openOnFinished: false
readonly property bool downloaded: progressInfo && progressInfo.completed
onDownloadedChanged: {
if (downloaded && openOnFinished)
openSavedFile()
}
function downloadAndOpen()
{
if (downloaded)
openSavedFile()
else
{
openOnFinished = true
currentRoom.downloadFile(eventId)
}
}
function openSavedFile()
{
if (Qt.openUrlExternally(progressInfo.localPath))
return;
if (Qt.openUrlExternally(progressInfo.localDir))
return;
}
}

22
qml/component/FileBubble.qml Normal file
View File

@ -0,0 +1,22 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Controls.Material 2.4
AvatarContainer {
DownloadableContent {
id: downloadable
width: downloadButton.width
height: downloadButton.height
Button {
id: downloadButton
text: content.body
highlighted: !sentByMe
onClicked: downloadable.downloadAndOpen()
}
}
}

36
qml/component/ImageBubble.qml
View File

@ -2,30 +2,7 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Controls.Material 2.4
Row {
id: messageRow
spacing: 6
ImageStatus {
id: avatar
width: height
height: 40
round: false
visible: !sentByMe
source: author.avatarUrl != "" ? "image://mxc/" + author.avatarUrl : null
displayText: author.displayName
MouseArea {
anchors.fill: parent
hoverEnabled: true
ToolTip.visible: containsMouse
ToolTip.text: author.displayName
}
}
AvatarContainer {
Rectangle {
id: messageRect
@ -34,9 +11,15 @@ Row {
color: sentByMe ? "lightgrey" : Material.accent
DownloadableContent {
id: downloadable
width: messageImage.width
height: messageImage.height
anchors.centerIn: parent
Image {
id: messageImage
anchors.centerIn: parent
source: "image://mxc/" + content.url
MouseArea {
@ -46,6 +29,9 @@ Row {
propagateComposedEvents: true
ToolTip.visible: containsMouse
ToolTip.text: content.body
onClicked: downloadable.downloadAndOpen()
}
}
}
}

32
qml/component/MessageBubble.qml
View File

@ -2,43 +2,15 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Controls.Material 2.4
Row {
AvatarContainer {
readonly property bool isNotice: eventType === "notice"
id: messageRow
spacing: 6
ImageStatus {
id: avatar
width: height
height: 40
round: false
visible: !sentByMe && aboveAuthor !== author
source: author.avatarUrl != "" ? "image://mxc/" + author.avatarUrl : null
displayText: author.displayName
MouseArea {
anchors.fill: parent
hoverEnabled: true
ToolTip.visible: containsMouse
ToolTip.text: author.displayName
}
}
Rectangle {
width: height
height: 40
color: "transparent"
visible: !sentByMe && aboveAuthor === author
}
Rectangle {
id: messageRect
width: Math.min(messageText.implicitWidth + 24, messageListView.width - (!sentByMe ? avatar.width + messageRow.spacing : 0))
width: Math.min(messageText.implicitWidth + 24, messageListView.width - (!sentByMe ? 40 + messageRow.spacing : 0))
height: messageText.implicitHeight + 24
color: isNotice ? "transparent" : sentByMe ? "lightgrey" : Material.accent

7
qml/component/MessageDelegate.qml
View File

@ -10,7 +10,7 @@ Item {
width: delegateLoader.width
height: delegateLoader.height
anchors.right: (eventType === "message" || eventType === "image") && sentByMe ? parent.right : undefined
anchors.right: (eventType === "message" || eventType === "image" || eventType === "file" || eventType === "video" || eventType === "audio") && sentByMe ? parent.right : undefined
anchors.horizontalCenter: (eventType === "state" || eventType === "emote") ? parent.horizontalCenter : undefined
MouseArea {
@ -34,7 +34,12 @@ Item {
case "emote":
case "state":
return "StateBubble.qml"
case "video":
case "audio":
case "file":
return "FileBubble.qml"
}
return ""
}
}
}

13
qml/form/RoomForm.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.11
import QtQuick.Controls.Material 2.4
import QtGraphicalEffects 1.0
@ -151,6 +152,18 @@ Item {
Layout.fillHeight: true
contentItem: MaterialIcon { icon: "\ue226" }
onClicked: fileDialog.visible = true
FileDialog {
id: fileDialog
title: "Please choose a file"
folder: shortcuts.home
onAccepted: {
console.log("You chose: " + fileDialog.fileUrls)
matriqueController.uploadFile(fileDialog.fileUrls)
}
}
}
TextField {

3
res.qrc
View File

@ -21,5 +21,8 @@
<file>qml/component/MessageBubble.qml</file>
<file>qml/component/ImageBubble.qml</file>
<file>qml/component/StateBubble.qml</file>
<file>qml/component/DownloadableContent.qml</file>
<file>qml/component/FileBubble.qml</file>
<file>qml/component/AvatarContainer.qml</file>
</qresource>
</RCC>