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
c821e797
Commit
c821e797
authored
Sep 15, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(mainWindow): use Timeline component
parent
c1f7bdab
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
103 additions
and
5 deletions
+103
-5
resources.qrc
tests/resources.qrc
+1
-0
SelectContact.qml
tests/ui/components/select/SelectContact.qml
+2
-2
Timeline.qml
tests/ui/components/timeline/Timeline.qml
+94
-0
contacts.qml
tests/ui/views/mainWindow/contacts.qml
+1
-0
mainWindow.qml
tests/ui/views/mainWindow/mainWindow.qml
+5
-3
No files found.
tests/resources.qrc
View file @
c821e797
...
...
@@ -4,6 +4,7 @@
<file>
languages/en.qm
</file>
<file>
ui/components/scrollBar/ForceScrollBar.qml
</file>
<file>
ui/components/misc/MenuEntry.qml
</file>
<file>
ui/components/timeline/Timeline.qml
</file>
<file>
ui/components/select/SelectContact.qml
</file>
<file>
ui/components/collapse/Collapse.qml
</file>
<file>
ui/components/contact/Contact.qml
</file>
...
...
tests/ui/components/select/SelectContact.qml
View file @
c821e797
...
...
@@ -71,12 +71,12 @@ Item {
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
do
$not$
disturb
'
$presence
:
'
do
_not_
disturb
'
$sipAddress
:
'
valentin.cognito.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
do
$not$
disturb
'
$presence
:
'
do
_not_
disturb
'
$sipAddress
:
'
charles.henri.sip.linphone.org
'
$username
:
'
Toto
'
}
...
...
tests/ui/components/timeline/Timeline.qml
0 → 100644
View file @
c821e797
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/contact
'
import
'
qrc:/ui/components/scrollBar
'
ColumnLayout
{
Row
{
Layout.preferredHeight
:
35
spacing
:
30
Image
{
fillMode
:
Image
.
PreserveAspectFit
height
:
parent
.
height
width
:
30
}
Text
{
color
:
'
#5A585B
'
font.pointSize
:
13
height
:
parent
.
height
text
:
qsTr
(
'
timelineTitle
'
)
verticalAlignment
:
Text
.
AlignVCenter
}
}
Rectangle
{
color
:
'
#DEDEDE
'
Layout.fillWidth
:
true
Layout.preferredHeight
:
1
}
ListView
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
ScrollBar.vertical
:
ForceScrollBar
{
}
boundsBehavior
:
Flickable
.
StopAtBounds
clip
:
true
highlightRangeMode
:
ListView
.
ApplyRange
spacing
:
0
// Replace by C++ class.
model
:
ListModel
{
ListElement
{
$presence
:
'
connected
'
$sipAddress
:
'
jim.williams.zzzz.yyyy.kkkk.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
connected
'
$sipAddress
:
'
toto.lala.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
disconnected
'
$sipAddress
:
'
machin.truc.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
absent
'
$sipAddress
:
'
hey.listen.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
do_not_disturb
'
$sipAddress
:
'
valentin.cognito.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
do_not_disturb
'
$sipAddress
:
'
charles.henri.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
disconnected
'
$sipAddress
:
'
yesyes.nono.sip.linphone.org
'
$username
:
'
Toto
'
}
ListElement
{
$presence
:
'
connected
'
$sipAddress
:
'
nsa.sip.linphone.org
'
$username
:
'
Toto
'
}
}
delegate
:
Contact
{
presence
:
$presence
sipAddress
:
$sipAddress
username
:
$username
width
:
parent
.
width
}
}
}
tests/ui/views/mainWindow/contacts.qml
View file @
c821e797
...
...
@@ -26,6 +26,7 @@ ColumnLayout {
spacing
:
20
width
:
parent
.
width
// TODO: Replace by top-level component.
TextField
{
Layout.fillWidth
:
true
background
:
Rectangle
{
...
...
tests/ui/views/mainWindow/mainWindow.qml
View file @
c821e797
...
...
@@ -6,6 +6,7 @@ import 'qrc:/ui/components/collapse'
import
'
qrc:/ui/components/contact
'
import
'
qrc:/ui/components/form
'
import
'
qrc:/ui/components/misc
'
import
'
qrc:/ui/components/timeline
'
import
'
qrc:/ui/scripts/utils.js
'
as
Utils
...
...
@@ -85,6 +86,7 @@ ApplicationWindow {
ColumnLayout
{
Layout.fillHeight
:
true
Layout.preferredWidth
:
250
Layout.maximumWidth
:
250
spacing
:
0
MenuEntry
{
...
...
@@ -102,14 +104,14 @@ ApplicationWindow {
}
// History.
Item
{
Timeline
{
Layout.fillHeight
:
true
Layout.preferredWidth
:
parent
.
width
}
// Logo.
Rectangle
{
Layout.preferredWidth
:
250
Layout.preferredWidth
:
parent
.
width
Layout.preferredHeight
:
70
color
:
'
#EAEAEA
'
}
...
...
@@ -119,7 +121,7 @@ ApplicationWindow {
Loader
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
source
:
'
qrc:/ui/views/mainWindow/con
tacts
.qml
'
source
:
'
qrc:/ui/views/mainWindow/con
versation
.qml
'
}
}
}
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