mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-19 20:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ui/views/App/Calls/ConferenceManager): in progress

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-29 13:33:57 +02:00
parent 6931f4a08c
commit b0a1cd5058
6 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/assets/images/tel_keypad_hovered.svg
View file

@ -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>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

7
linphone-desktop/src/components/conference/ConferenceModel.cpp
View file

@ -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());
}

8
linphone-desktop/src/components/conference/ConferenceModel.hpp
View file

@ -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);

5
linphone-desktop/ui/modules/Linphone/Calls/Calls.qml
View file

@ -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
}
// ---------------------------------------------------------------------------

2
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file

@ -44,7 +44,7 @@ function openConferenceManager () {
function getContent () {
var call = window.call
if (call == null) {
return null
return conference
}
var status = call.status

9
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file

@ -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 {