From 09dbd21fef6c18bb79f5dd1b0c73a02dd9fba92d Mon Sep 17 00:00:00 2001 From: Miquel Lionel Date: Tue, 2 Nov 2021 12:29:39 +0100 Subject: Videochat message displayed, rm actions dups - message.*, qml/Message.qml: Videochat invitation message send from the original DeltaChat app are displayed. Currently, it's best if the chat instance use http or https scheme, since it'll normally open in a browser - qml/ComposePane.qml : We made Shorcuts and actions are needed anymore, no need for duplicates - qml/main.qml: Fix shortcut help for opening Settings page, it's Shift+Tab not Shift+S. --- qml/ComposePane.qml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'qml/ComposePane.qml') diff --git a/qml/ComposePane.qml b/qml/ComposePane.qml index b2fcf88..d1140ba 100644 --- a/qml/ComposePane.qml +++ b/qml/ComposePane.qml @@ -84,12 +84,6 @@ Pane { else attachFileDialog.open(); } - - action: Action { - shortcut: "Ctrl+O" - onTriggered: attachButton.click() - } - } TextArea { @@ -129,22 +123,14 @@ Pane { text: qsTr("Send") enabled: messageField.length > 0 | attachFileUrl.length > 0 onClicked: { + sendButton.down = true; let msg = root.createMessage(); root.context.sendMessage(root.chatId, msg); + sendButton.down = false; attachFileUrl = ""; messageField.text = ""; root.context.setDraft(chatId, null); } - - action: Action { - shortcut: "Ctrl+S" - onTriggered: { - if (sendButton.enabled == true) - sendButton.click(); - - } - } - } Button { -- cgit v1.2.3-70-g09d2