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
77651510
Commit
77651510
authored
Oct 13, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Calls): StartingIncomingCall in progress
parent
5182938f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
174 additions
and
8 deletions
+174
-8
cat_contact.jpg
tests/imgs/cat_contact.jpg
+0
-0
resources.qrc
tests/resources.qrc
+5
-0
build_resources_file
tests/scripts/build_resources_file
+1
-1
ContactDescription.qml
tests/ui/modules/Linphone/Contact/ContactDescription.qml
+3
-0
RoundedImage.qml
tests/ui/modules/Linphone/Image/RoundedImage.qml
+47
-0
AvatarStyle.qml
tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
+1
-1
qmldir
tests/ui/modules/Linphone/qmldir
+1
-0
Calls.qml
tests/ui/views/Calls/Calls.qml
+1
-6
StartingCall.qml
tests/ui/views/Calls/StartingCall.qml
+7
-0
StartingIncomingCall.qml
tests/ui/views/Calls/StartingIncomingCall.qml
+102
-0
StartingOutgoingCall.qml
tests/ui/views/Calls/StartingOutgoingCall.qml
+6
-0
No files found.
tests/imgs/cat_contact.jpg
0 → 100644
View file @
77651510
43.4 KB
tests/resources.qrc
View file @
77651510
...
...
@@ -3,6 +3,7 @@
<file>
imgs/add_field.svg
</file>
<file>
imgs/call.svg
</file>
<file>
imgs/cam.svg
</file>
<file>
imgs/cat_contact.jpg
</file>
<file>
imgs/chat_attachment.svg
</file>
<file>
imgs/chat.svg
</file>
<file>
imgs/collapse.svg
</file>
...
...
@@ -55,6 +56,7 @@
<file>
ui/modules/Linphone/Form/TextButtonB.qml
</file>
<file>
ui/modules/Linphone/Form/TransparentComboBox.qml
</file>
<file>
ui/modules/Linphone/Image/Icon.qml
</file>
<file>
ui/modules/Linphone/Image/RoundedImage.qml
</file>
<file>
ui/modules/Linphone/InvertedMouseArea.qml
</file>
<file>
ui/modules/Linphone/Menu.qml
</file>
<file>
ui/modules/Linphone/Paned.qml
</file>
...
...
@@ -89,6 +91,9 @@
<file>
ui/scripts/Utils/qmldir
</file>
<file>
ui/scripts/Utils/utils.js
</file>
<file>
ui/views/Calls/Calls.qml
</file>
<file>
ui/views/Calls/StartingCall.qml
</file>
<file>
ui/views/Calls/StartingIncomingCall.qml
</file>
<file>
ui/views/Calls/StartingOutgoingCall.qml
</file>
<file>
ui/views/MainWindow/Contact.qml
</file>
<file>
ui/views/MainWindow/Contacts.qml
</file>
<file>
ui/views/MainWindow/Conversation.qml
</file>
...
...
tests/scripts/build_resources_file
View file @
77651510
...
...
@@ -12,7 +12,7 @@ do
basename
=
"
${
filename
##*/
}
"
extension
=
"
${
filename
##*.
}
"
if
[[
"
${
extension
}
"
==
@
(
qml|svg|png|qm|js
)
||
if
[[
"
${
extension
}
"
==
@
(
qml|svg|png|
jpg|
qm|js
)
||
"
${
basename
}
"
==
"qmldir"
]]
;
then
echo
" <file>
$filename
</file>"
>>
$RESOURCE_FILE
fi
...
...
tests/ui/modules/Linphone/Contact/ContactDescription.qml
View file @
77651510
...
...
@@ -7,6 +7,7 @@ import Linphone.Styles 1.0
Column
{
property
alias
sipAddress
:
sipAddress
.
text
property
alias
username
:
username
.
text
property
int
horizontalTextAlignment
// Username.
Text
{
...
...
@@ -17,6 +18,7 @@ Column {
font.bold
:
true
font.pointSize
:
ContactDescriptionStyle
.
username
.
fontSize
height
:
parent
.
height
/
2
horizontalAlignment
:
horizontalTextAlignment
verticalAlignment
:
Text
.
AlignBottom
width
:
parent
.
width
}
...
...
@@ -29,6 +31,7 @@ Column {
color
:
ContactDescriptionStyle
.
sipAddress
.
color
font.pointSize
:
ContactDescriptionStyle
.
sipAddress
.
fontSize
height
:
parent
.
height
/
2
horizontalAlignment
:
horizontalTextAlignment
verticalAlignment
:
Text
.
AlignTop
width
:
parent
.
width
}
...
...
tests/ui/modules/Linphone/Image/RoundedImage.qml
0 → 100644
View file @
77651510
import
QtQuick
2.7
// ===================================================================
Item
{
property
alias
source
:
image
.
source
Item
{
id
:
imageContainer
anchors.fill
:
parent
layer.enabled
:
true
visible
:
false
Image
{
id
:
image
anchors.fill
:
parent
fillMode
:
Image
.
PreserveAspectCrop
}
}
Rectangle
{
anchors.fill
:
parent
layer.enabled
:
true
layer.samplerName
:
'
mask
'
radius
:
parent
.
width
/
2
layer.effect
:
ShaderEffect
{
property
var
image
:
imageContainer
fragmentShader
:
"
uniform lowp sampler2D image;
uniform lowp sampler2D mask;
uniform lowp float qt_Opacity;
varying highp vec2 qt_TexCoord0;
void main () {
gl_FragColor = texture2D(image, qt_TexCoord0) *
texture2D(mask, qt_TexCoord0).a *
qt_Opacity;
}
"
}
}
}
tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
View file @
77651510
...
...
@@ -13,6 +13,6 @@ QtObject {
property
QtObject
mask
:
QtObject
{
property
color
color
:
Colors
.
r
property
int
radius
:
50
property
int
radius
:
50
0
}
}
tests/ui/modules/Linphone/qmldir
View file @
77651510
...
...
@@ -51,6 +51,7 @@ TransparentComboBox 1.0 Form/TransparentComboBox.qml
# Image
Icon 1.0 Image/Icon.qml
RoundedImage 1.0 Image/RoundedImage.qml
# InvertedMouseArea
InvertedMouseArea 1.0 InvertedMouseArea.qml
...
...
tests/ui/views/Calls/Calls.qml
View file @
77651510
...
...
@@ -38,13 +38,8 @@ Window {
resizeAInPriority
:
true
// Call.
childA
:
Rectangle
{
childA
:
StartingIncomingCall
{
anchors.fill
:
parent
color
:
'
orange
'
Text
{
text
:
'
hello
'
}
}
// Chat.
...
...
tests/ui/views/Calls/StartingCall.qml
0 → 100644
View file @
77651510
import
QtQuick
2.7
Item
{
}
tests/ui/views/Calls/StartingIncomingCall.qml
0 → 100644
View file @
77651510
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
Linphone
1.0
Rectangle
{
color
:
'
#EAEAEA
'
ColumnLayout
{
anchors
{
fill
:
parent
margins
:
20
}
spacing
:
0
// Call type.
Column
{
Layout.fillWidth
:
true
Text
{
color
:
'
#8E8E8E
'
font.bold
:
true
font.pointSize
:
17
horizontalAlignment
:
Text
.
AlignHCenter
text
:
'
INCOMING CALL
'
width
:
parent
.
width
}
Text
{
color
:
'
#8E8E8E
'
font.bold
:
true
font.pointSize
:
17
horizontalAlignment
:
Text
.
AlignHCenter
text
:
'
...
'
width
:
parent
.
width
}
}
// Contact area.
Item
{
id
:
contactContainer
Layout.fillWidth
:
true
Layout.fillHeight
:
true
Item
{
anchors.verticalCenter
:
parent
.
verticalCenter
implicitHeight
:
contactDescription
.
height
+
image
.
height
width
:
parent
.
width
ContactDescription
{
id
:
contactDescription
height
:
60
horizontalTextAlignment
:
Text
.
AlignHCenter
sipAddress
:
'
mister-meow@sip-linphone.org
'
username
:
'
Mister Meow
'
width
:
parent
.
width
}
RoundedImage
{
id
:
image
function
_computeImageSize
()
{
var
height
=
contactContainer
.
height
-
contactDescription
.
height
var
width
=
contactContainer
.
width
var
size
=
height
<
400
?
height
:
400
return
size
<
width
?
size
:
width
}
anchors.top
:
contactDescription
.
bottom
anchors.horizontalCenter
:
parent
.
horizontalCenter
height
:
_computeImageSize
()
source
:
"
qrc:/imgs/cat_contact.jpg
"
width
:
height
}
}
}
// Actions area.
ActionBar
{
Layout.alignment
:
Qt
.
AlignHCenter
Layout.bottomMargin
:
20
Layout.topMargin
:
20
iconSize
:
40
ActionButton
{
icon
:
'
cam
'
}
ActionButton
{
icon
:
'
call
'
}
ActionButton
{
icon
:
'
hangup
'
}
}
}
}
tests/ui/views/Calls/StartingOutgoingCall.qml
0 → 100644
View file @
77651510
import
QtQuick
2.7
Item
{
}
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