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
fd6ca7f2
Commit
fd6ca7f2
authored
May 29, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
9a1ff583
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
Calls.qml
linphone-desktop/ui/modules/Linphone/Calls/Calls.qml
+17
-2
Conference.qml
linphone-desktop/ui/views/App/Calls/Conference.qml
+1
-1
No files found.
linphone-desktop/ui/modules/Linphone/Calls/Calls.qml
View file @
fd6ca7f2
...
@@ -73,7 +73,7 @@ ListView {
...
@@ -73,7 +73,7 @@ ListView {
entryWidth
:
CallsStyle
.
entry
.
width
entryWidth
:
CallsStyle
.
entry
.
width
Repeater
{
Repeater
{
model
:
params
.
actions
model
:
params
?
params
.
actions
:
[]
DropDownStaticMenuEntry
{
DropDownStaticMenuEntry
{
entryName
:
modelData
.
name
entryName
:
modelData
.
name
...
@@ -93,10 +93,25 @@ ListView {
...
@@ -93,10 +93,25 @@ ListView {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
header
:
ConferenceControls
{
header
:
ConferenceControls
{
readonly
property
bool
isSelected
:
calls
.
currentIndex
===
-
1
&&
calls
.
_selectedCall
==
null
&&
visible
height
:
visible
?
ConferenceControlsStyle
.
height
:
0
height
:
visible
?
ConferenceControlsStyle
.
height
:
0
width
:
parent
.
width
width
:
parent
.
width
visible
:
calls
.
conferenceModel
.
count
>
0
visible
:
calls
.
conferenceModel
.
count
>
0
color
:
isSelected
?
CallsStyle
.
entry
.
color
.
selected
:
CallsStyle
.
entry
.
color
.
normal
textColor
:
isSelected
?
CallsStyle
.
entry
.
usernameColor
.
selected
:
CallsStyle
.
entry
.
usernameColor
.
normal
onClicked
:
Logic
.
resetSelectedCall
()
onVisibleChanged
:
!
visible
&&
Logic
.
handleCountChanged
(
calls
.
count
)
}
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
...
@@ -155,7 +170,7 @@ ListView {
...
@@ -155,7 +170,7 @@ ListView {
SequentialAnimation
on
color
{
SequentialAnimation
on
color
{
loops
:
CallsStyle
.
entry
.
endCallAnimation
.
loops
loops
:
CallsStyle
.
entry
.
endCallAnimation
.
loops
running
:
$call
.
status
===
CallModel
.
CallStatusEnded
running
:
$call
&&
$call
.
status
===
CallModel
.
CallStatusEnded
ColorAnimation
{
ColorAnimation
{
duration
:
CallsStyle
.
entry
.
endCallAnimation
.
duration
duration
:
CallsStyle
.
entry
.
endCallAnimation
.
duration
...
...
linphone-desktop/ui/views/App/Calls/Conference.qml
View file @
fd6ca7f2
...
@@ -144,7 +144,7 @@ Rectangle {
...
@@ -144,7 +144,7 @@ Rectangle {
width
:
size
width
:
size
backgroundColor
:
CallStyle
.
container
.
avatar
.
backgroundColor
backgroundColor
:
CallStyle
.
container
.
avatar
.
backgroundColor
foregroundColor
:
$call
.
status
===
CallModel
.
CallStatusPaused
foregroundColor
:
$call
&&
$call
.
status
===
CallModel
.
CallStatusPaused
?
CallStyle
.
container
.
pause
.
color
?
CallStyle
.
container
.
pause
.
color
:
'
transparent
'
:
'
transparent
'
...
...
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