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
6b17b767
Commit
6b17b767
authored
May 24, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
853d46f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
7 deletions
+49
-7
ConferenceModel.cpp
...one-desktop/src/components/conference/ConferenceModel.cpp
+3
-1
ConferenceModel.hpp
...one-desktop/src/components/conference/ConferenceModel.hpp
+0
-1
Conference.qml
linphone-desktop/ui/views/App/Calls/Conference.qml
+46
-5
No files found.
linphone-desktop/src/components/conference/ConferenceModel.cpp
View file @
6b17b767
...
...
@@ -31,7 +31,9 @@ using namespace std;
// =============================================================================
ConferenceModel
::
ConferenceModel
(
QObject
*
parent
)
:
QSortFilterProxyModel
(
parent
)
{}
ConferenceModel
::
ConferenceModel
(
QObject
*
parent
)
:
QSortFilterProxyModel
(
parent
)
{
setSourceModel
(
CoreManager
::
getInstance
()
->
getCallsListModel
());
}
bool
ConferenceModel
::
filterAcceptsRow
(
int
sourceRow
,
const
QModelIndex
&
sourceParent
)
const
{
const
QModelIndex
&
index
=
sourceModel
()
->
index
(
sourceRow
,
0
,
sourceParent
);
...
...
linphone-desktop/src/components/conference/ConferenceModel.hpp
View file @
6b17b767
...
...
@@ -33,7 +33,6 @@ class ConferenceModel : public QSortFilterProxyModel {
Q_OBJECT
;
Q_PROPERTY
(
bool
microMuted
READ
getMicroMuted
WRITE
setMicroMuted
NOTIFY
microMutedChanged
);
Q_PROPERTY
(
bool
recording
READ
getRecording
NOTIFY
recordingChanged
);
public:
...
...
linphone-desktop/ui/views/App/Calls/Conference.qml
View file @
6b17b767
...
...
@@ -2,9 +2,9 @@ import QtQuick 2.7
import
QtQuick
.
Layouts
1.3
import
Common
1.0
import
Common
.
Styles
1.0
import
Linphone
1.0
import
LinphoneUtils
1.0
import
Utils
1.0
import
App
.
Styles
1.0
...
...
@@ -15,10 +15,6 @@ Rectangle {
// ---------------------------------------------------------------------------
ConferenceModel
{
id
:
conference
}
ColumnLayout
{
anchors
{
fill
:
parent
...
...
@@ -96,6 +92,51 @@ Rectangle {
Layout.fillWidth
:
true
Layout.fillHeight
:
true
Layout.margins
:
CallStyle
.
container
.
margins
GridView
{
id
:
grid
anchors.fill
:
parent
cellHeight
:
145
cellWidth
:
154
model
:
ConferenceModel
{
id
:
conference
}
delegate
:
ColumnLayout
{
readonly
property
string
sipAddress
:
$call
.
sipAddress
readonly
property
var
sipAddressObserver
:
SipAddressesModel
.
getSipAddressObserver
(
sipAddress
)
height
:
grid
.
cellHeight
width
:
grid
.
cellWidth
ContactDescription
{
id
:
contactDescription
Layout.preferredHeight
:
35
Layout.fillWidth
:
true
horizontalTextAlignment
:
Text
.
AlignHCenter
sipAddress
:
parent
.
sipAddressObserver
.
sipAddress
username
:
LinphoneUtils
.
getContactUsername
(
parent
.
sipAddressObserver
.
contact
||
parent
.
sipAddress
)
}
Avatar
{
height
:
parent
.
width
width
:
parent
.
width
backgroundColor
:
CallStyle
.
container
.
avatar
.
backgroundColor
foregroundColor
:
incall
.
call
.
status
===
CallModel
.
CallStatusPaused
?
CallStyle
.
container
.
pause
.
color
:
'
transparent
'
image
:
parent
.
sipAddressObserver
.
contact
&&
parent
.
sipAddressObserver
.
contact
.
vcard
.
avatar
username
:
contactDescription
.
username
}
}
}
}
// -------------------------------------------------------------------------
...
...
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