Skip to content

L
linphone-desktop
Commit 17efccd5 authored by Ronan Abhamon's avatar Ronan Abhamon
Browse files
Options

feat(ui/views/App/Calls/ZrtpTokenAuthentication): coding style & refactoring

parent 9ccbd52d
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 106 deletions
linphone-desktop/assets/languages/en.ts
View file @ 17efccd5
...@@ -833,7 +833,7 @@ your friend&apos;s SIP address or username.</translation> ...@@ -833,7 +833,7 @@ your friend&apos;s SIP address or username.</translation>
<name>MessageMenu</name> <name>MessageMenu</name>
<message> <message>
<source>copy</source> <source>copy</source>
<translation type="unfinished"></translation> <translation>Copy</translation>
</message> </message>
</context> </context>
<context> <context>
...@@ -1362,23 +1362,23 @@ your friend&apos;s SIP address or username.</translation> ...@@ -1362,23 +1362,23 @@ your friend&apos;s SIP address or username.</translation>
<context> <context>
<name>ZrtpTokenAuthentication</name> <name>ZrtpTokenAuthentication</name>
<message> <message>
<source>Confirm the following SAS with peer:</source> <source>confirmSas</source>
<translation>Confirm the following SAS with peer:</translation> <translation>Confirm the following SAS with peer.</translation>
</message> </message>
<message> <message>
<source>Say:</source> <source>codeA</source>
<translation>Say:</translation> <translation>Say:</translation>
</message> </message>
<message> <message>
<source>Your correspondent should say:</source> <source>codeB</source>
<translation>Your correspondent should say:</translation> <translation>Your correspondent should say:</translation>
</message> </message>
<message> <message>
<source>Deny</source> <source>deny</source>
<translation>DENY</translation> <translation>DENY</translation>
</message> </message>
<message> <message>
<source>Accept</source> <source>accept</source>
<translation>ACCEPT</translation> <translation>ACCEPT</translation>
</message> </message>
</context> </context>
......
linphone-desktop/assets/languages/fr.ts
View file @ 17efccd5
...@@ -1361,24 +1361,24 @@ un chat ou ajouter un contact.</translation> ...@@ -1361,24 +1361,24 @@ un chat ou ajouter un contact.</translation>
<context> <context>
<name>ZrtpTokenAuthentication</name> <name>ZrtpTokenAuthentication</name>
<message> <message>
<source>Confirm the following SAS with peer:</source> <source>confirmSas</source>
<translation>Confirmez le SAS suivant avec votre interlocuteur :</translation> <translation>Confirmez le SAS suivant avec votre interlocuteur.</translation>
</message> </message>
<message> <message>
<source>Say:</source> <source>codeA</source>
<translation>Dites :</translation> <translation>Dites :</translation>
</message> </message>
<message> <message>
<source>Your correspondent should say:</source> <source>codeB</source>
<translation>Votre interlocuteur devrait dire :</translation> <translation>Votre interlocuteur devrait dire :</translation>
</message> </message>
<message> <message>
<source>Deny</source> <source>deny</source>
<translation>REJETER</translation> <translation>REFUSER</translation>
</message> </message>
<message> <message>
<source>Accept</source> <source>accept</source>
<translation>VALIDER</translation> <translation>ACCEPTER</translation>
</message> </message>
</context> </context>
</TS> </TS>
linphone-desktop/ui/views/App/Calls/Incall.js
View file @ 17efccd5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
// ============================================================================= // =============================================================================
function computeAvatarSize (maxSize) { function computeAvatarSize (maxSize) {
var height = zrtp.visible ? container.height - zrtp.height : container.height var height = container.height
var width = container.width var width = container.width
var size = height < maxSize && height > 0 ? height : maxSize var size = height < maxSize && height > 0 ? height : maxSize
......
linphone-desktop/ui/views/App/Calls/Incall.qml
View file @ 17efccd5
...@@ -249,8 +249,19 @@ Rectangle { ...@@ -249,8 +249,19 @@ Rectangle {
} }
} }
// -------------------------------------------------------------------------
// Zrtp.
// -------------------------------------------------------------------------
ZrtpTokenAuthentication { ZrtpTokenAuthentication {
id: zrtp id: zrtp
Layout.fillWidth: true
Layout.margins: CallStyle.container.margins
Layout.preferredHeight: CallStyle.zrtpArea.height
call: incall.call
z: Constants.zPopup
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
......
linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml
View file @ 17efccd5
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Common 1.0 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 import App.Styles 1.0
Item { // =============================================================================
height: CallStyle.zrtpArea.height
visible: false ColumnLayout {
id: zrtp
// ---------------------------------------------------------------------------
property var call
// ---------------------------------------------------------------------------
visible: false
// ---------------------------------------------------------------------------
// Main text.
// ---------------------------------------------------------------------------
Text {
Layout.fillWidth: true Layout.fillWidth: true
anchors.top: container.bottom
Layout.margins: CallStyle.container.margins horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
GridLayout {
anchors.centerIn: parent text: qsTr('confirmSas')
columns: 1
color: CallStyle.zrtpArea.text.colorA
Text { elide: Text.ElideRight
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter font {
horizontalAlignment: Text.AlignHCenter bold: true
verticalAlignment: Text.AlignVCenter pointSize: CallStyle.zrtpArea.text.fontSize
text: qsTr("Confirm the following SAS with peer:") }
elide: Text.ElideRight }
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true // ---------------------------------------------------------------------------
color: Colors.j // Rules.
} // ---------------------------------------------------------------------------
RowLayout { Row {
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
spacing: CallStyle.zrtpArea.vu.spacing
Layout.fillWidth: true spacing: CallStyle.zrtpArea.text.wordsSpacing
Text { Text {
text: qsTr("Say:") color: CallStyle.zrtpArea.text.colorA
font.pointSize: CallStyle.zrtpArea.fontSize font.pointSize: CallStyle.zrtpArea.text.fontSize
color: Colors.j text: qsTr('codeA')
} }
Text { Text {
text: incall.call.localSAS color: CallStyle.zrtpArea.text.colorB
font.pointSize: CallStyle.zrtpArea.fontSize
font.bold: true font {
color: Colors.i bold: true
} pointSize: CallStyle.zrtpArea.text.fontSize
}
Text {
text: "-" text: zrtp.call.localSAS
font.pointSize: CallStyle.zrtpArea.fontSize }
color: Colors.j
} Text {
color: CallStyle.zrtpArea.text.colorA
Text { font.pointSize: CallStyle.zrtpArea.text.fontSize
text: qsTr("Your correspondent should say:") text: '-'
font.pointSize: CallStyle.zrtpArea.fontSize }
color: Colors.j
} Text {
color: CallStyle.zrtpArea.text.colorA
Text { font.pointSize: CallStyle.zrtpArea.text.fontSize
text: incall.call.remoteSAS text: qsTr('codeB')
font.pointSize: CallStyle.zrtpArea.fontSize }
font.bold: true
color: Colors.i Text {
} color: CallStyle.zrtpArea.text.colorB
}
font {
RowLayout { bold: true
anchors.horizontalCenter: parent.horizontalCenter pointSize: CallStyle.zrtpArea.text.fontSize
spacing: CallStyle.zrtpArea.vu.spacing }
Layout.fillWidth: true
text: zrtp.call.remoteSAS
TextButtonA { }
text: qsTr('Deny') }
onClicked: {
zrtp.visible = false // ---------------------------------------------------------------------------
incall.call.verifyAuthenticationToken(false) // Buttons.
} // ---------------------------------------------------------------------------
}
Row {
TextButtonB { Layout.alignment: Qt.AlignHCenter
text: qsTr('Accept')
onClicked: { spacing: CallStyle.zrtpArea.buttons.spacing
zrtp.visible = false
incall.call.verifyAuthenticationToken(true) TextButtonA {
} text: qsTr('deny')
} onClicked: {
} zrtp.visible = false
zrtp.call.verifyAuthenticationToken(false)
}
}
TextButtonB {
text: qsTr('accept')
onClicked: {
zrtp.visible = false
zrtp.call.verifyAuthenticationToken(true)
}
} }
} }
\ No newline at end of file }
linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
View file @ 17efccd5
...@@ -79,10 +79,16 @@ QtObject { ...@@ -79,10 +79,16 @@ QtObject {
property QtObject zrtpArea: QtObject { property QtObject zrtpArea: QtObject {
property int height: 50 property int height: 50
property int fontSize: 12
property QtObject vu: QtObject { property QtObject buttons: QtObject {
property int spacing: 5 property int spacing: 10
}
property QtObject text: QtObject {
property color colorA: Colors.j
property color colorB: Colors.i
property int fontSize: 12
property int wordsSpacing: 5
} }
} }
} }
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