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
dcbf6916
Commit
dcbf6916
authored
Sep 26, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(timeline): use style file (in progress)
parent
653cbfaf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
4 deletions
+22
-4
resources.qrc
tests/resources.qrc
+1
-0
Timeline.qml
tests/ui/components/timeline/Timeline.qml
+7
-2
DialogStyle.qml
tests/ui/style/components/DialogStyle.qml
+2
-2
TimelineStyle.qml
tests/ui/style/components/TimelineStyle.qml
+11
-0
qmldir
tests/ui/style/components/qmldir
+1
-0
No files found.
tests/resources.qrc
View file @
dcbf6916
...
...
@@ -38,6 +38,7 @@
<file>
ui/style/components/qmldir
</file>
<file>
ui/style/components/DialogStyle.qml
</file>
<file>
ui/style/components/ScrollBarStyle.qml
</file>
<file>
ui/style/components/TimelineStyle.qml
</file>
<file>
ui/style/components/SearchBoxStyle.qml
</file>
<file>
ui/style/components/CollapseStyle.qml
</file>
<file>
ui/style/components/PopupStyle.qml
</file>
...
...
tests/ui/components/timeline/Timeline.qml
View file @
dcbf6916
...
...
@@ -6,11 +6,14 @@ import 'qrc:/ui/components/contact'
import
'
qrc:/ui/components/image
'
import
'
qrc:/ui/components/view
'
import
'
qrc:/ui/style/components
'
ColumnLayout
{
id
:
item
property
var
model
// Legend.
Row
{
Layout.preferredHeight
:
35
spacing
:
30
...
...
@@ -28,12 +31,14 @@ ColumnLayout {
}
}
// Separator.
Rectangle
{
Layout.fillWidth
:
true
Layout.preferredHeight
:
1
color
:
'
#DEDEDE
'
Layout.preferredHeight
:
TimelineStyle
.
separator
.
height
color
:
TimelineStyle
.
separator
.
color
}
// History.
ScrollableListView
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
...
...
tests/ui/style/components/DialogStyle.qml
View file @
dcbf6916
...
...
@@ -18,7 +18,7 @@ QtObject {
property
QtObject
description
:
QtObject
{
property
int
fontSize
:
12
property
int
height
:
90
property
int
minHeight
:
25
property
int
height
:
90
// Height with text.
property
int
minHeight
:
25
// Height without text.
}
}
tests/ui/style/components/TimelineStyle.qml
0 → 100644
View file @
dcbf6916
pragma
Singleton
import
QtQuick
2.7
import
'
qrc:/ui/style/global
'
QtObject
{
property
QtObject
separator
:
QtObject
{
property
int
height
:
1
property
string
color
:
'
#DEDEDE
'
}
}
tests/ui/style/components/qmldir
View file @
dcbf6916
...
...
@@ -7,3 +7,4 @@ singleton DialogStyle 1.0 DialogStyle.qml
singleton PopupStyle 1.0 PopupStyle.qml
singleton SearchBoxStyle 1.0 SearchBoxStyle.qml
singleton ScrollBarStyle 1.0 ScrollBarStyle.qml
singleton TimelineStyle 1.0 TimelineStyle.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