Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-desktop
Commits
4fa94882
Commit
4fa94882
authored
May 16, 2017
by
Ronan
Browse files
fix(ui/views/App/Main/Contacts): use correctly `SipAddressesMenu`
parent
44bb52b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml
...ne-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml
+4
-6
linphone-desktop/ui/views/App/Main/Contacts.qml
linphone-desktop/ui/views/App/Main/Contacts.qml
+3
-3
No files found.
linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml
View file @
4fa94882
...
@@ -10,7 +10,6 @@ Item {
...
@@ -10,7 +10,6 @@ Item {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
property
alias
launcher
:
menu
.
launcher
property
alias
relativeTo
:
menu
.
relativeTo
property
alias
relativeTo
:
menu
.
relativeTo
property
alias
relativeX
:
menu
.
relativeX
property
alias
relativeX
:
menu
.
relativeX
property
alias
relativeY
:
menu
.
relativeY
property
alias
relativeY
:
menu
.
relativeY
...
@@ -19,7 +18,7 @@ Item {
...
@@ -19,7 +18,7 @@ Item {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
function
show
Menu
()
{
function
show
()
{
var
length
=
sipAddresses
.
length
var
length
=
sipAddresses
.
length
if
(
!
length
)
{
if
(
!
length
)
{
return
return
...
@@ -29,7 +28,7 @@ Item {
...
@@ -29,7 +28,7 @@ Item {
return
sipAddressesMenu
.
sipAddressClicked
(
sipAddresses
[
0
])
return
sipAddressesMenu
.
sipAddressClicked
(
sipAddresses
[
0
])
}
}
menu
.
show
Menu
()
menu
.
show
()
}
}
function
_fillModel
()
{
function
_fillModel
()
{
...
@@ -57,13 +56,12 @@ Item {
...
@@ -57,13 +56,12 @@ Item {
entryHeight
:
SipAddressesMenuStyle
.
entry
.
height
entryHeight
:
SipAddressesMenuStyle
.
entry
.
height
maxMenuHeight
:
SipAddressesMenuStyle
.
maxHeight
maxMenuHeight
:
SipAddressesMenuStyle
.
maxHeight
width
:
SipAddressesMenuStyle
.
entry
.
width
ScrollableListView
{
ScrollableListView
{
id
:
list
id
:
list
anchors.fill
:
parent
spacing
:
SipAddressesMenuStyle
.
spacing
spacing
:
SipAddressesMenuStyle
.
spacing
width
:
SipAddressesMenuStyle
.
entry
.
width
model
:
ListModel
{
model
:
ListModel
{
id
:
model
id
:
model
...
@@ -106,7 +104,7 @@ Item {
...
@@ -106,7 +104,7 @@ Item {
hoverEnabled
:
true
hoverEnabled
:
true
onClicked
:
{
onClicked
:
{
menu
.
hide
Menu
()
menu
.
hide
()
sipAddressesMenu
.
sipAddressClicked
(
$sipAddress
)
sipAddressesMenu
.
sipAddressClicked
(
$sipAddress
)
}
}
}
}
...
...
linphone-desktop/ui/views/App/Main/Contacts.qml
View file @
4fa94882
...
@@ -132,17 +132,17 @@ ColumnLayout {
...
@@ -132,17 +132,17 @@ ColumnLayout {
ActionButton
{
ActionButton
{
icon
:
'
video_call
'
icon
:
'
video_call
'
onClicked
:
actions
.
itemAt
(
0
).
show
Menu
()
onClicked
:
actions
.
itemAt
(
0
).
show
()
}
}
ActionButton
{
ActionButton
{
icon
:
'
call
'
icon
:
'
call
'
onClicked
:
actions
.
itemAt
(
1
).
show
Menu
()
onClicked
:
actions
.
itemAt
(
1
).
show
()
}
}
ActionButton
{
ActionButton
{
icon
:
'
chat
'
icon
:
'
chat
'
onClicked
:
actions
.
itemAt
(
2
).
show
Menu
()
onClicked
:
actions
.
itemAt
(
2
).
show
()
}
}
}
}
...
...
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