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
b81239ae
Commit
b81239ae
authored
Sep 27, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Form/ExclusiveButtons): use style file
parent
eaafc4b0
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
108 additions
and
59 deletions
+108
-59
linphone.pro
tests/linphone.pro
+1
-0
resources.qrc
tests/resources.qrc
+2
-0
ExclusiveButtons.qml
tests/ui/modules/Linphone/Form/ExclusiveButtons.qml
+31
-30
SmallButton.qml
tests/ui/modules/Linphone/Form/SmallButton.qml
+25
-22
ExclusiveButtonsStyle.qml
...ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml
+17
-0
SmallButtonStyle.qml
tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml
+22
-0
qmldir
tests/ui/modules/Linphone/Styles/qmldir
+10
-7
No files found.
tests/linphone.pro
View file @
b81239ae
...
...
@@ -36,6 +36,7 @@ lupdate_only{
ui/modules/Linphone/Popup
/*
.qml \
ui/modules/Linphone/Select
/*
.qml \
ui/modules/Linphone/Styles
/*
.qml \
ui/modules/Linphone/Styles/Form
/*
.qml \
ui/modules/Linphone/View
/*
.qml \
ui/views
/*
.qml \
ui/views/MainWindow
/*
.qml \
...
...
tests/resources.qrc
View file @
b81239ae
...
...
@@ -60,6 +60,8 @@
<file>
ui/modules/Linphone/Styles/CollapseStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/DialogStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/ForceScrollBarStyle.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/MenuStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/PopupStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/qmldir
</file>
...
...
tests/ui/modules/Linphone/Form/ExclusiveButtons.qml
View file @
b81239ae
import
QtQuick
2.7
import
Linphone
.
Styles
1.0
// ===================================================================
Row
{
property
int
selectedButton
:
0
property
int
_
selectedButton
:
0
property
variant
texts
signal
clicked
(
int
button
)
spacing
:
8
spacing
:
ExclusiveButtonsStyle
.
buttonsSpacing
Repeater
{
model
:
texts
SmallButton
{
anchors.verticalCenter
:
parent
.
verticalCenter
backgroundColor
:
selectedButton
===
index
?
'
#8E8E8E
'
:
(
button
.
down
?
'
#FE5E00
'
:
(
button
.
hovered
?
'
#C0C0C0
'
:
'
#D1D1D1
'
backgroundColor
:
_
selectedButton
===
index
?
ExclusiveButtonsStyle
.
button
.
color
.
selected
:
(
down
?
ExclusiveButtonsStyle
.
button
.
color
.
pressed
:
(
hovered
?
ExclusiveButtonsStyle
.
button
.
color
.
hovered
:
ExclusiveButtonsStyle
.
button
.
color
.
normal
)
)
id
:
button
text
:
modelData
onClicked
:
{
if
(
selectedButton
!==
index
)
{
selectedButton
=
index
if
(
_
selectedButton
!==
index
)
{
_
selectedButton
=
index
clicked
(
index
)
}
}
...
...
tests/ui/modules/Linphone/Form/SmallButton.qml
View file @
b81239ae
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
Linphone
.
Styles
1.0
// ===================================================================
Button
{
id
:
button
property
alias
backgroundColor
:
background
.
color
background
:
Rectangle
{
id
:
background
color
:
button
.
down
?
'
#FE5E00
'
?
SmallButtonStyle
.
background
.
color
.
pressed
:
(
button
.
hovered
?
'
#C0C0C0
'
:
'
#D1D1D1
'
?
SmallButtonStyle
.
background
.
color
.
hovered
:
SmallButtonStyle
.
background
.
color
.
normal
)
id
:
background
implicitHeight
:
22
radius
:
10
implicitHeight
:
SmallButtonStyle
.
background
.
height
radius
:
SmallButtonStyle
.
background
.
radius
}
contentItem
:
Text
{
color
:
'
#FFFFFF
'
font.pointSize
:
8
color
:
SmallButtonStyle
.
text
.
color
font.pointSize
:
SmallButtonStyle
.
text
.
fontSize
horizontalAlignment
:
Text
.
AlignHCenter
id
:
text
text
:
button
.
text
verticalAlignment
:
Text
.
AlignVCenter
}
hoverEnabled
:
true
id
:
button
}
tests/ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml
0 → 100644
View file @
b81239ae
pragma
Singleton
import
QtQuick
2.7
import
Linphone
1.0
QtObject
{
property
int
buttonsSpacing
:
8
property
QtObject
button
:
QtObject
{
property
QtObject
color
:
QtObject
{
property
string
hovered
:
'
#C0C0C0
'
property
string
normal
:
'
#D1D1D1
'
property
string
pressed
:
'
#FE5E00
'
property
string
selected
:
'
#8E8E8E
'
}
}
}
tests/ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml
0 → 100644
View file @
b81239ae
pragma
Singleton
import
QtQuick
2.7
import
Linphone
1.0
QtObject
{
property
QtObject
background
:
QtObject
{
property
int
height
:
22
property
int
radius
:
10
property
QtObject
color
:
QtObject
{
property
string
hovered
:
'
#C0C0C0
'
property
string
normal
:
'
#D1D1D1
'
property
string
pressed
:
'
#FE5E00
'
}
}
property
QtObject
text
:
QtObject
{
property
int
fontSize
:
8
property
string
color
:
'
#FFFFFF
'
}
}
tests/ui/modules/Linphone/Styles/qmldir
View file @
b81239ae
...
...
@@ -10,3 +10,6 @@ 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 ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.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