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
178eb0f2
Commit
178eb0f2
authored
Dec 28, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/modules/Linphone): refactoring & coding style
parent
4248a6a7
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
59 additions
and
32 deletions
+59
-32
AccountSettingsModel.hpp
tests/src/components/settings/AccountSettingsModel.hpp
+2
-1
AccountStatus.qml
tests/ui/modules/Linphone/Account/AccountStatus.qml
+5
-1
Chat.qml
tests/ui/modules/Linphone/Chat/Chat.qml
+10
-10
Event.qml
tests/ui/modules/Linphone/Chat/Event.qml
+1
-1
IncomingMessage.qml
tests/ui/modules/Linphone/Chat/IncomingMessage.qml
+1
-1
Message.qml
tests/ui/modules/Linphone/Chat/Message.qml
+5
-3
OutgoingMessage.qml
tests/ui/modules/Linphone/Chat/OutgoingMessage.qml
+1
-1
Avatar.qml
tests/ui/modules/Linphone/Contact/Avatar.qml
+2
-0
Contact.qml
tests/ui/modules/Linphone/Contact/Contact.qml
+4
-0
ContactDescription.qml
tests/ui/modules/Linphone/Contact/ContactDescription.qml
+2
-0
Notification.qml
tests/ui/modules/Linphone/Notifications/Notification.qml
+5
-1
Notification.spec.qml
...s/ui/modules/Linphone/Notifications/Notification.spec.qml
+1
-1
PresenceLevel.qml
tests/ui/modules/Linphone/Presence/PresenceLevel.qml
+1
-1
PresenceString.qml
tests/ui/modules/Linphone/Presence/PresenceString.qml
+5
-1
AccountStatusStyle.qml
...ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
+1
-1
ChatStyle.qml
tests/ui/modules/Linphone/Styles/ChatStyle.qml
+1
-1
AvatarStyle.qml
tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
+1
-1
ContactDescriptionStyle.qml
...dules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
+1
-1
ContactStyle.qml
tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml
+1
-1
NotificationStyle.qml
tests/ui/modules/Linphone/Styles/NotificationStyle.qml
+1
-1
PresenceStringStyle.qml
.../modules/Linphone/Styles/Presence/PresenceStringStyle.qml
+1
-1
TimelineStyle.qml
tests/ui/modules/Linphone/Styles/TimelineStyle.qml
+1
-1
Timeline.qml
tests/ui/modules/Linphone/Timeline.qml
+4
-0
linphone-utils.js
tests/ui/scripts/LinphoneUtils/linphone-utils.js
+2
-2
No files found.
tests/src/components/settings/AccountSettingsModel.hpp
View file @
178eb0f2
...
...
@@ -13,7 +13,8 @@ class AccountSettingsModel : public QObject {
Q_PROPERTY
(
QString
username
READ
getUsername
WRITE
setUsername
// WRITE setUsername
CONSTANT
// TODO: TMP
);
Q_PROPERTY
(
...
...
tests/ui/modules/Linphone/Account/AccountStatus.qml
View file @
178eb0f2
...
...
@@ -4,13 +4,17 @@ import QtQuick.Layouts 1.3
import
Linphone
1.0
import
Linphone
.
Styles
1.0
// ===================================================================
// ===================================================================
==========
Item
{
id
:
accountStatus
// ---------------------------------------------------------------------------
signal
clicked
// ---------------------------------------------------------------------------
Column
{
anchors.fill
:
parent
...
...
tests/ui/modules/Linphone/Chat/Chat.qml
View file @
178eb0f2
...
...
@@ -6,7 +6,7 @@ import Common 1.0
import
Linphone
1.0
import
Linphone
.
Styles
1.0
// ===================================================================
// ===================================================================
==========
ColumnLayout
{
property
alias
proxyModel
:
chat
.
model
...
...
@@ -15,7 +15,7 @@ ColumnLayout {
proxyModel
.
sipAddress
)
||
proxyModel
.
sipAddress
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
spacing
:
0
...
...
@@ -41,9 +41,9 @@ ColumnLayout {
property
:
'
$sectionDate
'
}
// ---------------------------------------------------------------
// ---------------------------------------------------------------
----------
// Heading.
// ---------------------------------------------------------------
// ---------------------------------------------------------------
----------
Component
{
id
:
sectionHeading
...
...
@@ -85,9 +85,9 @@ ColumnLayout {
}
}
// ---------------------------------------------------------------
// ---------------------------------------------------------------
----------
// Message/Event renderer.
// ---------------------------------------------------------------
// ---------------------------------------------------------------
----------
delegate
:
Rectangle
{
id
:
entry
...
...
@@ -118,7 +118,7 @@ ColumnLayout {
}
implicitHeight
:
layout
.
height
+
ChatStyle
.
entry
.
bottomMargin
// -------------------------------------------------------------
// -------------------------------------------------------------
----------
// Avoid the use of explicit qrc paths.
Component
{
...
...
@@ -136,7 +136,7 @@ ColumnLayout {
OutgoingMessage
{}
}
// -------------------------------------------------------------
// -------------------------------------------------------------
----------
MouseArea
{
id
:
mouseArea
...
...
@@ -200,9 +200,9 @@ ColumnLayout {
onContentYChanged
:
_loadMoreEntries
()
}
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
// Send area.
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
Borders
{
Layout.fillWidth
:
true
...
...
tests/ui/modules/Linphone/Chat/Event.qml
View file @
178eb0f2
...
...
@@ -5,7 +5,7 @@ import Linphone 1.0
import
Linphone
.
Styles
1.0
import
Utils
1.0
// ===================================================================
// ===================================================================
==========
Row
{
property
string
_type
:
{
...
...
tests/ui/modules/Linphone/Chat/IncomingMessage.qml
View file @
178eb0f2
...
...
@@ -6,7 +6,7 @@ import Linphone 1.0
import
Linphone
.
Styles
1.0
import
LinphoneUtils
1.0
// ===================================================================
// ===================================================================
==========
RowLayout
{
implicitHeight
:
message
.
height
...
...
tests/ui/modules/Linphone/Chat/Message.qml
View file @
178eb0f2
...
...
@@ -4,18 +4,20 @@ import Common 1.0
import
Linphone
.
Styles
1.0
import
Utils
1.0
// ===================================================================
// ===================================================================
==========
Item
{
id
:
container
// ---------------------------------------------------------------------------
property
alias
backgroundColor
:
rectangle
.
color
property
alias
color
:
text
.
color
property
alias
fontSize
:
text
.
font
.
pointSize
default
property
alias
_content
:
content
.
data
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
function
_handleHoveredLink
(
hoveredLink
)
{
// Can be the `invertedMouseArea` of other message.
...
...
@@ -34,7 +36,7 @@ Item {
}
}
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
implicitHeight
:
text
.
contentHeight
+
text
.
padding
*
2
...
...
tests/ui/modules/Linphone/Chat/OutgoingMessage.qml
View file @
178eb0f2
...
...
@@ -5,7 +5,7 @@ import Common 1.0
import
Linphone
1.0
import
Linphone
.
Styles
1.0
// ===================================================================
// ===================================================================
==========
Item
{
implicitHeight
:
message
.
height
...
...
tests/ui/modules/Linphone/Contact/Avatar.qml
View file @
178eb0f2
...
...
@@ -9,6 +9,8 @@ import Linphone.Styles 1.0
Item
{
id
:
avatar
// ---------------------------------------------------------------------------
property
alias
presenceLevel
:
presenceLevel
.
level
property
color
backgroundColor
:
AvatarStyle
.
backgroundColor
property
string
username
...
...
tests/ui/modules/Linphone/Contact/Contact.qml
View file @
178eb0f2
...
...
@@ -11,12 +11,16 @@ import Linphone.Styles 1.0
Rectangle
{
id
:
item
// ---------------------------------------------------------------------------
property
alias
actions
:
actionBar
.
data
property
alias
sipAddressColor
:
description
.
sipAddressColor
property
alias
usernameColor
:
description
.
usernameColor
property
string
sipAddress
property
var
_contact
:
SipAddressesModel
.
mapSipAddressToContact
(
sipAddress
)
// ---------------------------------------------------------------------------
color
:
'
transparent
'
// No color by default.
height
:
ContactStyle
.
height
...
...
tests/ui/modules/Linphone/Contact/ContactDescription.qml
View file @
178eb0f2
...
...
@@ -11,6 +11,8 @@ Column {
property
color
usernameColor
:
ContactDescriptionStyle
.
username
.
color
property
int
horizontalTextAlignment
// ---------------------------------------------------------------------------
Text
{
id
:
username
...
...
tests/ui/modules/Linphone/Notifications/Notification.qml
View file @
178eb0f2
...
...
@@ -8,14 +8,18 @@ import Common 1.0
import
Linphone
.
Styles
1.0
import
Utils
1.0
// ===================================================================
// ===================================================================
==========
DesktopPopup
{
id
:
notification
// ---------------------------------------------------------------------------
property
int
notificationOffset
:
0
property
alias
notificationHeight
:
notification
.
popupHeight
// ---------------------------------------------------------------------------
flags
:
Qt
.
Popup
Component.onCompleted
:
{
...
...
tests/ui/modules/Linphone/Notifications/Notification.spec.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtTest 1.1
import
Linphone
1.0
import
Utils
1.0
// ===================================================================
// ===================================================================
==========
// Check defined properties/methods used in `Notifier.cpp`.
TestCase
{
...
...
tests/ui/modules/Linphone/Presence/PresenceLevel.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtQuick 2.7
import
Common
1.0
import
Linphone
1.0
// ===================================================================
// ===================================================================
==========
// Wrapper to use `icon` property.
Item
{
...
...
tests/ui/modules/Linphone/Presence/PresenceString.qml
View file @
178eb0f2
...
...
@@ -3,11 +3,13 @@ import QtQuick 2.7
import
Linphone
1.0
import
Linphone
.
Styles
1.0
// ===================================================================
// ===================================================================
==========
Text
{
property
int
status
:
-
1
// ---------------------------------------------------------------------------
function
_getStatusString
()
{
switch
(
status
)
{
case
Presence.Online
:
...
...
@@ -33,6 +35,8 @@ Text {
}
}
// ---------------------------------------------------------------------------
color
:
PresenceStringStyle
.
color
elide
:
Text
.
ElideRight
font.pointSize
:
PresenceStringStyle
.
fontSize
...
...
tests/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
// ===================================================================
==========
QtObject
{
property
int
horizontalSpacing
:
6
...
...
tests/ui/modules/Linphone/Styles/ChatStyle.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
// ===================================================================
==========
QtObject
{
property
QtObject
sectionHeading
:
QtObject
{
...
...
tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
// ===================================================================
==========
QtObject
{
property
color
backgroundColor
:
Colors
.
r
...
...
tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
// ===================================================================
==========
QtObject
{
property
QtObject
sipAddress
:
QtObject
{
...
...
tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml
View file @
178eb0f2
pragma
Singleton
import
QtQuick
2.7
// ===================================================================
// ===================================================================
==========
QtObject
{
property
int
contentHeight
:
32
...
...
tests/ui/modules/Linphone/Styles/NotificationStyle.qml
View file @
178eb0f2
pragma
Singleton
import
QtQuick
2.7
// ===================================================================
// ===================================================================
==========
QtObject
{
property
int
margin
:
10
...
...
tests/ui/modules/Linphone/Styles/Presence/PresenceStringStyle.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
// ===================================================================
==========
QtObject
{
property
color
color
:
Colors
.
w
...
...
tests/ui/modules/Linphone/Styles/TimelineStyle.qml
View file @
178eb0f2
...
...
@@ -3,7 +3,7 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
// ===================================================================
==========
QtObject
{
property
QtObject
contact
:
QtObject
{
...
...
tests/ui/modules/Linphone/Timeline.qml
View file @
178eb0f2
...
...
@@ -11,8 +11,12 @@ import Utils 1.0
ColumnLayout
{
id
:
timeline
// ---------------------------------------------------------------------------
property
alias
model
:
view
.
model
// ---------------------------------------------------------------------------
signal
entrySelected
(
var
entry
)
// ---------------------------------------------------------------------------
...
...
tests/ui/scripts/LinphoneUtils/linphone-utils.js
View file @
178eb0f2
// ===================================================================
// ===================================================================
==========
// Contains linphone helpers.
// ===================================================================
// ===================================================================
==========
.
pragma
library
...
...
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