Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add real FullScreen Mode

Browse Source
This commit is contained in:
Phenom 2015-10-03 02:11:52 +02:00
parent 8a7e359557
commit 5d8972e82d
3 changed files with 90 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/VOIP/gui/QVideoDevice.cpp
View File

@ -125,7 +125,7 @@ QVideoOutputDevice::QVideoOutputDevice(QWidget *parent)
void QVideoOutputDevice::showFrameOff()
{
setPixmap(QPixmap(":/images/video-icon-big.png").scaled(320,256,Qt::KeepAspectRatio,Qt::SmoothTransformation)) ;
setPixmap(QPixmap(":/images/video-icon-big.png").scaled(QSize(height()*4/3,height()),Qt::KeepAspectRatio,Qt::SmoothTransformation)) ;
}
void QVideoOutputDevice::showFrame(const QImage& img)

83
plugins/VOIP/gui/VOIPChatWidgetHolder.cpp
View File

@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <QToolButton>
#include <QPropertyAnimation>
#include <QIcon>
#include <QLayout>
#include <QPropertyAnimation>
#include <QToolButton>
#include <gui/audiodevicehelper.h>
#include "interface/rsVOIP.h"
@ -154,12 +154,45 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n
connect(inputVideoDevice, SIGNAL(networkPacketReady()), this, SLOT(sendVideoData()));
echoVideoDevice->setMinimumSize(320,256) ;
outputVideoDevice->setMinimumSize(320,256) ;
echoVideoDevice->setMinimumSize(320,240) ;//4/3
outputVideoDevice->setMinimumSize(320,240) ;//4/3
echoVideoDevice->showFrameOff();
outputVideoDevice->showFrameOff();
echoVideoDevice->setStyleSheet("border: 4px solid #CCCCCC; border-radius: 4px;");
outputVideoDevice->setStyleSheet("border: 4px solid #CCCCCC; border-radius: 4px;");
/// FULLSCREEN ///
fullScreenFrame = new QFrame();
outputVideoDeviceFS = new QVideoOutputDevice(fullScreenFrame);
outputVideoDeviceFS->setGeometry(QRect(QPoint(0,0),fullScreenFrame->geometry().size()));
outputVideoDeviceFS->showFrameOff();
hideChatTextToggleButtonFS = new QToolButton(fullScreenFrame);
hideChatTextToggleButtonFS->setMinimumSize(QSize(44,44));
hideChatTextToggleButtonFS->setMaximumSize(QSize(44,44));
hideChatTextToggleButtonFS->setText(QString());
hideChatTextToggleButtonFS->setToolTip(tr("Hide Chat Text"));
hideChatTextToggleButtonFS->setIcon(icon4);
hideChatTextToggleButtonFS->setIconSize(QSize(42,42));
hideChatTextToggleButtonFS->setAutoRaise(true);
hideChatTextToggleButtonFS->setCheckable(true);
hideChatTextToggleButtonFS->setEnabled(false);
connect(hideChatTextToggleButtonFS, SIGNAL(clicked()), this , SLOT(toggleHideChatTextFS()));
echoVideoDeviceFS = new QVideoOutputDevice(fullScreenFrame);
echoVideoDeviceFS->setGeometry(QRect(QPoint(fullScreenFrame->width(), fullScreenFrame->height()) - QPoint(320,240), QSize(320,240)));
echoVideoDeviceFS->showFrameOff();
fullScreenFrame->setParent(0);
fullScreenFrame->setWindowFlags( Qt::WindowStaysOnTopHint );
fullScreenFrame->setFocusPolicy( Qt::StrongFocus );
fullScreenFrame->setWindowState(Qt::WindowFullScreen);
fullScreenFrame->hide();
fullScreenFrame->installEventFilter(this);
mChatWidget->addChatHorizontalWidget(videoWidget) ;
inputVideoDevice->setEchoVideoTarget(echoVideoDevice) ;
@ -180,6 +213,23 @@ VOIPChatWidgetHolder::~VOIPChatWidgetHolder()
it = buttonMapTakeVideo.erase(it);
}
}
bool VOIPChatWidgetHolder::eventFilter(QObject *obj, QEvent *event)
{
if (obj == fullScreenFrame) {
if (event->type() == QEvent::Close || event->type() == QEvent::MouseButtonDblClick) {
showChatText();
}
if (event->type() == QEvent::Resize) {
outputVideoDeviceFS->setGeometry(QRect(QPoint(0,0),fullScreenFrame->geometry().size()));
outputVideoDeviceFS->showFrameOff();
echoVideoDeviceFS->setGeometry(QRect(QPoint(fullScreenFrame->width(), fullScreenFrame->height()) - QPoint(320,240), QSize(320,240)));
echoVideoDeviceFS->showFrameOff();
}
}
// pass the event on to the parent class
return QObject::eventFilter(obj, event);
}
void VOIPChatWidgetHolder::toggleAudioListen()
{
@ -273,6 +323,7 @@ void VOIPChatWidgetHolder::toggleVideoCapture()
if (videoCaptureToggleButton->isChecked())
{
hideChatTextToggleButton->setEnabled(true);
hideChatTextToggleButtonFS->setEnabled(true);
//activate video input
//
videoWidget->show();
@ -295,6 +346,8 @@ void VOIPChatWidgetHolder::toggleVideoCapture()
{
hideChatTextToggleButton->setEnabled(false);
hideChatTextToggleButton->setChecked(false);
hideChatTextToggleButtonFS->setEnabled(false);
hideChatTextToggleButtonFS->setChecked(false);
toggleHideChatText();
inputVideoDevice->stop() ;
videoCaptureToggleButton->setToolTip(tr("Activate camera"));
@ -355,15 +408,35 @@ void VOIPChatWidgetHolder::addVideoData(const RsPeerId &peer_id, QByteArray* arr
}
}
void VOIPChatWidgetHolder::toggleHideChatTextFS()
{
hideChatTextToggleButton->setChecked(hideChatTextToggleButtonFS->isChecked());
toggleHideChatText();
}
void VOIPChatWidgetHolder::toggleHideChatText()
{
if (hideChatTextToggleButton->isChecked()) {
mChatWidget->hideChatText(true);
hideChatTextToggleButton->setToolTip(tr("Show Chat Text"));
inputVideoDevice->setEchoVideoTarget(echoVideoDeviceFS) ;
videoProcessor->setDisplayTarget(outputVideoDeviceFS) ;
fullScreenFrame->show();
} else {
mChatWidget->hideChatText(false);
hideChatTextToggleButton->setToolTip(tr("Hide Chat Text"));
inputVideoDevice->setEchoVideoTarget(echoVideoDevice) ;
videoProcessor->setDisplayTarget(outputVideoDevice) ;
fullScreenFrame->hide();
}
hideChatTextToggleButtonFS->setChecked(hideChatTextToggleButton->isChecked());
hideChatTextToggleButtonFS->setToolTip(fullScreenFrame->toolTip());
}
void VOIPChatWidgetHolder::showChatText()
{
hideChatTextToggleButton->setChecked(false);
hideChatTextToggleButtonFS->setChecked(false);
toggleHideChatText();
}
void VOIPChatWidgetHolder::botMouseEnter()

11
plugins/VOIP/gui/VOIPChatWidgetHolder.h
View File

@ -63,11 +63,15 @@ private slots:
void toggleAudioCapture();
void toggleVideoCapture();
void toggleHideChatText();
void toggleHideChatTextFS();
void showChatText();
void hangupCall() ;
void botMouseEnter();
void botMouseLeave();
protected:
bool eventFilter(QObject *obj, QEvent *event);
// Audio input/output
QAudioInput* inputAudioDevice;
QAudioOutput* outputAudioDevice;
@ -80,6 +84,12 @@ protected:
QVideoOutputDevice *echoVideoDevice;
QVideoInputDevice *inputVideoDevice;
//For FullScreen Mode
QFrame *fullScreenFrame;
QVideoOutputDevice *outputVideoDeviceFS;
QVideoOutputDevice *echoVideoDeviceFS;
Qt::WindowFlags outputVideoDeviceFlags;
QWidget *videoWidget ; // pointer to call show/hide
VideoProcessor *videoProcessor;
@ -89,6 +99,7 @@ protected:
QToolButton *audioCaptureToggleButton ;
QToolButton *videoCaptureToggleButton ;
QToolButton *hideChatTextToggleButton ;
QToolButton *hideChatTextToggleButtonFS ;
QToolButton *hangupButton ;
typedef QMap<QString, RSButtonOnText*> button_map;