Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
cf547ff6
Commit
cf547ff6
authored
Apr 14, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Main/AuthenticationRequest): display realm
parent
fc9fcc19
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
4 deletions
+27
-4
en.ts
linphone-desktop/assets/languages/en.ts
+4
-0
fr.ts
linphone-desktop/assets/languages/fr.ts
+4
-0
Authentication.cpp
...-desktop/src/components/authentication/Authentication.cpp
+1
-0
Authentication.hpp
...-desktop/src/components/authentication/Authentication.hpp
+1
-1
AuthenticationRequest.qml
linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml
+13
-0
MainWindow.js
linphone-desktop/ui/views/App/Main/MainWindow.js
+2
-1
MainWindow.qml
linphone-desktop/ui/views/App/Main/MainWindow.qml
+1
-1
AuthenticationRequestStyle.qml
...p/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml
+1
-1
No files found.
linphone-desktop/assets/languages/en.ts
View file @
cf547ff6
...
...
@@ -170,6 +170,10 @@
<
source
>
userIdLabel
<
/source
>
<
translation
>
User
ID
(
optional
)
<
/translation
>
<
/message
>
<
message
>
<
source
>
realmLabel
<
/source
>
<
translation
>
Realm
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
Calls
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
cf547ff6
...
...
@@ -170,6 +170,10 @@
<
source
>
userIdLabel
<
/source
>
<
translation
>
ID
utilisateur
(
optionnel
)
<
/translation
>
<
/message
>
<
message
>
<
source
>
realmLabel
<
/source
>
<
translation
>
Realm
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
Calls
<
/name
>
...
...
linphone-desktop/src/components/authentication/Authentication.cpp
View file @
cf547ff6
...
...
@@ -39,6 +39,7 @@ Authentication::Authentication (QObject *parent) : QObject(parent) {
void
Authentication
::
handleAuthenticationRequested
(
const
shared_ptr
<
linphone
::
AuthInfo
>
&
authInfo
)
{
emit
authenticationRequested
(
QVariant
::
fromValue
(
authInfo
),
::
Utils
::
linphoneStringToQString
(
authInfo
->
getRealm
()),
QStringLiteral
(
"%1@%2"
).
arg
(
::
Utils
::
linphoneStringToQString
(
authInfo
->
getUsername
())
).
arg
(
...
...
linphone-desktop/src/components/authentication/Authentication.hpp
View file @
cf547ff6
...
...
@@ -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
<
linphone
::
AuthInfo
>
&
authInfo
);
...
...
linphone-desktop/ui/views/App/Main/AuthenticationRequest.qml
View file @
cf547ff6
...
...
@@ -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
'
)
...
...
linphone-desktop/ui/views/App/Main/MainWindow.js
View file @
cf547ff6
...
...
@@ -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
})
...
...
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @
cf547ff6
...
...
@@ -87,7 +87,7 @@ ApplicationWindow {
// -----------------------------------------------------------------------
Authentication
{
onAuthenticationRequested
:
Logic
.
handleAuthenticationRequested
(
authInfo
,
sipAddress
,
userId
)
onAuthenticationRequested
:
Logic
.
handleAuthenticationRequested
(
authInfo
,
realm
,
sipAddress
,
userId
)
}
// -----------------------------------------------------------------------
...
...
linphone-desktop/ui/views/App/Styles/Main/AuthenticationRequestStyle.qml
View file @
cf547ff6
...
...
@@ -4,7 +4,7 @@ import QtQuick 2.7
// =============================================================================
QtObject
{
property
int
height
:
36
6
property
int
height
:
41
6
property
int
leftMargin
:
35
property
int
rightMargin
:
35
property
int
width
:
480
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment