Commit a7389fcc authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Ming Rui Zhang

calls: remove hold/pause call button for conference calls

Change-Id: I886fe081b21c12688109ddf268bb27de404997d4
parent 69ed9278
...@@ -1231,7 +1231,12 @@ CallWidget::selectConversation(const lrc::api::conversation::Info& item) ...@@ -1231,7 +1231,12 @@ CallWidget::selectConversation(const lrc::api::conversation::Info& item)
accInfo.conversationModel->selectConversation(item.uid); accInfo.conversationModel->selectConversation(item.uid);
accInfo.conversationModel->clearUnreadInteractions(item.uid); accInfo.conversationModel->clearUnreadInteractions(item.uid);
if (!item.callId.empty()) { 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(); ui->conversationsFilterWidget->update();
return true; return true;
......
...@@ -62,6 +62,9 @@ VideoOverlay::VideoOverlay(QWidget* parent) ...@@ -62,6 +62,9 @@ VideoOverlay::VideoOverlay(QWidget* parent)
this, &VideoOverlay::slotWillDoTransfer); this, &VideoOverlay::slotWillDoTransfer);
connect(sipInputPanel_, &SipInputPanel::sipInputPanelClicked, connect(sipInputPanel_, &SipInputPanel::sipInputPanelClicked,
this, &VideoOverlay::slotSIPInputPanelClicked); this, &VideoOverlay::slotSIPInputPanelClicked);
ui->holdButton->setVisible(false);
} }
VideoOverlay::~VideoOverlay() VideoOverlay::~VideoOverlay()
...@@ -119,6 +122,9 @@ VideoOverlay::updateCall(const conversation::Info& convInfo) ...@@ -119,6 +122,9 @@ VideoOverlay::updateCall(const conversation::Info& convInfo)
ui->addToConferenceButton->setVisible(!isSIP); ui->addToConferenceButton->setVisible(!isSIP);
ui->transferCallButton->setVisible(isSIP); ui->transferCallButton->setVisible(isSIP);
ui->sipInputPanelButton->setVisible(isSIP); ui->sipInputPanelButton->setVisible(isSIP);
// only show the hold/pause button for non-conference calls
ui->holdButton->setVisible(convInfo.confId.empty());
} }
void void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment