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
ee86c545
Commit
ee86c545
authored
Oct 31, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): add `PresenceStatus` and used in `MainWindow`
parent
8ca63e09
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
78 additions
and
43 deletions
+78
-43
resources.qrc
tests/resources.qrc
+1
-1
AccountStatus.qml
tests/ui/modules/Linphone/Account/AccountStatus.qml
+24
-8
ContactDescription.qml
tests/ui/modules/Linphone/Contact/ContactDescription.qml
+0
-1
PresenceLevel.qml
tests/ui/modules/Linphone/Contact/PresenceLevel.qml
+0
-30
PresenceLevel.qml
tests/ui/modules/Linphone/PresenceLevel.qml
+38
-0
AccountStatusStyle.qml
...ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
+9
-0
qmldir
tests/ui/modules/Linphone/qmldir
+3
-1
utils.js
tests/ui/scripts/Utils/utils.js
+1
-1
MainWindow.qml
tests/ui/views/App/MainWindow/MainWindow.qml
+1
-1
MainWindowStyle.qml
tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml
+1
-0
No files found.
tests/resources.qrc
View file @
ee86c545
...
@@ -120,7 +120,7 @@
...
@@ -120,7 +120,7 @@
<file>
ui/modules/Linphone/Contact/Avatar.qml
</file>
<file>
ui/modules/Linphone/Contact/Avatar.qml
</file>
<file>
ui/modules/Linphone/Contact/ContactDescription.qml
</file>
<file>
ui/modules/Linphone/Contact/ContactDescription.qml
</file>
<file>
ui/modules/Linphone/Contact/Contact.qml
</file>
<file>
ui/modules/Linphone/Contact/Contact.qml
</file>
<file>
ui/modules/Linphone/
Contact/
PresenceLevel.qml
</file>
<file>
ui/modules/Linphone/PresenceLevel.qml
</file>
<file>
ui/modules/Linphone/qmldir
</file>
<file>
ui/modules/Linphone/qmldir
</file>
<file>
ui/modules/Linphone/Select/SelectContact.qml
</file>
<file>
ui/modules/Linphone/Select/SelectContact.qml
</file>
<file>
ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
</file>
...
...
tests/ui/modules/Linphone/Account/AccountStatus.qml
View file @
ee86c545
import
QtQuick
2.7
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
Linphone
1.0
import
Linphone
.
Styles
1.0
import
Linphone
.
Styles
1.0
import
Utils
1.0
import
Utils
1.0
...
@@ -9,16 +11,30 @@ Item {
...
@@ -9,16 +11,30 @@ Item {
Column
{
Column
{
anchors.fill
:
parent
anchors.fill
:
parent
Text
{
RowLayout
{
clip
:
true
color
:
AccountStatusStyle
.
username
.
color
elide
:
Text
.
ElideRight
font.bold
:
true
font.pointSize
:
AccountStatusStyle
.
username
.
fontSize
height
:
parent
.
height
/
2
height
:
parent
.
height
/
2
text
:
AccountSettingsModel
.
username
spacing
:
AccountStatusStyle
.
horizontalSpacing
verticalAlignment
:
Text
.
AlignBottom
width
:
parent
.
width
width
:
parent
.
width
PresenceLevel
{
Layout.preferredHeight
:
AccountStatusStyle
.
presenceLevel
.
size
Layout.preferredWidth
:
AccountStatusStyle
.
presenceLevel
.
size
icon
:
'
chevron
'
level
:
AccountSettingsModel
.
presenceLevel
Layout.alignment
:
Qt
.
AlignBottom
Layout.bottomMargin
:
AccountStatusStyle
.
presenceLevel
.
bottoMargin
}
Text
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
color
:
AccountStatusStyle
.
username
.
color
elide
:
Text
.
ElideRight
font.bold
:
true
font.pointSize
:
AccountStatusStyle
.
username
.
fontSize
text
:
AccountSettingsModel
.
username
verticalAlignment
:
Text
.
AlignBottom
}
}
}
Text
{
Text
{
...
...
tests/ui/modules/Linphone/Contact/ContactDescription.qml
View file @
ee86c545
...
@@ -15,7 +15,6 @@ Column {
...
@@ -15,7 +15,6 @@ Column {
Text
{
Text
{
id
:
username
id
:
username
clip
:
true
color
:
usernameColor
color
:
usernameColor
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
font.bold
:
true
font.bold
:
true
...
...
tests/ui/modules/Linphone/Contact/PresenceLevel.qml
deleted
100644 → 0
View file @
8ca63e09
import
QtQuick
2.7
import
Common
1.0
import
Linphone
1.0
// ===================================================================
Icon
{
property
int
level
:
-
1
function
_getColorString
()
{
if
(
level
===
Presence
.
Green
)
{
return
'
green
'
}
if
(
level
===
Presence
.
Orange
)
{
return
'
orange
'
}
if
(
level
===
Presence
.
Red
)
{
return
'
red
'
}
if
(
level
===
Presence
.
White
)
{
return
'
white
'
}
}
icon
:
{
var
level
=
_getColorString
()
return
level
?
'
led_
'
+
level
:
''
}
}
tests/ui/modules/Linphone/PresenceLevel.qml
0 → 100644
View file @
ee86c545
import
QtQuick
2.7
import
Common
1.0
import
Linphone
1.0
// ===================================================================
// Wrapper to use `icon` property.
Item
{
property
int
level
:
-
1
property
string
icon
:
'
led
'
Icon
{
anchors.fill
:
parent
function
_getColorString
()
{
if
(
level
===
Presence
.
Green
)
{
return
'
green
'
}
if
(
level
===
Presence
.
Orange
)
{
return
'
orange
'
}
if
(
level
===
Presence
.
Red
)
{
return
'
red
'
}
if
(
level
===
Presence
.
White
)
{
return
'
white
'
}
}
icon
:
{
var
level
=
_getColorString
()
return
level
?
parent
.
icon
+
'
_
'
+
level
:
''
}
}
}
tests/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
View file @
ee86c545
...
@@ -3,7 +3,16 @@ import QtQuick 2.7
...
@@ -3,7 +3,16 @@ import QtQuick 2.7
import
Common
1.0
import
Common
1.0
// ===================================================================
QtObject
{
QtObject
{
property
int
horizontalSpacing
:
6
property
QtObject
presenceLevel
:
QtObject
{
property
int
bottomMargin
:
2
property
int
size
:
16
}
property
QtObject
sipAddress
:
QtObject
{
property
QtObject
sipAddress
:
QtObject
{
property
color
color
:
Colors
.
j75
property
color
color
:
Colors
.
j75
property
int
fontSize
:
10
property
int
fontSize
:
10
...
...
tests/ui/modules/Linphone/qmldir
View file @
ee86c545
...
@@ -19,7 +19,9 @@ Chat 1.0 Chat/Chat.qml
...
@@ -19,7 +19,9 @@ Chat 1.0 Chat/Chat.qml
Avatar 1.0 Contact/Avatar.qml
Avatar 1.0 Contact/Avatar.qml
Contact 1.0 Contact/Contact.qml
Contact 1.0 Contact/Contact.qml
ContactDescription 1.0 Contact/ContactDescription.qml
ContactDescription 1.0 Contact/ContactDescription.qml
PresenceLevel 1.0 Contact/PresenceLevel.qml
# PresenceLevel
PresenceLevel 1.0 PresenceLevel.qml
# Select
# Select
SelectContact 1.0 Select/SelectContact.qml
SelectContact 1.0 Select/SelectContact.qml
...
...
tests/ui/scripts/Utils/utils.js
View file @
ee86c545
...
@@ -16,7 +16,7 @@ function openWindow (window, parent, options) {
...
@@ -16,7 +16,7 @@ function openWindow (window, parent, options) {
object
=
Qt
.
createQmlObject
(
window
,
parent
)
object
=
Qt
.
createQmlObject
(
window
,
parent
)
}
else
{
}
else
{
var
component
=
Qt
.
createComponent
(
var
component
=
Qt
.
createComponent
(
'
qrc:/ui/views/
'
+
window
+
'
.qml
'
'
qrc:/ui/views/
App/
'
+
window
+
'
.qml
'
)
)
if
(
component
.
status
!==
Component
.
Ready
)
{
if
(
component
.
status
!==
Component
.
Ready
)
{
...
...
tests/ui/views/App/MainWindow/MainWindow.qml
View file @
ee86c545
...
@@ -100,7 +100,7 @@ ApplicationWindow {
...
@@ -100,7 +100,7 @@ ApplicationWindow {
Layout.fillHeight
:
true
Layout.fillHeight
:
true
Layout.maximumWidth
:
MainWindowStyle
.
menu
.
width
Layout.maximumWidth
:
MainWindowStyle
.
menu
.
width
Layout.preferredWidth
:
MainWindowStyle
.
menu
.
width
Layout.preferredWidth
:
MainWindowStyle
.
menu
.
width
spacing
:
0
spacing
:
MainWindowStyle
.
menu
.
spacing
Menu
{
Menu
{
entryHeight
:
MainWindowStyle
.
menu
.
entryHeight
entryHeight
:
MainWindowStyle
.
menu
.
entryHeight
...
...
tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml
View file @
ee86c545
...
@@ -14,6 +14,7 @@ QtObject {
...
@@ -14,6 +14,7 @@ QtObject {
property
QtObject
menu
:
QtObject
{
property
QtObject
menu
:
QtObject
{
property
int
entryHeight
:
50
property
int
entryHeight
:
50
property
int
spacing
:
0
property
int
width
:
250
property
int
width
:
250
}
}
...
...
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