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
6788f33e
Commit
6788f33e
authored
Mar 17, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): coding style
parent
314899ac
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
Presence.cpp
linphone-desktop/src/components/presence/Presence.cpp
+2
-2
Contacts.qml
linphone-desktop/ui/views/App/Main/Contacts.qml
+2
-2
ContactsStyle.qml
linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
+5
-2
No files found.
linphone-desktop/src/components/presence/Presence.cpp
View file @
6788f33e
...
@@ -64,7 +64,7 @@ QString Presence::getPresenceLevelIconName (const PresenceLevel &level) {
...
@@ -64,7 +64,7 @@ QString Presence::getPresenceLevelIconName (const PresenceLevel &level) {
return
"led_red"
;
return
"led_red"
;
case
White
:
case
White
:
return
"led_white"
;
return
"led_white"
;
default:
return
""
;
}
}
return
""
;
}
}
linphone-desktop/ui/views/App/Main/Contacts.qml
View file @
6788f33e
...
@@ -113,9 +113,9 @@ ColumnLayout {
...
@@ -113,9 +113,9 @@ ColumnLayout {
Text
{
Text
{
Layout.fillWidth
:
true
Layout.fillWidth
:
true
color
:
ContactsStyle
.
contact
.
presence
StringC
olor
color
:
ContactsStyle
.
contact
.
presence
.
c
olor
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
font.pointSize
:
ContactsStyle
.
contact
.
presence
StringF
ontSize
font.pointSize
:
ContactsStyle
.
contact
.
presence
.
f
ontSize
text
:
Presence
.
getPresenceStatusAsString
(
$contact
.
presenceStatus
)
text
:
Presence
.
getPresenceStatusAsString
(
$contact
.
presenceStatus
)
}
}
}
}
...
...
linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
View file @
6788f33e
...
@@ -25,8 +25,6 @@ QtObject {
...
@@ -25,8 +25,6 @@ QtObject {
property
int
presenceLevelSize
:
12
property
int
presenceLevelSize
:
12
property
int
rightMargin
:
25
property
int
rightMargin
:
25
property
int
spacing
:
15
property
int
spacing
:
15
property
int
presenceStringFontSize
:
10
property
color
presenceStringColor
:
Colors
.
w
property
QtObject
backgroundColor
:
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
color
normal
:
Colors
.
k
property
color
normal
:
Colors
.
k
...
@@ -43,6 +41,11 @@ QtObject {
...
@@ -43,6 +41,11 @@ QtObject {
property
int
width
:
5
property
int
width
:
5
}
}
property
QtObject
presence
:
QtObject
{
property
int
fontSize
:
10
property
color
color
:
Colors
.
w
}
property
QtObject
username
:
QtObject
{
property
QtObject
username
:
QtObject
{
property
color
color
:
Colors
.
j
property
color
color
:
Colors
.
j
property
int
fontSize
:
9
property
int
fontSize
:
9
...
...
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