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
05b6b43e
Commit
05b6b43e
authored
Dec 05, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): calls views in progress
parent
10c7ee4b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
10 deletions
+27
-10
ActionButton.qml
tests/ui/modules/Common/Form/ActionButton.qml
+0
-2
ActionSwitch.qml
tests/ui/modules/Common/Form/ActionSwitch.qml
+1
-0
Calls.qml
tests/ui/views/App/Calls/Calls.qml
+2
-1
Incall.qml
tests/ui/views/App/Calls/Incall.qml
+13
-4
OutgoingCall.qml
tests/ui/views/App/Calls/OutgoingCall.qml
+10
-2
StartingCallStyle.qml
tests/ui/views/App/Styles/Calls/StartingCallStyle.qml
+1
-1
No files found.
tests/ui/modules/Common/Form/ActionButton.qml
View file @
05b6b43e
...
@@ -38,8 +38,6 @@ Button {
...
@@ -38,8 +38,6 @@ Button {
}
}
hoverEnabled
:
true
hoverEnabled
:
true
// Ugly hack, use current size, ActionBar size,
// or other parent height.
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
width
:
iconSize
||
parent
.
iconSize
||
parent
.
height
width
:
iconSize
||
parent
.
iconSize
||
parent
.
height
...
...
tests/ui/modules/Common/Form/ActionSwitch.qml
View file @
05b6b43e
...
@@ -21,6 +21,7 @@ Item {
...
@@ -21,6 +21,7 @@ Item {
anchors.fill
:
parent
anchors.fill
:
parent
icon
:
parent
.
icon
+
(
parent
.
enabled
?
'
_on
'
:
'
_off
'
)
icon
:
parent
.
icon
+
(
parent
.
enabled
?
'
_on
'
:
'
_off
'
)
iconSize
:
parent
.
iconSize
onClicked
:
parent
.
clicked
()
onClicked
:
parent
.
clicked
()
}
}
...
...
tests/ui/views/App/Calls/Calls.qml
View file @
05b6b43e
...
@@ -77,7 +77,7 @@ Window {
...
@@ -77,7 +77,7 @@ Window {
anchors.fill
:
parent
anchors.fill
:
parent
closingEdge
:
Qt
.
RightEdge
closingEdge
:
Qt
.
RightEdge
defaultClosed
:
true
defaultClosed
:
true
minimumLeftLimit
:
3
80
minimumLeftLimit
:
3
95
minimumRightLimit
:
300
minimumRightLimit
:
300
resizeAInPriority
:
true
resizeAInPriority
:
true
...
@@ -85,6 +85,7 @@ Window {
...
@@ -85,6 +85,7 @@ Window {
childA
:
Incall
{
childA
:
Incall
{
anchors.fill
:
parent
anchors.fill
:
parent
sipAddress
:
'
sip:erwan.croze@sip.linphone.org
'
sipAddress
:
'
sip:erwan.croze@sip.linphone.org
'
isVideoCall
:
true
}
}
// Chat.
// Chat.
...
...
tests/ui/views/App/Calls/Incall.qml
View file @
05b6b43e
...
@@ -2,6 +2,7 @@ import QtQuick 2.7
...
@@ -2,6 +2,7 @@ import QtQuick 2.7
import
QtQuick
.
Layouts
1.3
import
QtQuick
.
Layouts
1.3
import
Common
1.0
import
Common
1.0
import
Common
.
Styles
1.0
import
Linphone
1.0
import
Linphone
1.0
import
LinphoneUtils
1.0
import
LinphoneUtils
1.0
...
@@ -118,33 +119,41 @@ Rectangle {
...
@@ -118,33 +119,41 @@ Rectangle {
Item
{
Item
{
Layout.fillWidth
:
true
Layout.fillWidth
:
true
Layout.preferredHeight
:
StartingCallStyle
.
actionAreaHeight
+
10
Layout.preferredHeight
:
StartingCallStyle
.
actionAreaHeight
ActionBar
{
GridLayout
{
anchors
{
anchors
{
left
:
parent
.
left
left
:
parent
.
left
leftMargin
:
StartingCallStyle
.
leftButtonsGroupMargin
leftMargin
:
StartingCallStyle
.
leftButtonsGroupMargin
verticalCenter
:
parent
.
verticalCenter
verticalCenter
:
parent
.
verticalCenter
}
}
iconSize
:
StartingCallStyle
.
iconSize
rowSpacing
:
ActionBarStyle
.
spacing
columns
:
call
.
width
<
645
&&
isVideoCall
?
2
:
4
ActionSwitch
{
ActionSwitch
{
icon
:
'
micro
'
icon
:
'
micro
'
iconSize
:
StartingCallStyle
.
iconSize
onClicked
:
enabled
=
!
enabled
onClicked
:
enabled
=
!
enabled
}
}
ActionSwitch
{
ActionSwitch
{
icon
:
'
speaker
'
icon
:
'
speaker
'
iconSize
:
StartingCallStyle
.
iconSize
onClicked
:
enabled
=
!
enabled
onClicked
:
enabled
=
!
enabled
}
}
ActionSwitch
{
ActionSwitch
{
icon
:
'
camera
'
icon
:
'
camera
'
iconSize
:
StartingCallStyle
.
iconSize
onClicked
:
enabled
=
!
enabled
onClicked
:
enabled
=
!
enabled
}
}
ActionButton
{
ActionButton
{
Layout.preferredHeight
:
StartingCallStyle
.
iconSize
Layout.preferredWidth
:
StartingCallStyle
.
iconSize
icon
:
'
options
'
icon
:
'
options
'
iconSize
:
StartingCallStyle
.
iconSize
}
}
}
}
...
@@ -152,7 +161,7 @@ Rectangle {
...
@@ -152,7 +161,7 @@ Rectangle {
anchors.centerIn
:
parent
anchors.centerIn
:
parent
color
:
'
red
'
color
:
'
red
'
height
:
StartingCallStyle
.
userVideo
.
height
height
:
StartingCallStyle
.
userVideo
.
height
visible
:
true
visible
:
call
.
width
>=
550
width
:
StartingCallStyle
.
userVideo
.
width
width
:
StartingCallStyle
.
userVideo
.
width
}
}
...
...
tests/ui/views/App/Calls/OutgoingCall.qml
View file @
05b6b43e
import
QtQuick
2.7
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
Common
1.0
import
Common
1.0
import
Common
.
Styles
1.0
import
App
.
Styles
1.0
import
App
.
Styles
1.0
...
@@ -12,21 +14,27 @@ AbstractStartingCall {
...
@@ -12,21 +14,27 @@ AbstractStartingCall {
?
qsTr
(
'
outgoingVideoCall
'
)
?
qsTr
(
'
outgoingVideoCall
'
)
:
qsTr
(
'
outgoingAudioCall
'
)
:
qsTr
(
'
outgoingAudioCall
'
)
ActionBar
{
GridLayout
{
rowSpacing
:
ActionBarStyle
.
spacing
columns
:
parent
.
width
<
415
&&
isVideoCall
?
1
:
2
anchors
{
anchors
{
left
:
parent
.
left
left
:
parent
.
left
leftMargin
:
StartingCallStyle
.
leftButtonsGroupMargin
leftMargin
:
StartingCallStyle
.
leftButtonsGroupMargin
verticalCenter
:
parent
.
verticalCenter
verticalCenter
:
parent
.
verticalCenter
}
}
iconSize
:
StartingCallStyle
.
iconSize
ActionSwitch
{
ActionSwitch
{
icon
:
'
micro
'
icon
:
'
micro
'
iconSize
:
StartingCallStyle
.
iconSize
onClicked
:
enabled
=
!
enabled
onClicked
:
enabled
=
!
enabled
}
}
ActionSwitch
{
ActionSwitch
{
icon
:
'
speaker
'
icon
:
'
speaker
'
iconSize
:
StartingCallStyle
.
iconSize
onClicked
:
enabled
=
!
enabled
onClicked
:
enabled
=
!
enabled
}
}
}
}
...
...
tests/ui/views/App/Styles/Calls/StartingCallStyle.qml
View file @
05b6b43e
...
@@ -12,7 +12,7 @@ QtObject {
...
@@ -12,7 +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
rightButtonsGroupMargin
:
85
property
int
rightButtonsGroupMargin
:
50
property
QtObject
avatar
:
QtObject
{
property
QtObject
avatar
:
QtObject
{
property
color
backgroundColor
:
Colors
.
w
property
color
backgroundColor
:
Colors
.
w
...
...
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