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
2e8929f6
Commit
2e8929f6
authored
Jan 23, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): calls in progress
parent
552f2c84
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
7 deletions
+27
-7
CallModel.cpp
tests/src/components/call/CallModel.cpp
+1
-0
CallsWindow.qml
tests/ui/views/App/Calls/CallsWindow.qml
+13
-0
Incall.qml
tests/ui/views/App/Calls/Incall.qml
+10
-5
OutgoingCall.qml
tests/ui/views/App/Calls/OutgoingCall.qml
+1
-1
StartingCallStyle.qml
tests/ui/views/App/Styles/Calls/StartingCallStyle.qml
+2
-1
No files found.
tests/src/components/call/CallModel.cpp
View file @
2e8929f6
...
@@ -126,6 +126,7 @@ void CallModel::setPausedByUser (bool status) {
...
@@ -126,6 +126,7 @@ void CallModel::setPausedByUser (bool status) {
bool
CallModel
::
getVideoOutputEnabled
()
const
{
bool
CallModel
::
getVideoOutputEnabled
()
const
{
// TODO
// TODO
return
false
;
}
}
void
CallModel
::
setVideoOutputEnabled
(
bool
status
)
{
void
CallModel
::
setVideoOutputEnabled
(
bool
status
)
{
...
...
tests/ui/views/App/Calls/CallsWindow.qml
View file @
2e8929f6
...
@@ -15,6 +15,7 @@ Window {
...
@@ -15,6 +15,7 @@ Window {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
readonly
property
bool
chatIsOpened
:
!
rightPaned
.
isClosed
()
readonly
property
var
call
:
calls
.
selectedCall
readonly
property
var
call
:
calls
.
selectedCall
readonly
property
var
sipAddress
:
{
readonly
property
var
sipAddress
:
{
if
(
call
)
{
if
(
call
)
{
...
@@ -24,6 +25,16 @@ Window {
...
@@ -24,6 +25,16 @@ Window {
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
function
openChat
()
{
rightPaned
.
open
()
}
function
closeChat
()
{
rightPaned
.
close
()
}
// ---------------------------------------------------------------------------
minimumHeight
:
CallsWindowStyle
.
minimumHeight
minimumHeight
:
CallsWindowStyle
.
minimumHeight
minimumWidth
:
CallsWindowStyle
.
minimumWidth
minimumWidth
:
CallsWindowStyle
.
minimumWidth
title
:
CallsWindowStyle
.
title
title
:
CallsWindowStyle
.
title
...
@@ -97,6 +108,8 @@ Window {
...
@@ -97,6 +108,8 @@ Window {
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
childB
:
Paned
{
childB
:
Paned
{
id
:
rightPaned
anchors.fill
:
parent
anchors.fill
:
parent
closingEdge
:
Qt
.
RightEdge
closingEdge
:
Qt
.
RightEdge
defaultClosed
:
true
defaultClosed
:
true
...
...
tests/ui/views/App/Calls/Incall.qml
View file @
2e8929f6
...
@@ -11,6 +11,10 @@ import App.Styles 1.0
...
@@ -11,6 +11,10 @@ import App.Styles 1.0
// =============================================================================
// =============================================================================
Rectangle
{
Rectangle
{
id
:
incall
// ---------------------------------------------------------------------------
property
var
call
property
var
call
property
var
_contactObserver
:
SipAddressesModel
.
getContactObserver
(
sipAddress
)
property
var
_contactObserver
:
SipAddressesModel
.
getContactObserver
(
sipAddress
)
...
@@ -195,18 +199,19 @@ Rectangle {
...
@@ -195,18 +199,19 @@ Rectangle {
ActionButton
{
ActionButton
{
icon
:
'
hangup
'
icon
:
'
hangup
'
onClicked
:
Call
.
terminate
()
}
}
ActionSwitch
{
ActionSwitch
{
enabled
:
!
call
.
parent
.
parent
.
isClosed
()
enabled
:
CallsWindow
.
chatIsOpened
icon
:
'
chat
'
icon
:
'
chat
'
onClicked
:
{
var
parent
=
call
.
parent
.
parent
onClicked
:
{
if
(
enabled
)
{
if
(
enabled
)
{
parent
.
close
()
CallsWindow
.
closeChat
()
}
else
{
}
else
{
parent
.
open
()
CallsWindow
.
openChat
()
}
}
}
}
}
}
...
...
tests/ui/views/App/Calls/OutgoingCall.qml
View file @
2e8929f6
...
@@ -10,7 +10,7 @@ import App.Styles 1.0
...
@@ -10,7 +10,7 @@ import App.Styles 1.0
AbstractStartingCall
{
AbstractStartingCall
{
GridLayout
{
GridLayout
{
columns
:
parent
.
width
<
415
&&
call
.
videoOutputEnabled
?
1
:
2
columns
:
parent
.
width
<
StartingCallStyle
.
low
&&
call
.
videoOutputEnabled
?
1
:
2
rowSpacing
:
ActionBarStyle
.
spacing
rowSpacing
:
ActionBarStyle
.
spacing
anchors
{
anchors
{
...
...
tests/ui/views/App/Styles/Calls/StartingCallStyle.qml
View file @
2e8929f6
...
@@ -12,6 +12,7 @@ QtObject {
...
@@ -12,6 +12,7 @@ QtObject {
property
int
containerMargins
:
20
property
int
containerMargins
:
20
property
int
iconSize
:
40
property
int
iconSize
:
40
property
int
leftButtonsGroupMargin
:
50
property
int
leftButtonsGroupMargin
:
50
property
int
lowWidth
:
415
property
int
rightButtonsGroupMargin
:
50
property
int
rightButtonsGroupMargin
:
50
property
QtObject
avatar
:
QtObject
{
property
QtObject
avatar
:
QtObject
{
...
@@ -31,7 +32,7 @@ QtObject {
...
@@ -31,7 +32,7 @@ QtObject {
}
}
property
QtObject
userVideo
:
QtObject
{
property
QtObject
userVideo
:
QtObject
{
property
int
width
:
130
property
int
height
:
90
property
int
height
:
90
property
int
width
:
130
}
}
}
}
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