Mute/Unmute Chatrooms
This commit is contained in:
parent
0470988c32
commit
7484962441
8 changed files with 96 additions and 5 deletions
|
|
@ -319,6 +319,8 @@ void Notifier::notifyReceivedMessages(const std::shared_ptr<linphone::ChatRoom>
|
||||||
const list<shared_ptr<linphone::ChatMessage>> &messages) {
|
const list<shared_ptr<linphone::ChatMessage>> &messages) {
|
||||||
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
|
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
|
||||||
|
|
||||||
|
if (room->getMuted()) return;
|
||||||
|
|
||||||
QString txt;
|
QString txt;
|
||||||
QString remoteAddress;
|
QString remoteAddress;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1774,6 +1774,18 @@
|
||||||
<extracomment>"Supprimer"</extracomment>
|
<extracomment>"Supprimer"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="340"/>
|
||||||
|
<source>chat_room_mute</source>
|
||||||
|
<extracomment>"Mute"</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="340"/>
|
||||||
|
<source>chat_room_unmute</source>
|
||||||
|
<extracomment>"Unmute"</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="346"/>
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="346"/>
|
||||||
<source>chat_list_delete_chat_popup_title</source>
|
<source>chat_list_delete_chat_popup_title</source>
|
||||||
|
|
@ -3082,6 +3094,12 @@ Error</extracomment>
|
||||||
<extracomment>"Sourdine"</extracomment>
|
<extracomment>"Sourdine"</extracomment>
|
||||||
<translation>Stummschalten</translation>
|
<translation>Stummschalten</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="117"/>
|
||||||
|
<source>group_infos_unmute</source>
|
||||||
|
<extracomment>"Réactiver les notifications"</extracomment>
|
||||||
|
<translation>Unmute</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="139"/>
|
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="139"/>
|
||||||
<source>group_infos_meeting</source>
|
<source>group_infos_meeting</source>
|
||||||
|
|
@ -4245,6 +4263,12 @@ Error</extracomment>
|
||||||
<extracomment>"Sourdine"</extracomment>
|
<extracomment>"Sourdine"</extracomment>
|
||||||
<translation>Stummschalten</translation>
|
<translation>Stummschalten</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="74"/>
|
||||||
|
<source>one_one_infos_unmute</source>
|
||||||
|
<extracomment>"Réactiver les notifications"</extracomment>
|
||||||
|
<translation>Unmute</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="86"/>
|
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="86"/>
|
||||||
<source>one_one_infos_search</source>
|
<source>one_one_infos_search</source>
|
||||||
|
|
|
||||||
|
|
@ -1736,6 +1736,18 @@
|
||||||
<extracomment>"Supprimer"</extracomment>
|
<extracomment>"Supprimer"</extracomment>
|
||||||
<translation>Delete</translation>
|
<translation>Delete</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="340"/>
|
||||||
|
<source>chat_room_mute</source>
|
||||||
|
<extracomment>"Sourdine"</extracomment>
|
||||||
|
<translation>Mute</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="340"/>
|
||||||
|
<source>chat_room_unmute</source>
|
||||||
|
<extracomment>"Unmute"</extracomment>
|
||||||
|
<translation>Unmute</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="346"/>
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="346"/>
|
||||||
<source>chat_list_delete_chat_popup_title</source>
|
<source>chat_list_delete_chat_popup_title</source>
|
||||||
|
|
@ -3005,6 +3017,12 @@ Only your correspondent can decrypt them.</translation>
|
||||||
<extracomment>"Sourdine"</extracomment>
|
<extracomment>"Sourdine"</extracomment>
|
||||||
<translation>Mute</translation>
|
<translation>Mute</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="117"/>
|
||||||
|
<source>group_infos_unmute</source>
|
||||||
|
<extracomment>"Réactiver les notifications"</extracomment>
|
||||||
|
<translation>Unmute</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="139"/>
|
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="139"/>
|
||||||
<source>group_infos_meeting</source>
|
<source>group_infos_meeting</source>
|
||||||
|
|
@ -4158,6 +4176,12 @@ Only your correspondent can decrypt them.</translation>
|
||||||
<extracomment>"Sourdine"</extracomment>
|
<extracomment>"Sourdine"</extracomment>
|
||||||
<translation>Mute</translation>
|
<translation>Mute</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="74"/>
|
||||||
|
<source>one_one_infos_unmute</source>
|
||||||
|
<extracomment>"Réactiver les notifications"</extracomment>
|
||||||
|
<translation>Unmute</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="86"/>
|
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="86"/>
|
||||||
<source>one_one_infos_search</source>
|
<source>one_one_infos_search</source>
|
||||||
|
|
|
||||||
|
|
@ -1736,6 +1736,18 @@
|
||||||
<extracomment>"Supprimer"</extracomment>
|
<extracomment>"Supprimer"</extracomment>
|
||||||
<translation>Supprimer</translation>
|
<translation>Supprimer</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="340"/>
|
||||||
|
<source>chat_room_mute</source>
|
||||||
|
<extracomment>"Sourdine"</extracomment>
|
||||||
|
<translation>Mettre en sourdine</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="340"/>
|
||||||
|
<source>chat_room_unmute</source>
|
||||||
|
<extracomment>"Unmute"</extracomment>
|
||||||
|
<translation>Enlever la sourdine </translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="346"/>
|
<location filename="../../view/Control/Display/Chat/ChatListView.qml" line="346"/>
|
||||||
<source>chat_list_delete_chat_popup_title</source>
|
<source>chat_list_delete_chat_popup_title</source>
|
||||||
|
|
@ -3005,6 +3017,12 @@ en bout. Seul votre correspondant peut les déchiffrer.</translation>
|
||||||
<extracomment>"Sourdine"</extracomment>
|
<extracomment>"Sourdine"</extracomment>
|
||||||
<translation>Sourdine</translation>
|
<translation>Sourdine</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="117"/>
|
||||||
|
<source>group_infos_unmute</source>
|
||||||
|
<extracomment>"Réactiver les notifications"</extracomment>
|
||||||
|
<translation>Réactiver les notifications</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="139"/>
|
<location filename="../../view/Page/Layout/Chat/GroupConversationInfos.qml" line="139"/>
|
||||||
<source>group_infos_meeting</source>
|
<source>group_infos_meeting</source>
|
||||||
|
|
@ -4158,6 +4176,12 @@ en bout. Seul votre correspondant peut les déchiffrer.</translation>
|
||||||
<extracomment>"Sourdine"</extracomment>
|
<extracomment>"Sourdine"</extracomment>
|
||||||
<translation>Sourdine</translation>
|
<translation>Sourdine</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="74"/>
|
||||||
|
<source>one_one_infos_unmute</source>
|
||||||
|
<extracomment>"Réactiver les notifications"</extracomment>
|
||||||
|
<translation>Réactiver les notifications</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="86"/>
|
<location filename="../../view/Page/Layout/Chat/OneOneConversationInfos.qml" line="86"/>
|
||||||
<source>one_one_infos_search</source>
|
<source>one_one_infos_search</source>
|
||||||
|
|
|
||||||
|
|
@ -335,6 +335,17 @@ ListView {
|
||||||
visible: mouseArea.containsMouse || hovered || popup.opened
|
visible: mouseArea.containsMouse || hovered || popup.opened
|
||||||
enabled: visible
|
enabled: visible
|
||||||
popup.contentItem: ColumnLayout {
|
popup.contentItem: ColumnLayout {
|
||||||
|
IconLabelButton {
|
||||||
|
//: "Sourdine"
|
||||||
|
text: modelData.core.muted ? qsTr("chat_room_unmute") : qsTr("chat_room_mute")
|
||||||
|
icon.source: modelData.core.muted ? AppIcons.bell : AppIcons.bellSlash
|
||||||
|
spacing: Math.round(10 * DefaultStyle.dp)
|
||||||
|
Layout.fillWidth: true
|
||||||
|
onClicked: {
|
||||||
|
modelData.core.muted = !modelData.core.muted
|
||||||
|
chatroomPopup.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
IconLabelButton {
|
IconLabelButton {
|
||||||
//: "Supprimer"
|
//: "Supprimer"
|
||||||
text: qsTr("chat_room_delete")
|
text: qsTr("chat_room_delete")
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,14 @@ RowLayout {
|
||||||
capitalization: Font.Capitalize
|
capitalization: Font.Capitalize
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
EffectImage {
|
||||||
|
visible: mainItem.chat?.core.muted
|
||||||
|
Layout.preferredWidth: 20 * DefaultStyle.dp
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
|
Layout.preferredHeight: 20 * DefaultStyle.dp
|
||||||
|
colorizationColor: DefaultStyle.main1_500_main
|
||||||
|
imageSource: AppIcons.bellSlash
|
||||||
|
}
|
||||||
},
|
},
|
||||||
RowLayout {
|
RowLayout {
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
|
||||||
|
|
@ -116,10 +116,8 @@ ColumnLayout {
|
||||||
button.icon.height: Math.round(24 * DefaultStyle.dp)
|
button.icon.height: Math.round(24 * DefaultStyle.dp)
|
||||||
button.icon.source: chatCore.muted ? AppIcons.bell : AppIcons.bellSlash
|
button.icon.source: chatCore.muted ? AppIcons.bell : AppIcons.bellSlash
|
||||||
//: "Sourdine"
|
//: "Sourdine"
|
||||||
label: qsTr("group_infos_mute")
|
label: chatCore.muted ? qsTr("group_infos_unmute") : qsTr("group_infos_mute")
|
||||||
button.onClicked: {
|
button.onClicked: chatCore.muted = !chatCore.muted
|
||||||
chatCore.muted = !chatCore.muted
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
LabelButton {
|
LabelButton {
|
||||||
visible: !SettingsCpp.disableMeetingsFeature
|
visible: !SettingsCpp.disableMeetingsFeature
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ ColumnLayout {
|
||||||
button.icon.height: Math.round(24 * DefaultStyle.dp)
|
button.icon.height: Math.round(24 * DefaultStyle.dp)
|
||||||
button.icon.source: mainItem.chatCore.muted ? AppIcons.bell : AppIcons.bellSlash
|
button.icon.source: mainItem.chatCore.muted ? AppIcons.bell : AppIcons.bellSlash
|
||||||
//: "Sourdine"
|
//: "Sourdine"
|
||||||
label: qsTr("one_one_infos_mute")
|
label: mainItem.chatCore.muted ? qsTr("one_one_infos_unmute") : qsTr("one_one_infos_mute")
|
||||||
button.onClicked: {
|
button.onClicked: {
|
||||||
mainItem.chatCore.muted = !mainItem.chatCore.muted
|
mainItem.chatCore.muted = !mainItem.chatCore.muted
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue