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
bcf304f1
Commit
bcf304f1
authored
Sep 27, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Form/ActionBar): use style file
parent
2509d01c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
12 deletions
+26
-12
resources.qrc
tests/resources.qrc
+1
-0
ActionBar.qml
tests/ui/modules/Linphone/Form/ActionBar.qml
+5
-2
ActionButton.qml
tests/ui/modules/Linphone/Form/ActionButton.qml
+13
-10
ActionBarStyle.qml
tests/ui/modules/Linphone/Styles/Form/ActionBarStyle.qml
+6
-0
qmldir
tests/ui/modules/Linphone/Styles/qmldir
+1
-0
No files found.
tests/resources.qrc
View file @
bcf304f1
...
...
@@ -62,6 +62,7 @@
<file>
ui/modules/Linphone/Styles/DialogStyle.qml
</file>
<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/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/ActionBar.qml
View file @
bcf304f1
import
QtQuick
2.7
import
Linphone
.
Styles
1.0
// ===================================================================
// Bar which can contains ActionButtons.
// ===================================================================
Row
{
property
int
iconSize
spacing
:
8
property
int
iconSize
spacing
:
ActionBarStyle
.
spacing
}
tests/ui/modules/Linphone/Form/ActionButton.qml
View file @
bcf304f1
...
...
@@ -8,16 +8,19 @@ import Linphone 1.0
// ===================================================================
Button
{
property
int
iconSize
property
alias
icon
:
icon
.
icon
property
alias
icon
:
icon
.
icon
property
int
iconSize
// Ugly hack, use current size, ActionBar size,
// or other parent height.
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
width
:
iconSize
||
parent
.
iconSize
||
parent
.
height
flat
:
true
Icon
{
anchors.fill
:
parent
id
:
icon
}
// Ugly hack, use current size, ActionBar size,
// or other parent height.
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
width
:
iconSize
||
parent
.
iconSize
||
parent
.
height
Icon
{
id
:
icon
anchors.fill
:
parent
}
}
tests/ui/modules/Linphone/Styles/Form/ActionBarStyle.qml
0 → 100644
View file @
bcf304f1
pragma
Singleton
import
QtQuick
2.7
QtObject
{
property
int
spacing
:
8
}
tests/ui/modules/Linphone/Styles/qmldir
View file @
bcf304f1
...
...
@@ -12,6 +12,7 @@ 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 ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.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