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
a52d0666
Commit
a52d0666
authored
May 18, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
a00a2cbf
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
3 deletions
+51
-3
en.ts
linphone-desktop/assets/languages/en.ts
+8
-0
fr.ts
linphone-desktop/assets/languages/fr.ts
+8
-0
ConferenceAddModel.cpp
...-desktop/src/components/conference/ConferenceAddModel.cpp
+13
-0
ConferenceAddModel.hpp
...-desktop/src/components/conference/ConferenceAddModel.hpp
+2
-0
ConferenceHelperModel.hpp
...sktop/src/components/conference/ConferenceHelperModel.hpp
+2
-2
ConferenceManager.qml
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
+18
-1
No files found.
linphone-desktop/assets/languages/en.ts
View file @
a52d0666
...
...
@@ -363,6 +363,14 @@ Server url not configured.</translation>
<
source
>
conferenceManagerDescription
<
/source
>
<
translation
>
Manage
participants
to
your
conference
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
cancel
<
/source
>
<
translation
>
CANCEL
<
/translation
>
<
/message
>
<
message
>
<
source
>
confirm
<
/source
>
<
translation
>
START
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ConfirmDialog
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
a52d0666
...
...
@@ -363,6 +363,14 @@ Url du serveur non configurée.</translation>
<
source
>
conferenceManagerDescription
<
/source
>
<
translation
>
G
é
rer
les
participants
de
votre
conf
é
rence
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
cancel
<
/source
>
<
translation
>
ANNULER
<
/translation
>
<
/message
>
<
message
>
<
source
>
confirm
<
/source
>
<
translation
>
LANCER
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ConfirmDialog
<
/name
>
...
...
linphone-desktop/src/components/conference/ConferenceAddModel.cpp
View file @
a52d0666
...
...
@@ -106,6 +106,19 @@ bool ConferenceAddModel::removeFromConference (const QString &sipAddress) {
// -----------------------------------------------------------------------------
void
ConferenceAddModel
::
update
()
{
list
<
shared_ptr
<
linphone
::
Address
>
>
linphoneAddresses
;
for
(
const
auto
&
map
:
mRefs
)
linphoneAddresses
.
push_back
(
map
->
value
(
"__linphoneAddress"
).
value
<
shared_ptr
<
linphone
::
Address
>
>
());
mConferenceHelperModel
->
mConference
->
inviteParticipants
(
linphoneAddresses
,
CoreManager
::
getInstance
()
->
getCore
()
->
createCallParams
(
nullptr
)
);
}
// -----------------------------------------------------------------------------
void
ConferenceAddModel
::
addToConference
(
const
std
::
shared_ptr
<
linphone
::
Address
>
&
linphoneAddress
)
{
QString
sipAddress
=
::
Utils
::
linphoneStringToQString
(
linphoneAddress
->
asStringUriOnly
());
QVariantMap
map
;
...
...
linphone-desktop/src/components/conference/ConferenceAddModel.hpp
View file @
a52d0666
...
...
@@ -50,6 +50,8 @@ public:
Q_INVOKABLE
bool
addToConference
(
const
QString
&
sipAddress
);
Q_INVOKABLE
bool
removeFromConference
(
const
QString
&
sipAddress
);
Q_INVOKABLE
void
update
();
bool
contains
(
const
QString
&
sipAddress
)
const
{
return
mSipAddresses
.
contains
(
sipAddress
);
}
...
...
linphone-desktop/src/components/conference/ConferenceHelperModel.hpp
View file @
a52d0666
...
...
@@ -37,6 +37,8 @@ namespace linphone {
}
class
ConferenceHelperModel
:
public
QSortFilterProxyModel
{
friend
class
ConferenceAddModel
;
Q_OBJECT
;
Q_PROPERTY
(
ConferenceAddModel
*
toAdd
READ
getConferenceAddModel
CONSTANT
);
...
...
@@ -47,8 +49,6 @@ public:
QHash
<
int
,
QByteArray
>
roleNames
()
const
override
;
void
update
();
Q_INVOKABLE
void
setFilter
(
const
QString
&
pattern
);
protected:
...
...
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
View file @
a52d0666
...
...
@@ -8,7 +8,24 @@ import App.Styles 1.0
// =============================================================================
ConfirmDialog
{
DialogPlus
{
buttons
:
[
TextButtonA
{
text
:
qsTr
(
'
cancel
'
)
onClicked
:
exit
(
0
)
},
TextButtonB
{
text
:
qsTr
(
'
confirm
'
)
onClicked
:
{
conferenceHelperModel
.
toAdd
.
update
()
exit
(
1
)
}
}
]
centeredButtons
:
true
descriptionText
:
qsTr
(
'
conferenceManagerDescription
'
)
height
:
ConferenceManagerStyle
.
height
...
...
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