From 06ddff4584d0d8a86e7754c084da35b51a70154b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Fri, 24 Mar 2023 14:25:10 -0400 Subject: [PATCH] sip: hide non working button https://git.jami.net/savoirfairelinux/jami-project/-/issues/1538 Change-Id: I50593347fe2c1adbeecdd371400f639234dad74c --- src/app/commoncomponents/SBSMessageBase.qml | 22 +++++++++++++-------- src/app/mainview/components/MessageBar.qml | 4 +++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml index d8473e2f..2375a9a2 100644 --- a/src/app/commoncomponents/SBSMessageBase.qml +++ b/src/app/commoncomponents/SBSMessageBase.qml @@ -276,10 +276,13 @@ Control { anchors.verticalCenter: parent.verticalCenter anchors.right: isOutgoing ? optionButtonItem.right : undefined anchors.left: !isOutgoing ? optionButtonItem.left : undefined - visible: Body !== "" && (bubbleArea.bubbleHovered - || hovered - || reply.hovered - || bgHandler.hovered) + visible: CurrentAccount.type !== Profile.Type.SIP && Body !== "" && + ( + bubbleArea.bubbleHovered + || hovered + || reply.hovered + || bgHandler.hovered + ) source: JamiResources.more_vert_24dp_svg width: optionButtonItem.width / 2 height: optionButtonItem.height @@ -312,10 +315,13 @@ Control { anchors.verticalCenter: parent.verticalCenter anchors.right: isOutgoing ? more.left : undefined anchors.left: !isOutgoing ? more.right : undefined - visible: Body !== "" && (bubbleArea.bubbleHovered - || hovered - || more.hovered - || bgHandler.hovered) + visible: CurrentAccount.type !== Profile.Type.SIP && Body !== "" && + ( + bubbleArea.bubbleHovered + || hovered + || more.hovered + || bgHandler.hovered + ) onClicked: { MessagesAdapter.editId = "" diff --git a/src/app/mainview/components/MessageBar.qml b/src/app/mainview/components/MessageBar.qml index 3ca1e603..16dfa630 100644 --- a/src/app/mainview/components/MessageBar.qml +++ b/src/app/mainview/components/MessageBar.qml @@ -97,6 +97,7 @@ ColumnLayout { preferredSize: JamiTheme.chatViewFooterButtonIconSize - 6 toolTipText: JamiStrings.sendFile + visible: !CurrentConversation.isSip source: JamiResources.link_black_24dp_svg @@ -117,6 +118,7 @@ ColumnLayout { preferredSize: JamiTheme.chatViewFooterButtonIconSize toolTipText: JamiStrings.leaveAudioMessage + visible: !CurrentConversation.isSip source: JamiResources.message_audio_black_24dp_svg @@ -134,7 +136,7 @@ ColumnLayout { Layout.alignment: Qt.AlignVCenter Layout.preferredWidth: JamiTheme.chatViewFooterButtonSize Layout.preferredHeight: JamiTheme.chatViewFooterButtonSize - visible: VideoDevices.listSize !== 0 + visible: VideoDevices.listSize !== 0 && !CurrentConversation.isSip radius: JamiTheme.chatViewFooterButtonRadius preferredSize: JamiTheme.chatViewFooterButtonIconSize