Make chat text input look less foreign

This commit is contained in:
Carson Black
2020-11-16 17:54:36 -05:00
parent b209b4aff5
commit bb5ed865c4

View File

@@ -16,7 +16,7 @@ import NeoChat.Setting 1.0
import org.kde.neochat 1.0 import org.kde.neochat 1.0
Control { ToolBar {
id: root id: root
property alias isReply: replyItem.visible property alias isReply: replyItem.visible
@@ -33,22 +33,7 @@ Control {
property bool hasAttachment: false property bool hasAttachment: false
property url attachmentPath property url attachmentPath
padding: 0 position: ToolBar.Footer
background: Rectangle {
color: Kirigami.Theme.backgroundColor
Kirigami.Separator {
Rectangle {
anchors.fill: parent
color: Kirigami.Theme.focusColor
}
anchors {
left: parent.left
right: parent.right
top: parent.top
}
}
}
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 0 spacing: 0
@@ -191,47 +176,9 @@ Control {
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 0 spacing: Kirigami.Units.smallSpacing
ToolButton {
id: uploadButton
Layout.preferredWidth: 48
Layout.preferredHeight: 48
Layout.alignment: Qt.AlignBottom
visible: !isReply && !hasAttachment
icon.name: "mail-attachment"
onClicked: {
if (Clipboard.hasImage) {
attachDialog.open()
} else {
var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
fileDialog.chosen.connect(function(path) {
if (!path) return
root.attach(path)
})
fileDialog.open()
}
}
BusyIndicator {
anchors.fill: parent
running: currentRoom && currentRoom.hasFileUploading
}
}
ToolButton {
Layout.preferredWidth: 48
Layout.preferredHeight: 48
Layout.alignment: Qt.AlignBottom
Button {
id: cancelReplyButton id: cancelReplyButton
visible: isReply visible: isReply
@@ -279,12 +226,11 @@ Control {
property real progress: 0 property real progress: 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumHeight: 48
id: inputField id: inputField
wrapMode: Text.Wrap wrapMode: Text.Wrap
placeholderText: "Send a Message" placeholderText: "Write your message..."
topPadding: 0 topPadding: 0
bottomPadding: 0 bottomPadding: 0
selectByMouse: true selectByMouse: true
@@ -418,22 +364,46 @@ Control {
} }
} }
ToolButton {
Layout.preferredWidth: 48
Layout.preferredHeight: 48
Layout.alignment: Qt.AlignBottom
Button {
id: emojiButton id: emojiButton
icon.name: "preferences-desktop-emoticons" icon.name: "preferences-desktop-emoticons"
icon.color: "transparent" icon.color: "transparent"
onClicked: emojiPicker.visible = !emojiPicker.visible onClicked: emojiPicker.visible = !emojiPicker.visible
} }
ToolButton {
Layout.preferredWidth: 48
Layout.preferredHeight: 48
Layout.alignment: Qt.AlignBottom
Button {
id: uploadButton
visible: !isReply && !hasAttachment
icon.name: "mail-attachment"
onClicked: {
if (Clipboard.hasImage) {
attachDialog.open()
} else {
var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
fileDialog.chosen.connect(function(path) {
if (!path) return
root.attach(path)
})
fileDialog.open()
}
}
BusyIndicator {
anchors.fill: parent
running: currentRoom && currentRoom.hasFileUploading
}
}
Button {
icon.name: "document-send" icon.name: "document-send"
icon.color: "transparent" icon.color: "transparent"