From b759e3578047b96968c9b9a817389d374850de59 Mon Sep 17 00:00:00 2001 From: Miquel Lionel Date: Thu, 4 Nov 2021 05:38:46 +0100 Subject: Implement sending Videochat invitations - layers popping function was hard to read in main.qml, add a line - add editable videochat instance setting --- qml/ComposePane.qml | 19 ++++++++++++++----- qml/SettingsPage.qml | 7 +++++++ qml/main.qml | 3 ++- 3 files changed, 23 insertions(+), 6 deletions(-) (limited to 'qml') diff --git a/qml/ComposePane.qml b/qml/ComposePane.qml index 976b4f1..1af4033 100644 --- a/qml/ComposePane.qml +++ b/qml/ComposePane.qml @@ -13,6 +13,7 @@ Pane { property var attachFileUrl: "" property bool canSend: root.chat && root.chat.canSend property bool isContactRequest: root.chat && root.chat.isContactRequest + readonly property string vChatUrl: root.context.getConfig("webrtc_instance") function createMessage() { let DC_MSG_TEXT = 10; @@ -100,24 +101,32 @@ Pane { Button { id: sendVChatUrl + enabled: vChatUrl.length > 0 ? true : false hoverEnabled: true ToolTip.visible: hovered ToolTip.text: "Send videochat invitation" text: "📞" + Layout.preferredWidth: attachButton.width / 2 + Layout.alignment: Qt.AlignBottom font.pixelSize: 20 + onClicked: { + if(vChatUrl.length > 0) + root.context.sendVChatInv(chatId); + } } Button { id: sendButton - action: Action { + action: Kirigami.Action { + checked: false shortcut: "Ctrl+S" onTriggered:{ if (sendButton.enabled) { root.focus = true; - focus = true; - down = true; - clicked(); - down = false; + sendButton.focus = true; + sendButton.down = true; + sendButton.clicked(); + sendButton.down = false; } } } diff --git a/qml/SettingsPage.qml b/qml/SettingsPage.qml index 1e28917..c963162 100644 --- a/qml/SettingsPage.qml +++ b/qml/SettingsPage.qml @@ -61,6 +61,13 @@ Kirigami.ScrollablePage { selectByMouse: true } + TextArea { + Kirigami.FormData.label: "Videochat instance: " + text: root.context.getConfig("webrtc_instance") + onEditingFinished: root.context.setConfig("webrtc_instance", text) + selectByMouse: true + } + Switch { text: "Prefer end-to-end encryption" checked: root.context.getConfig("e2ee_enabled") == "1" diff --git a/qml/main.qml b/qml/main.qml index f0798fd..34e94e8 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -162,7 +162,8 @@ Kirigami.ApplicationWindow { tooltip: "Alt+Tab" iconName: "system-users" onTriggered: { - while (pageStack.layers.depth > 1)pageStack.layers.pop() + while (pageStack.layers.depth > 1) + pageStack.layers.pop(); pageStack.layers.push(accountsPage); } }, -- cgit v1.2.3-70-g09d2