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

conference: use CurrentCall.isModerator instead of meModerator

Browse source 
GitLab: #1079

Change-Id: I0ad09d2a8f47de17103500ebb7eb212bda96e37d
This commit is contained in:
Aline Gondim Santos 2023-05-25 14:39:37 -03:00
parent f1aa4173df
commit afb9211e7a
4 changed files with 12 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/app/calladapter.cpp
View file

@ -689,23 +689,6 @@ CallAdapter::participantIsHost(const QString& uri) const
return true; return true;
} }
bool
CallAdapter::isModerator(const QString& uri) const
{
auto* callModel = lrcInstance_->getAccountInfo(accountId_).callModel.get();
const auto& convInfo = lrcInstance_->getConversationFromConvUid(
lrcInstance_->get_selectedConvUid());
auto confId = convInfo.confId;
if (confId.isEmpty())
confId = convInfo.callId;
try {
return callModel->isModerator(confId, uri);
} catch (...) {
}
return false;
}
bool bool
CallAdapter::isHandRaised(const QString& uri) const CallAdapter::isHandRaised(const QString& uri) const
{ {

1
src/app/calladapter.h
View file

@ -71,7 +71,6 @@ public:
Q_INVOKABLE bool isCurrentHost() const; Q_INVOKABLE bool isCurrentHost() const;
Q_INVOKABLE bool participantIsHost(const QString& uri) const; Q_INVOKABLE bool participantIsHost(const QString& uri) const;
Q_INVOKABLE void setModerator(const QString& uri, const bool state); Q_INVOKABLE void setModerator(const QString& uri, const bool state);
Q_INVOKABLE bool isModerator(const QString& uri = {}) const;
Q_INVOKABLE bool isHandRaised(const QString& uri = {}) const; Q_INVOKABLE bool isHandRaised(const QString& uri = {}) const;
Q_INVOKABLE void raiseHand(const QString& uri, const QString& deviceId, bool state); Q_INVOKABLE void raiseHand(const QString& uri, const QString& deviceId, bool state);
Q_INVOKABLE void holdThisCallToggle(); Q_INVOKABLE void holdThisCallToggle();

2
src/app/mainview/components/ParticipantControlLayout.qml
View file

@ -49,7 +49,7 @@ RowLayout {
Layout.preferredWidth: buttonPreferredSize Layout.preferredWidth: buttonPreferredSize
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
source: showModeratorMute ? JamiResources.micro_black_24dp_svg : JamiResources.micro_off_black_24dp_svg source: showModeratorMute ? JamiResources.micro_black_24dp_svg : JamiResources.micro_off_black_24dp_svg
checkable: meModerator checkable: CurrentCall.isModerator
onClicked: { onClicked: {
if (participantIsModeratorMuted && isLocalMuted) { if (participantIsModeratorMuted && isLocalMuted) {
if (isMe) if (isMe)

23
src/app/mainview/components/ParticipantOverlay.qml
View file

@ -40,7 +40,7 @@ Item {
property string bestName: "" property string bestName: ""
property string sinkId: "" property string sinkId: ""
property bool participantIsActive: false property bool participantIsActive: false
property bool canMaximize: root.meModerator && (!root.participantIsActive || CallParticipantsModel.conferenceLayout === CallParticipantsModel.ONE_WITH_SMALL) property bool canMaximize: CurrentCall.isModerator && (!root.participantIsActive || CallParticipantsModel.conferenceLayout === CallParticipantsModel.ONE_WITH_SMALL)
property bool participantIsHost: CallAdapter.participantIsHost(uri) property bool participantIsHost: CallAdapter.participantIsHost(uri)
property bool participantIsModerator: false property bool participantIsModerator: false
property bool participantIsMuted: isLocalMuted || participantIsModeratorMuted property bool participantIsMuted: isLocalMuted || participantIsModeratorMuted
@ -53,7 +53,6 @@ Item {
property bool isSharing: false property bool isSharing: false
property bool meHost: CallAdapter.isCurrentHost() property bool meHost: CallAdapter.isCurrentHost()
property bool meModerator: CallAdapter.isModerator()
property bool isMe: false property bool isMe: false
property string muteAlertMessage: "" property string muteAlertMessage: ""
@ -181,7 +180,7 @@ Item {
ParticipantOverlayMenu { ParticipantOverlayMenu {
id: overlayMenu id: overlayMenu
visible: isMe || meModerator visible: isMe || CurrentCall.isModerator
anchors.fill: parent anchors.fill: parent
onHoveredChanged: { onHoveredChanged: {
@ -195,11 +194,11 @@ Item {
showSetModerator: root.meHost && !root.isMe && !root.participantIsModerator showSetModerator: root.meHost && !root.isMe && !root.participantIsModerator
showUnsetModerator: root.meHost && !root.isMe && root.participantIsModerator showUnsetModerator: root.meHost && !root.isMe && root.participantIsModerator
showModeratorMute: root.meModerator && !root.participantIsModeratorMuted showModeratorMute: CurrentCall.isModerator && !root.participantIsModeratorMuted
showModeratorUnmute: (root.meModerator || root.isMe) && root.participantIsModeratorMuted showModeratorUnmute: (CurrentCall.isModerator || root.isMe) && root.participantIsModeratorMuted
showMaximize: root.canMaximize showMaximize: root.canMaximize
showMinimize: root.meModerator && root.participantIsActive showMinimize: CurrentCall.isModerator && root.participantIsActive
showHangup: root.meModerator && !root.isMe && !root.participantIsHost showHangup: CurrentCall.isModerator && !root.isMe && !root.participantIsHost
} }
// Participant footer with host, moderator and mute indicators // Participant footer with host, moderator and mute indicators
@ -313,7 +312,7 @@ Item {
containerHeight: 12 containerHeight: 12
containerWidth: 12 containerWidth: 12
visible: (!root.isMe && !root.meModerator) ? root.participantIsMuted : root.isLocalMuted visible: (!root.isMe && !CurrentCall.isModerator) ? root.participantIsMuted : root.isLocalMuted
source: JamiResources.micro_off_black_24dp_svg source: JamiResources.micro_off_black_24dp_svg
color: JamiTheme.redColor color: JamiTheme.redColor
@ -324,11 +323,11 @@ Item {
MaterialToolTip { MaterialToolTip {
visible: hoverMicrophone.hovered visible: hoverMicrophone.hovered
text: { text: {
if (!root.isMe && !root.meModerator && root.participantIsModeratorMuted && root.isLocalMuted) if (!root.isMe && !CurrentCall.isModerator && root.participantIsModeratorMuted && root.isLocalMuted)
return JamiStrings.bothMuted; return JamiStrings.bothMuted;
if (root.isLocalMuted) if (root.isLocalMuted)
return JamiStrings.localMuted; return JamiStrings.localMuted;
if (!root.isMe && !root.meModerator && root.participantIsModeratorMuted) if (!root.isMe && !CurrentCall.isModerator && root.participantIsModeratorMuted)
return JamiStrings.moderatorMuted; return JamiStrings.moderatorMuted;
return JamiStrings.notMuted; return JamiStrings.notMuted;
} }
@ -353,12 +352,12 @@ Item {
visible: root.participantHandIsRaised visible: root.participantHandIsRaised
anchors.right: participantRect.right anchors.right: participantRect.right
anchors.top: participantRect.top anchors.top: participantRect.top
checkable: root.meModerator checkable: CurrentCall.isModerator
pressedColor: JamiTheme.raiseHandColor pressedColor: JamiTheme.raiseHandColor
hoveredColor: JamiTheme.raiseHandColor hoveredColor: JamiTheme.raiseHandColor
normalColor: JamiTheme.raiseHandColor normalColor: JamiTheme.raiseHandColor
z: participantRect.z + 1 z: participantRect.z + 1
toolTipText: root.meModerator ? JamiStrings.lowerHand : "" toolTipText: CurrentCall.isModerator ? JamiStrings.lowerHand : ""
onClicked: CallAdapter.raiseHand(uri, deviceId, false) onClicked: CallAdapter.raiseHand(uri, deviceId, false)
radius: 5 radius: 5
} }