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
09b43034
Commit
09b43034
authored
Sep 27, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): use `Colors` instead of `Constants.colors` in qml styles
parent
a7423b4b
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
38 additions
and
34 deletions
+38
-34
resources.qrc
tests/resources.qrc
+1
-0
Colors.qml
tests/ui/modules/Linphone/Colors.qml
+22
-0
Constants.qml
tests/ui/modules/Linphone/Constants.qml
+0
-20
DialogStyle.qml
tests/ui/modules/Linphone/Styles/DialogStyle.qml
+1
-1
ForceScrollBarStyle.qml
tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml
+4
-4
MenuStyle.qml
tests/ui/modules/Linphone/Styles/MenuStyle.qml
+5
-5
PopupStyle.qml
tests/ui/modules/Linphone/Styles/PopupStyle.qml
+1
-1
SearchBoxStyle.qml
tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml
+1
-1
TimelineStyle.qml
tests/ui/modules/Linphone/Styles/TimelineStyle.qml
+2
-2
qmldir
tests/ui/modules/Linphone/qmldir
+1
-0
No files found.
tests/resources.qrc
View file @
09b43034
...
...
@@ -30,6 +30,7 @@
<file>
ui/modules/Linphone/Chat/Message.qml
</file>
<file>
ui/modules/Linphone/Chat/OutgoingMessage.qml
</file>
<file>
ui/modules/Linphone/Collapse.qml
</file>
<file>
ui/modules/Linphone/Colors.qml
</file>
<file>
ui/modules/Linphone/Constants.qml
</file>
<file>
ui/modules/Linphone/Contact/Avatar.qml
</file>
<file>
ui/modules/Linphone/Contact/ContactDescription.qml
</file>
...
...
tests/ui/modules/Linphone/Colors.qml
0 → 100644
View file @
09b43034
pragma
Singleton
import
QtQuick
2.7
QtObject
{
property
string
a
:
'
transparent
'
property
string
b
:
'
#5E5E5F
'
// Pressed toolbar.
property
string
c
:
'
#C5C5C5
'
// Released toolbar.
property
string
d
:
'
#5A585B
'
// Text color.
property
string
e
:
'
#DEDEDE
'
// Timeline separator
property
string
f
:
'
#808080
'
// Popup shadow.
property
string
g
:
'
#8E8E8E
'
// MenuEntry Normal.
property
string
h
:
'
#707070
'
// MenuEntry Hovered.
property
string
i
:
'
#FE5E00
'
// MenuEntry Pressed.
property
string
j
:
'
#434343
'
// MenuEntry Selected.
property
string
k
:
'
#FFFFFF
'
// Text color.
property
string
l
:
'
#000000
'
// Text color.
}
tests/ui/modules/Linphone/Constants.qml
View file @
09b43034
...
...
@@ -4,24 +4,4 @@ import QtQuick 2.7
QtObject
{
property
int
zPopup
:
999
property
int
zMax
:
999999
property
QtObject
colors
:
QtObject
{
property
string
a
:
'
transparent
'
property
string
b
:
'
#5E5E5F
'
// Pressed toolbar.
property
string
c
:
'
#C5C5C5
'
// Released toolbar.
property
string
d
:
'
#5A585B
'
// Text color.
property
string
e
:
'
#DEDEDE
'
// Timeline separator
property
string
f
:
'
#808080
'
// Popup shadow.
property
string
g
:
'
#8E8E8E
'
// MenuEntry Normal.
property
string
h
:
'
#707070
'
// MenuEntry Hovered.
property
string
i
:
'
#FE5E00
'
// MenuEntry Pressed.
property
string
j
:
'
#434343
'
// MenuEntry Selected.
property
string
k
:
'
#FFFFFF
'
// Text color.
property
string
l
:
'
#000000
'
// Text color.
}
}
tests/ui/modules/Linphone/Styles/DialogStyle.qml
View file @
09b43034
...
...
@@ -22,6 +22,6 @@ QtObject {
property
int
fontSize
:
12
property
int
verticalMargin
:
25
property
string
color
:
Co
nstants
.
co
lors
.
l
property
string
color
:
Colors
.
l
}
}
tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml
View file @
09b43034
...
...
@@ -5,7 +5,7 @@ import Linphone 1.0
QtObject
{
property
Rectangle
background
:
Rectangle
{
color
:
Co
nstants
.
co
lors
.
a
color
:
Colors
.
a
}
property
Rectangle
contentItem
:
Rectangle
{
...
...
@@ -15,8 +15,8 @@ QtObject {
}
property
QtObject
color
:
QtObject
{
property
string
hovered
:
Co
nstants
.
co
lors
.
h
property
string
normal
:
Co
nstants
.
co
lors
.
c
property
string
pressed
:
Co
nstants
.
co
lors
.
b
property
string
hovered
:
Colors
.
h
property
string
normal
:
Colors
.
c
property
string
pressed
:
Colors
.
b
}
}
tests/ui/modules/Linphone/Styles/MenuStyle.qml
View file @
09b43034
...
...
@@ -15,13 +15,13 @@ QtObject {
property
int
spacing
:
18
property
string
selectionIcon
:
'
right_arrow
'
property
string
textColor
:
Co
nstants
.
co
lors
.
k
property
string
textColor
:
Colors
.
k
property
QtObject
color
:
QtObject
{
property
string
normal
:
Co
nstants
.
co
lors
.
g
property
string
hovered
:
Co
nstants
.
co
lors
.
h
property
string
pressed
:
Co
nstants
.
co
lors
.
i
property
string
selected
:
Co
nstants
.
co
lors
.
j
property
string
normal
:
Colors
.
g
property
string
hovered
:
Colors
.
h
property
string
pressed
:
Colors
.
i
property
string
selected
:
Colors
.
j
}
}
}
tests/ui/modules/Linphone/Styles/PopupStyle.qml
View file @
09b43034
...
...
@@ -11,6 +11,6 @@ QtObject {
property
int
samples
:
15
property
int
verticalOffset
:
2
property
string
color
:
Co
nstants
.
co
lors
.
f
property
string
color
:
Colors
.
f
}
}
tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml
View file @
09b43034
...
...
@@ -4,7 +4,7 @@ import QtQuick 2.7
import
Linphone
1.0
QtObject
{
property
string
shadowColor
:
Co
nstants
.
co
lors
.
f
property
string
shadowColor
:
Colors
.
f
property
Rectangle
searchFieldBackground
:
Rectangle
{
implicitHeight
:
30
...
...
tests/ui/modules/Linphone/Styles/TimelineStyle.qml
View file @
09b43034
...
...
@@ -12,13 +12,13 @@ QtObject {
property
int
spacing
:
16
property
int
topMargin
:
10
property
string
color
:
Co
nstants
.
co
lors
.
d
property
string
color
:
Colors
.
d
property
string
icon
:
'
history
'
}
property
QtObject
separator
:
QtObject
{
property
int
height
:
1
property
string
color
:
Co
nstants
.
co
lors
.
e
property
string
color
:
Colors
.
e
}
}
tests/ui/modules/Linphone/qmldir
View file @
09b43034
...
...
@@ -2,6 +2,7 @@ module Linphone
# Constants ----------------------------------------------------------
singleton Colors 1.0 Colors.qml
singleton Constants 1.0 Constants.qml
# Components ---------------------------------------------------------
...
...
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