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
5a3903dc
Commit
5a3903dc
authored
May 16, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/Incall): use `Popup` in `CallStatistics`
parent
715d729b
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
92 additions
and
95 deletions
+92
-95
Popup.qml
linphone-desktop/ui/modules/Common/Popup/Popup.qml
+16
-13
qmldir
linphone-desktop/ui/modules/Common/qmldir
+0
-1
CallStatistics.qml
...hone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml
+72
-77
Calls.qml
linphone-desktop/ui/modules/Linphone/Calls/Calls.qml
+0
-1
qmldir
linphone-desktop/ui/modules/Linphone/qmldir
+2
-0
Incall.js
linphone-desktop/ui/views/App/Calls/Incall.js
+1
-1
Incall.qml
linphone-desktop/ui/views/App/Calls/Incall.qml
+1
-2
No files found.
linphone-desktop/ui/modules/Common/Popup/Popup.qml
View file @
5a3903dc
import
QtQuick
2.7
import
QtQuick
2.7
import
QtQuick
.
Controls
2.1
as
Controls
import
QtQuick
.
Controls
2.1
as
Controls
import
Common
.
Styles
1.0
import
Utils
1.0
import
Utils
1.0
// =============================================================================
// =============================================================================
Item
{
Item
{
id
:
wrapper
// Optionnal parameters, set the position of popup relative to this item.
// Optionnal parameters, set the position of popup relative to this item.
property
var
relativeTo
property
var
relativeTo
property
int
relativeX
:
0
property
int
relativeX
:
0
...
@@ -59,7 +62,11 @@ Item {
...
@@ -59,7 +62,11 @@ Item {
Controls.Popup
{
Controls.Popup
{
id
:
popup
id
:
popup
height
:
wrapper
.
_content
.
height
width
:
wrapper
.
_content
.
width
background
:
Rectangle
{
background
:
Rectangle
{
color
:
PopupStyle
.
backgroundColor
height
:
popup
.
height
height
:
popup
.
height
width
:
popup
.
width
width
:
popup
.
width
...
@@ -69,10 +76,6 @@ Item {
...
@@ -69,10 +76,6 @@ Item {
}
}
}
}
contentItem
:
Column
{
id
:
internalData
}
padding
:
0
padding
:
0
Component.onCompleted
:
parent
=
Utils
.
getTopParent
(
this
)
Component.onCompleted
:
parent
=
Utils
.
getTopParent
(
this
)
...
...
linphone-desktop/ui/modules/Common/qmldir
View file @
5a3903dc
...
@@ -70,7 +70,6 @@ Collapse 1.0 Misc/Collapse.qml
...
@@ -70,7 +70,6 @@ Collapse 1.0 Misc/Collapse.qml
ForceScrollBar 1.0 Misc/ForceScrollBar.qml
ForceScrollBar 1.0 Misc/ForceScrollBar.qml
Paned 1.0 Misc/Paned.qml
Paned 1.0 Misc/Paned.qml
AbstractDropDownMenu 1.0 Popup/AbstractDropDownMenu.qml
DesktopPopup 1.0 Popup/DesktopPopup.qml
DesktopPopup 1.0 Popup/DesktopPopup.qml
DropDownDynamicMenu 1.0 Popup/DropDownDynamicMenu.qml
DropDownDynamicMenu 1.0 Popup/DropDownDynamicMenu.qml
Popup 1.0 Popup/Popup.qml
Popup 1.0 Popup/Popup.qml
...
...
linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml
View file @
5a3903dc
...
@@ -7,18 +7,46 @@ import Linphone.Styles 1.0
...
@@ -7,18 +7,46 @@ import Linphone.Styles 1.0
// =============================================================================
// =============================================================================
AbstractDropDownMenu
{
Popup
{
id
:
callStatistics
id
:
callStatistics
property
var
call
property
var
call
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
function
_computeHeight
()
{
Rectangle
{
return
CallStatisticsStyle
.
height
color
:
CallStatisticsStyle
.
color
height
:
CallStatisticsStyle
.
height
width
:
callStatistics
.
width
Row
{
anchors
{
fill
:
parent
topMargin
:
CallStatisticsStyle
.
topMargin
leftMargin
:
CallStatisticsStyle
.
leftMargin
rightMargin
:
CallStatisticsStyle
.
rightMargin
}
}
// ---------------------------------------------------------------------------
Loader
{
property
string
$label
:
qsTr
(
'
audioStatsLabel
'
)
property
var
$data
:
callStatistics
.
call
.
audioStats
sourceComponent
:
media
width
:
parent
.
width
/
2
}
Loader
{
property
string
$label
:
qsTr
(
'
videoStatsLabel
'
)
property
var
$data
:
callStatistics
.
call
.
videoStats
sourceComponent
:
media
width
:
parent
.
width
/
2
}
}
// -------------------------------------------------------------------------
// Line.
// -------------------------------------------------------------------------
Component
{
Component
{
id
:
line
id
:
line
...
@@ -27,8 +55,6 @@ AbstractDropDownMenu {
...
@@ -27,8 +55,6 @@ AbstractDropDownMenu {
spacing
:
CallStatisticsStyle
.
spacing
spacing
:
CallStatisticsStyle
.
spacing
width
:
parent
.
width
width
:
parent
.
width
// -----------------------------------------------------------------------
Text
{
Text
{
Layout.preferredWidth
:
CallStatisticsStyle
.
key
.
width
Layout.preferredWidth
:
CallStatisticsStyle
.
key
.
width
...
@@ -46,8 +72,6 @@ AbstractDropDownMenu {
...
@@ -46,8 +72,6 @@ AbstractDropDownMenu {
text
:
modelData
.
key
text
:
modelData
.
key
}
}
// -----------------------------------------------------------------------
Text
{
Text
{
Layout.fillWidth
:
true
Layout.fillWidth
:
true
...
@@ -60,7 +84,9 @@ AbstractDropDownMenu {
...
@@ -60,7 +84,9 @@ AbstractDropDownMenu {
}
}
}
}
// ---------------------------------------------------------------------------
// -------------------------------------------------------------------------
// Media.
// -------------------------------------------------------------------------
Component
{
Component
{
id
:
media
id
:
media
...
@@ -88,36 +114,5 @@ AbstractDropDownMenu {
...
@@ -88,36 +114,5 @@ AbstractDropDownMenu {
}
}
}
}
}
}
// ---------------------------------------------------------------------------
Rectangle
{
anchors.fill
:
parent
color
:
CallStatisticsStyle
.
color
Row
{
anchors
{
fill
:
parent
topMargin
:
CallStatisticsStyle
.
topMargin
leftMargin
:
CallStatisticsStyle
.
leftMargin
rightMargin
:
CallStatisticsStyle
.
rightMargin
}
Loader
{
property
string
$label
:
qsTr
(
'
audioStatsLabel
'
)
property
var
$data
:
callStatistics
.
call
.
audioStats
sourceComponent
:
media
width
:
parent
.
width
/
2
}
Loader
{
property
string
$label
:
qsTr
(
'
videoStatsLabel
'
)
property
var
$data
:
callStatistics
.
call
.
videoStats
sourceComponent
:
media
width
:
parent
.
width
/
2
}
}
}
}
}
}
linphone-desktop/ui/modules/Linphone/Calls/Calls.qml
View file @
5a3903dc
...
@@ -64,7 +64,6 @@ ListView {
...
@@ -64,7 +64,6 @@ ListView {
Popup
{
Popup
{
id
:
popup
id
:
popup
implicitWidth
:
actionMenu
.
width
relativeTo
:
callControls
relativeTo
:
callControls
relativeX
:
callControls
.
width
relativeX
:
callControls
.
width
...
...
linphone-desktop/ui/modules/Linphone/qmldir
View file @
5a3903dc
...
@@ -31,3 +31,5 @@ SmartSearchBar 1.0 SmartSearchBar/SmartSearchBar.qml
...
@@ -31,3 +31,5 @@ SmartSearchBar 1.0 SmartSearchBar/SmartSearchBar.qml
TelKeypad 1.0 TelKeypad/TelKeypad.qml
TelKeypad 1.0 TelKeypad/TelKeypad.qml
Timeline 1.0 Timeline/Timeline.qml
Timeline 1.0 Timeline/Timeline.qml
SipAddressesView 1.0 View/SipAddressesView.qml
linphone-desktop/ui/views/App/Calls/Incall.js
View file @
5a3903dc
...
@@ -24,7 +24,7 @@ function handleStatusChanged (status) {
...
@@ -24,7 +24,7 @@ function handleStatusChanged (status) {
}
}
telKeypad
.
visible
=
false
telKeypad
.
visible
=
false
callStatistics
.
hide
Menu
()
callStatistics
.
hide
()
}
}
}
}
...
...
linphone-desktop/ui/views/App/Calls/Incall.qml
View file @
5a3903dc
...
@@ -70,7 +70,7 @@ Rectangle {
...
@@ -70,7 +70,7 @@ Rectangle {
iconSize
:
CallStyle
.
header
.
iconSize
iconSize
:
CallStyle
.
header
.
iconSize
useStates
:
false
useStates
:
false
onClicked
:
callStatistics
.
show
Menu
()
onClicked
:
callStatistics
.
show
()
// See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73
// See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73
Timer
{
Timer
{
...
@@ -88,7 +88,6 @@ Rectangle {
...
@@ -88,7 +88,6 @@ Rectangle {
call
:
incall
.
call
call
:
incall
.
call
width
:
container
.
width
width
:
container
.
width
launcher
:
callQuality
relativeTo
:
callQuality
relativeTo
:
callQuality
relativeY
:
CallStyle
.
header
.
stats
.
relativeY
relativeY
:
CallStyle
.
header
.
stats
.
relativeY
}
}
...
...
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