Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-desktop
Commits
c74b0fbe
Commit
c74b0fbe
authored
Sep 28, 2016
by
Ronan
Browse files
feat(Form/TransparentComboBox): use style file
parent
fbcbb7e1
Changes
7
Hide whitespace changes
Inline
Side-by-side
tests/resources.qrc
View file @
c74b0fbe
...
...
@@ -68,6 +68,7 @@
<file>
ui/modules/Linphone/Styles/Form/SmallButtonStyle.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/TransparentComboBoxStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/MenuStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/PopupStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/qmldir
</file>
...
...
tests/ui/modules/Linphone/Form/TransparentComboBox.qml
View file @
c74b0fbe
import
QtQuick
2.7
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
{
id
:
comboBox
background
:
Rectangle
{
color
:
'
transparent
'
// No Style constant, see component name.
}
delegate
:
ItemDelegate
{
id
:
item
background
:
Rectangle
{
color
:
'
transparent
'
}
id
:
comboBox
delegate
:
ItemDelegate
{
background
:
Rectangle
{
color
:
delegate
.
down
?
'
#FE5E00
'
:
(
comboBox
.
currentIndex
===
index
?
'
#F0F0F0
'
:
'
#FFFFFF
'
)
opacity
:
enabled
?
1
:
0.3
}
font.weight
:
comboBox
.
currentIndex
===
index
?
Font
.
DemiBold
:
Font
.
Normal
id
:
delegate
text
:
key
||
modelData
width
:
comboBox
.
width
color
:
item
.
down
?
TransparentComboBoxStyle
.
item
.
color
.
pressed
:
(
comboBox
.
currentIndex
===
index
?
TransparentComboBoxStyle
.
item
.
color
.
selected
:
TransparentComboBoxStyle
.
item
.
color
.
normal
)
}
font.bold
:
comboBox
.
currentIndex
===
index
text
:
key
||
modelData
width
:
comboBox
.
width
}
}
tests/ui/modules/Linphone/Styles/DialogStyle.qml
View file @
c74b0fbe
...
...
@@ -19,9 +19,9 @@ QtObject {
}
property
QtObject
description
:
QtObject
{
property
color
color
:
Colors
.
l
property
int
fontSize
:
12
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
QtObject
{
property
QtObject
background
:
QtObject
{
property
int
height
:
30
property
int
width
:
160
property
int
radius
:
4
property
int
width
:
160
}
property
QtObject
text
:
QtObject
{
...
...
tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml
View file @
c74b0fbe
...
...
@@ -6,13 +6,13 @@ import Linphone 1.0
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
color
hovered
:
Colors
.
o
property
color
pressed
:
Colors
.
i
property
color
normal
:
Colors
.
j
property
color
pressed
:
Colors
.
i
}
property
QtObject
textColor
:
QtObject
{
property
color
hovered
:
Colors
.
k
property
color
pressed
:
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
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
color
hovered
:
Colors
.
p
property
color
pressed
:
Colors
.
i
property
color
normal
:
Colors
.
m
property
color
pressed
:
Colors
.
i
}
property
QtObject
textColor
:
QtObject
{
property
color
hovered
:
Colors
.
d
property
color
pressed
:
Colors
.
k
property
color
normal
:
Colors
.
d
property
color
pressed
:
Colors
.
k
}
}
tests/ui/modules/Linphone/Styles/qmldir
View file @
c74b0fbe
...
...
@@ -3,18 +3,19 @@
module Linphone.Style
# Components styles.
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml
singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml
singleton MenuStyle 1.0 MenuStyle.qml
singleton PopupStyle 1.0 PopupStyle.qml
singleton SearchBoxStyle 1.0 SearchBoxStyle.qml
singleton TimelineStyle 1.0 TimelineStyle.qml
singleton CollapseStyle
1.0 CollapseStyle.qml
singleton DialogStyle
1.0 DialogStyle.qml
singleton ForceScrollBarStyle
1.0 ForceScrollBarStyle.qml
singleton MenuStyle
1.0 MenuStyle.qml
singleton PopupStyle
1.0 PopupStyle.qml
singleton SearchBoxStyle
1.0 SearchBoxStyle.qml
singleton TimelineStyle
1.0 TimelineStyle.qml
singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml
singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml
singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml
singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml
singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml
singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml
singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml
singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml
singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.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