mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-24 06:18:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(ui/views/App/Calls/Incall): better encryption tooltip

Browse source
This commit is contained in:
Ronan Abhamon 2017-06-07 11:03:20 +02:00
parent bd6a2a899c
commit 60b9f93a5b
5 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -315,10 +315,6 @@
<source>callErrorNotAcceptable</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>noMediaEncryption</source>
<translation>None</translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -812,6 +808,14 @@ Server url not configured.</translation>
<source>pendingRequestLabel</source>
<translation>Please to wait, a request is pending.</translation>
</message>
<message>
<source>securedStringFormat</source>
<translation>Call is encrypted with: %1.</translation>
</message>
<message>
<source>callNotSecured</source>
<translation>Call not encrypted.</translation>
</message>
</context>
<context>
<name>InviteFriends</name>

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

@ -315,10 +315,6 @@
<source>callErrorNotAcceptable</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>noMediaEncryption</source>
<translation>Aucun</translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -812,6 +808,14 @@ Url du serveur non configurée.</translation>
<source>pendingRequestLabel</source>
<translation>Merci de patienter, une requête est en attente.</translation>
</message>
<message>
<source>securedStringFormat</source>
<translation>L&apos;appel est chiffré avec: %1.</translation>
</message>
<message>
<source>callNotSecured</source>
<translation>Appel non chiffré.</translation>
</message>
</context>
<context>
<name>InviteFriends</name>

2
linphone-desktop/src/components/call/CallModel.cpp
View file

@ -541,7 +541,7 @@ QString CallModel::getSecuredString () const {
break;
}
return tr("noMediaEncryption");
return QStringLiteral("");
}
// -----------------------------------------------------------------------------

8
linphone-desktop/ui/views/App/Calls/Incall.js
View file

@ -64,6 +64,14 @@ function handleVideoRequested () {
})
}
function makeReadableSecuredString (securedString) {
if (!securedString.length) {
return qsTr('callNotSecured')
}
return qsTr('securedStringFormat').replace('%1', securedString)
}
function showFullscreen () {
if (incall._fullscreen) {
return

2
linphone-desktop/ui/views/App/Calls/Incall.qml
View file

@ -111,7 +111,7 @@ Rectangle {
onClicked: zrtp.visible = (incall.call.encryption === CallModel.CallEncryptionZRTP)
TooltipArea {
text: incall.call.securedString
text: Logic.makeReadableSecuredString(incall.call.securedString)
}
}
}