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
cc4e0252
Commit
cc4e0252
authored
Nov 02, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Timeline): supports the selection of contact
parent
bd3eb748
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
9 deletions
+53
-9
RoundedImage.qml
tests/ui/modules/Common/Image/RoundedImage.qml
+2
-2
ContactDescriptionStyle.qml
...dules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
+1
-1
TimelineStyle.qml
tests/ui/modules/Linphone/Styles/TimelineStyle.qml
+20
-2
Timeline.qml
tests/ui/modules/Linphone/Timeline.qml
+26
-4
MainWindow.qml
tests/ui/views/App/MainWindow/MainWindow.qml
+4
-0
No files found.
tests/ui/modules/Common/Image/RoundedImage.qml
View file @
cc4e0252
...
...
@@ -27,7 +27,7 @@ Item {
effect
:
ShaderEffect
{
property
var
image
:
imageContainer
fragmentShader
:
"
fragmentShader
:
'
uniform lowp sampler2D image;
uniform lowp sampler2D mask;
uniform lowp float qt_Opacity;
...
...
@@ -39,7 +39,7 @@ Item {
texture2D(mask, qt_TexCoord0).a *
qt_Opacity;
}
"
'
}
enabled
:
true
...
...
tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
View file @
cc4e0252
...
...
@@ -7,7 +7,7 @@ import Common 1.0
QtObject
{
property
QtObject
sipAddress
:
QtObject
{
property
color
color
:
Colors
.
d
property
color
color
:
Colors
.
w
property
int
fontSize
:
10
}
...
...
tests/ui/modules/Linphone/Styles/TimelineStyle.qml
View file @
cc4e0252
...
...
@@ -7,9 +7,27 @@ import Common 1.0
QtObject
{
property
QtObject
contact
:
QtObject
{
property
color
colorA
:
Colors
.
g10
property
color
colorB
:
Colors
.
a
property
int
height
:
60
property
QtObject
backgroundColor
:
QtObject
{
property
color
a
:
Colors
.
g10
property
color
b
:
Colors
.
a
property
color
selected
:
Colors
.
i
}
property
QtObject
sipAddress
:
QtObject
{
property
QtObject
color
:
QtObject
{
property
color
normal
:
Colors
.
w
property
color
selected
:
Colors
.
k
}
}
property
QtObject
username
:
QtObject
{
property
QtObject
color
:
QtObject
{
property
color
normal
:
Colors
.
j
property
color
selected
:
Colors
.
k
}
}
}
property
QtObject
legend
:
QtObject
{
...
...
tests/ui/modules/Linphone/Timeline.qml
View file @
cc4e0252
...
...
@@ -13,6 +13,14 @@ ColumnLayout {
signal
clicked
(
var
contact
)
// -----------------------------------------------------------------
function
resetSelectedItem
()
{
view
.
currentIndex
=
-
1
}
// -----------------------------------------------------------------
spacing
:
0
Rectangle
{
...
...
@@ -51,6 +59,7 @@ ColumnLayout {
Layout.fillHeight
:
true
Layout.fillWidth
:
true
currentIndex
:
-
1
delegate
:
Item
{
height
:
TimelineStyle
.
contact
.
height
...
...
@@ -58,10 +67,20 @@ ColumnLayout {
Contact
{
anchors.fill
:
parent
color
:
index
%
2
==
0
?
TimelineStyle
.
contact
.
colorA
:
TimelineStyle
.
contact
.
colorB
color
:
view
.
currentIndex
===
index
?
TimelineStyle
.
contact
.
backgroundColor
.
selected
:
(
index
%
2
==
0
?
TimelineStyle
.
contact
.
backgroundColor
.
a
:
TimelineStyle
.
contact
.
backgroundColor
.
b
)
contact
:
$contact
sipAddressColor
:
view
.
currentIndex
===
index
?
TimelineStyle
.
contact
.
sipAddress
.
color
.
selected
:
TimelineStyle
.
contact
.
sipAddress
.
color
.
normal
usernameColor
:
view
.
currentIndex
===
index
?
TimelineStyle
.
contact
.
username
.
color
.
selected
:
TimelineStyle
.
contact
.
username
.
color
.
normal
}
MouseArea
{
...
...
@@ -71,7 +90,10 @@ ColumnLayout {
:
Qt
.
ArrowCursor
hoverEnabled
:
true
onClicked
:
timeline
.
clicked
(
$contact
)
onClicked
:
{
view
.
currentIndex
=
index
timeline
.
clicked
(
$contact
)
}
}
}
}
...
...
tests/ui/views/App/MainWindow/MainWindow.qml
View file @
cc4e0252
...
...
@@ -138,6 +138,8 @@ ApplicationWindow {
}]
onEntrySelected
:
{
timeline
.
resetSelectedItem
()
if
(
entry
===
0
)
{
setView
(
'
Home
'
)
}
else
if
(
entry
===
1
)
{
...
...
@@ -148,6 +150,8 @@ ApplicationWindow {
// History.
Timeline
{
id
:
timeline
Layout.fillHeight
:
true
Layout.fillWidth
:
true
model
:
ContactsListModel
{}
// Use History list.
...
...
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