Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-05 12:54:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Moved to display own video at bottom and Friend at top.

Browse source 
* Added to display system message text when call is stopped.
* Fixing spaces on chat window.
* Clean up chatwidget buttons, moved text color to the font menu button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-12-06 14:21:36 +00:00
parent 7a06e2f449
commit b11459329b
7 changed files with 101 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/VOIP/gui/VOIPChatWidgetHolder.cpp
View file

@ -108,8 +108,8 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget)
// Make a widget with two video devices, one for echo, and one for the talking peer.
videoWidget = new QWidget(mChatWidget) ;
videoWidget->setLayout(new QVBoxLayout()) ;
videoWidget->layout()->addWidget(echoVideoDevice = new QVideoOutputDevice(videoWidget)) ;
videoWidget->layout()->addWidget(outputVideoDevice = new QVideoOutputDevice(videoWidget)) ;
videoWidget->layout()->addWidget(echoVideoDevice = new QVideoOutputDevice(videoWidget)) ;
videoWidget->hide();
connect(inputVideoDevice, SIGNAL(networkPacketReady()), this, SLOT(sendVideoData()));
@ -159,6 +159,11 @@ void VOIPChatWidgetHolder::hangupCall()
if (outputAudioDevice) {
outputAudioDevice->stop();
}
if (mChatWidget) {
mChatWidget->addChatMsg(true, tr("VoIP Status"), QDateTime::currentDateTime(), QDateTime::currentDateTime(), tr("Outgoing Call stopped."), ChatWidget::MSGTYPE_SYSTEM);
}
audioListenToggleButton->setChecked(false);
audioCaptureToggleButton->setChecked(false);
hangupButton->hide();
@ -219,6 +224,9 @@ void VOIPChatWidgetHolder::toggleVideoCapture()
videoCaptureToggleButton->setToolTip(tr("Activate camera"));
outputVideoDevice->showFrameOff();
videoWidget->hide();
if (mChatWidget)
mChatWidget->addChatMsg(true, tr("VoIP Status"), QDateTime::currentDateTime(), QDateTime::currentDateTime(), tr("Video call stopped"), ChatWidget::MSGTYPE_SYSTEM);
}
}