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
c821636a
Commit
c821636a
authored
Jan 23, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/Incall): little fixes
parent
ff749bbb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
17 deletions
+25
-17
AbstractStartingCall.qml
tests/ui/views/App/Calls/AbstractStartingCall.qml
+2
-2
Incall.qml
tests/ui/views/App/Calls/Incall.qml
+18
-14
CallStyle.qml
tests/ui/views/App/Styles/Calls/CallStyle.qml
+5
-1
No files found.
tests/ui/views/App/Calls/AbstractStartingCall.qml
View file @
c821636a
...
@@ -38,7 +38,7 @@ Rectangle {
...
@@ -38,7 +38,7 @@ Rectangle {
ContactDescription
{
ContactDescription
{
id
:
contactDescription
id
:
contactDescription
height
:
CallStyle
.
header
.
contactDescription
H
eight
height
:
CallStyle
.
header
.
contactDescription
.
h
eight
horizontalTextAlignment
:
Text
.
AlignHCenter
horizontalTextAlignment
:
Text
.
AlignHCenter
sipAddress
:
call
.
sipAddress
sipAddress
:
call
.
sipAddress
username
:
LinphoneUtils
.
getContactUsername
(
_contactObserver
.
contact
||
call
.
sipAddress
)
username
:
LinphoneUtils
.
getContactUsername
(
_contactObserver
.
contact
||
call
.
sipAddress
)
...
@@ -81,7 +81,7 @@ Rectangle {
...
@@ -81,7 +81,7 @@ Rectangle {
anchors.centerIn
:
parent
anchors.centerIn
:
parent
backgroundColor
:
CallStyle
.
container
.
avatar
.
backgroundColor
backgroundColor
:
CallStyle
.
container
.
avatar
.
backgroundColor
image
:
_contactObserver
.
contact
&&
_contactObserver
.
contact
.
avatar
image
:
_contactObserver
.
contact
&&
_contactObserver
.
contact
.
vcard
.
avatar
username
:
contactDescription
.
username
username
:
contactDescription
.
username
height
:
_computeAvatarSize
()
height
:
_computeAvatarSize
()
...
...
tests/ui/views/App/Calls/Incall.qml
View file @
c821636a
...
@@ -41,7 +41,7 @@ Rectangle {
...
@@ -41,7 +41,7 @@ Rectangle {
Layout.fillWidth
:
true
Layout.fillWidth
:
true
Layout.leftMargin
:
CallStyle
.
header
.
leftMargin
Layout.leftMargin
:
CallStyle
.
header
.
leftMargin
Layout.rightMargin
:
CallStyle
.
header
.
rightMargin
Layout.rightMargin
:
CallStyle
.
header
.
rightMargin
Layout.preferredHeight
:
CallStyle
.
header
.
contactDescription
H
eight
Layout.preferredHeight
:
CallStyle
.
header
.
contactDescription
.
h
eight
Icon
{
Icon
{
id
:
callQuality
id
:
callQuality
...
@@ -49,7 +49,7 @@ Rectangle {
...
@@ -49,7 +49,7 @@ Rectangle {
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
icon
:
'
call_quality_0
'
icon
:
'
call_quality_0
'
iconSize
:
CallStyle
.
header
.
iconSize
iconSize
:
CallStyle
.
header
.
iconSize
onIconChanged
:
console
.
log
(
icon
)
// See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73
// See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73
Timer
{
Timer
{
interval
:
5000
interval
:
5000
...
@@ -77,25 +77,29 @@ Rectangle {
...
@@ -77,25 +77,29 @@ Rectangle {
username
:
LinphoneUtils
.
getContactUsername
(
_contactObserver
.
contact
||
call
.
sipAddress
)
username
:
LinphoneUtils
.
getContactUsername
(
_contactObserver
.
contact
||
call
.
sipAddress
)
height
:
parent
.
height
height
:
parent
.
height
width
:
parent
.
width
-
cameraActions
.
width
-
callQuality
.
width
-
150
width
:
parent
.
width
-
cameraActions
.
width
-
callQuality
.
width
-
CallStyle
.
header
.
contactDescription
.
width
}
}
ActionBa
r
{
Loade
r
{
id
:
cameraActions
id
:
cameraActions
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
iconSize
:
CallStyle
.
header
.
iconSize
active
:
call
.
videoInputEnabled
ActionButton
{
sourceComponent
:
ActionBar
{
icon
:
'
screenshot
'
iconSize
:
CallStyle
.
header
.
iconSize
}
ActionButton
{
ActionButton
{
icon
:
'
record
'
icon
:
'
screenshot
'
}
}
ActionButton
{
ActionButton
{
icon
:
'
fullscreen
'
icon
:
'
record
'
}
ActionButton
{
icon
:
'
fullscreen
'
}
}
}
}
}
}
}
...
@@ -127,7 +131,7 @@ Rectangle {
...
@@ -127,7 +131,7 @@ Rectangle {
}
}
backgroundColor
:
CallStyle
.
container
.
avatar
.
backgroundColor
backgroundColor
:
CallStyle
.
container
.
avatar
.
backgroundColor
image
:
_contactObserver
.
contact
?
_contactObserver
.
contact
.
vcard
.
avatar
:
''
image
:
_contactObserver
.
contact
&&
_contactObserver
.
contact
.
vcard
.
avatar
username
:
contactDescription
.
username
username
:
contactDescription
.
username
height
:
_computeAvatarSize
()
height
:
_computeAvatarSize
()
...
...
tests/ui/views/App/Styles/Calls/CallStyle.qml
View file @
c821636a
...
@@ -31,7 +31,6 @@ QtObject {
...
@@ -31,7 +31,6 @@ QtObject {
}
}
property
QtObject
header
:
QtObject
{
property
QtObject
header
:
QtObject
{
property
int
contactDescriptionHeight
:
60
property
int
iconSize
:
40
property
int
iconSize
:
40
property
int
leftMargin
:
20
property
int
leftMargin
:
20
property
int
rightMargin
:
20
property
int
rightMargin
:
20
...
@@ -43,5 +42,10 @@ QtObject {
...
@@ -43,5 +42,10 @@ QtObject {
property
int
height
:
30
property
int
height
:
30
property
int
width
:
30
property
int
width
:
30
}
}
property
QtObject
contactDescription
:
QtObject
{
property
int
height
:
60
property
int
width
:
150
}
}
}
}
}
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