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
fa047030
Commit
fa047030
authored
Sep 26, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(dialog): better code
parent
c5478fa8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
70 additions
and
63 deletions
+70
-63
DialogPlus.qml
tests/ui/components/dialog/DialogPlus.qml
+9
-13
Icon.qml
tests/ui/components/image/Icon.qml
+2
-0
Timeline.qml
tests/ui/components/timeline/Timeline.qml
+5
-43
Dialog.qml
tests/ui/style/components/Dialog.qml
+10
-6
mainWindow.qml
tests/ui/views/mainWindow/mainWindow.qml
+43
-1
manageAccounts.qml
tests/ui/views/manageAccounts.qml
+1
-0
No files found.
tests/ui/components/dialog/DialogPlus.qml
View file @
fa047030
...
...
@@ -19,6 +19,7 @@ Window {
signal
exitStatus
(
int
status
)
// Derived class must use this function instead of close.
// Destroy the component and send signal to caller.
function
exit
(
status
)
{
if
(
!
_disableExitStatus
)
{
_disableExitStatus
=
true
...
...
@@ -52,19 +53,14 @@ Window {
}
// Buttons.
Item
{
Layout.fillWidth
:
true
Layout.preferredHeight
:
DialogStyle
.
buttonsAreaHeight
Row
{
id
:
buttons
anchors.left
:
(
!
centeredButtons
&&
parent
.
left
)
||
undefined
anchors.centerIn
:
centeredButtons
?
parent
:
undefined
anchors.leftMargin
:
DialogStyle
.
leftMargin
anchors.verticalCenter
:
(
!
centeredButtons
&&
parent
.
verticalCenter
)
||
undefined
spacing
:
DialogStyle
.
buttonsSpacing
}
Row
{
id
:
buttons
Layout.alignment
:
(
centeredButtons
&&
Qt
.
AlignHCenter
)
||
Qt
.
AlignLeft
Layout.bottomMargin
:
DialogStyle
.
buttons
.
bottomMargin
Layout.leftMargin
:
(
!
centeredButtons
&&
DialogStyle
.
leftMargin
)
||
undefined
Layout.topMargin
:
DialogStyle
.
buttons
.
topMargin
spacing
:
DialogStyle
.
buttons
.
spacing
}
}
}
tests/ui/components/image/Icon.qml
View file @
fa047030
import
QtQuick
2.7
// ===================================================================
Image
{
property
int
iconSize
property
string
icon
...
...
tests/ui/components/timeline/Timeline.qml
View file @
fa047030
...
...
@@ -7,6 +7,10 @@ import 'qrc:/ui/components/image'
import
'
qrc:/ui/components/scrollBar
'
ColumnLayout
{
id
:
item
property
var
model
Row
{
Layout.preferredHeight
:
35
spacing
:
30
...
...
@@ -39,49 +43,7 @@ ColumnLayout {
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
'
}
}
model
:
item
.
model
delegate
:
Contact
{
presence
:
$presence
...
...
tests/ui/style/components/Dialog.qml
View file @
fa047030
...
...
@@ -2,19 +2,23 @@ pragma Singleton
import
QtQuick
2.7
QtObject
{
property
int
buttonsAreaHeight
:
60
property
int
buttonsSpacing
:
20
property
int
leftMargin
:
50
property
int
rightMargin
:
50
property
QtObject
description
:
QtObject
{
property
int
fontSize
:
12
property
int
height
:
9
0
property
int
minHeight
:
2
5
property
QtObject
buttons
:
QtObject
{
property
int
bottomMargin
:
15
property
int
spacing
:
2
0
property
int
topMargin
:
1
5
}
property
QtObject
confirm
:
QtObject
{
property
int
height
:
150
property
int
width
:
370
}
property
QtObject
description
:
QtObject
{
property
int
fontSize
:
12
property
int
height
:
90
property
int
minHeight
:
25
}
}
tests/ui/views/mainWindow/mainWindow.qml
View file @
fa047030
...
...
@@ -116,8 +116,50 @@ ApplicationWindow {
Timeline
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
}
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
'
}
}
}
// Logo.
Rectangle
{
Layout.fillWidth
:
true
...
...
tests/ui/views/manageAccounts.qml
View file @
fa047030
...
...
@@ -19,6 +19,7 @@ DialogPlus {
Item
{
anchors.fill
:
parent
// TODO: Compute list max.
ListView
{
ScrollBar.vertical
:
ForceScrollBar
{
}
anchors.fill
:
parent
...
...
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