mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-28 17:29:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ui/views/App/Calls/Conference): remove useless tooltip that block button animations on pause

Browse source
This commit is contained in:
Wescoeur 2017-06-09 19:12:19 +02:00
parent 62428fa155
commit 29d54f7ec7
3 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone-desktop/assets/languages/en.ts
View file

@ -443,14 +443,6 @@ Server url not configured.</translation>
<source>conferenceTitle</source>
<translation>CONFERENCE</translation>
</message>
<message>
<source>leaveConf</source>
<translation>Temporarily leave the conference</translation>
</message>
<message>
<source>joinBackConf</source>
<translation>Join back the conference</translation>
</message>
</context>
<context>
<name>ConferenceControls</name>

8
linphone-desktop/assets/languages/fr.ts
View file

@ -443,14 +443,6 @@ Url du serveur non configurée.</translation>
<source>conferenceTitle</source>
<translation>CONFÉRENCE</translation>
</message>
<message>
<source>leaveConf</source>
<translation>Quitter temporairement la conférence</translation>
</message>
<message>
<source>joinBackConf</source>
<translation>Rejoindre la conférence</translation>
</message>
</context>
<context>
<name>ConferenceControls</name>

14
linphone-desktop/ui/views/App/Calls/Conference.qml
View file

@ -234,18 +234,20 @@ Rectangle {
rightMargin: CallStyle.actionArea.rightButtonsGroupMargin
verticalCenter: parent.verticalCenter
}
iconSize: CallStyle.actionArea.iconSize
ActionSwitch {
icon: 'pause'
enabled: conference.conferenceModel.isInConf
icon: 'pause'
onClicked: {
conference.conferenceModel.isInConf ? conference.conferenceModel.leave() : conference.conferenceModel.join()
}
TooltipArea {
text: conference.conferenceModel.isInConf ? qsTr('leaveConf') : qsTr('joinBackConf')
var model = conference.conferenceModel
if (model.isInConf) {
model.leave()
} else {
model.join()
}
}
}