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
a7a5c96d
Commit
a7a5c96d
authored
Dec 02, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): calls views in progress
parent
854cbeb6
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
47 additions
and
28 deletions
+47
-28
led_green.svg
tests/assets/images/led_green.svg
+2
-2
led_orange.svg
tests/assets/images/led_orange.svg
+2
-2
led_red.svg
tests/assets/images/led_red.svg
+2
-2
led_white.svg
tests/assets/images/led_white.svg
+2
-2
resources.qrc
tests/resources.qrc
+6
-0
ActionButton.qml
tests/ui/modules/Common/Form/ActionButton.qml
+2
-2
ActionSwitch.qml
tests/ui/modules/Common/Form/ActionSwitch.qml
+11
-11
Avatar.qml
tests/ui/modules/Linphone/Contact/Avatar.qml
+3
-2
OutgoingCall.qml
tests/ui/views/App/Calls/OutgoingCall.qml
+17
-5
No files found.
tests/assets/images/led_green.svg
View file @
a7a5c96d
...
...
@@ -12,7 +12,7 @@
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"statut_avatar_available_l"
>
<path
d=
"M7.9995,16 C3.581,16 0,12.4185 0,8 C0,3.582 3.581,0 7.9995,0 C12.418,0 16,3.582 16,8 C16,12.4185 12.418,16 7.9995,16 Z"
fill=
"#9ECD1D"
></path>
<use
stroke=
"#FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
<use
stroke=
"#
00
FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
tests/assets/images/led_orange.svg
View file @
a7a5c96d
...
...
@@ -12,7 +12,7 @@
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"statut_avatar_absent_l"
>
<path
d=
"M7.9995,16 C3.581,16 0,12.4185 0,8 C0,3.582 3.581,0 7.9995,0 C12.418,0 16,3.582 16,8 C16,12.4185 12.418,16 7.9995,16 Z"
fill=
"#EFAE00"
></path>
<use
stroke=
"#FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
<use
stroke=
"#
00
FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
tests/assets/images/led_red.svg
View file @
a7a5c96d
...
...
@@ -12,7 +12,7 @@
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"statut_avatar_busy_l"
>
<path
d=
"M7.9995,16 C3.581,16 0,12.4185 0,8 C0,3.582 3.581,0 7.9995,0 C12.418,0 16,3.582 16,8 C16,12.4185 12.418,16 7.9995,16 Z"
id=
"statut_avatar_busy_s"
fill=
"#DC4100"
></path>
<use
id=
"statut_avatar_busy_s"
stroke=
"#FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
<use
id=
"statut_avatar_busy_s"
stroke=
"#
00
FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
tests/assets/images/led_white.svg
View file @
a7a5c96d
...
...
@@ -12,7 +12,7 @@
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"statut_avatar_disconnected_l"
>
<path
d=
"M7.9995,16 C3.581,16 0,12.4185 0,8 C0,3.582 3.581,0 7.9995,0 C12.418,0 16,3.582 16,8 C16,12.4185 12.418,16 7.9995,16 Z"
fill=
"#B1B1B1"
></path>
<use
stroke=
"#FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
<use
stroke=
"#
00
FFFFFF"
mask=
"url(#mask-2)"
stroke-width=
"4"
xlink:href=
"#path-1"
></use>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
tests/resources.qrc
View file @
a7a5c96d
...
...
@@ -44,6 +44,9 @@
<file>
assets/images/led_red.svg
</file>
<file>
assets/images/led_white.svg
</file>
<file>
assets/images/linphone.png
</file>
<file>
assets/images/micro_off_hovered.svg
</file>
<file>
assets/images/micro_off_normal.svg
</file>
<file>
assets/images/micro_off_pressed.svg
</file>
<file>
assets/images/micro_on_hovered.svg
</file>
<file>
assets/images/micro_on_normal.svg
</file>
<file>
assets/images/micro_on_pressed.svg
</file>
...
...
@@ -51,6 +54,9 @@
<file>
assets/images/missed_outgoing_call.svg
</file>
<file>
assets/images/outgoing_call.svg
</file>
<file>
assets/images/search.svg
</file>
<file>
assets/images/speaker_off_hovered.svg
</file>
<file>
assets/images/speaker_off_normal.svg
</file>
<file>
assets/images/speaker_off_pressed.svg
</file>
<file>
assets/images/speaker_on_hovered.svg
</file>
<file>
assets/images/speaker_on_normal.svg
</file>
<file>
assets/images/speaker_on_pressed.svg
</file>
...
...
tests/ui/modules/Common/Form/ActionButton.qml
View file @
a7a5c96d
...
...
@@ -17,7 +17,7 @@ Button {
// `icon`_pressed, `icon`_hovered and `icon`_normal.
property
string
icon
// -----------------------------------------------------------------
// -----------------------------------------------------------------
function
_getIcon
()
{
if
(
!
useStates
)
{
...
...
@@ -31,7 +31,7 @@ Button {
)
}
// -----------------------------------------------------------------
// -----------------------------------------------------------------
background
:
Rectangle
{
color
:
'
transparent
'
...
...
tests/ui/modules/Common/Form/ActionSwitch.qml
View file @
a7a5c96d
...
...
@@ -3,25 +3,25 @@ import QtQuick 2.7
// ===================================================================
Item
{
property
alias
useStates
:
actionButton
.
useStates
property
alias
useStates
:
actionButton
.
useStates
property
int
iconSize
// Optionnal.
property
string
icon
property
bool
enabled
:
true
property
bool
enabled
:
true
signal
onC
licked
signal
c
licked
// -----------------------------------------------------------------
// -----------------------------------------------------------------
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
width
:
iconSize
||
parent
.
iconSize
||
parent
.
height
ActionButton
{
id
:
actionButton
ActionButton
{
id
:
actionButton
anchors.fill
:
parent
icon
:
parent
.
icon
+
(
parent
.
enabled
?
'
_on
'
:
'
_off
'
)
anchors.fill
:
parent
icon
:
parent
.
icon
+
(
parent
.
enabled
?
'
_on
'
:
'
_off
'
)
onClicked
:
parent
.
onClicked
}
onClicked
:
parent
.
clicked
()
}
}
tests/ui/modules/Linphone/Contact/Avatar.qml
View file @
a7a5c96d
...
...
@@ -58,6 +58,7 @@ Item {
}
text
:
_computeInitials
()
visible
:
roundedImage
.
status
!==
Image
.
Ready
}
PresenceLevel
{
...
...
@@ -68,7 +69,7 @@ Item {
right
:
parent
.
right
}
height
:
parent
.
height
/
3
width
:
parent
.
width
/
3
height
:
parent
.
height
/
4
width
:
parent
.
width
/
4
}
}
tests/ui/views/App/Calls/OutgoingCall.qml
View file @
a7a5c96d
import
QtQuick
2.7
import
Common
1.0
// ===================================================================
...
...
@@ -9,21 +11,31 @@ AbstractCall {
ActionBar
{
anchors
{
left
:
parent
.
left
leftMargin
:
50
verticalCenter
:
parent
.
verticalCenter
}
iconSize
:
40
left
:
parent
.
left
leftMargin
:
50
verticalCenter
:
parent
.
verticalCenter
}
iconSize
:
40
ActionSwitch
{
icon
:
'
micro
'
onClicked
:
enabled
=
!
enabled
}
ActionSwitch
{
icon
:
'
speaker
'
onClicked
:
enabled
=
!
enabled
}
}
Rectangle
{
anchors.centerIn
:
parent
color
:
'
red
'
width
:
130
height
:
80
visible
:
isVideoCall
}
ActionBar
{
anchors
{
verticalCenter
:
parent
.
verticalCenter
...
...
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