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
c74b0fbe
Commit
c74b0fbe
authored
Sep 28, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Form/TransparentComboBox): use style file
parent
fbcbb7e1
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
44 additions
and
41 deletions
+44
-41
resources.qrc
tests/resources.qrc
+1
-0
TransparentComboBox.qml
tests/ui/modules/Linphone/Form/TransparentComboBox.qml
+21
-20
DialogStyle.qml
tests/ui/modules/Linphone/Styles/DialogStyle.qml
+2
-2
AbstractTextButtonStyle.qml
.../modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml
+1
-1
TextButtonAStyle.qml
tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml
+2
-2
TextButtonBStyle.qml
tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml
+2
-2
qmldir
tests/ui/modules/Linphone/Styles/qmldir
+15
-14
No files found.
tests/resources.qrc
View file @
c74b0fbe
...
@@ -68,6 +68,7 @@
...
@@ -68,6 +68,7 @@
<file>
ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/TransparentComboBoxStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/MenuStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/MenuStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/PopupStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/PopupStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/qmldir
</file>
<file>
ui/modules/Linphone/Styles/qmldir
</file>
...
...
tests/ui/modules/Linphone/Form/TransparentComboBox.qml
View file @
c74b0fbe
import
QtQuick
2.7
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Controls
2.0
import
Linphone
.
Styles
1.0
// ===================================================================
// ===================================================================
// Discrete ComboBox
which
can be integrated in text.
// Discrete ComboBox
that
can be integrated in text.
// ===================================================================
// ===================================================================
ComboBox
{
ComboBox
{
id
:
comboBox
background
:
Rectangle
{
background
:
Rectangle
{
color
:
'
transparent
'
color
:
'
transparent
'
// No Style constant, see component name.
}
}
id
:
comboBox
delegate
:
ItemDelegate
{
delegate
:
ItemDelegate
{
id
:
item
background
:
Rectangle
{
background
:
Rectangle
{
color
:
delegate
.
down
color
:
item
.
down
?
'
#FE5E00
'
?
TransparentComboBoxStyle
.
item
.
color
.
pressed
:
(
comboBox
.
currentIndex
===
index
:
(
comboBox
.
currentIndex
===
index
?
'
#F0F0F0
'
?
TransparentComboBoxStyle
.
item
.
color
.
selected
:
'
#FFFFFF
'
:
TransparentComboBoxStyle
.
item
.
color
.
normal
)
)
opacity
:
enabled
?
1
:
0.3
}
}
font.weight
:
comboBox
.
currentIndex
===
index
font.bold
:
comboBox
.
currentIndex
===
index
?
Font
.
DemiBold
:
Font
.
Normal
id
:
delegate
text
:
key
||
modelData
text
:
key
||
modelData
width
:
comboBox
.
width
width
:
comboBox
.
width
}
}
...
...
tests/ui/modules/Linphone/Styles/DialogStyle.qml
View file @
c74b0fbe
...
@@ -19,9 +19,9 @@ QtObject {
...
@@ -19,9 +19,9 @@ QtObject {
}
}
property
QtObject
description
:
QtObject
{
property
QtObject
description
:
QtObject
{
property
color
color
:
Colors
.
l
property
int
fontSize
:
12
property
int
fontSize
:
12
property
int
verticalMargin
:
25
property
int
verticalMargin
:
25
property
color
color
:
Colors
.
l
}
}
}
}
tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml
View file @
c74b0fbe
...
@@ -4,8 +4,8 @@ import QtQuick 2.7
...
@@ -4,8 +4,8 @@ import QtQuick 2.7
QtObject
{
QtObject
{
property
QtObject
background
:
QtObject
{
property
QtObject
background
:
QtObject
{
property
int
height
:
30
property
int
height
:
30
property
int
width
:
160
property
int
radius
:
4
property
int
radius
:
4
property
int
width
:
160
}
}
property
QtObject
text
:
QtObject
{
property
QtObject
text
:
QtObject
{
...
...
tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml
View file @
c74b0fbe
...
@@ -6,13 +6,13 @@ import Linphone 1.0
...
@@ -6,13 +6,13 @@ import Linphone 1.0
QtObject
{
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
color
hovered
:
Colors
.
o
property
color
hovered
:
Colors
.
o
property
color
pressed
:
Colors
.
i
property
color
normal
:
Colors
.
j
property
color
normal
:
Colors
.
j
property
color
pressed
:
Colors
.
i
}
}
property
QtObject
textColor
:
QtObject
{
property
QtObject
textColor
:
QtObject
{
property
color
hovered
:
Colors
.
k
property
color
hovered
:
Colors
.
k
property
color
pressed
:
Colors
.
k
property
color
normal
:
Colors
.
k
property
color
normal
:
Colors
.
k
property
color
pressed
:
Colors
.
k
}
}
}
}
tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml
View file @
c74b0fbe
...
@@ -6,13 +6,13 @@ import Linphone 1.0
...
@@ -6,13 +6,13 @@ import Linphone 1.0
QtObject
{
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
color
hovered
:
Colors
.
p
property
color
hovered
:
Colors
.
p
property
color
pressed
:
Colors
.
i
property
color
normal
:
Colors
.
m
property
color
normal
:
Colors
.
m
property
color
pressed
:
Colors
.
i
}
}
property
QtObject
textColor
:
QtObject
{
property
QtObject
textColor
:
QtObject
{
property
color
hovered
:
Colors
.
d
property
color
hovered
:
Colors
.
d
property
color
pressed
:
Colors
.
k
property
color
normal
:
Colors
.
d
property
color
normal
:
Colors
.
d
property
color
pressed
:
Colors
.
k
}
}
}
}
tests/ui/modules/Linphone/Styles/qmldir
View file @
c74b0fbe
...
@@ -18,3 +18,4 @@ singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
...
@@ -18,3 +18,4 @@ singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml
singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml
singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml
singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml
singleton TransparentComboBoxStyle 1.0 Form/TransparentComboBoxStyle.qml
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