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
2be59c99
Commit
2be59c99
authored
Jan 17, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/modules/Linphone/Chat): use a custom QML2 `BusyIndicator`
parent
fdb937f5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
109 additions
and
10 deletions
+109
-10
resources.qrc
tests/resources.qrc
+2
-0
BusyIndicator.qml
tests/ui/modules/Common/BusyIndicator.qml
+80
-0
BusyIndicatorStyle.qml
tests/ui/modules/Common/Styles/BusyIndicatorStyle.qml
+12
-0
qmldir
tests/ui/modules/Common/Styles/qmldir
+2
-0
qmldir
tests/ui/modules/Common/qmldir
+7
-4
FileMessage.qml
tests/ui/modules/Linphone/Chat/FileMessage.qml
+3
-3
OutgoingMessage.qml
tests/ui/modules/Linphone/Chat/OutgoingMessage.qml
+3
-3
No files found.
tests/resources.qrc
View file @
2be59c99
...
...
@@ -134,6 +134,7 @@
<file>
assets/images/video_call_pressed.svg
</file>
<file>
ui/modules/Common/Animations/CaterpillarAnimation.qml
</file>
<file>
ui/modules/Common/Borders.qml
</file>
<file>
ui/modules/Common/BusyIndicator.qml
</file>
<file>
ui/modules/Common/Collapse.qml
</file>
<file>
ui/modules/Common/Colors.qml
</file>
<file>
ui/modules/Common/Constants.qml
</file>
...
...
@@ -172,6 +173,7 @@
<file>
ui/modules/Common/SearchBox.qml
</file>
<file>
ui/modules/Common/SmartConnect.qml
</file>
<file>
ui/modules/Common/Styles/Animations/CaterpillarAnimationStyle.qml
</file>
<file>
ui/modules/Common/Styles/BusyIndicatorStyle.qml
</file>
<file>
ui/modules/Common/Styles/CollapseStyle.qml
</file>
<file>
ui/modules/Common/Styles/DialogStyle.qml
</file>
<file>
ui/modules/Common/Styles/DroppableTextAreaStyle.qml
</file>
...
...
tests/ui/modules/Common/BusyIndicator.qml
0 → 100644
View file @
2be59c99
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
Common
.
Styles
1.0
// =============================================================================
BusyIndicator
{
id
:
busyIndicator
// ---------------------------------------------------------------------------
readonly
property
int
_rotation
:
360
readonly
property
int
_size
:
width
<
height
?
width
:
height
// ---------------------------------------------------------------------------
contentItem
:
Item
{
x
:
parent
.
width
/
2
-
width
/
2
y
:
parent
.
height
/
2
-
height
/
2
height
:
_size
width
:
_size
Item
{
id
:
item
height
:
parent
.
height
width
:
parent
.
width
// -----------------------------------------------------------------------
// Animation.
// -----------------------------------------------------------------------
RotationAnimator
{
duration
:
BusyIndicatorStyle
.
duration
loops
:
Animation
.
Infinite
running
:
busyIndicator
.
visible
&&
busyIndicator
.
running
target
:
item
from
:
0
to
:
busyIndicator
.
_rotation
}
// -----------------------------------------------------------------------
// Items to draw.
// -----------------------------------------------------------------------
Repeater
{
id
:
repeater
model
:
BusyIndicatorStyle
.
nSpheres
Rectangle
{
x
:
item
.
width
/
2
-
width
/
2
y
:
item
.
height
/
2
-
height
/
2
height
:
item
.
height
/
3
width
:
item
.
width
/
3
color
:
BusyIndicatorStyle
.
color
radius
:
(
width
>
height
?
width
:
height
)
/
2
transform
:
[
Translate
{
y
:
busyIndicator
.
_size
/
2
},
Rotation
{
angle
:
index
/
repeater
.
count
*
busyIndicator
.
_rotation
origin
{
x
:
width
/
2
y
:
height
/
2
}
}
]
}
}
}
}
}
tests/ui/modules/Common/Styles/BusyIndicatorStyle.qml
0 → 100644
View file @
2be59c99
pragma
Singleton
import
QtQuick
2.7
import
Common
1.0
// =============================================================================
QtObject
{
property
color
color
:
Colors
.
i
property
int
duration
:
1250
property
int
nSpheres
:
6
}
tests/ui/modules/Common/Styles/qmldir
View file @
2be59c99
...
...
@@ -4,6 +4,8 @@ module Common.Styles
# Components styles ------------------------------------------------------------
singleton BusyIndicatorStyle 1.0 BusyIndicatorStyle.qml
singleton CaterpillarAnimationStyle 1.0 Animations/CaterpillarAnimationStyle.qml
singleton CollapseStyle 1.0 CollapseStyle.qml
...
...
tests/ui/modules/Common/qmldir
View file @
2be59c99
# ====================================================================
# ====================================================================
==========
# Common's components to export.
# ====================================================================
# ====================================================================
==========
module Common
# Constants ----------------------------------------------------------
# Constants ----------------------------------------------------------
----------
singleton Colors 1.0 Colors.qml
singleton Constants 1.0 Constants.qml
# Components ---------------------------------------------------------
# Components ---------------------------------------------------------
----------
# Animations
CaterpillarAnimation 1.0 Animations/CaterpillarAnimation.qml
...
...
@@ -17,6 +17,9 @@ CaterpillarAnimation 1.0 Animations/CaterpillarAnimation.qml
# Chat
Borders 1.0 Borders.qml
# BusyIndicator
BusyIndicator 1.0 BusyIndicator.qml
# Collapse
Collapse 1.0 Collapse.qml
...
...
tests/ui/modules/Linphone/Chat/FileMessage.qml
View file @
2be59c99
...
...
@@ -223,13 +223,13 @@ Row {
Component
{
id
:
indicator
BusyIndicator
{
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
}
BusyIndicator
{}
}
Loader
{
height
:
ChatStyle
.
entry
.
lineHeight
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
sourceComponent
:
$chatEntry
.
isOutgoing
?
(
$chatEntry
.
status
===
ChatModel
.
MessageStatusInProgress
...
...
tests/ui/modules/Linphone/Chat/OutgoingMessage.qml
View file @
2be59c99
...
...
@@ -52,13 +52,13 @@ Item {
Component
{
id
:
indicator
BusyIndicator
{
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
}
BusyIndicator
{}
}
Loader
{
height
:
ChatStyle
.
entry
.
lineHeight
width
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
sourceComponent
:
$chatEntry
.
status
===
ChatModel
.
MessageStatusInProgress
?
indicator
:
icon
...
...
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