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
6fa3026c
Commit
6fa3026c
authored
Sep 28, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Form/CheckBoxText): use style file
parent
bcf304f1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
25 deletions
+61
-25
resources.qrc
tests/resources.qrc
+1
-0
CheckBoxText.qml
tests/ui/modules/Linphone/Form/CheckBoxText.qml
+43
-24
CheckBoxTextStyle.qml
tests/ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml
+15
-0
qmldir
tests/ui/modules/Linphone/Styles/qmldir
+1
-0
MainWindow.qml
tests/ui/views/MainWindow/MainWindow.qml
+1
-1
No files found.
tests/resources.qrc
View file @
6fa3026c
...
...
@@ -63,6 +63,7 @@
<file>
ui/modules/Linphone/Styles/ForceScrollBarStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/ActionBarStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml
</file>
...
...
tests/ui/modules/Linphone/Form/CheckBoxText.qml
View file @
6fa3026c
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
Linphone
.
Styles
1.0
// ===================================================================
// Checkbox with clickable text.
// ===================================================================
CheckBox
{
contentItem
:
Text
{
color
:
checkBox
.
down
?
'
#FE5E00
'
:
'
#8E8E8E
'
font
:
checkBox
.
font
leftPadding
:
checkBox
.
indicator
.
width
+
checkBox
.
spacing
text
:
checkBox
.
text
verticalAlignment
:
Text
.
AlignVCenter
}
id
:
checkBox
indicator
:
Rectangle
{
border.color
:
checkBox
.
down
?
'
#FE5E00
'
:
'
#8E8E8E
'
implicitHeight
:
18
implicitWidth
:
18
radius
:
3
x
:
checkBox
.
leftPadding
y
:
parent
.
height
/
2
-
height
/
2
id
:
checkBox
contentItem
:
Text
{
color
:
checkBox
.
down
?
CheckBoxTextStyle
.
color
.
pressed
:
(
checkBox
.
hovered
?
CheckBoxTextStyle
.
color
.
hovered
:
CheckBoxTextStyle
.
color
.
normal
)
font
:
checkBox
.
font
leftPadding
:
checkBox
.
indicator
.
width
+
checkBox
.
spacing
text
:
checkBox
.
text
verticalAlignment
:
Text
.
AlignVCenter
}
hoverEnabled
:
true
indicator
:
Rectangle
{
border.color
:
checkBox
.
down
?
CheckBoxTextStyle
.
color
.
pressed
:
(
checkBox
.
hovered
?
CheckBoxTextStyle
.
color
.
hovered
:
CheckBoxTextStyle
.
color
.
normal
)
implicitHeight
:
CheckBoxTextStyle
.
size
implicitWidth
:
CheckBoxTextStyle
.
size
radius
:
CheckBoxTextStyle
.
radius
x
:
checkBox
.
leftPadding
y
:
parent
.
height
/
2
-
height
/
2
Rectangle
{
color
:
checkBox
.
down
?
'
#FE5E00
'
:
'
#8E8E8E
'
height
:
10
radius
:
2
visible
:
checkBox
.
checked
width
:
10
x
:
4
y
:
4
}
Rectangle
{
color
:
checkBox
.
down
?
CheckBoxTextStyle
.
color
.
pressed
:
(
checkBox
.
hovered
?
CheckBoxTextStyle
.
color
.
hovered
:
CheckBoxTextStyle
.
color
.
normal
)
height
:
parent
.
height
-
y
*
2
radius
:
CheckBoxTextStyle
.
radius
visible
:
checkBox
.
checked
width
:
parent
.
width
-
x
*
2
x
:
4
// Fixed, no style.
y
:
4
// Fixed, no style.
}
}
}
tests/ui/modules/Linphone/Styles/Form/CheckBoxTextStyle.qml
0 → 100644
View file @
6fa3026c
pragma
Singleton
import
QtQuick
2.7
import
Linphone
1.0
QtObject
{
property
int
radius
:
3
property
int
size
:
18
property
QtObject
color
:
QtObject
{
property
color
pressed
:
'
#FE5E00
'
property
color
hovered
:
'
#6E6E6E
'
property
color
normal
:
'
#8E8E8E
'
}
}
tests/ui/modules/Linphone/Styles/qmldir
View file @
6fa3026c
...
...
@@ -13,6 +13,7 @@ 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
...
...
tests/ui/views/MainWindow/MainWindow.qml
View file @
6fa3026c
...
...
@@ -275,7 +275,7 @@ ApplicationWindow {
Loader
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
source
:
'
qrc:/ui/views/MainWindow/
Contacts
.qml
'
source
:
'
qrc:/ui/views/MainWindow/
Home
.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