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
f1892798
Commit
f1892798
authored
Apr 13, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Main/ManageAccounts): display registration failed
parent
9a892096
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
4 deletions
+28
-4
AccountSettingsModel.cpp
...-desktop/src/components/settings/AccountSettingsModel.cpp
+0
-1
ComboBox.js
linphone-desktop/ui/modules/Common/Form/ComboBox.js
+21
-2
ComboBox.qml
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
+1
-1
ManageAccounts.qml
linphone-desktop/ui/views/App/Main/ManageAccounts.qml
+6
-0
No files found.
linphone-desktop/src/components/settings/AccountSettingsModel.cpp
View file @
f1892798
...
...
@@ -248,7 +248,6 @@ QVariantList AccountSettingsModel::getAccounts () const {
{
QVariantMap
account
;
account
[
"sipAddress"
]
=
::
Utils
::
linphoneStringToQString
(
core
->
getPrimaryContactParsed
()
->
asStringUriOnly
());
account
[
"proxyConfig"
].
setValue
(
shared_ptr
<
linphone
::
ProxyConfig
>
());
accounts
<<
account
;
}
...
...
linphone-desktop/ui/modules/Common/Form/ComboBox.js
View file @
f1892798
...
...
@@ -2,9 +2,13 @@
// `ComboBox.qml` Logic.
// =============================================================================
.
import
'
qrc:/ui/scripts/Utils/utils.js
'
as
Utils
// =============================================================================
function
getSelectedEntryIcon
()
{
var
iconRole
=
comboBox
.
iconRole
if
(
iconRole
.
length
===
0
)
{
if
(
iconRole
==
null
||
iconRole
.
length
===
0
)
{
return
''
}
...
...
@@ -14,6 +18,15 @@ function getSelectedEntryIcon () {
}
var
model
=
comboBox
.
model
if
(
Utils
.
isFunction
(
iconRole
))
{
return
iconRole
(
Utils
.
isArray
(
model
)
?
model
[
currentIndex
]
:
model
.
get
(
currentIndex
)
)
}
return
(
Utils
.
isArray
(
model
)
?
model
[
currentIndex
][
iconRole
]
...
...
@@ -23,5 +36,11 @@ function getSelectedEntryIcon () {
function
getEntryIcon
(
item
)
{
var
iconRole
=
comboBox
.
iconRole
return
(
iconRole
.
length
&&
item
.
flattenedModel
[
iconRole
])
||
''
if
(
iconRole
==
null
||
iconRole
.
length
===
0
)
{
return
''
}
return
Utils
.
isFunction
(
iconRole
)
?
iconRole
(
item
.
flattenedModel
)
:
item
.
flattenedModel
[
iconRole
]
}
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
View file @
f1892798
...
...
@@ -16,7 +16,7 @@ ComboBox {
// ---------------------------------------------------------------------------
property
string
iconRole
:
''
property
var
iconRole
// ---------------------------------------------------------------------------
...
...
linphone-desktop/ui/views/App/Main/ManageAccounts.qml
View file @
f1892798
...
...
@@ -62,6 +62,12 @@ DialogPlus {
})
model
:
AccountSettingsModel
.
accounts
iconRole
:
(
function
(
data
)
{
var
proxyConfig
=
data
.
proxyConfig
return
proxyConfig
&&
AccountSettingsModel
.
getProxyConfigDescription
(
proxyConfig
).
registrationState
!==
AccountSettingsModel
.
RegistrationStateRegistered
?
'
generic_error
'
:
''
})
textRole
:
'
sipAddress
'
onActivated
:
AccountSettingsModel
.
setDefaultProxyConfig
(
model
[
index
].
proxyConfig
)
...
...
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