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
fa2f547e
Commit
fa2f547e
authored
Nov 02, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): many code fixes
parent
52829269
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
18 deletions
+22
-18
resources.qrc
tests/resources.qrc
+0
-5
Colors.qml
tests/ui/modules/Common/Colors.qml
+4
-3
TextFieldStyle.qml
tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
+1
-1
AccountStatus.qml
tests/ui/modules/Linphone/Account/AccountStatus.qml
+7
-4
AvatarStyle.qml
tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
+2
-2
ContactDescriptionStyle.qml
...dules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
+2
-2
ContactStyle.qml
tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml
+2
-0
PresenceStringStyle.qml
.../modules/Linphone/Styles/Presence/PresenceStringStyle.qml
+1
-1
Contacts.qml
tests/ui/views/App/MainWindow/Contacts.qml
+1
-0
MainWindow.qml
tests/ui/views/App/MainWindow/MainWindow.qml
+2
-0
No files found.
tests/resources.qrc
View file @
fa2f547e
...
@@ -32,18 +32,13 @@
...
@@ -32,18 +32,13 @@
<file>
assets/images/video_call_normal.svg
</file>
<file>
assets/images/video_call_normal.svg
</file>
<file>
assets/images/video_call_pressed.svg
</file>
<file>
assets/images/video_call_pressed.svg
</file>
<file>
assets/old_images/add_field.svg
</file>
<file>
assets/old_images/add_field.svg
</file>
<file>
assets/old_images/call.svg
</file>
<file>
assets/old_images/cam.svg
</file>
<file>
assets/old_images/cat_contact.jpg
</file>
<file>
assets/old_images/cat_contact.jpg
</file>
<file>
assets/old_images/chat_attachment.svg
</file>
<file>
assets/old_images/chat_attachment.svg
</file>
<file>
assets/old_images/chat.svg
</file>
<file>
assets/old_images/collapse.svg
</file>
<file>
assets/old_images/collapse.svg
</file>
<file>
assets/old_images/conference.svg
</file>
<file>
assets/old_images/conference.svg
</file>
<file>
assets/old_images/contacts_list.svg
</file>
<file>
assets/old_images/contacts_list.svg
</file>
<file>
assets/old_images/contact.svg
</file>
<file>
assets/old_images/contact.svg
</file>
<file>
assets/old_images/delete.svg
</file>
<file>
assets/old_images/hangup.svg
</file>
<file>
assets/old_images/hangup.svg
</file>
<file>
assets/old_images/history.svg
</file>
<file>
assets/old_images/home.svg
</file>
<file>
assets/old_images/home.svg
</file>
<file>
assets/old_images/incoming_call.svg
</file>
<file>
assets/old_images/incoming_call.svg
</file>
<file>
assets/old_images/lost_incoming_call.svg
</file>
<file>
assets/old_images/lost_incoming_call.svg
</file>
...
...
tests/ui/modules/Common/Colors.qml
View file @
fa2f547e
pragma
Singleton
pragma
Singleton
import
QtQuick
2.7
import
QtQuick
2.7
// ===================================================================
QtObject
{
QtObject
{
property
color
a
:
'
transparent
'
property
color
a
:
'
transparent
'
property
color
b
:
'
#5E5E5F
'
// Pressed toolbar.
property
color
b
:
'
#5E5E5F
'
// Pressed toolbar.
...
@@ -21,9 +23,6 @@ QtObject {
...
@@ -21,9 +23,6 @@ QtObject {
property
color
q
:
'
#E6E6E6
'
property
color
q
:
'
#E6E6E6
'
property
color
r
:
'
#8F8F8F
'
// -----------------------------------------------------------------
// -----------------------------------------------------------------
// OK.
// OK.
...
@@ -39,8 +38,10 @@ QtObject {
...
@@ -39,8 +38,10 @@ QtObject {
property
color
j75
:
'
#BF4B5964
'
property
color
j75
:
'
#BF4B5964
'
property
color
k
:
'
#FFFFFF
'
property
color
k
:
'
#FFFFFF
'
property
color
k50
:
'
#32FFFFFF
'
property
color
k50
:
'
#32FFFFFF
'
property
color
r
:
'
#595759
'
property
color
s
:
'
#D64D00
'
property
color
s
:
'
#D64D00
'
property
color
t
:
'
#FF8600
'
property
color
t
:
'
#FF8600
'
property
color
u
:
'
#B1B1B1
'
property
color
u
:
'
#B1B1B1
'
property
color
v
:
'
#E2E2E2
'
property
color
v
:
'
#E2E2E2
'
property
color
w
:
'
#A1A1A1
'
}
}
tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
View file @
fa2f547e
...
@@ -12,7 +12,7 @@ QtObject {
...
@@ -12,7 +12,7 @@ QtObject {
property
int
radius
:
4
property
int
radius
:
4
property
QtObject
border
:
QtObject
{
property
QtObject
border
:
QtObject
{
property
color
color
:
'
#CBCBCB
'
property
color
color
:
Colors
.
c
property
int
width
:
1
property
int
width
:
1
}
}
}
}
...
...
tests/ui/modules/Linphone/Account/AccountStatus.qml
View file @
fa2f547e
...
@@ -3,11 +3,14 @@ import QtQuick.Layouts 1.3
...
@@ -3,11 +3,14 @@ import QtQuick.Layouts 1.3
import
Linphone
1.0
import
Linphone
1.0
import
Linphone
.
Styles
1.0
import
Linphone
.
Styles
1.0
import
Utils
1.0
// ===================================================================
// ===================================================================
Item
{
Item
{
id
:
accountStatus
signal
clicked
Column
{
Column
{
anchors.fill
:
parent
anchors.fill
:
parent
...
@@ -17,12 +20,12 @@ Item {
...
@@ -17,12 +20,12 @@ Item {
width
:
parent
.
width
width
:
parent
.
width
PresenceLevel
{
PresenceLevel
{
Layout.alignment
:
Qt
.
AlignBottom
Layout.bottomMargin
:
AccountStatusStyle
.
presenceLevel
.
bottoMargin
Layout.preferredHeight
:
AccountStatusStyle
.
presenceLevel
.
size
Layout.preferredHeight
:
AccountStatusStyle
.
presenceLevel
.
size
Layout.preferredWidth
:
AccountStatusStyle
.
presenceLevel
.
size
Layout.preferredWidth
:
AccountStatusStyle
.
presenceLevel
.
size
icon
:
'
chevron
'
icon
:
'
chevron
'
level
:
AccountSettingsModel
.
presenceLevel
level
:
AccountSettingsModel
.
presenceLevel
Layout.alignment
:
Qt
.
AlignBottom
Layout.bottomMargin
:
AccountStatusStyle
.
presenceLevel
.
bottoMargin
}
}
Text
{
Text
{
...
@@ -55,6 +58,6 @@ Item {
...
@@ -55,6 +58,6 @@ Item {
:
Qt
.
ArrowCursor
:
Qt
.
ArrowCursor
hoverEnabled
:
true
hoverEnabled
:
true
onClicked
:
Utils
.
openWindow
(
'
ManageAccounts
'
,
this
)
onClicked
:
accountStatus
.
clicked
(
)
}
}
}
}
tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
View file @
fa2f547e
...
@@ -3,16 +3,16 @@ import QtQuick 2.7
...
@@ -3,16 +3,16 @@ import QtQuick 2.7
import
Common
1.0
import
Common
1.0
// ===================================================================
QtObject
{
QtObject
{
property
QtObject
initials
:
QtObject
{
property
QtObject
initials
:
QtObject
{
property
color
color
:
Colors
.
k
property
color
color
:
Colors
.
k
property
int
fontSize
:
10
property
int
fontSize
:
10
}
}
property
QtObject
mask
:
QtObject
{
property
QtObject
mask
:
QtObject
{
property
color
color
:
Colors
.
r
property
color
color
:
Colors
.
r
property
int
radius
:
500
property
int
radius
:
500
}
}
}
}
tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
View file @
fa2f547e
...
@@ -3,16 +3,16 @@ import QtQuick 2.7
...
@@ -3,16 +3,16 @@ import QtQuick 2.7
import
Common
1.0
import
Common
1.0
// ===================================================================
QtObject
{
QtObject
{
property
QtObject
sipAddress
:
QtObject
{
property
QtObject
sipAddress
:
QtObject
{
property
color
color
:
Colors
.
d
property
color
color
:
Colors
.
d
property
int
fontSize
:
10
property
int
fontSize
:
10
}
}
property
QtObject
username
:
QtObject
{
property
QtObject
username
:
QtObject
{
property
color
color
:
Colors
.
d
property
color
color
:
Colors
.
d
property
int
fontSize
:
11
property
int
fontSize
:
11
}
}
}
}
tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml
View file @
fa2f547e
pragma
Singleton
pragma
Singleton
import
QtQuick
2.7
import
QtQuick
2.7
// ===================================================================
QtObject
{
QtObject
{
property
int
contentHeight
:
32
property
int
contentHeight
:
32
property
int
height
:
50
property
int
height
:
50
...
...
tests/ui/modules/Linphone/Styles/Presence/PresenceStringStyle.qml
View file @
fa2f547e
...
@@ -6,6 +6,6 @@ import Common 1.0
...
@@ -6,6 +6,6 @@ import Common 1.0
// ===================================================================
// ===================================================================
QtObject
{
QtObject
{
property
color
color
:
'
#A1A1A1
'
property
color
color
:
Colors
.
w
property
int
fontSize
:
10
property
int
fontSize
:
10
}
}
tests/ui/views/App/MainWindow/Contacts.qml
View file @
fa2f547e
...
@@ -148,6 +148,7 @@ ColumnLayout {
...
@@ -148,6 +148,7 @@ ColumnLayout {
id
:
container1
id
:
container1
anchors.fill
:
parent
anchors.fill
:
parent
spacing
:
ContactsStyle
.
contact
.
spacing
PresenceLevel
{
PresenceLevel
{
Layout.preferredHeight
:
ContactsStyle
.
contact
.
presenceLevelSize
Layout.preferredHeight
:
ContactsStyle
.
contact
.
presenceLevelSize
...
...
tests/ui/views/App/MainWindow/MainWindow.qml
View file @
fa2f547e
...
@@ -55,6 +55,8 @@ ApplicationWindow {
...
@@ -55,6 +55,8 @@ ApplicationWindow {
Layout.fillHeight
:
parent
.
height
Layout.fillHeight
:
parent
.
height
Layout.preferredWidth
:
MainWindowStyle
.
accountStatus
.
width
Layout.preferredWidth
:
MainWindowStyle
.
accountStatus
.
width
onClicked
:
Utils
.
openWindow
(
'
ManageAccounts
'
,
window
)
}
}
Column
{
Column
{
...
...
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