lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-10 09:45:40 +02:00
Code Activity

contextmenu: remove incorrect block contact

Browse source 
Change-Id: Ia3c72757c903e022f2cbf6d74fc0e0916cd83a94
GitLab: #1270
This commit is contained in:
Sébastien Blin 2023-07-27 14:19:37 -04:00
parent a5bf258476
commit 5e874f4f4b
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/app/constant/JamiStrings.qml
View file

@ -266,7 +266,6 @@ Item {
property string confirmBlockConversation: qsTr("Would you really like to block this conversation?") property string confirmBlockConversation: qsTr("Would you really like to block this conversation?")
property string removeContact: qsTr("Remove contact") property string removeContact: qsTr("Remove contact")
property string blockContact: qsTr("Block contact") property string blockContact: qsTr("Block contact")
property string blockSwarm: qsTr("Block swarm")
property string convDetails: qsTr("Conversation details") property string convDetails: qsTr("Conversation details")
property string contactDetails: qsTr("Contact details") property string contactDetails: qsTr("Contact details")

4
src/app/mainview/components/ConversationSmartListContextMenu.qml
View file

@ -126,8 +126,8 @@ ContextMenuAutoLoader {
GeneralMenuItem { GeneralMenuItem {
id: blockContact id: blockContact
canTrigger: !hasCall && contactType !== Profile.Type.SIP && !root.isBanned canTrigger: !hasCall && contactType !== Profile.Type.SIP && !root.isBanned && isCoreDialog
itemName: !(mode && isCoreDialog) ? JamiStrings.blockContact : JamiStrings.blockSwarm itemName: JamiStrings.blockContact
iconSource: JamiResources.block_black_24dp_svg iconSource: JamiResources.block_black_24dp_svg
addMenuSeparatorAfter: canTrigger addMenuSeparatorAfter: canTrigger
onClicked: { onClicked: {