diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index 8faa37356..8bce1f90d 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -170,6 +170,10 @@ userIdLabel User ID (optional) + + realmLabel + Realm + Calls diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index 0bf6af836..19d9a7917 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -170,6 +170,10 @@ userIdLabel ID utilisateur (optionnel) + + realmLabel + Realm + Calls diff --git a/linphone-desktop/src/components/authentication/Authentication.cpp b/linphone-desktop/src/components/authentication/Authentication.cpp index 60b8acc64..1269360b0 100644 --- a/linphone-desktop/src/components/authentication/Authentication.cpp +++ b/linphone-desktop/src/components/authentication/Authentication.cpp @@ -39,6 +39,7 @@ Authentication::Authentication (QObject *parent) : QObject(parent) { void Authentication::handleAuthenticationRequested (const shared_ptr &authInfo) { emit authenticationRequested( QVariant::fromValue(authInfo), + ::Utils::linphoneStringToQString(authInfo->getRealm()), QStringLiteral("%1@%2").arg( ::Utils::linphoneStringToQString(authInfo->getUsername()) ).arg( diff --git a/linphone-desktop/src/components/authentication/Authentication.hpp b/linphone-desktop/src/components/authentication/Authentication.hpp index 16f283d85..6798514fe 100644 --- a/linphone-desktop/src/components/authentication/Authentication.hpp +++ b/linphone-desktop/src/components/authentication/Authentication.hpp @@ -37,7 +37,7 @@ public: ~Authentication () = default; signals: - void authenticationRequested (const QVariant &authInfo, const QString &sipAddress, const QString &userId); + void authenticationRequested (const QVariant &authInfo, const QString &realm, const QString &sipAddress, const QString &userId); private: void handleAuthenticationRequested (const std::shared_ptr &authInfo); diff --git a/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml b/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml index 431500ec7..dd4650f74 100644 --- a/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml +++ b/linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml @@ -11,6 +11,7 @@ import 'AuthenticationRequest.js' as Logic DialogPlus { id: dialog + property alias realm: realm.text property alias sipAddress: identity.text property alias userId: userId.text @@ -63,6 +64,18 @@ DialogPlus { } } + FormLine { + FormGroup { + label: qsTr('realmLabel') + + TextField { + id: realm + + readOnly: true + } + } + } + FormLine { FormGroup { label: qsTr('userIdLabel') diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.js b/linphone-desktop/ui/views/App/Main/MainWindow.js index 50f21f042..796f61bf9 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindow.js +++ b/linphone-desktop/ui/views/App/Main/MainWindow.js @@ -88,9 +88,10 @@ function updateSelectedEntry (view, props) { // ----------------------------------------------------------------------------- -function handleAuthenticationRequested (authInfo, sipAddress, userId) { +function handleAuthenticationRequested (authInfo, realm, sipAddress, userId) { window.attachVirtualWindow(Qt.resolvedUrl('AuthenticationRequest.qml'), { authInfo: authInfo, + realm: realm, sipAddress: sipAddress, userId: userId }) diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml index 11d992373..781bb8aa3 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindow.qml +++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml @@ -87,7 +87,7 @@ ApplicationWindow { // ----------------------------------------------------------------------- Authentication { - onAuthenticationRequested: Logic.handleAuthenticationRequested(authInfo, sipAddress, userId) + onAuthenticationRequested: Logic.handleAuthenticationRequested(authInfo, realm, sipAddress, userId) } // ----------------------------------------------------------------------- diff --git a/linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml index 85e472584..4816b9d67 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 // ============================================================================= QtObject { - property int height: 366 + property int height: 416 property int leftMargin: 35 property int rightMargin: 35 property int width: 480