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
8a888707
Commit
8a888707
authored
Jun 08, 2017
by
Sylvain Berfini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update pause button to reflect conference state
parent
e7eb5d6a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
4 deletions
+40
-4
en.ts
linphone-desktop/assets/languages/en.ts
+8
-0
fr.ts
linphone-desktop/assets/languages/fr.ts
+8
-0
ConferenceModel.cpp
...one-desktop/src/components/conference/ConferenceModel.cpp
+15
-3
ConferenceModel.hpp
...one-desktop/src/components/conference/ConferenceModel.hpp
+3
-1
Conference.qml
linphone-desktop/ui/views/App/Calls/Conference.qml
+6
-0
No files found.
linphone-desktop/assets/languages/en.ts
View file @
8a888707
...
@@ -443,6 +443,14 @@ Server url not configured.</translation>
...
@@ -443,6 +443,14 @@ Server url not configured.</translation>
<
source
>
conferenceTitle
<
/source
>
<
source
>
conferenceTitle
<
/source
>
<
translation
>
CONFERENCE
<
/translation
>
<
translation
>
CONFERENCE
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
leaveConf
<
/source
>
<
translation
>
Temporarily
leave
the
conference
<
/translation
>
<
/message
>
<
message
>
<
source
>
joinBackConf
<
/source
>
<
translation
>
Join
back
the
conference
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
ConferenceControls
<
/name
>
<
name
>
ConferenceControls
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
8a888707
...
@@ -443,6 +443,14 @@ Url du serveur non configurée.</translation>
...
@@ -443,6 +443,14 @@ Url du serveur non configurée.</translation>
<
source
>
conferenceTitle
<
/source
>
<
source
>
conferenceTitle
<
/source
>
<
translation
>
CONF
É
RENCE
<
/translation
>
<
translation
>
CONF
É
RENCE
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
leaveConf
<
/source
>
<
translation
>
Quitter
temporairement
la
conf
é
rence
<
/translation
>
<
/message
>
<
message
>
<
source
>
joinBackConf
<
/source
>
<
translation
>
Rejoindre
la
conf
é
rence
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
ConferenceControls
<
/name
>
<
name
>
ConferenceControls
<
/name
>
...
...
linphone-desktop/src/components/conference/ConferenceModel.cpp
View file @
8a888707
...
@@ -40,7 +40,12 @@ ConferenceModel::ConferenceModel (QObject *parent) : QSortFilterProxyModel(paren
...
@@ -40,7 +40,12 @@ ConferenceModel::ConferenceModel (QObject *parent) : QSortFilterProxyModel(paren
});
});
setSourceModel
(
CoreManager
::
getInstance
()
->
getCallsListModel
());
setSourceModel
(
CoreManager
::
getInstance
()
->
getCallsListModel
());
emit
conferenceChanged
(
true
);
emit
conferenceChanged
();
QObject
::
connect
(
CoreManager
::
getInstance
()
->
getHandlers
().
get
(),
&
CoreHandlers
::
callStateChanged
,
this
,
&
ConferenceModel
::
handleCallStateChanged
);
}
}
bool
ConferenceModel
::
filterAcceptsRow
(
int
sourceRow
,
const
QModelIndex
&
sourceParent
)
const
{
bool
ConferenceModel
::
filterAcceptsRow
(
int
sourceRow
,
const
QModelIndex
&
sourceParent
)
const
{
...
@@ -143,16 +148,23 @@ float ConferenceModel::getMicroVu () const {
...
@@ -143,16 +148,23 @@ float ConferenceModel::getMicroVu () const {
void
ConferenceModel
::
leave
()
{
void
ConferenceModel
::
leave
()
{
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
core
->
leaveConference
();
core
->
leaveConference
();
emit
conferenceChanged
(
false
);
emit
conferenceChanged
();
}
}
void
ConferenceModel
::
join
()
{
void
ConferenceModel
::
join
()
{
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
core
->
enterConference
();
core
->
enterConference
();
emit
conferenceChanged
(
true
);
emit
conferenceChanged
();
}
}
bool
ConferenceModel
::
isInConference
()
const
{
bool
ConferenceModel
::
isInConference
()
const
{
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
qInfo
()
<<
QStringLiteral
(
"Is in conf:"
)
<<
core
->
isInConference
();
return
core
->
isInConference
();
return
core
->
isInConference
();
}
// -----------------------------------------------------------------------------
void
ConferenceModel
::
handleCallStateChanged
(
const
shared_ptr
<
linphone
::
Call
>
&
call
,
linphone
::
CallState
state
)
{
emit
conferenceChanged
();
}
}
\ No newline at end of file
linphone-desktop/src/components/conference/ConferenceModel.hpp
View file @
8a888707
...
@@ -60,9 +60,11 @@ signals:
...
@@ -60,9 +60,11 @@ signals:
void
microMutedChanged
(
bool
status
);
void
microMutedChanged
(
bool
status
);
void
recordingChanged
(
bool
status
);
void
recordingChanged
(
bool
status
);
void
conferenceChanged
(
bool
status
);
void
conferenceChanged
();
private:
private:
void
handleCallStateChanged
(
const
std
::
shared_ptr
<
linphone
::
Call
>
&
call
,
linphone
::
CallState
state
);
int
getCount
()
const
{
int
getCount
()
const
{
return
rowCount
();
return
rowCount
();
}
}
...
...
linphone-desktop/ui/views/App/Calls/Conference.qml
View file @
8a888707
...
@@ -216,6 +216,7 @@ Rectangle {
...
@@ -216,6 +216,7 @@ Rectangle {
ActionSwitch
{
ActionSwitch
{
id
:
micro
id
:
micro
enabled
:
!
conference
.
conferenceModel
.
microMuted
icon
:
'
micro
'
icon
:
'
micro
'
iconSize
:
CallStyle
.
actionArea
.
iconSize
iconSize
:
CallStyle
.
actionArea
.
iconSize
...
@@ -235,10 +236,15 @@ Rectangle {
...
@@ -235,10 +236,15 @@ Rectangle {
ActionSwitch
{
ActionSwitch
{
icon
:
'
pause
'
icon
:
'
pause
'
enabled
:
conference
.
conferenceModel
.
isInConf
onClicked
:
{
onClicked
:
{
conference
.
conferenceModel
.
isInConf
?
conference
.
conferenceModel
.
leave
()
:
conference
.
conferenceModel
.
join
()
conference
.
conferenceModel
.
isInConf
?
conference
.
conferenceModel
.
leave
()
:
conference
.
conferenceModel
.
join
()
}
}
TooltipArea
{
text
:
conference
.
conferenceModel
.
isInConf
?
qsTr
(
'
leaveConf
'
)
:
qsTr
(
'
joinBackConf
'
)
}
}
}
ActionButton
{
ActionButton
{
...
...
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