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
13000110
Commit
13000110
authored
May 23, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
06ff2410
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
CallModel.hpp
linphone-desktop/src/components/call/CallModel.hpp
+5
-6
CallsListProxyModel.cpp
...hone-desktop/src/components/calls/CallsListProxyModel.cpp
+1
-3
Window.js
linphone-desktop/ui/modules/Common/Window/Window.js
+4
-1
No files found.
linphone-desktop/src/components/call/CallModel.hpp
View file @
13000110
...
...
@@ -25,7 +25,7 @@
#include <linphone++/linphone.hh>
#include <QObject>
#include <QDebug>
// =============================================================================
class
CallModel
:
public
QObject
{
...
...
@@ -76,6 +76,10 @@ public:
QString
getSipAddress
()
const
;
bool
isInConference
()
const
{
return
mIsInConference
;
}
static
void
setRecordFile
(
std
::
shared_ptr
<
linphone
::
CallParams
>
&
callParams
);
void
updateStats
(
const
std
::
shared_ptr
<
const
linphone
::
CallStats
>
&
callStats
);
...
...
@@ -114,11 +118,6 @@ private:
return
mCall
->
getDir
()
==
linphone
::
CallDirOutgoing
;
}
bool
isInConference
()
const
{
qDebug
()
<<
"toto"
<<
mIsInConference
;
return
mIsInConference
;
}
void
updateIsInConference
();
void
acceptWithAutoAnswerDelay
();
...
...
linphone-desktop/src/components/calls/CallsListProxyModel.cpp
View file @
13000110
...
...
@@ -43,7 +43,5 @@ CallsListProxyModel::CallsListProxyModel (QObject *parent) : QSortFilterProxyMod
bool
CallsListProxyModel
::
filterAcceptsRow
(
int
sourceRow
,
const
QModelIndex
&
sourceParent
)
const
{
const
QModelIndex
&
index
=
sourceModel
()
->
index
(
sourceRow
,
0
,
sourceParent
);
shared_ptr
<
linphone
::
Call
>
call
=
index
.
data
().
value
<
CallModel
*>
()
->
getCall
();
return
call
->
getConference
()
==
nullptr
;
return
!
index
.
data
().
value
<
CallModel
*>
()
->
isInConference
();
}
linphone-desktop/ui/modules/Common/Window/Window.js
View file @
13000110
...
...
@@ -24,7 +24,10 @@ function attachVirtualWindow (component, properties, exitStatusHandler) {
object
.
exitStatus
.
connect
(
exitStatusHandler
)
}
object
.
exitStatus
.
connect
(
function
()
{
virtualWindow
.
unsetContent
().
destroy
()
var
content
=
virtualWindow
.
unsetContent
()
if
(
content
)
{
content
.
destroy
()
}
})
virtualWindow
.
setContent
(
object
)
...
...
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