ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve attachement handling and change emoji icon

Browse Source
This commit is contained in:
Carl Schwan
2020-11-03 16:58:45 +00:00
parent 9dd18828dc
commit 87dcaf3953
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
qml/ChatTextInput.qml
View File

@@ -12,6 +12,8 @@ import Spectral.Setting 0.1
import Spectral 0.1 import Spectral 0.1
Control { Control {
id: root
property alias isReply: replyItem.visible property alias isReply: replyItem.visible
property bool isReaction: false property bool isReaction: false
property var replyModel property var replyModel
@@ -27,10 +29,8 @@ Control {
property bool hasAttachment: false property bool hasAttachment: false
property url attachmentPath property url attachmentPath
id: root
padding: 0 padding: 0
background: Rectangle { background: Rectangle {
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
Kirigami.Separator { Kirigami.Separator {
@@ -158,7 +158,7 @@ Control {
Kirigami.Avatar { Kirigami.Avatar {
Layout.preferredWidth: 24 Layout.preferredWidth: 24
Layout.preferredHeight: 24 Layout.preferredHeight: 24
source: modelData.avatarMediaId ? "image://mxc/" + modelData.avatarMediaId : "" source: modelData.avatarMediaId ? "image://mxc/" + modelData.avatarMediaId : ""
color: modelData.color ? Qt.darker(modelData.color, 1.1) : null color: modelData.color ? Qt.darker(modelData.color, 1.1) : null
} }
@@ -198,11 +198,12 @@ Control {
spacing: 0 spacing: 0
ToolButton { ToolButton {
id: uploadButton
Layout.preferredWidth: 48 Layout.preferredWidth: 48
Layout.preferredHeight: 48 Layout.preferredHeight: 48
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
id: uploadButton
visible: !isReply && !hasAttachment visible: !isReply && !hasAttachment
icon.name: "mail-attachment" icon.name: "mail-attachment"
@@ -216,7 +217,7 @@ Control {
fileDialog.chosen.connect(function(path) { fileDialog.chosen.connect(function(path) {
if (!path) return if (!path) return
roomPanelInput.attach(path) root.attach(path)
}) })
fileDialog.open() fileDialog.open()
@@ -252,7 +253,7 @@ Control {
visible: hasAttachment visible: hasAttachment
rightPadding: 8 rightPadding: 8
contentItem: RowLayout { contentItem: RowLayout {
spacing: 0 spacing: 0
@@ -262,7 +263,7 @@ Control {
id: cancelAttachmentButton id: cancelAttachmentButton
icon.name: "mail-attachement" icon.name: "dialog-cancel"
onClicked: { onClicked: {
hasAttachment = false; hasAttachment = false;
@@ -273,8 +274,7 @@ Control {
Label { Label {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: attachmentPath != "" ? attachmentPath.toString().substring(attachmentPath.toString().lastIndexOf('/') + 1, attachmentPath.length) : "" text: attachmentPath !== "" ? attachmentPath.toString().substring(attachmentPath.toString().lastIndexOf('/') + 1, attachmentPath.length) : ""
color: "white"
} }
} }
} }
@@ -427,7 +427,7 @@ Control {
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
id: emojiButton id: emojiButton
icon.name: "document-send" icon.name: "preferences-desktop-emoticons"
onClicked: emojiPicker.visible = !emojiPicker.visible onClicked: emojiPicker.visible = !emojiPicker.visible
} }