Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-windows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
a7389fcc
Commit
a7389fcc
authored
Nov 19, 2019
by
Andreas Traczyk
Committed by
Ming Rui Zhang
Nov 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
calls: remove hold/pause call button for conference calls
Change-Id: I886fe081b21c12688109ddf268bb27de404997d4
parent
69ed9278
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
callwidget.cpp
callwidget.cpp
+6
-1
videooverlay.cpp
videooverlay.cpp
+6
-0
No files found.
callwidget.cpp
View file @
a7389fcc
...
...
@@ -1231,7 +1231,12 @@ CallWidget::selectConversation(const lrc::api::conversation::Info& item)
accInfo
.
conversationModel
->
selectConversation
(
item
.
uid
);
accInfo
.
conversationModel
->
clearUnreadInteractions
(
item
.
uid
);
if
(
!
item
.
callId
.
empty
())
{
accInfo
.
callModel
->
setCurrentCall
(
item
.
callId
);
QtConcurrent
::
run
(
[
convUid
=
item
.
uid
,
accId
=
item
.
accountId
]
{
auto
item
=
LRCInstance
::
getConversationFromConvUid
(
convUid
);
auto
&
accInfo
=
LRCInstance
::
getAccountInfo
(
item
.
accountId
);
accInfo
.
callModel
->
setCurrentCall
(
item
.
callId
);
});
}
ui
->
conversationsFilterWidget
->
update
();
return
true
;
...
...
videooverlay.cpp
View file @
a7389fcc
...
...
@@ -62,6 +62,9 @@ VideoOverlay::VideoOverlay(QWidget* parent)
this
,
&
VideoOverlay
::
slotWillDoTransfer
);
connect
(
sipInputPanel_
,
&
SipInputPanel
::
sipInputPanelClicked
,
this
,
&
VideoOverlay
::
slotSIPInputPanelClicked
);
ui
->
holdButton
->
setVisible
(
false
);
}
VideoOverlay
::~
VideoOverlay
()
...
...
@@ -119,6 +122,9 @@ VideoOverlay::updateCall(const conversation::Info& convInfo)
ui
->
addToConferenceButton
->
setVisible
(
!
isSIP
);
ui
->
transferCallButton
->
setVisible
(
isSIP
);
ui
->
sipInputPanelButton
->
setVisible
(
isSIP
);
// only show the hold/pause button for non-conference calls
ui
->
holdButton
->
setVisible
(
convInfo
.
confId
.
empty
());
}
void
...
...
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