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
b0a1cd50
Commit
b0a1cd50
authored
May 29, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
6931f4a0
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
2 deletions
+31
-2
tel_keypad_hovered.svg
linphone-desktop/assets/images/tel_keypad_hovered.svg
+1
-1
ConferenceModel.cpp
...one-desktop/src/components/conference/ConferenceModel.cpp
+7
-0
ConferenceModel.hpp
...one-desktop/src/components/conference/ConferenceModel.hpp
+8
-0
Calls.qml
linphone-desktop/ui/modules/Linphone/Calls/Calls.qml
+5
-0
CallsWindow.js
linphone-desktop/ui/views/App/Calls/CallsWindow.js
+1
-1
CallsWindow.qml
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
+9
-0
No files found.
linphone-desktop/assets/images/tel_keypad_hovered.svg
View file @
b0a1cd50
...
...
@@ -5,7 +5,7 @@
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Page-1"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"08-INCALL-02-Simple-Chiffrement"
transform=
"translate(-301.000000, -64.000000)"
fill=
"#
FF5E00
"
>
<g
id=
"08-INCALL-02-Simple-Chiffrement"
transform=
"translate(-301.000000, -64.000000)"
fill=
"#
6B7A86
"
>
<g
id=
"dialer_dtmf"
transform=
"translate(301.000000, 64.000000)"
>
<g
id=
"Group-2"
>
<rect
id=
"Rectangle"
x=
"0"
y=
"0.295454545"
width=
"3.52941176"
height=
"3.64145658"
rx=
"1"
></rect>
...
...
linphone-desktop/src/components/conference/ConferenceModel.cpp
View file @
b0a1cd50
...
...
@@ -32,6 +32,13 @@ using namespace std;
// =============================================================================
ConferenceModel
::
ConferenceModel
(
QObject
*
parent
)
:
QSortFilterProxyModel
(
parent
)
{
QObject
::
connect
(
this
,
&
ConferenceModel
::
rowsRemoved
,
[
this
]
{
emit
countChanged
(
rowCount
());
});
QObject
::
connect
(
this
,
&
ConferenceModel
::
rowsInserted
,
[
this
]
{
emit
countChanged
(
rowCount
());
});
setSourceModel
(
CoreManager
::
getInstance
()
->
getCallsListModel
());
}
...
...
linphone-desktop/src/components/conference/ConferenceModel.hpp
View file @
b0a1cd50
...
...
@@ -32,6 +32,8 @@ class CallModel;
class
ConferenceModel
:
public
QSortFilterProxyModel
{
Q_OBJECT
;
Q_PROPERTY
(
int
count
READ
getCount
NOTIFY
countChanged
);
Q_PROPERTY
(
bool
microMuted
READ
getMicroMuted
WRITE
setMicroMuted
NOTIFY
microMutedChanged
);
Q_PROPERTY
(
bool
recording
READ
getRecording
NOTIFY
recordingChanged
);
...
...
@@ -48,10 +50,16 @@ protected:
Q_INVOKABLE
void
stopRecording
();
signals:
void
countChanged
(
int
count
);
void
microMutedChanged
(
bool
status
);
void
recordingChanged
(
bool
status
);
private:
int
getCount
()
const
{
return
rowCount
();
}
bool
getMicroMuted
()
const
;
void
setMicroMuted
(
bool
status
);
...
...
linphone-desktop/ui/modules/Linphone/Calls/Calls.qml
View file @
b0a1cd50
...
...
@@ -15,6 +15,8 @@ ListView {
readonly
property
var
selectedCall
:
calls
.
_selectedCall
property
var
conferenceModel
property
var
_selectedCall
// ---------------------------------------------------------------------------
...
...
@@ -91,7 +93,10 @@ ListView {
// ---------------------------------------------------------------------------
header
:
ConferenceControls
{
height
:
visible
?
ConferenceControlsStyle
.
height
:
0
width
:
parent
.
width
visible
:
calls
.
conferenceModel
.
count
>
0
}
// ---------------------------------------------------------------------------
...
...
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file @
b0a1cd50
...
...
@@ -44,7 +44,7 @@ function openConferenceManager () {
function
getContent
()
{
var
call
=
window
.
call
if
(
call
==
null
)
{
return
null
return
conference
}
var
status
=
call
.
status
...
...
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file @
b0a1cd50
...
...
@@ -120,6 +120,7 @@ Window {
Layout.fillHeight
:
true
Layout.fillWidth
:
true
conferenceModel
:
ConferenceModel
{}
model
:
CallsListProxyModel
{}
}
}
...
...
@@ -183,6 +184,14 @@ Window {
}
}
Component
{
id
:
conference
Conference
{
conferenceModel
:
calls
.
conferenceModel
}
}
// -----------------------------------------------------------------------
childA
:
Loader
{
...
...
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