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
3d83700f
Commit
3d83700f
authored
Jan 24, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/modules/Linphone/Calls/Calls): deal with call clicks & display correctly current call
parent
bc6a75ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletion
+23
-1
CallControls.qml
tests/ui/modules/Linphone/Calls/CallControls.qml
+10
-0
Calls.qml
tests/ui/modules/Linphone/Calls/Calls.qml
+12
-0
CallsWindow.qml
tests/ui/views/App/Calls/CallsWindow.qml
+1
-1
No files found.
tests/ui/modules/Linphone/Calls/CallControls.qml
View file @
3d83700f
...
@@ -25,10 +25,20 @@ Rectangle {
...
@@ -25,10 +25,20 @@ Rectangle {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
signal
clicked
// ---------------------------------------------------------------------------
color
:
CallControlsStyle
.
color
color
:
CallControlsStyle
.
color
height
:
CallControlsStyle
.
height
height
:
CallControlsStyle
.
height
width
:
CallControlsStyle
.
width
width
:
CallControlsStyle
.
width
MouseArea
{
anchors.fill
:
parent
onClicked
:
callControls
.
clicked
()
}
RowLayout
{
RowLayout
{
anchors
{
anchors
{
fill
:
parent
fill
:
parent
...
...
tests/ui/modules/Linphone/Calls/Calls.qml
View file @
3d83700f
...
@@ -54,6 +54,7 @@ ListView {
...
@@ -54,6 +54,7 @@ ListView {
name
:
qsTr
(
'
terminateCall
'
)
name
:
qsTr
(
'
terminateCall
'
)
}],
}],
component
:
callActions
,
component
:
callActions
,
icon
:
'
hangup
'
,
string
:
'
connected
'
string
:
'
connected
'
}
}
...
@@ -214,10 +215,14 @@ ListView {
...
@@ -214,10 +215,14 @@ ListView {
delegate
:
CallControls
{
delegate
:
CallControls
{
id
:
_callControls
id
:
_callControls
// -------------------------------------------------------------------------
function
useColorStatus
()
{
function
useColorStatus
()
{
return
calls
.
currentIndex
===
index
&&
$call
&&
$call
.
status
!==
CallModel
.
CallStatusEnded
return
calls
.
currentIndex
===
index
&&
$call
&&
$call
.
status
!==
CallModel
.
CallStatusEnded
}
}
// -------------------------------------------------------------------------
color
:
useColorStatus
()
color
:
useColorStatus
()
?
CallsStyle
.
entry
.
color
.
selected
?
CallsStyle
.
entry
.
color
.
selected
:
CallsStyle
.
entry
.
color
.
normal
:
CallsStyle
.
entry
.
color
.
normal
...
@@ -232,6 +237,13 @@ ListView {
...
@@ -232,6 +237,13 @@ ListView {
sipAddress
:
$call
.
sipAddress
sipAddress
:
$call
.
sipAddress
width
:
parent
.
width
width
:
parent
.
width
onClicked
:
{
smartConnect
.
selectedCall
=
$call
calls
.
currentIndex
=
index
}
// -------------------------------------------------------------------------
Loader
{
Loader
{
property
int
callId
:
index
property
int
callId
:
index
property
var
call
:
$call
property
var
call
:
$call
...
...
tests/ui/views/App/Calls/CallsWindow.qml
View file @
3d83700f
...
@@ -153,7 +153,7 @@ Window {
...
@@ -153,7 +153,7 @@ Window {
anchors.fill
:
parent
anchors.fill
:
parent
sourceComponent
:
{
sourceComponent
:
{
var
status
=
window
.
call
.
status
var
status
=
window
.
call
.
status
if
(
!
status
)
{
if
(
status
==
null
)
{
return
null
return
null
}
}
...
...
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