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
854cbeb6
Commit
854cbeb6
authored
Dec 02, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): calls views in progress
parent
e07748ba
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
130 additions
and
7 deletions
+130
-7
micro_on_hovered.svg
tests/assets/images/micro_on_hovered.svg
+13
-0
micro_on_normal.svg
tests/assets/images/micro_on_normal.svg
+13
-0
micro_on_pressed.svg
tests/assets/images/micro_on_pressed.svg
+13
-0
speaker_on_hovered.svg
tests/assets/images/speaker_on_hovered.svg
+14
-0
speaker_on_normal.svg
tests/assets/images/speaker_on_normal.svg
+13
-0
speaker_on_pressed.svg
tests/assets/images/speaker_on_pressed.svg
+14
-0
resources.qrc
tests/resources.qrc
+7
-0
ActionButton.qml
tests/ui/modules/Common/Form/ActionButton.qml
+4
-0
ActionSwitch.qml
tests/ui/modules/Common/Form/ActionSwitch.qml
+27
-0
qmldir
tests/ui/modules/Common/qmldir
+1
-0
Calls.qml
tests/ui/views/App/Calls/Calls.qml
+1
-1
OutgoingCall.qml
tests/ui/views/App/Calls/OutgoingCall.qml
+10
-6
No files found.
tests/assets/images/micro_on_hovered.svg
0 → 100644
View file @
854cbeb6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"40px"
height=
"40px"
viewBox=
"0 0 40 40"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
<title>
micro_off
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"micro_off"
>
<path
d=
"M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z"
fill=
"#D0D8DE"
></path>
<path
d=
"M15.680106,21.1588052 C15.680106,23.2272241 17.3725587,24.9049836 19.4593354,24.9049836 C21.5467466,24.9049836 23.2391993,23.2272241 23.2391993,21.1588052 L23.2391993,11.7474365 C23.2391993,9.67775946 21.5467466,8 19.4593354,8 C17.3725587,8 15.680106,9.67775946 15.680106,11.7474365 L15.680106,21.1588052 L15.680106,21.1588052 Z M26.6155393,16.5901033 L26.6155393,20.6788163 C26.6155393,24.5976774 23.4114583,27.7732791 19.4593354,27.7732791 M19.4593354,27.7732791 L19.4593354,32.1916307 L19.4593354,27.7732791 Z M17.2326577,32.6854594 L21.6869648,32.6854594 L17.2326577,32.6854594 Z M12.3034487,16.5901033 L12.3034487,20.6788163 C12.3034487,24.5976774 15.5075297,27.7732791 19.4596526,27.7732791 M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/assets/images/micro_on_normal.svg
0 → 100644
View file @
854cbeb6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"40px"
height=
"40px"
viewBox=
"0 0 40 40"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
<title>
micro_on
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"micro_on"
>
<path
d=
"M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z"
fill=
"#4B5964"
></path>
<path
d=
"M15.680106,21.1588052 C15.680106,23.2272241 17.3725587,24.9049836 19.4593354,24.9049836 C21.5467466,24.9049836 23.2391993,23.2272241 23.2391993,21.1588052 L23.2391993,11.7474365 C23.2391993,9.67775946 21.5467466,8 19.4593354,8 C17.3725587,8 15.680106,9.67775946 15.680106,11.7474365 L15.680106,21.1588052 L15.680106,21.1588052 Z M26.6155393,16.5901033 L26.6155393,20.6788163 C26.6155393,24.5976774 23.4114583,27.7732791 19.4593354,27.7732791 M19.4593354,27.7732791 L19.4593354,32.1916307 L19.4593354,27.7732791 Z M17.2326577,32.6854594 L21.6869648,32.6854594 L17.2326577,32.6854594 Z M12.3034487,16.5901033 L12.3034487,20.6788163 C12.3034487,24.5976774 15.5075297,27.7732791 19.4596526,27.7732791"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/assets/images/micro_on_pressed.svg
0 → 100644
View file @
854cbeb6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"40px"
height=
"40px"
viewBox=
"0 0 40 40"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
<title>
micro_off_clic
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"micro_off_clic"
>
<path
d=
"M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z"
fill=
"#FF5E00"
></path>
<path
d=
"M15.680106,21.1588052 C15.680106,23.2272241 17.3725587,24.9049836 19.4593354,24.9049836 C21.5467466,24.9049836 23.2391993,23.2272241 23.2391993,21.1588052 L23.2391993,11.7474365 C23.2391993,9.67775946 21.5467466,8 19.4593354,8 C17.3725587,8 15.680106,9.67775946 15.680106,11.7474365 L15.680106,21.1588052 L15.680106,21.1588052 Z M26.6155393,16.5901033 L26.6155393,20.6788163 C26.6155393,24.5976774 23.4114583,27.7732791 19.4593354,27.7732791 M19.4593354,27.7732791 L19.4593354,32.1916307 L19.4593354,27.7732791 Z M17.2326577,32.6854594 L21.6869648,32.6854594 L17.2326577,32.6854594 Z M12.3034487,16.5901033 L12.3034487,20.6788163 C12.3034487,24.5976774 15.5075297,27.7732791 19.4596526,27.7732791 M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/assets/images/speaker_on_hovered.svg
0 → 100644
View file @
854cbeb6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"40px"
height=
"40px"
viewBox=
"0 0 40 40"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
<title>
speaker_off
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"speaker_off"
>
<path
d=
"M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z"
fill=
"#D0D8DE"
></path>
<path
d=
"M10.1559954,23.7737278 L15.8840871,23.7737278 L22.3361811,29 L22.3361811,11 L15.8840871,16.2259714 L10,16.2259714 L10,23.7737278 L10.1559954,23.7737278 L10.1559954,23.7737278 Z M25.5099238,21.7675107 C26.548364,20.7459012 26.548364,19.0898471 25.5099238,18.0688393 M27.9740401,23.254199 C29.8472089,21.4119328 29.8475148,18.4241163 27.9740401,16.5818501"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
<path
d=
"M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/assets/images/speaker_on_normal.svg
0 → 100644
View file @
854cbeb6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"40px"
height=
"40px"
viewBox=
"0 0 40 40"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
<title>
speaker_on
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"speaker_on"
>
<path
d=
"M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z"
fill=
"#4B5964"
></path>
<path
d=
"M10.1559954,23.7737278 L15.8840871,23.7737278 L22.3361811,29 L22.3361811,11 L15.8840871,16.2259714 L10,16.2259714 L10,23.7737278 L10.1559954,23.7737278 L10.1559954,23.7737278 Z M25.5099238,21.7675107 C26.548364,20.7459012 26.548364,19.0898471 25.5099238,18.0688393 M27.9740401,23.254199 C29.8472089,21.4119328 29.8475148,18.4241163 27.9740401,16.5818501"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/assets/images/speaker_on_pressed.svg
0 → 100644
View file @
854cbeb6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"40px"
height=
"40px"
viewBox=
"0 0 40 40"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
<title>
speaker_off_clic
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"speaker_off_clic"
>
<path
d=
"M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z"
fill=
"#FF5E00"
></path>
<path
d=
"M10.1559954,23.7737278 L15.8840871,23.7737278 L22.3361811,29 L22.3361811,11 L15.8840871,16.2259714 L10,16.2259714 L10,23.7737278 L10.1559954,23.7737278 L10.1559954,23.7737278 Z M25.5099238,21.7675107 C26.548364,20.7459012 26.548364,19.0898471 25.5099238,18.0688393 M27.9740401,23.254199 C29.8472089,21.4119328 29.8475148,18.4241163 27.9740401,16.5818501"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
<path
d=
"M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z"
stroke=
"#FFFFFF"
stroke-width=
"1.5"
stroke-linecap=
"round"
stroke-linejoin=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/resources.qrc
View file @
854cbeb6
...
@@ -44,10 +44,16 @@
...
@@ -44,10 +44,16 @@
<file>
assets/images/led_red.svg
</file>
<file>
assets/images/led_red.svg
</file>
<file>
assets/images/led_white.svg
</file>
<file>
assets/images/led_white.svg
</file>
<file>
assets/images/linphone.png
</file>
<file>
assets/images/linphone.png
</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>
<file>
assets/images/missed_incoming_call.svg
</file>
<file>
assets/images/missed_incoming_call.svg
</file>
<file>
assets/images/missed_outgoing_call.svg
</file>
<file>
assets/images/missed_outgoing_call.svg
</file>
<file>
assets/images/outgoing_call.svg
</file>
<file>
assets/images/outgoing_call.svg
</file>
<file>
assets/images/search.svg
</file>
<file>
assets/images/search.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>
<file>
assets/images/tooltip_arrow_bottom.svg
</file>
<file>
assets/images/tooltip_arrow_bottom.svg
</file>
<file>
assets/images/tooltip_arrow_left.svg
</file>
<file>
assets/images/tooltip_arrow_left.svg
</file>
<file>
assets/images/tooltip_arrow_right.svg
</file>
<file>
assets/images/tooltip_arrow_right.svg
</file>
...
@@ -71,6 +77,7 @@
...
@@ -71,6 +77,7 @@
<file>
ui/modules/Common/Form/AbstractTextButton.qml
</file>
<file>
ui/modules/Common/Form/AbstractTextButton.qml
</file>
<file>
ui/modules/Common/Form/ActionBar.qml
</file>
<file>
ui/modules/Common/Form/ActionBar.qml
</file>
<file>
ui/modules/Common/Form/ActionButton.qml
</file>
<file>
ui/modules/Common/Form/ActionButton.qml
</file>
<file>
ui/modules/Common/Form/ActionSwitch.qml
</file>
<file>
ui/modules/Common/Form/CheckBoxText.qml
</file>
<file>
ui/modules/Common/Form/CheckBoxText.qml
</file>
<file>
ui/modules/Common/Form/ExclusiveButtons.qml
</file>
<file>
ui/modules/Common/Form/ExclusiveButtons.qml
</file>
<file>
ui/modules/Common/Form/ListForm.qml
</file>
<file>
ui/modules/Common/Form/ListForm.qml
</file>
...
...
tests/ui/modules/Common/Form/ActionButton.qml
View file @
854cbeb6
...
@@ -17,6 +17,8 @@ Button {
...
@@ -17,6 +17,8 @@ Button {
// `icon`_pressed, `icon`_hovered and `icon`_normal.
// `icon`_pressed, `icon`_hovered and `icon`_normal.
property
string
icon
property
string
icon
// -----------------------------------------------------------------
function
_getIcon
()
{
function
_getIcon
()
{
if
(
!
useStates
)
{
if
(
!
useStates
)
{
return
button
.
icon
return
button
.
icon
...
@@ -29,6 +31,8 @@ Button {
...
@@ -29,6 +31,8 @@ Button {
)
)
}
}
// -----------------------------------------------------------------
background
:
Rectangle
{
background
:
Rectangle
{
color
:
'
transparent
'
color
:
'
transparent
'
}
}
...
...
tests/ui/modules/Common/Form/ActionSwitch.qml
0 → 100644
View file @
854cbeb6
import
QtQuick
2.7
// ===================================================================
Item
{
property
alias
useStates
:
actionButton
.
useStates
property
int
iconSize
// Optionnal.
property
string
icon
property
bool
enabled
:
true
signal
onClicked
// -----------------------------------------------------------------
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
width
:
iconSize
||
parent
.
iconSize
||
parent
.
height
ActionButton
{
id
:
actionButton
anchors.fill
:
parent
icon
:
parent
.
icon
+
(
parent
.
enabled
?
'
_on
'
:
'
_off
'
)
onClicked
:
parent
.
onClicked
}
}
tests/ui/modules/Common/qmldir
View file @
854cbeb6
...
@@ -33,6 +33,7 @@ ForceScrollBar 1.0 ForceScrollBar.qml
...
@@ -33,6 +33,7 @@ ForceScrollBar 1.0 ForceScrollBar.qml
# Form
# Form
ActionBar 1.0 Form/ActionBar.qml
ActionBar 1.0 Form/ActionBar.qml
ActionButton 1.0 Form/ActionButton.qml
ActionButton 1.0 Form/ActionButton.qml
ActionSwitch 1.0 Form/ActionSwitch.qml
CheckBoxText 1.0 Form/CheckBoxText.qml
CheckBoxText 1.0 Form/CheckBoxText.qml
ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
LightButton 1.0 Form/LightButton.qml
LightButton 1.0 Form/LightButton.qml
...
...
tests/ui/views/App/Calls/Calls.qml
View file @
854cbeb6
...
@@ -83,7 +83,7 @@ Window {
...
@@ -83,7 +83,7 @@ Window {
resizeAInPriority
:
true
resizeAInPriority
:
true
// Call.
// Call.
childA
:
Incom
ingCall
{
childA
:
Outgo
ingCall
{
anchors.fill
:
parent
anchors.fill
:
parent
sipAddress
:
'
sip:erwan.croze@sip.linphone.org
'
sipAddress
:
'
sip:erwan.croze@sip.linphone.org
'
}
}
...
...
tests/ui/views/App/Calls/OutgoingCall.qml
View file @
854cbeb6
...
@@ -8,15 +8,19 @@ AbstractCall {
...
@@ -8,15 +8,19 @@ AbstractCall {
:
'
OUTGOING AUDIO CALL
'
:
'
OUTGOING AUDIO CALL
'
ActionBar
{
ActionBar
{
anchors.centerIn
:
parent
anchors
{
left
:
parent
.
left
leftMargin
:
50
verticalCenter
:
parent
.
verticalCenter
}
iconSize
:
40
iconSize
:
40
Action
Button
{
Action
Switch
{
icon
:
'
video_call_accept
'
icon
:
'
micro
'
}
}
Action
Button
{
Action
Switch
{
icon
:
'
call_accept
'
icon
:
'
speaker
'
}
}
}
}
...
...
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