Skip to content

L
linphone-desktop
Commit 545f39cf authored by Sylvain Berfini's avatar Sylvain Berfini
Browse files
Options

Moved ZRTP token authentication into it's own component

parent 59010084
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 123 deletions
linphone-desktop/assets/languages/en.ts
View file @ 545f39cf
......@@ -731,26 +731,6 @@ Server url not configured.</translation>
<source>pendingRequestLabel</source>
<translation>Please to wait, a request is pending.</translation>
</message>
<message>
<source>Say:</source>
<translation>Say:</translation>
</message>
<message>
<source>Your correspondent should say:</source>
<translation>Your correspondent should say:</translation>
</message>
<message>
<source>Deny</source>
<translation>DENY</translation>
</message>
<message>
<source>Accept</source>
<translation>ACCEPT</translation>
</message>
<message>
<source>Confirm the following SAS with peer:</source>
<translation>Confirm the following SAS with peer:</translation>
</message>
</context>
<context>
<name>InviteFriends</name>
......@@ -1365,4 +1345,27 @@ your friend&apos;s SIP address or username.</translation>
<translation>Transport</translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>
<message>
<source>Confirm the following SAS with peer:</source>
<translation>Confirm the following SAS with peer:</translation>
</message>
<message>
<source>Say:</source>
<translation>Say:</translation>
</message>
<message>
<source>Your correspondent should say:</source>
<translation>Your correspondent should say:</translation>
</message>
<message>
<source>Deny</source>
<translation>DENY</translation>
</message>
<message>
<source>Accept</source>
<translation>ACCEPT</translation>
</message>
</context>
</TS>
linphone-desktop/assets/languages/fr.ts
View file @ 545f39cf
......@@ -731,26 +731,6 @@ Url du serveur non configurée.</translation>
<source>pendingRequestLabel</source>
<translation>Merci de patienter, une requête est en attente.</translation>
</message>
<message>
<source>Say:</source>
<translation>Dites :</translation>
</message>
<message>
<source>Your correspondent should say:</source>
<translation>Votre interlocuteur devrait dire :</translation>
</message>
<message>
<source>Deny</source>
<translation>REJETER</translation>
</message>
<message>
<source>Accept</source>
<translation>VALIDER</translation>
</message>
<message>
<source>Confirm the following SAS with peer:</source>
<translation>Confirmez le SAS suivant avec votre interlocuteur :</translation>
</message>
</context>
<context>
<name>InviteFriends</name>
......@@ -1364,4 +1344,27 @@ un chat ou ajouter un contact.</translation>
<translation>Transport</translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>
<message>
<source>Confirm the following SAS with peer:</source>
<translation>Confirmez le SAS suivant avec votre interlocuteur :</translation>
</message>
<message>
<source>Say:</source>
<translation>Dites :</translation>
</message>
<message>
<source>Your correspondent should say:</source>
<translation>Votre interlocuteur devrait dire :</translation>
</message>
<message>
<source>Deny</source>
<translation>REJETER</translation>
</message>
<message>
<source>Accept</source>
<translation>VALIDER</translation>
</message>
</context>
</TS>
linphone-desktop/resources.qrc
View file @ 545f39cf
......@@ -371,6 +371,7 @@
<file>ui/views/App/Calls/Incall.qml</file>
<file>ui/views/App/Calls/IncomingCall.qml</file>
<file>ui/views/App/Calls/OutgoingCall.qml</file>
<file>ui/views/App/Calls/ZrtpTokenAuthentication.qml</file>
<file>ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml</file>
<file>ui/views/App/Main/Assistant/AssistantAbstractView.qml</file>
<file>ui/views/App/Main/Assistant/AssistantHome.qml</file>
......
linphone-desktop/ui/views/App/Calls/Incall.qml
View file @ 545f39cf
......@@ -249,90 +249,8 @@ Rectangle {
}
}
Item {
ZrtpTokenAuthentication {
id: zrtp
height: CallStyle.zrtpArea.height
visible: false
Layout.fillWidth: true
anchors.top: container.bottom
Layout.margins: CallStyle.container.margins
GridLayout {
anchors.centerIn: parent
columns: 1
Text {
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: qsTr("Confirm the following SAS with peer:")
elide: Text.ElideRight
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true
color: Colors.j
}
RowLayout {
anchors.horizontalCenter: parent.horizontalCenter
spacing: CallStyle.zrtpArea.vu.spacing
Layout.fillWidth: true
Text {
text: qsTr("Say:")
font.pointSize: CallStyle.zrtpArea.fontSize
color: Colors.j
}
Text {
text: incall.call.localSAS
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true
color: Colors.i
}
Text {
text: "-"
font.pointSize: CallStyle.zrtpArea.fontSize
color: Colors.j
}
Text {
text: qsTr("Your correspondent should say:")
font.pointSize: CallStyle.zrtpArea.fontSize
color: Colors.j
}
Text {
text: incall.call.remoteSAS
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true
color: Colors.i
}
}
RowLayout {
anchors.horizontalCenter: parent.horizontalCenter
spacing: CallStyle.zrtpArea.vu.spacing
Layout.fillWidth: true
TextButtonA {
text: qsTr('Deny')
onClicked: {
zrtp.visible = false
incall.call.verifyAuthenticationToken(false)
}
}
TextButtonB {
text: qsTr('Accept')
onClicked: {
zrtp.visible = false
incall.call.verifyAuthenticationToken(true)
}
}
}
}
}
// -------------------------------------------------------------------------
......
linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml 0 → 100644
View file @ 545f39cf
import QtQuick 2.7
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.3
import Common 1.0
import Common.Styles 1.0
import Linphone 1.0
import LinphoneUtils 1.0
import Utils 1.0
import App.Styles 1.0
Item {
height: CallStyle.zrtpArea.height
visible: false
Layout.fillWidth: true
anchors.top: container.bottom
Layout.margins: CallStyle.container.margins
GridLayout {
anchors.centerIn: parent
columns: 1
Text {
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: qsTr("Confirm the following SAS with peer:")
elide: Text.ElideRight
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true
color: Colors.j
}
RowLayout {
anchors.horizontalCenter: parent.horizontalCenter
spacing: CallStyle.zrtpArea.vu.spacing
Layout.fillWidth: true
Text {
text: qsTr("Say:")
font.pointSize: CallStyle.zrtpArea.fontSize
color: Colors.j
}
Text {
text: incall.call.localSAS
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true
color: Colors.i
}
Text {
text: "-"
font.pointSize: CallStyle.zrtpArea.fontSize
color: Colors.j
}
Text {
text: qsTr("Your correspondent should say:")
font.pointSize: CallStyle.zrtpArea.fontSize
color: Colors.j
}
Text {
text: incall.call.remoteSAS
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true
color: Colors.i
}
}
RowLayout {
anchors.horizontalCenter: parent.horizontalCenter
spacing: CallStyle.zrtpArea.vu.spacing
Layout.fillWidth: true
TextButtonA {
text: qsTr('Deny')
onClicked: {
zrtp.visible = false
incall.call.verifyAuthenticationToken(false)
}
}
TextButtonB {
text: qsTr('Accept')
onClicked: {
zrtp.visible = false
incall.call.verifyAuthenticationToken(true)
}
}
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023